Sophie

Sophie

distrib > Fedora > 16 > x86_64 > media > updates-src > by-pkgid > f813983ca54507e0faa8a7824ac8a017 > files > 4

imsettings-1.2.9-4.fc16.src.rpm

diff -pruN imsettings-1.2.9.orig/backends/gconf/gconf-module.c imsettings-1.2.9/backends/gconf/gconf-module.c
--- imsettings-1.2.9.orig/backends/gconf/gconf-module.c	2011-12-02 13:09:45.000000000 +0900
+++ imsettings-1.2.9/backends/gconf/gconf-module.c	2012-12-04 15:28:56.000000000 +0900
@@ -57,11 +57,11 @@ module_switch_im(IMSettingsInfo *info)
 		goto finalize;
 	}
 
-#ifdef ENABLE_FALLBACK_IM
-	v = g_strdup_printf("%s:xim", gtkimm);
-#else
+//#ifdef ENABLE_FALLBACK_IM
+//	v = g_strdup_printf("%s:xim", gtkimm);
+//#else
 	v = g_strdup(gtkimm);
-#endif
+//#endif
 	val = gconf_value_new_from_string(GCONF_VALUE_STRING,
 					  v, &err);
 	if (err)
diff -pruN imsettings-1.2.9.orig/backends/gsettings/gsettings-module.c imsettings-1.2.9/backends/gsettings/gsettings-module.c
--- imsettings-1.2.9.orig/backends/gsettings/gsettings-module.c	2011-11-17 12:30:46.000000000 +0900
+++ imsettings-1.2.9/backends/gsettings/gsettings-module.c	2012-12-04 15:29:08.000000000 +0900
@@ -69,11 +69,11 @@ module_switch_im(IMSettingsInfo *info)
 	}
 	if (!_check_schema())
 		goto finalize;
-#ifdef ENABLE_FALLBACK_IM
-	val = g_strdup_printf("%s:xim", gtkimm);
-#else
+//#ifdef ENABLE_FALLBACK_IM
+//	val = g_strdup_printf("%s:xim", gtkimm);
+//#else
 	val = g_strdup(gtkimm);
-#endif
+//#endif
 	settings = g_settings_new(IMMODULE_SCHEMA);
 	if (!g_settings_set_string(settings,
 				   IMMODULE_KEY,
diff -pruN imsettings-1.2.9.orig/backends/lxde/lxde-module.c imsettings-1.2.9/backends/lxde/lxde-module.c
--- imsettings-1.2.9.orig/backends/lxde/lxde-module.c	2012-04-23 17:28:00.000000000 +0900
+++ imsettings-1.2.9/backends/lxde/lxde-module.c	2012-12-04 15:29:19.000000000 +0900
@@ -69,11 +69,11 @@ _update_config(const gchar *configdir,
 		}
 	}
 
-#ifdef ENABLE_FALLBACK_IM
-	val = g_strdup_printf("%s:xim", module);
-#else
+//#ifdef ENABLE_FALLBACK_IM
+//	val = g_strdup_printf("%s:xim", module);
+//#else
 	val = g_strdup(module);
-#endif
+//#endif
 	g_key_file_set_string(key, "GTK", "sGtk/IMModule",
 			      val);
 
diff -pruN imsettings-1.2.9.orig/backends/mate-gsettings/mate-gsettings-module.c imsettings-1.2.9/backends/mate-gsettings/mate-gsettings-module.c
--- imsettings-1.2.9.orig/backends/mate-gsettings/mate-gsettings-module.c	2012-12-04 15:27:46.000000000 +0900
+++ imsettings-1.2.9/backends/mate-gsettings/mate-gsettings-module.c	2012-12-04 15:29:30.000000000 +0900
@@ -69,11 +69,11 @@ module_switch_im(IMSettingsInfo *info)
 	}
 	if (!_check_schema())
 		goto finalize;
-#ifdef ENABLE_FALLBACK_IM
-	val = g_strdup_printf("%s:xim", gtkimm);
-#else
+//#ifdef ENABLE_FALLBACK_IM
+//	val = g_strdup_printf("%s:xim", gtkimm);
+//#else
 	val = g_strdup(gtkimm);
-#endif
+//#endif
 	settings = g_settings_new(IMMODULE_SCHEMA);
 	if (!g_settings_set_string(settings,
 				   IMMODULE_KEY,
diff -pruN imsettings-1.2.9.orig/backends/mateconf/mateconf-module.c imsettings-1.2.9/backends/mateconf/mateconf-module.c
--- imsettings-1.2.9.orig/backends/mateconf/mateconf-module.c	2012-12-04 15:27:46.000000000 +0900
+++ imsettings-1.2.9/backends/mateconf/mateconf-module.c	2012-12-04 15:29:40.000000000 +0900
@@ -57,11 +57,11 @@ module_switch_im(IMSettingsInfo *info)
 		goto finalize;
 	}
 
-#ifdef ENABLE_FALLBACK_IM
-	v = g_strdup_printf("%s:xim", gtkimm);
-#else
+//#ifdef ENABLE_FALLBACK_IM
+//	v = g_strdup_printf("%s:xim", gtkimm);
+//#else
 	v = g_strdup(gtkimm);
-#endif
+//#endif
 	val = mateconf_value_new_from_string(MATECONF_VALUE_STRING,
 					     v, &err);
 	if (err)
diff -pruN imsettings-1.2.9.orig/backends/xfce/xfce-module.c imsettings-1.2.9/backends/xfce/xfce-module.c
--- imsettings-1.2.9.orig/backends/xfce/xfce-module.c	2011-11-17 12:30:27.000000000 +0900
+++ imsettings-1.2.9/backends/xfce/xfce-module.c	2012-12-04 15:29:57.000000000 +0900
@@ -53,11 +53,11 @@ module_switch_im(IMSettingsInfo *info)
 		g_error_free(err);
 		return;
 	}
-#ifdef ENABLE_FALLBACK_IM
-	val = g_strdup_printf("%s:xim", gtkimm);
-#else
+//#ifdef ENABLE_FALLBACK_IM
+//	val = g_strdup_printf("%s:xim", gtkimm);
+//#else
 	val = g_strdup(gtkimm);
-#endif
+//#endif
 	ch = xfconf_channel_new("xsettings");
 	if (!xfconf_channel_set_string(ch, "/Gtk/IMModule", val)) {
 		g_warning("Unable to set %s to xfconf.", val);