1 files changed, 13 insertions, 9 deletions

diff --git a/src/identity/gnunet-identity-gtk_advertise.c b/src/identity/gnunet-identity-gtk_advertise.c
index 22755134..54ddecb5 100644
--- a/src/identity/gnunet-identity-gtk_advertise.c
+++ b/src/identity/gnunet-identity-gtk_advertise.c
@@ -26,7 +26,9 @@
 #include "gnunet-identity-gtk_advertise.h"
 #include "gnunet-identity-gtk.h"
 #include <gnunet/gnunet_fs_service.h>
-
+#if HAVE_EXTRACTOR_H
+#include <extractor.h>
+#endif
 
 #define NEW_KEYWORD_TEXT "<add>"
 
@@ -41,10 +43,12 @@ static gint types[] =
   EXTRACTOR_METATYPE_SUBJECT,
   EXTRACTOR_METATYPE_DESCRIPTION,
   EXTRACTOR_METATYPE_COMMENT,
-  EXTRACTOR_METATYPE_COPYRIGHT,
   EXTRACTOR_METATYPE_URI,
+#if HAVE_EXTRACTOR_H
+  EXTRACTOR_METATYPE_COPYRIGHT,
   EXTRACTOR_METATYPE_CREATOR,
   EXTRACTOR_METATYPE_CREATION_DATE,
+#endif
   EXTRACTOR_METATYPE_RESERVED
 };
 
@@ -588,7 +592,6 @@ GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb (GtkButton * button
   struct AdvertiseContext *ac = user_data;
   GtkTreeIter iter;
   guint type;
-  const char *type_as_string;
   const char *value;
   GtkEntry *value_entry;
   GtkComboBox *type_box;
@@ -605,7 +608,6 @@ GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb (GtkButton * button
                       &iter,
                       METATYPES_MC_TYPE_AS_ENUM, &type,
                       -1);
-  type_as_string = EXTRACTOR_metatype_to_string (type);
   value_entry = GTK_ENTRY (gtk_builder_get_object (ac->builder,
                                                    "GNUNET_GTK_identity_advertise_metadata_value_entry"));
   value = gtk_entry_get_text (value_entry);
@@ -618,7 +620,9 @@ GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb (GtkButton * button
   gtk_list_store_insert_with_values (ac->metadata,
                                      &iter, 0,
                                      METADATA_MC_TYPE_AS_ENUM, type,
-                                     METADATA_MC_TYPE_AS_STRING, type_as_string,
+#if HAVE_EXTRACTOR
+                                     METADATA_MC_TYPE_AS_STRING, EXTRACTOR_metatype_to_string (type),
+#endif
                                      METADATA_MC_VALUE, value,
                                      -1);
   gtk_entry_set_text (value_entry, "");
@@ -661,10 +665,10 @@ GIG_advertise_dialog_start_ (const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv)
   {
     gtk_list_store_insert_with_values (ac->meta_types,
                                        &iter, G_MAXINT,
-                                       METATYPES_MC_TYPE_AS_STRING,
-                                       EXTRACTOR_metatype_to_string (types[i]),
-                                       METATYPES_MC_TYPE_AS_ENUM,
-                                       types[i],
+#if HAVE_EXTRACTOR
+                                       METATYPES_MC_TYPE_AS_STRING, EXTRACTOR_metatype_to_string (types[i]),
+#endif
+                                       METATYPES_MC_TYPE_AS_ENUM, types[i],
                                        -1);
     if (0 == i)
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX