diff options
| author | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-10 11:24:51 +0800 |
|---|---|---|
| committer | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-10 11:24:51 +0800 |
| commit | 4fdeceb51956a114a684c7a9b75db4db459c5ee4 (patch) | |
| tree | b5fe4431464ada8f6c585c045abe807173144e48 | |
| parent | 566270731276e9028350dd90b6982c865490f243 (diff) | |
| download | ibus-4fdeceb51956a114a684c7a9b75db4db459c5ee4.tar.gz ibus-4fdeceb51956a114a684c7a9b75db4db459c5ee4.tar.xz ibus-4fdeceb51956a114a684c7a9b75db4db459c5ee4.zip | |
Fix problem with desktop files.
| -rw-r--r-- | bus/Makefile.am | 7 | ||||
| -rw-r--r-- | bus/ibus.desktop | 11 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | setup/Makefile.am | 3 | ||||
| -rw-r--r-- | setup/ibus-setup.desktop (renamed from setup/ibus-setup.desktop.in) | 6 |
5 files changed, 22 insertions, 6 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index d0f883a..03ddfb3 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -43,6 +43,9 @@ TESTS = \ test-matchrule \ $(NULL) +desktop_DATA = ibus.desktop +desktopdir = $(datadir)/applications + noinst_PROGRAMS = $(TESTS) bin_PROGRAMS = ibus-daemon ibus_daemon_DEPENDENCIES = \ @@ -92,6 +95,10 @@ test_matchrule_SOURCES = \ test-matchrule.c \ $(NULL) +EXTRA_DIST = \ + ibus.desktop \ + $(NULL) + $(libibus): $(MAKE) -C $(top_builddir)/src diff --git a/bus/ibus.desktop b/bus/ibus.desktop new file mode 100644 index 0000000..fd98021 --- /dev/null +++ b/bus/ibus.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=IBus +GenericName=Intelligent Input Bus +Comment=Intellignent Input Bus +Exec=ibus-daemon --xim +Icon=ibus +Terminal=false +Type=Application +StartupNotify=false +Categories=Utility; diff --git a/configure.ac b/configure.ac index 047b05d..7481739 100644 --- a/configure.ac +++ b/configure.ac @@ -228,7 +228,6 @@ client/qt4/Makefile client/x11/Makefile setup/Makefile setup/ibus-setup -setup/ibus-setup.desktop src/Makefile bus/Makefile bindings/Makefile diff --git a/setup/Makefile.am b/setup/Makefile.am index 0e144e9..65cfdab 100644 --- a/setup/Makefile.am +++ b/setup/Makefile.am @@ -40,12 +40,11 @@ desktopdir = $(datadir)/applications CLEANFILES = \ *.pyc \ ibus-setup \ - ibus-setup.desktop \ $(NULL) EXTRA_DIST = \ ibus-setup.in \ - ibus-setup.desktop.in \ + ibus-setup.desktop \ setup.glade \ $(NULL) diff --git a/setup/ibus-setup.desktop.in b/setup/ibus-setup.desktop index b6a3176..673a830 100644 --- a/setup/ibus-setup.desktop.in +++ b/setup/ibus-setup.desktop @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 -Name=iBus Preferences -GenericName=iBus Preferences -Comment=Setup utility for iBus +Name=IBus Preferences +GenericName=IBus Preferences +Comment=Setup utility for IBus Exec=ibus-setup Icon=ibus-setup Terminal=false |