rpms/control-center/devel 0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch, NONE, 1.1 monitor-aspect.patch, NONE, 1.1 control-center.spec, 1.494, 1.495

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	control-center.spec 
Added Files:
	0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch 
	monitor-aspect.patch 
Log Message:
Copy over F12 changes


0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch:
 wm-common.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- NEW FILE 0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch ---
>From 11c5d4f3391400987c8fa41ef6e67458c1c29260 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 29 Oct 2009 12:18:37 +0000
Subject: [PATCH] Fix all the keybindings showing up when using compiz

The wm_common_get_current_keybindings() implementation
was broken.

https://bugzilla.gnome.org/show_bug.cgi?id=600021
---
 capplets/common/wm-common.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/capplets/common/wm-common.c b/capplets/common/wm-common.c
index ef38489..d2ce82a 100644
--- a/capplets/common/wm-common.c
+++ b/capplets/common/wm-common.c
@@ -27,7 +27,7 @@ wm_common_get_window_manager_property (Atom atom)
   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 @@ wm_common_get_window_manager_property (Atom atom)
       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 @@ wm_common_get_current_keybindings (void)
       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 : g_strdup (WM_COMMON_UNKNOWN);
 
       results = g_strdupv (to_copy);
       g_free (wm_name);
-- 
1.6.5.1


monitor-aspect.patch:
 gnome-wp-item.c |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE monitor-aspect.patch ---
diff --git a/capplets/appearance/gnome-wp-item.c b/capplets/appearance/gnome-wp-item.c
index b4c86f2..5b28aca 100644
--- a/capplets/appearance/gnome-wp-item.c
+++ b/capplets/appearance/gnome-wp-item.c
@@ -211,9 +211,13 @@ GdkPixbuf * gnome_wp_item_get_frame_thumbnail (GnomeWPItem * item,
 					       GnomeDesktopThumbnailFactory * thumbs,
                                                gint frame) {
   GdkPixbuf *pixbuf = NULL;
-  double aspect =
-    (double)gdk_screen_get_height (gdk_screen_get_default()) /
-    gdk_screen_get_width (gdk_screen_get_default());
+  GdkRectangle rect;
+  double aspect;
+
+  /* Use primary monitor for aspect.  Should we use the monitor with
+     the pointer? */
+  gdk_screen_get_monitor_geometry (gdk_screen_get_default(), 0, &rect);
+  aspect = (double)rect.height / rect.width;
 
   set_bg_properties (item);
 


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -p -r1.494 -r1.495
--- control-center.spec	2 Nov 2009 05:50:43 -0000	1.494
+++ control-center.spec	10 Nov 2009 01:03:31 -0000	1.495
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.1
-Release: 3%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -46,6 +46,9 @@ Patch22: slab-icon-names.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=555591
 Patch30: default-layout-toggle.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=600021
+Patch31: 0001-Fix-all-the-keybindings-showing-up-when-using-compiz.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=588729
 Patch45: mnemonic.patch
 
@@ -74,6 +77,9 @@ Patch55: finger-icons.patch
 
 Patch56: best-shapes.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=147808
+Patch57: monitor-aspect.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
@@ -214,6 +220,7 @@ for the GNOME desktop.
 %patch54 -p1 -b .about-me-delete
 %patch55 -p1 -b .finger-icons
 %patch56 -p1 -b .best-shapes
+%patch57 -p1 -b .monitor-aspect
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -404,6 +411,13 @@ fi
 
 
 %changelog
+* Mon Nov  9 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-5
+- Use the primary monitor when determining background
+  aspect ratio (gnome #137808)
+
+* Thu Oct 29 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-4
+- Fix metacity keybindings showing up under compiz
+
 * Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-3
 - Change 'Best shapes' to mean grayscale+slight