[xsettings-kde] * Mon Nov 29 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.11-3 - fix the gtk-menu-images patch to

[Kevin Kofler]

commit e55fbb9d0282da4dec4cdea668bf19fb4264afc5
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Tue Nov 30 00:03:47 2010 +0100

    * Mon Nov 29 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.11-3
    - fix the gtk-menu-images patch to set the setting BEFORE notifying apps

 xsettings-kde-0.11-gtk-menu-images.patch |   17 +++++++++--------
 xsettings-kde.spec                       |    5 ++++-
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/xsettings-kde-0.11-gtk-menu-images.patch b/xsettings-kde-0.11-gtk-menu-images.patch
index 3a8493e..cbad324 100644
--- a/xsettings-kde-0.11-gtk-menu-images.patch
+++ b/xsettings-kde-0.11-gtk-menu-images.patch
@@ -1,6 +1,6 @@
 diff -ur xsettings-kde-0.11/xsettings-kde.c xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c
 --- xsettings-kde-0.11/xsettings-kde.c	2009-08-19 12:01:38.000000000 +0200
-+++ xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c	2010-11-22 02:42:26.000000000 +0100
++++ xsettings-kde-0.11-gtk-menu-images/xsettings-kde.c	2010-11-30 00:02:07.000000000 +0100
 @@ -67,7 +67,7 @@
   * Gtk/Modules => not supported
   * Gtk/FileChooserBackend => forced to gnome-vfs
@@ -10,15 +10,16 @@ diff -ur xsettings-kde-0.11/xsettings-kde.c xsettings-kde-0.11-gtk-menu-images/x
   * Gtk/MenuBarAccel => not supported
   * Xft/Antialias => KDE uses .fonts.conf directly
   * Xft/Hinting => KDE uses .fonts.conf directly
-@@ -469,6 +469,11 @@
- 			xsettings_manager_notify (managers[i]);
- 		}
+@@ -464,6 +464,12 @@
+ 		notify = 1;
  	}
-+
+ 
 +	/* KDE always shows menu images, so make sure GTK+ does, too */
 +	for (i = 0 ; i < max_display ; i++) {
 +		xsettings_manager_set_int(managers[i], "Gtk/MenuImages", 1);
 +	}
- }
- 
- void initial_init () {
++	notify = 1; /* TODO: eliminate this variable, as this makes it useless */
++
+ 	if (notify) {
+ 		for (i = 0 ; i < max_display ; i++) {
+ 			xsettings_manager_notify (managers[i]);
diff --git a/xsettings-kde.spec b/xsettings-kde.spec
index 29739b7..34e7383 100644
--- a/xsettings-kde.spec
+++ b/xsettings-kde.spec
@@ -2,7 +2,7 @@
 Summary: XSettings Daemon for KDE
 Name:    xsettings-kde
 Version: 0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:   User Interface/Desktops 
 # upstream is a svn
@@ -61,6 +61,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 29 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.11-3
+- fix the gtk-menu-images patch to set the setting BEFORE notifying apps
+
 * Mon Nov 22 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.11-2
 - make GTK+ apps display menu images in KDE