summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-03-11 05:11:23 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-03-11 05:11:23 +0800
commite56bdf2c6657c728fb6734a6e10d693c3a81cfef (patch)
treec3267c708e11c2229080f94477021df73ed61c54
parenta9f85bfc2316a62d921f78b9fae59a2b15619769 (diff)
downloadmarcuscom-ports-e56bdf2c6657c728fb6734a6e10d693c3a81cfef.tar
marcuscom-ports-e56bdf2c6657c728fb6734a6e10d693c3a81cfef.tar.gz
marcuscom-ports-e56bdf2c6657c728fb6734a6e10d693c3a81cfef.tar.bz2
marcuscom-ports-e56bdf2c6657c728fb6734a6e10d693c3a81cfef.tar.lz
marcuscom-ports-e56bdf2c6657c728fb6734a6e10d693c3a81cfef.tar.xz
marcuscom-ports-e56bdf2c6657c728fb6734a6e10d693c3a81cfef.tar.zst
marcuscom-ports-e56bdf2c6657c728fb6734a6e10d693c3a81cfef.zip
Fix the crash with clicking on Filesystem in the new File Chooser dialog.
Reported by: Jeremy Messenger <mezz7@cox.net> Obtained from: GNOME CVS git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2028 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11-toolkits/gtk20/Makefile1
-rw-r--r--x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c16
2 files changed, 17 insertions, 0 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 02d3e6d23..c8ff8348b 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk
PORTVERSION= 2.3.6
+PORTREVISION= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.3,} \
ftp://ftp.gtk.org/pub/gtk/v2.3/ \
diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c b/x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c
new file mode 100644
index 000000000..a2a281fe2
--- /dev/null
+++ b/x11-toolkits/gtk20/files/patch-gtk_gtkfilechooserdefault.c
@@ -0,0 +1,16 @@
+--- gtk/gtkfilechooserdefault.c.orig Wed Mar 10 16:11:22 2004
++++ gtk/gtkfilechooserdefault.c Wed Mar 10 16:12:05 2004
+@@ -757,10 +757,12 @@
+ GtkFileFolder *parent_folder;
+ GtkFileInfo *info;
+
++ info = NULL;
++
+ if (!gtk_file_system_get_parent (file_system, path, &parent_path, error))
+ return NULL;
+
+- parent_folder = gtk_file_system_get_folder (file_system, parent_path,
++ parent_folder = gtk_file_system_get_folder (file_system, parent_path ? parent_path : path,
+ GTK_FILE_INFO_DISPLAY_NAME
+ #if 0
+ | GTK_FILE_INFO_ICON