r12090 - in /desktop/unstable/nautilus/debian: changelog patches/60_combobox-changed-signal.patch patches/series

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Jul 24 13:57:20 2007
New Revision: 12090

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12090
Log:
* New patch, 60_combobox-changed-signal, fix a crash with newer Gtk emitting
  a changed signal; GNOME #459221; SVN r13002.

Added:
    desktop/unstable/nautilus/debian/patches/60_combobox-changed-signal.patch
Modified:
    desktop/unstable/nautilus/debian/changelog
    desktop/unstable/nautilus/debian/patches/series

Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=12090&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Tue Jul 24 13:57:20 2007
@@ -1,3 +1,10 @@
+nautilus (2.18.3-3) UNRELEASED; urgency=low
+
+  * New patch, 60_combobox-changed-signal, fix a crash with newer Gtk emitting
+    a changed signal; GNOME #459221; SVN r13002.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 24 Jul 2007 15:57:04 +0200
+
 nautilus (2.18.3-2) unstable; urgency=low
 
   * 14_sidebar_network-protocol.patch: fix systematic segfault.

Added: desktop/unstable/nautilus/debian/patches/60_combobox-changed-signal.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/60_combobox-changed-signal.patch?rev=12090&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/60_combobox-changed-signal.patch (added)
+++ desktop/unstable/nautilus/debian/patches/60_combobox-changed-signal.patch Tue Jul 24 13:57:20 2007
@@ -1,0 +1,24 @@
+GNOME #459221; SVN r13002; fix a crash with newer Gtk emitting a changed signal
+
+2007-07-18  Martin Wehner  <martin.wehner at gmail.com>
+
+       * src/nautilus-navigation-window.c:
+       (view_as_menu_switch_views_callback):
+       Handle the fact that the gtk+ 2.11.x combobox emits the
+       changed signal on removing the active entry without crash.
+
+--- nautilus-2.18.3.orig/src/nautilus-navigation-window.c	2007-07-24 15:52:55.000000000 +0200
++++ nautilus-2.18.3/src/nautilus-navigation-window.c	2007-07-24 15:53:38.000000000 +0200
+@@ -854,8 +854,10 @@
+ 	g_assert (NAUTILUS_IS_WINDOW (window));
+ 
+ 	active = gtk_combo_box_get_active (combo_box);
+-	
+-	if (active < GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo_box), "num viewers"))  ) {
++
++	if (active < 0) {
++		return;
++	} else if (active < GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo_box), "num viewers"))) {
+ 		activate_nth_short_list_item (window, active);
+ 	} else {
+ 		activate_extra_viewer (window);

Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=12090&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Tue Jul 24 13:57:20 2007
@@ -11,4 +11,5 @@
 13_thumbnail_size_pref.patch
 14_sidebar_network-protocol.patch
 20_upstream_nautilus-dnd-user-owned.patch -p0
+60_combobox-changed-signal.patch
 99_ltmain_as-needed.patch