public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in gnome-base/nautilus/files: nautilus-2.18.3-gtk2.12-compatibility.patch digest-nautilus-2.18.3-r1
@ 2007-09-25 10:47 Mart Raudsepp (leio)
  0 siblings, 0 replies; only message in thread
From: Mart Raudsepp (leio) @ 2007-09-25 10:47 UTC (permalink / raw
  To: gentoo-commits

leio        07/09/25 10:47:05

  Added:                nautilus-2.18.3-gtk2.12-compatibility.patch
                        digest-nautilus-2.18.3-r1
  Log:
  Fix crashes with gtk+-2.12 in browser mode, bug #193536
  (Portage version: 2.1.3.9)

Revision  Changes    Path
1.1                  gnome-base/nautilus/files/nautilus-2.18.3-gtk2.12-compatibility.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.18.3-gtk2.12-compatibility.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/nautilus-2.18.3-gtk2.12-compatibility.patch?rev=1.1&content-type=text/plain

Index: nautilus-2.18.3-gtk2.12-compatibility.patch
===================================================================
>From http://svn.gnome.org/viewcvs/nautilus?view=revision&revision=13002 to fix
http://bugzilla.gnome.org/show_bug.cgi?id=459221
and our bug http://bugs.gentoo.org/show_bug.cgi?id=193536

ChangeLog entry:
* 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.

--- trunk/src/nautilus-navigation-window.c	2007/07/18 12:24:05	13001
+++ trunk/src/nautilus-navigation-window.c	2007/07/18 22:07:07	13002
@@ -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);



1.1                  gnome-base/nautilus/files/digest-nautilus-2.18.3-r1

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/digest-nautilus-2.18.3-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/digest-nautilus-2.18.3-r1?rev=1.1&content-type=text/plain

Index: digest-nautilus-2.18.3-r1
===================================================================
MD5 e027b4e1a925122ef3e7f54323cc3c44 nautilus-2.18.3.tar.bz2 4331118
RMD160 2069e1e9bb00c1ef6d942b114f8acda4776a06b0 nautilus-2.18.3.tar.bz2 4331118
SHA256 8ecc2b27f9e8e7f12ee2a84ae54d71d60c769e559f9952f8d792447e6f657c16 nautilus-2.18.3.tar.bz2 4331118



-- 
gentoo-commits@gentoo.org mailing list



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2007-09-25 10:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-25 10:47 [gentoo-commits] gentoo-x86 commit in gnome-base/nautilus/files: nautilus-2.18.3-gtk2.12-compatibility.patch digest-nautilus-2.18.3-r1 Mart Raudsepp (leio)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox