rpms/gtk2/devel randr-fix.patch,NONE,1.1 gtk2.spec,1.333,1.334

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv725

Modified Files:
	gtk2.spec 
Added Files:
	randr-fix.patch 
Log Message:
small xrandr fix


randr-fix.patch:

--- NEW FILE randr-fix.patch ---
diff -up gtk+-2.14.4/gdk/x11/gdkscreen-x11.c.randr-fix gtk+-2.14.4/gdk/x11/gdkscreen-x11.c
--- gtk+-2.14.4/gdk/x11/gdkscreen-x11.c.randr-fix	2008-10-22 00:57:46.000000000 -0400
+++ gtk+-2.14.4/gdk/x11/gdkscreen-x11.c	2008-10-22 00:59:18.000000000 -0400
@@ -894,6 +894,11 @@ void
 _gdk_x11_screen_size_changed (GdkScreen *screen,
 			      XEvent    *event)
 {
+  gint width, height;
+
+  width = gdk_screen_get_width (screen);
+  height = gdk_screen_get_height (screen);
+
 #ifdef HAVE_RANDR
   if (!XRRUpdateConfiguration (event))
     return;
@@ -909,6 +914,10 @@ _gdk_x11_screen_size_changed (GdkScreen 
   else
     return;
 #endif
+
+  if (gdk_screen_get_width (screen) == width &&
+      gdk_screen_get_height (screen) == height)
+    return;
   
   _gdk_x11_screen_process_monitors_change (screen);
   g_signal_emit_by_name (screen, "size_changed");


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- gtk2.spec	17 Oct 2008 14:27:03 -0000	1.333
+++ gtk2.spec	22 Oct 2008 14:58:22 -0000	1.334
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
+# from upstream
+Patch3: randr-fix.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -116,6 +118,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
+%patch3 -p1 -b .randr-fix
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -297,6 +300,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Wed Oct 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.4-2
+- Don't emit size-changed signals if the screen size doesn't change
+
 * Fri Oct 17 2008 Matthias Clasen <mclasen at redhat.com> - 2.14.4-1
 - Update to 2.14.4