Fix make distcheck errors.

bus/Makefile.am

@@ -103,7 +103,11 @@ test_matchrule_SOURCES = \
 	$(NULL)
 
 EXTRA_DIST = \
-	ibus.desktop \
+	$(desktop_in_files) \
+	$(NULL)
+
+DISTCLEANFILES = \
+	$(desktop_DATA) \
 	$(NULL)
 
 $(libibus):

data/Makefile.am

@@ -25,7 +25,7 @@ SUBDIRS = \
 
 
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_files = ibus.schemas
+schemas_in_files = ibus.schemas.in
 schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -40,5 +40,9 @@ if GCONF_SCHEMAS_INSTALL
 endif
 
 EXTRA_DIST = \
+	$(schemas_in_files) \
+	$(NULL)
+
+DISTCLEANFILES = \
 	$(schemas_DATA) \
 	$(NULL)

po/POTFILES.in

@@ -1,37 +1,55 @@
-./ibus/bus.py
-./ibus/__init__.py
-./ibus/common.py
-./ibus/utility.py
-./ibus/keysyms.py
-./ibus/modifier.py
-./ibus/attribute.py
-./ibus/engine.py
-./ibus/panel.py
-./ibus/interface/__init__.py
-./ibus/interface/ipanel.py
-./ibus/interface/iconfig.py
-./ibus/interface/iibus.py
-./ibus/interface/iengine.py
-./ibus/interface/ienginefactory.py
-./ibus/exception.py
-./ibus/application.py
-./ibus/object.py
-./ibus/lang.py
-./ibus/lookuptable.py
-./ibus/property.py
-./ibus/_gtk.py
-./ibus/ascii.py
-./ibus/factory.py
-./ui/gtk/menu.py
-./ui/gtk/handle.py
-./ui/gtk/icon.py
-./ui/gtk/candidatepanel.py
-./ui/gtk/toolitem.py
-./ui/gtk/main.py
-./ui/gtk/panel.py
-./ui/gtk/propitem.py
-./ui/gtk/languagebar.py
-./setup/main.py
-./setup/keyboardshortcut.py
-./setup/enginecombobox.py
-./setup/setup.glade
+src/ibusbus.c
+src/ibusconfig.c
+src/ibusconnection.c
+src/ibusengine.c
+src/ibushotkey.c
+src/ibusinputcontext.c
+src/ibusobject.c
+src/ibusproxy.c
+src/ibusserver.c
+src/ibusservice.c
+src/keyname-table.h
+bus/ibus.desktop.in
+bus/dbusimpl.c
+bus/engineproxy.c
+bus/inputcontext.c
+bus/panelproxy.c
+ibus/bus.py
+ibus/__init__.py
+ibus/common.py
+ibus/utility.py
+ibus/keysyms.py
+ibus/modifier.py
+ibus/attribute.py
+ibus/engine.py
+ibus/panel.py
+ibus/interface/__init__.py
+ibus/interface/ipanel.py
+ibus/interface/iconfig.py
+ibus/interface/iibus.py
+ibus/interface/iengine.py
+ibus/interface/ienginefactory.py
+ibus/exception.py
+ibus/application.py
+ibus/object.py
+ibus/lang.py
+ibus/lookuptable.py
+ibus/property.py
+ibus/_gtk.py
+ibus/ascii.py
+ibus/factory.py
+ui/gtk/menu.py
+ui/gtk/handle.py
+ui/gtk/icon.py
+ui/gtk/candidatepanel.py
+ui/gtk/toolitem.py
+ui/gtk/main.py
+ui/gtk/panel.py
+ui/gtk/propitem.py
+ui/gtk/languagebar.py
+setup/main.py
+setup/keyboardshortcut.py
+setup/enginecombobox.py
+setup/setup.glade
+setup/ibus-setup.desktop.in
+data/ibus.schemas.in

po/fr.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-30 17:12+0800\n"
+"POT-Creation-Date: 2009-03-31 10:27+0800\n"
 "PO-Revision-Date: 2009-03-11 17:30+0100\n"
 "Last-Translator: Julroy67 <julroy67@gmail.com>\n"
 "Language-Team: French <julroy67@gmail.com>\n"
@@ -18,77 +18,6 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: .././data/ibus.schemas.in.h:1
-msgid "Auto Hide"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:2
-#, fuzzy
-msgid "Custom Font"
-msgstr "Police personnalisée :"
-
-#: .././data/ibus.schemas.in.h:3
-msgid "Custom font name for language panel"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:4
-#, fuzzy
-msgid "Next Engine Hotkey"
-msgstr "moteur suivant"
-
-#: .././data/ibus.schemas.in.h:5
-msgid "Next engine hotkey for switch to next input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:6
-msgid "Orientation of Lookup Table"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:7
-msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:8
-#, fuzzy
-msgid "Preload Engines"
-msgstr "moteur précédent"
-
-#: .././data/ibus.schemas.in.h:9
-msgid "Preload Engines during ibus starts up"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:10
-#, fuzzy
-msgid "Prev Engine Hotkey"
-msgstr "moteur précédent"
-
-#: .././data/ibus.schemas.in.h:11
-msgid "Prev engine hotkey for switch to previous input method engine"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:12
-msgid ""
-"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
-"show"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:13
-msgid "Trigger Hotkey"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:14
-msgid "Trigger hotkey for enable or disable input context"
-msgstr ""
-
-#: .././data/ibus.schemas.in.h:15
-#, fuzzy
-msgid "Use Custom Font"
-msgstr "Utiliser une police personnalisée"
-
-#: .././data/ibus.schemas.in.h:16
-msgid "Use custom font name for language panel"
-msgstr ""
-
 #: .././ibus/lang.py:40 .././ui/gtk/panel.py:307 .././ui/gtk/panel.py:308
 #: .././ui/gtk/panel.py:309 .././ui/gtk/panel.py:310
 msgid "Other"
@@ -280,3 +209,78 @@ msgstr "Utiliser une police personnalisée"
 #: .././setup/setup.glade.h:28
 msgid "previous input method:"
 msgstr "méthode d'entrée précédente :"
+
+#: .././data/ibus.schemas.in.h:1
+msgid "Auto Hide"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:2
+#, fuzzy
+msgid "Custom Font"
+msgstr "Police personnalisée :"
+
+#: .././data/ibus.schemas.in.h:3
+msgid "Custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:4
+#, fuzzy
+msgid "Next Engine Hotkey"
+msgstr "moteur suivant"
+
+#: .././data/ibus.schemas.in.h:5
+msgid "Next engine hotkey for switch to next input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:6
+msgid "Orientation of Lookup Table"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:7
+msgid "Orientation of Lookup Table. 0 = Horizontal, 1 = Vertical"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:8
+#, fuzzy
+msgid "Preload Engines"
+msgstr "moteur précédent"
+
+#: .././data/ibus.schemas.in.h:9
+msgid "Preload Engines during ibus starts up"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:10
+#, fuzzy
+msgid "Prev Engine Hotkey"
+msgstr "moteur précédent"
+
+#: .././data/ibus.schemas.in.h:11
+msgid "Prev engine hotkey for switch to previous input method engine"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:12
+msgid ""
+"The behavior of language panel. 0 = Always hide, 1 = Auto hide, 2 = Always "
+"show"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:13
+msgid "Trigger Hotkey"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:14
+msgid "Trigger hotkey for enable or disable input context"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:15
+#, fuzzy
+msgid "Use Custom Font"
+msgstr "Utiliser une police personnalisée"
+
+#: .././data/ibus.schemas.in.h:16
+msgid "Use custom font name for language panel"
+msgstr ""
+
+#: .././data/ibus.schemas.in.h:17
+msgid "[Control+space]"
+msgstr ""