r14255 - in /desktop/unstable/gtk+2.0/debian: changelog patches/092_recentfiles-recursion-fix.patch patches/series

[slomo at users.alioth.debian.org]

Author: slomo
Date: Thu Jan 17 10:01:15 2008
New Revision: 14255

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14255
Log:
* 092_recentfiles-recursion-fix.patch: Guard against recursion in
  gtk_recent_files_menu_populate(). Patch from upstream SVN by
  William Pitcock (Closes: #459393).

Added:
    desktop/unstable/gtk+2.0/debian/patches/092_recentfiles-recursion-fix.patch
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/series

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=14255&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Thu Jan 17 10:01:15 2008
@@ -19,6 +19,9 @@
   * Fixes FTBFS caused by not installing the png pixbuf loader correctly
     (Closes: #461037).
   * Update Standards-Version to 3.7.3, no additional changes needed.
+  * 092_recentfiles-recursion-fix.patch: Guard against recursion in
+    gtk_recent_files_menu_populate(). Patch from upstream SVN by
+    William Pitcock (Closes: #459393).
 
  -- Sebastian Dröge <slomo at debian.org>  Thu, 17 Jan 2008 10:49:09 +0100
 

Added: desktop/unstable/gtk+2.0/debian/patches/092_recentfiles-recursion-fix.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/092_recentfiles-recursion-fix.patch?rev=14255&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/092_recentfiles-recursion-fix.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/092_recentfiles-recursion-fix.patch Thu Jan 17 10:01:15 2008
@@ -1,0 +1,55 @@
+diff -urN gtk+2.0-2.12.3/gtk/gtkrecentchoosermenu.c gtk+2.0-2.12.3+fix/gtk/gtkrecentchoosermenu.c
+--- gtk+2.0-2.12.3/gtk/gtkrecentchoosermenu.c	2007-12-04 10:52:08.000000000 -0600
++++ gtk+2.0-2.12.3+fix/gtk/gtkrecentchoosermenu.c	2008-01-04 23:22:01.000000000 -0600
+@@ -926,8 +926,6 @@
+   pdata = (MenuPopulateData *) data;
+   priv = pdata->menu->priv;
+ 
+-  priv->populate_id = 0;
+-
+   if (!pdata->items)
+     {
+       pdata->items = gtk_recent_chooser_get_items (GTK_RECENT_CHOOSER (pdata->menu));
+@@ -936,6 +934,7 @@
+           /* show the placeholder here */
+           gtk_widget_show (pdata->placeholder);
+           pdata->displayed_items = 1;
++          priv->populate_id = 0;
+ 
+ 	  return FALSE;
+ 	}
+@@ -978,6 +977,8 @@
+       g_list_foreach (pdata->items, (GFunc) gtk_recent_info_unref, NULL);
+       g_list_free (pdata->items);
+ 
++      priv->populate_id = 0;
++
+       retval = FALSE;
+     }
+   else
+@@ -991,14 +992,17 @@
+ {
+   MenuPopulateData *pdata = data;
+ 
+-  /* show the placeholder in case no item survived
+-   * the filtering process in the idle loop
+-   */
+-  if (!pdata->displayed_items)
+-    gtk_widget_show (pdata->placeholder);
+-  g_object_unref (pdata->placeholder);
++  if (pdata->menu->priv->populate_id == 0)
++    {
++      /* show the placeholder in case no item survived
++       * the filtering process in the idle loop
++       */
++      if (!pdata->displayed_items)
++        gtk_widget_show (pdata->placeholder);
++      g_object_unref (pdata->placeholder);
+ 
+-  g_slice_free (MenuPopulateData, data);
++      g_slice_free (MenuPopulateData, data);
++    }
+ }
+ 
+ static void
+

Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=14255&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series Thu Jan 17 10:01:15 2008
@@ -21,3 +21,4 @@
 070_mandatory-relibtoolize.patch
 091_workaround_no_gtk_init_incorrect_display.patch
 093_directfb-type-changes.patch
+092_recentfiles-recursion-fix.patch