diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
commit | a6ee13798647ec09fb33e316a90ef6ed0b7f314a (patch) | |
tree | 815ded684a1ee9e4c23c2f03c98691b9272243c1 /extra/gnome-panel/fix-crasher-launchers.patch | |
parent | c3b94090a6330f678ade2f767e76ab7802d3463e (diff) | |
parent | 4d22176132f4a830ab0cc510dabbc9f8c1c362ea (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'extra/gnome-panel/fix-crasher-launchers.patch')
-rw-r--r-- | extra/gnome-panel/fix-crasher-launchers.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/extra/gnome-panel/fix-crasher-launchers.patch b/extra/gnome-panel/fix-crasher-launchers.patch deleted file mode 100644 index b15fdf29c..000000000 --- a/extra/gnome-panel/fix-crasher-launchers.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8c275a2adf4ad99297a17cabf251344837620831 Mon Sep 17 00:00:00 2001 -From: Josselin Mouette <joss@malsain.org> -Date: Mon, 11 Apr 2011 13:05:32 +0000 -Subject: panel: Fix crash when starting launcher - -Do not destroy a widget in its draw signal. This is bad. Really. - -This was happening in the animation that is being drawn after clicking a -launcher. - -https://bugzilla.gnome.org/show_bug.cgi?id=641325 ---- -diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c -index 8465341..5acbf66 100644 ---- a/gnome-panel/xstuff.c -+++ b/gnome-panel/xstuff.c -@@ -305,6 +305,14 @@ zoom_timeout (GtkWidget *window) - } - - static gboolean -+idle_destroy (gpointer data) -+{ -+ gtk_widget_destroy (GTK_WIDGET (data)); -+ -+ return FALSE; -+} -+ -+static gboolean - zoom_draw (GtkWidget *widget, - cairo_t *cr, - gpointer user_data) -@@ -323,7 +331,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; --- -cgit v0.9 |