- fix for gtk2

2 files changed, 8 insertions, 4 deletions

diff --git a/contrib/gnunet_gns_gtk_zone_open.glade b/contrib/gnunet_gns_gtk_zone_open.glade
index 392f2738..2d6916b6 100644
--- a/contrib/gnunet_gns_gtk_zone_open.glade
+++ b/contrib/gnunet_gns_gtk_zone_open.glade
@@ -2,9 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkFileFilter" id="GNUNET_GNS_GTK_zone_open_filefilter">
-    <patterns>
-      <pattern>*.zkey</pattern>
-    </patterns>
   </object>
   <object class="GtkFileChooserDialog" id="GNUNET_GNS_GTK_zone_open_filechooserdialog">
     <property name="can_focus">False</property>
diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index 4751f24a..da5ee2e8 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -175,6 +175,7 @@ GNUNET_GNS_GTK_open_imagemenuitem_activate_cb (GtkMenuItem *menuitem,
   GtkWidget *ad;
   GtkBuilder *builder;
   GtkWidget *toplevel;
+  GtkFileFilter *ff;
 
   builder =
     GNUNET_GTK_get_new_builder ("gnunet_gns_gtk_zone_open.glade", NULL);
@@ -183,9 +184,15 @@ GNUNET_GNS_GTK_open_imagemenuitem_activate_cb (GtkMenuItem *menuitem,
     GNUNET_break (0);
     return;
   }
+  /* This file filter could be set with glade if we use gtk3
+   * With gtk2 we have to set it manually */
+  ff = GTK_FILE_FILTER (gtk_builder_get_object
+      (builder, "GNUNET_GNS_GTK_zone_open_filefilter"));
+  gtk_file_filter_add_pattern (ff, "*.zkey");
+
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GNS_GTK_zone_open_filechooserdialog"));
-  toplevel = gtk_widget_get_toplevel (menuitem);
+  toplevel = gtk_widget_get_toplevel (GTK_WIDGET (menuitem));
   if (GTK_IS_WINDOW (toplevel))
     gtk_window_set_transient_for (GTK_WINDOW (ad), GTK_WINDOW (toplevel));
   gtk_window_present (GTK_WINDOW (ad));