Third time's the charm. Meanwhile, Daniel Boles from upstream came up
with a much simpler and better patch.

https://gitlab.gnome.org/GNOME/gtk/merge_requests/213

Index: Makefile
===================================================================
RCS file: /var/cvs/ports/x11/gtk+2/Makefile,v
retrieving revision 1.222
diff -u -p -r1.222 Makefile
--- Makefile    9 Jan 2018 13:22:24 -0000       1.222
+++ Makefile    22 Jun 2018 13:15:23 -0000
@@ -9,6 +9,7 @@ COMMENT-cups=           gtk+2 CUPS print backend
 
 GNOME_VERSION=         2.24.32
 GNOME_PROJECT=         gtk+
+REVISION=              0
 
 PKGNAME-main=          gtk+2-${GNOME_VERSION}
 PKGNAME-cups=          gtk+2-cups-${GNOME_VERSION}
Index: patches/patch-gtk_gtkfilechooserdefault_c
===================================================================
RCS file: patches/patch-gtk_gtkfilechooserdefault_c
diff -N patches/patch-gtk_gtkfilechooserdefault_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-gtk_gtkfilechooserdefault_c   22 Jun 2018 13:37:03 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+
+Index: gtk/gtkfilechooserdefault.c
+--- gtk/gtkfilechooserdefault.c.orig
++++ gtk/gtkfilechooserdefault.c
+@@ -2810,8 +2810,8 @@ bookmarks_check_remove_sensitivity (GtkFileChooserDefa
+ {
+   GtkTreeIter iter;
+   gboolean removable = FALSE;
++  gboolean have_bookmark_name = FALSE;
+   gchar *name = NULL;
+-  gchar *tip;
+   
+   if (shortcuts_get_selected (impl, &iter))
+     {
+@@ -2820,6 +2820,13 @@ bookmarks_check_remove_sensitivity (GtkFileChooserDefa
+                           SHORTCUTS_COL_NAME, &name,
+                           -1);
+       gtk_widget_set_sensitive (impl->browse_shortcuts_remove_button, 
removable);
++
++      have_bookmark_name = name != NULL && name[0] != '\0';
++    }
++
++  if (have_bookmark_name)
++    {
++      char *tip;
+ 
+       if (removable)
+         tip = g_strdup_printf (_("Remove the bookmark '%s'"), name);

Reply via email to