summaryrefslogtreecommitdiffstats
path: root/x11-fm/nautilus
diff options
context:
space:
mode:
authormezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2007-07-22 23:56:51 +0800
committermezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059>2007-07-22 23:56:51 +0800
commit5d3010874cc0d73082698de693cb0469dbcd0909 (patch)
tree7868bf424384cb0e3728985cc7649d0362c36514 /x11-fm/nautilus
parentcb8272dfeef1f6ff54cae8a7fa5f759b01617d15 (diff)
downloadmarcuscom-ports-5d3010874cc0d73082698de693cb0469dbcd0909.tar
marcuscom-ports-5d3010874cc0d73082698de693cb0469dbcd0909.tar.gz
marcuscom-ports-5d3010874cc0d73082698de693cb0469dbcd0909.tar.bz2
marcuscom-ports-5d3010874cc0d73082698de693cb0469dbcd0909.tar.lz
marcuscom-ports-5d3010874cc0d73082698de693cb0469dbcd0909.tar.xz
marcuscom-ports-5d3010874cc0d73082698de693cb0469dbcd0909.tar.zst
marcuscom-ports-5d3010874cc0d73082698de693cb0469dbcd0909.zip
Fix the crash with new gtk.
Obtained from: GNOME SVN git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9233 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-fm/nautilus')
-rw-r--r--x11-fm/nautilus/Makefile3
-rw-r--r--x11-fm/nautilus/files/patch-src_nautilus-navigation-window.c15
2 files changed, 17 insertions, 1 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 4457370a8..2b8a6bf08 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,11 +3,12 @@
# Whom: ade, archie
#
# $FreeBSD$
-# $MCom: ports/x11-fm/nautilus/Makefile,v 1.136 2007/06/20 06:29:14 marcus Exp $
+# $MCom: ports/x11-fm/nautilus/Makefile,v 1.137 2007/07/10 14:38:26 ahze Exp $
#
PORTNAME= nautilus
PORTVERSION= 2.19.5
+PORTREVISION= 1
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11-fm/nautilus/files/patch-src_nautilus-navigation-window.c b/x11-fm/nautilus/files/patch-src_nautilus-navigation-window.c
new file mode 100644
index 000000000..74bf760cd
--- /dev/null
+++ b/x11-fm/nautilus/files/patch-src_nautilus-navigation-window.c
@@ -0,0 +1,15 @@
+--- src/nautilus-navigation-window.c 2007/01/11 19:16:19 12693
++++ 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);