rpms/control-center/devel no-duplicate-keybindings-dammit.patch, NONE, 1.1 control-center.spec, 1.496, 1.497

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11083

Modified Files:
	control-center.spec 
Added Files:
	no-duplicate-keybindings-dammit.patch 
Log Message:
copy f12 fixes


no-duplicate-keybindings-dammit.patch:
 wm-common.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE no-duplicate-keybindings-dammit.patch ---
--- gnome-control-center-2.28.1/capplets/common/wm-common.c	2009-09-21 06:44:55.000000000 -0400
+++ hacked/capplets/common/wm-common.c	2009-12-08 21:31:52.318541572 -0500
@@ -27,7 +27,7 @@
   guchar *val;
 
   if (wm_window == None)
-    return g_strdup (WM_COMMON_UNKNOWN);
+    return NULL;
 
   utf8_string = XInternAtom (GDK_DISPLAY (), "UTF8_STRING", False);
 
@@ -46,7 +46,7 @@
       type != utf8_string || format != 8 || nitems == 0 ||
       !g_utf8_validate (val, nitems, NULL))
     {
-      retval = g_strdup (WM_COMMON_UNKNOWN);
+      retval = NULL;
     }
   else
     {
@@ -93,7 +93,7 @@
       char *wm_name = wm_common_get_window_manager_property (wm_atom);
       char *to_copy[] = { NULL, NULL };
 
-      to_copy[0] = wm_name;
+      to_copy[0] = wm_name ? wm_name : WM_COMMON_UNKNOWN;
 
       results = g_strdupv (to_copy);
       g_free (wm_name);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -p -r1.496 -r1.497
--- control-center.spec	7 Dec 2009 18:36:53 -0000	1.496
+++ control-center.spec	9 Dec 2009 02:45:40 -0000	1.497
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 6%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -83,6 +83,9 @@ Patch57: monitor-aspect.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=492974
 Patch60: override-redirect.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=604130
+Patch62: no-duplicate-keybindings-dammit.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -225,6 +228,7 @@ for the GNOME desktop.
 %patch56 -p1 -b .best-shapes
 %patch57 -p1 -b .monitor-aspect
 %patch60 -p1 -b .override-redirect
+%patch62 -p1 -b .no-duplicate-keybindings
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -415,6 +419,9 @@ fi
 
 
 %changelog
+* Tue Dec  8 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-10
+- Avoid duplicate entries in the keybinding preferences (#542401)
+
 * Mon Dec  7 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-6
 - Improve typing break locking for multiple monitors