-modernize, stop using deprecated APIs

2 files changed, 32 insertions, 9 deletions

diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index b46c7ec0..a55cbe49 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -1236,26 +1236,47 @@ populate_popup_with_uri_items (void *cls,
 {
   struct UriPopulationContext *ctx = cls;
   GtkWidget *child;
-  char *label;
+  char *labels;
   GtkWidget *ns_association_icon;
   char *uris;
+  GtkWidget *box;
+  GtkWidget *label;
+  GtkAccelGroup *accel_group;
 
   ctx->counter++;
   uris = GNUNET_FS_uri_to_string (uri);
-  GNUNET_asprintf (&label,
+  GNUNET_asprintf (&labels,
                    _("URI #%d: %s"),
                    ctx->counter,
                    uris);
   GNUNET_free (uris);
-  child = gtk_image_menu_item_new_with_label (label);
-  GNUNET_free (label);
-
+  label = gtk_accel_label_new (labels);
+  GNUNET_free (labels);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                     2);
+  child = gtk_menu_item_new ();
   ns_association_icon = gtk_image_new_from_icon_name ("gnunet-fs-gtk-ns-association",
                                                       GTK_ICON_SIZE_MENU);
-
-  /* Takes ownership of the icon */
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (child),
-                                 ns_association_icon);
+  gtk_container_add (GTK_CONTAINER (box),
+                     ns_association_icon);
+  gtk_label_set_xalign (GTK_LABEL (label),
+                        0.0);
+  accel_group = gtk_accel_group_new ();
+  gtk_widget_add_accelerator (child,
+                              "activate",
+                              accel_group,
+                              GDK_KEY_m,
+                              GDK_CONTROL_MASK,
+                              GTK_ACCEL_VISIBLE);
+  gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label),
+                                    child);
+  gtk_box_pack_end (GTK_BOX (box),
+                    label,
+                    TRUE,
+                    TRUE,
+                    0);
+  gtk_container_add (GTK_CONTAINER (child),
+                     box);
 
   g_object_set_data_full (G_OBJECT (child),
                           "fs-uri",
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 39eb06f6..1eb5448a 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -878,6 +878,7 @@ preserve_meta_items (void *cls, const char *plugin_name,
 }
 
 
+#if HAVE_EXTRACTOR
 /**
  * Type of a function that libextractor calls for each
  * meta data item found.  Used to get the mime type.
@@ -914,6 +915,7 @@ le_callback (void *cls,
   }
   return 0;
 }
+#endif
 
 
 /**