rpms/control-center/F-12 mirror-crash.patch, NONE, 1.1 control-center.spec, 1.493, 1.494

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/control-center/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17088

Modified Files:
	control-center.spec 
Added Files:
	mirror-crash.patch 
Log Message:
Fix a crash in the display capplet


mirror-crash.patch:
 xrandr-capplet.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- NEW FILE mirror-crash.patch ---
--- gnome-control-center-2.28.0/capplets/display/xrandr-capplet.c	2009-08-24 06:54:41.000000000 -0400
+++ hacked/capplets/display/xrandr-capplet.c	2009-09-30 09:29:05.160839814 -0400
@@ -516,6 +516,7 @@
 {
     int i;
     GnomeRRMode **modes;
+    int best_w, best_h;
     const char *current;
 
     clear_combo (app->resolution_combo);
@@ -533,6 +534,8 @@
 
     gtk_widget_set_sensitive (app->resolution_combo, TRUE);
 
+    best_w = 0;
+    best_h = 0;
     for (i = 0; modes[i] != NULL; ++i)
     {
 	int width, height;
@@ -543,12 +546,21 @@
 	add_key (app->resolution_combo,
 		 idle_free (make_resolution_string (width, height)),
 		 width, height, 0, -1);
+
+        if (width * height > best_w * best_h)
+        {
+            best_w = width;
+            best_h = height;
+        }
     }
 
     current = idle_free (make_resolution_string (app->current_output->width, app->current_output->height));
 
     if (!combo_select (app->resolution_combo, current))
-	g_assert_not_reached ();
+    {
+         combo_select (app->resolution_combo,
+                       idle_free (make_resolution_string (best_w, best_h)));
+    }
 }
 
 static void


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-12/control-center.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -p -r1.493 -r1.494
--- control-center.spec	29 Sep 2009 02:22:33 -0000	1.493
+++ control-center.spec	30 Sep 2009 13:36:58 -0000	1.494
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.28.0
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -58,6 +58,9 @@ Patch47: save-as.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=596369
 Patch50: fix-background-tooltips.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=593866
+Patch51: mirror-crash.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
@@ -192,6 +195,7 @@ for the GNOME desktop.
 %patch46 -p1 -b .no-tweaks
 %patch47 -p1 -b .save-as
 %patch50 -p1 -b .fix-background-tooltips
+%patch51 -p1 -b .mirror-crash
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -382,6 +386,9 @@ fi
 
 
 %changelog
+* Wed Sep 30 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-12
+- Fix a crash in the display capplet
+
 * Mon Sep 28 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-11
 - Steal translations for "Make Default" from gnome-power-manager