rpms/xfce4-settings/devel xfce4-settings-4.5.93-imsettings.patch, NONE, 1.1 xfce4-settings.spec, 1.4, 1.5

[Kevin Fenzi]

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1849

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.5.93-imsettings.patch 
Log Message:
Add patch to fix imsettings (fixes #478669)


xfce4-settings-4.5.93-imsettings.patch:

--- NEW FILE xfce4-settings-4.5.93-imsettings.patch ---
diff -pruN xfce4-settings-4.5.99.1.orig/xfsettingsd/registry.c xfce4-settings-4.5.99.1/xfsettingsd/registry.c
--- xfce4-settings-4.5.99.1.orig/xfsettingsd/registry.c	2009-01-25 23:29:31.000000000 +0900
+++ xfce4-settings-4.5.99.1/xfsettingsd/registry.c	2009-02-16 23:10:36.000000000 +0900
@@ -107,6 +107,7 @@ enum
     XSETTING_ENTRY_GTK_MENUBARACCEL,
     XSETTING_ENTRY_GTK_CURSORTHEMENAME,
     XSETTING_ENTRY_GTK_CURSORTHEMESIZE,
+    XSETTING_ENTRY_GTK_IMMODULE,
 } XSettingType;
 
 static XSettingsRegistryEntry properties[] = {
@@ -141,6 +142,7 @@ static XSettingsRegistryEntry properties
 { "Gtk/MenuBarAccel", {G_TYPE_STRING, }},
 { "Gtk/CursorThemeName", {G_TYPE_STRING, }},
 { "Gtk/CursorThemeSize", {G_TYPE_INT, }},
+{ "Gtk/IMModule", {G_TYPE_STRING, }},
 
 { NULL, {0, }},
 };
@@ -267,6 +269,7 @@ xsettings_registry_init(XSettingsRegistr
 
     g_value_set_string (&properties[XSETTING_ENTRY_GTK_CURSORTHEMENAME].value, NULL);
     g_value_set_int (&properties[XSETTING_ENTRY_GTK_CURSORTHEMESIZE].value, 0);
+    g_value_set_string (&properties[XSETTING_ENTRY_GTK_IMMODULE].value, NULL);
 }
 
 static void


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-settings.spec	27 Jan 2009 18:29:46 -0000	1.4
+++ xfce4-settings.spec	20 Feb 2009 21:34:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.5.99.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -9,6 +9,7 @@
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
 # use vendor's artwork
+Patch0:          xfce4-settings-4.5.93-imsettings.patch
 Patch10:         xfce4-settings-4.5.93-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .imsettings
 %patch10 -p1 -b .vendor
 
 %build
@@ -109,6 +111,9 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Fri Feb 20 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-2
+- Add patch to fix imsettings (bug #478669)
+
 * Mon Jan 26 2009 Kevin Fenzi <kevin at tummy.com> - 4.5.99.1-1
 - Update to 4.5.99.1