Archives
Archives
| From: | "Mart Raudsepp (leio)" <leio@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in gnome-base/nautilus/files: nautilus-2.18.3-gtk2.12-compatibility.patch digest-nautilus-2.18.3-r1 |
| Date: | Tue, 25 Sep 2007 10:55:28 |
| Message-Id: | E1Ia7wX-00079q-Vd@stork.gentoo.org |
| 1 | leio 07/09/25 10:47:05 |
| 2 | |
| 3 | Added: nautilus-2.18.3-gtk2.12-compatibility.patch |
| 4 | digest-nautilus-2.18.3-r1 |
| 5 | Log: |
| 6 | Fix crashes with gtk+-2.12 in browser mode, bug #193536 |
| 7 | (Portage version: 2.1.3.9) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 gnome-base/nautilus/files/nautilus-2.18.3-gtk2.12-compatibility.patch |
| 11 | |
| 12 | 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 |
| 13 | 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 |
| 14 | |
| 15 | Index: nautilus-2.18.3-gtk2.12-compatibility.patch |
| 16 | =================================================================== |
| 17 | >From http://svn.gnome.org/viewcvs/nautilus?view=revision&revision=13002 to fix |
| 18 | http://bugzilla.gnome.org/show_bug.cgi?id=459221 |
| 19 | and our bug http://bugs.gentoo.org/show_bug.cgi?id=193536 |
| 20 | |
| 21 | ChangeLog entry: |
| 22 | * src/nautilus-navigation-window.c: |
| 23 | (view_as_menu_switch_views_callback): |
| 24 | Handle the fact that the gtk+ 2.11.x combobox emits the |
| 25 | changed signal on removing the active entry without crash. |
| 26 | |
| 27 | --- trunk/src/nautilus-navigation-window.c 2007/07/18 12:24:05 13001 |
| 28 | +++ trunk/src/nautilus-navigation-window.c 2007/07/18 22:07:07 13002 |
| 29 | @@ -854,8 +854,10 @@ |
| 30 | g_assert (NAUTILUS_IS_WINDOW (window)); |
| 31 | |
| 32 | active = gtk_combo_box_get_active (combo_box); |
| 33 | - |
| 34 | - if (active < GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo_box), "num viewers")) ) { |
| 35 | + |
| 36 | + if (active < 0) { |
| 37 | + return; |
| 38 | + } else if (active < GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo_box), "num viewers"))) { |
| 39 | activate_nth_short_list_item (window, active); |
| 40 | } else { |
| 41 | activate_extra_viewer (window); |
| 42 | |
| 43 | |
| 44 | |
| 45 | 1.1 gnome-base/nautilus/files/digest-nautilus-2.18.3-r1 |
| 46 | |
| 47 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/nautilus/files/digest-nautilus-2.18.3-r1?rev=1.1&view=markup |
| 48 | 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 |
| 49 | |
| 50 | Index: digest-nautilus-2.18.3-r1 |
| 51 | =================================================================== |
| 52 | MD5 e027b4e1a925122ef3e7f54323cc3c44 nautilus-2.18.3.tar.bz2 4331118 |
| 53 | RMD160 2069e1e9bb00c1ef6d942b114f8acda4776a06b0 nautilus-2.18.3.tar.bz2 4331118 |
| 54 | SHA256 8ecc2b27f9e8e7f12ee2a84ae54d71d60c769e559f9952f8d792447e6f657c16 nautilus-2.18.3.tar.bz2 4331118 |
| 55 | |
| 56 | |
| 57 | |
| 58 | -- |
| 59 | gentoo-commits@g.o mailing list |