summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2007-12-24 19:04:58 +0000
committerChristian Persch <chpe@src.gnome.org>2007-12-24 19:04:58 +0000
commitde7b3d599972e1b2d4797891739c20dfb3078aec (patch)
tree7dbcfce2f739cd3f55db5ace0fd7f0f69a92485d
parenta5afd99be2239ed291a7c12ccfa9ef580c33fdcc (diff)
downloadgnome-settings-daemon-de7b3d599972e1b2d4797891739c20dfb3078aec.tar.gz
Add Gtk/IMModule XSetting. Bug #504182, patch by Akira TAGOH.
2007-12-24 Christian Persch <chpe@gnome.org> * plugins/xsettings/gsd-xsettings-manager.c: Add Gtk/IMModule XSetting. Bug #504182, patch by Akira TAGOH. svn path=/trunk/; revision=38
-rw-r--r--ChangeLog5
-rw-r--r--plugins/xsettings/gsd-xsettings-manager.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b7d4067c..e80e3edd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-24 Christian Persch <chpe@gnome.org>
+
+ * plugins/xsettings/gsd-xsettings-manager.c: Add Gtk/IMModule XSetting.
+ Bug #504182, patch by Akira TAGOH.
+
2007-12-22 William Jon McCann <mccann@jhu.edu>
* plugins/xsettings/gsd-xsettings-manager.c:
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
index 05d45d4f..10ab0232 100644
--- a/plugins/xsettings/gsd-xsettings-manager.c
+++ b/plugins/xsettings/gsd-xsettings-manager.c
@@ -183,6 +183,7 @@ static TranslationEntry translations [] = {
{ "/desktop/gnome/interface/gtk_color_scheme", "Gtk/ColorScheme", GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/interface/gtk-im-preedit-style", "Gtk/IMPreeditStyle", GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/interface/gtk-im-status-style", "Gtk/IMStatusStyle", GCONF_VALUE_STRING, translate_string_string },
+ { "/desktop/gnome/interface/gtk-im-module", "Gtk/IMModule", GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/interface/icon_theme", "Net/IconThemeName", GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/interface/file_chooser_backend", "Gtk/FileChooserBackend", GCONF_VALUE_STRING, translate_string_string },
{ "/desktop/gnome/interface/menus_have_icons", "Gtk/MenuImages", GCONF_VALUE_BOOL, translate_bool_int },