r22708 - in /desktop/unstable/control-center/debian: changelog patches/02_xrandr_assert.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Jan  4 17:39:57 2010
New Revision: 22708

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22708
Log:
02_xrandr_assert.patch: stolen upstream. Fix assertion when using 
mirroring. Closes: #563094.

Added:
    desktop/unstable/control-center/debian/patches/02_xrandr_assert.patch
Modified:
    desktop/unstable/control-center/debian/changelog
    desktop/unstable/control-center/debian/patches/series

Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=22708&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog [utf-8] (original)
+++ desktop/unstable/control-center/debian/changelog [utf-8] Mon Jan  4 17:39:57 2010
@@ -1,9 +1,11 @@
-control-center (1:2.28.1-2) UNRELEASED; urgency=low
+control-center (1:2.28.1-2) unstable; urgency=low
 
   * Drop libxxf86misc-dev build-dependency, it is not used.
     Closes: #559694.
-
- -- Josselin Mouette <joss at debian.org>  Mon, 07 Dec 2009 10:01:29 +0100
+  * 02_xrandr_assert.patch: stolen upstream. Fix assertion when using 
+    mirroring. Closes: #563094.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 04 Jan 2010 18:26:06 +0100
 
 control-center (1:2.28.1-1) unstable; urgency=low
 

Added: desktop/unstable/control-center/debian/patches/02_xrandr_assert.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/02_xrandr_assert.patch?rev=22708&op=file
==============================================================================
--- desktop/unstable/control-center/debian/patches/02_xrandr_assert.patch (added)
+++ desktop/unstable/control-center/debian/patches/02_xrandr_assert.patch [utf-8] Mon Jan  4 17:39:57 2010
@@ -1,0 +1,87 @@
+From 41c5405976978ec23339d89d3857c3793955ed43 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Mon, 19 Oct 2009 18:57:27 +0000
+Subject: bgo#593866 - Don't assert when the current output doesn't have a resolution set yet
+
+Signed-off-by: Federico Mena Quintero <federico at novell.com>
+---
+diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c
+index f21857c..5a8b5b1 100644
+--- a/capplets/display/xrandr-capplet.c
++++ b/capplets/display/xrandr-capplet.c
+@@ -512,6 +512,29 @@ make_resolution_string (int width, int height)
+ }
+ 
+ static void
++find_best_mode (GnomeRRMode **modes, int *out_width, int *out_height)
++{
++    int i;
++
++    *out_width = 0;
++    *out_height = 0;
++
++    for (i = 0; modes[i] != NULL; i++)
++    {
++	int w, h;
++
++	w = gnome_rr_mode_get_width (modes[i]);
++	h = gnome_rr_mode_get_height (modes[i]);
++
++	if (w * h > *out_width * *out_height)
++	{
++	    *out_width = w;
++	    *out_height = h;
++	}
++    }
++}
++
++static void
+ rebuild_resolution_combo (App *app)
+ {
+     int i;
+@@ -548,7 +571,12 @@ rebuild_resolution_combo (App *app)
+     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 ();
++    {
++	int best_w, best_h;
++
++	find_best_mode (modes, &best_w, &best_h);
++	combo_select (app->resolution_combo, idle_free (make_resolution_string (best_w, best_h)));
++    }
+ }
+ 
+ static void
+@@ -654,29 +682,6 @@ on_rate_changed (GtkComboBox *box, gpointer data)
+ }
+ 
+ static void
+-find_best_mode (GnomeRRMode **modes, int *out_width, int *out_height)
+-{
+-    int i;
+-
+-    *out_width = 0;
+-    *out_height = 0;
+-
+-    for (i = 0; modes[i] != NULL; i++)
+-    {
+-	int w, h;
+-
+-	w = gnome_rr_mode_get_width (modes[i]);
+-	h = gnome_rr_mode_get_height (modes[i]);
+-
+-	if (w * h > *out_width * *out_height)
+-	{
+-	    *out_width = w;
+-	    *out_height = h;
+-	}
+-    }
+-}
+-
+-static void
+ select_resolution_for_current_output (App *app)
+ {
+     GnomeRRMode **modes;
+--
+cgit v0.8.3.1

Modified: desktop/unstable/control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/series?rev=22708&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/patches/series [utf-8] (original)
+++ desktop/unstable/control-center/debian/patches/series [utf-8] Mon Jan  4 17:39:57 2010
@@ -1,4 +1,5 @@
 01_fix_libslab_build.patch
+02_xrandr_assert.patch
 25_window_manager_settings.patch
 70_relibtoolize.patch
 99_ltmain_as-needed.patch