r27254 - in /desktop/experimental/gnome-panel/debian: changelog patches/02_launcher_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Apr  2 17:19:03 2011
New Revision: 27254

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27254
Log:
02_launcher_crash.patch: new patch. Fix a crash when clicking on 
launchers with the compositor enabled.

Added:
    desktop/experimental/gnome-panel/debian/patches/02_launcher_crash.patch
Modified:
    desktop/experimental/gnome-panel/debian/changelog
    desktop/experimental/gnome-panel/debian/patches/series

Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=27254&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/changelog [utf-8] Sat Apr  2 17:19:03 2011
@@ -1,3 +1,10 @@
+gnome-panel (2.91.93-2) UNRELEASED; urgency=low
+
+  * 02_launcher_crash.patch: new patch. Fix a crash when clicking on 
+    launchers with the compositor enabled.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 02 Apr 2011 19:06:08 +0200
+
 gnome-panel (2.91.93-1) experimental; urgency=low
 
   * New upstream pre-release.

Added: desktop/experimental/gnome-panel/debian/patches/02_launcher_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/02_launcher_crash.patch?rev=27254&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/02_launcher_crash.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/02_launcher_crash.patch [utf-8] Sat Apr  2 17:19:03 2011
@@ -1,0 +1,29 @@
+GNOME #641325
+
+Index: gnome-panel-2.91.93/gnome-panel/xstuff.c
+===================================================================
+--- gnome-panel-2.91.93.orig/gnome-panel/xstuff.c	2011-04-02 18:56:27.821302001 +0200
++++ gnome-panel-2.91.93/gnome-panel/xstuff.c	2011-04-02 19:01:24.937297950 +0200
+@@ -305,6 +305,13 @@ zoom_timeout (GtkWidget *window)
+ }
+ 
+ static gboolean
++idle_destroy (GtkWidget *window)
++{
++	gtk_widget_destroy (window);
++	return FALSE;
++}
++
++static gboolean
+ zoom_draw (GtkWidget *widget,
+ 	   cairo_t   *cr,
+            gpointer    user_data)
+@@ -323,7 +330,7 @@ zoom_draw (GtkWidget *widget,
+ 
+ 		g_slice_free (CompositedZoomData, zoom);
+ 
+-		gtk_widget_destroy (widget);
++		g_idle_add (idle_destroy, widget);
+ 	} else {
+ 		GdkPixbuf *scaled;
+ 		int width, height;

Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=27254&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-panel/debian/patches/series [utf-8] Sat Apr  2 17:19:03 2011
@@ -1,4 +1,5 @@
 01_panel_submenus.patch
+02_launcher_crash.patch
 03_tasklist_orientation.patch
 09_default_icons.patch
 10_bookmarks_limit.patch