1 files changed, 16 insertions, 17 deletions

diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index ba7a31e1..dca2b57f 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -66,7 +66,7 @@ createMetaDataListTreeView (GladeXML * xml,
   GtkTreeViewColumn *column;
   int col;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   metamodel
     = gtk_list_store_new (META_NUM, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
   metaList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
@@ -121,7 +121,7 @@ createMetaDataListTreeView (GladeXML * xml,
         }
       UNREF (loader);
     }
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 }
 
 static int
@@ -130,10 +130,10 @@ publishKeyword (const char *data, void *cls)
   GtkListStore *store = cls;
   GtkTreeIter iter;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   gtk_list_store_append (store, &iter);
   gtk_list_store_set (store, &iter, 0, data, -1);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
   return GNUNET_OK;
 }
 
@@ -147,7 +147,7 @@ createKeywordListTreeView (GladeXML * xml,
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   keymodel = gtk_list_store_new (1, G_TYPE_STRING);
   keywordList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection (keywordList),
@@ -165,7 +165,7 @@ createKeywordListTreeView (GladeXML * xml,
   gtk_tree_view_set_model (keywordList, GTK_TREE_MODEL (keymodel));
   if (init != NULL)
     GNUNET_ECRS_uri_get_keywords_from_ksk (init, &publishKeyword, keymodel);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 }
 
 void
@@ -178,7 +178,7 @@ createMetaTypeComboBox (GladeXML * xml, const char *name)
   GtkTreeIter iter;
   EXTRACTOR_KeywordType type;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   keywordTypeModel
     = gtk_list_store_new (KTYPE_NUM, G_TYPE_STRING, G_TYPE_INT);
   metaType = glade_xml_get_widget (xml, name);
@@ -196,7 +196,7 @@ createMetaTypeComboBox (GladeXML * xml, const char *name)
   gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (metaType),
                                  renderer, "text", KTYPE_STRING);
   gtk_combo_box_set_active (GTK_COMBO_BOX (metaType), 0);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 }
 
 void
@@ -210,7 +210,7 @@ handleKeywordListUpdate (GladeXML * xml,
   GtkListStore *keymodel;
   GtkTreeIter iter;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   keywordList = glade_xml_get_widget (xml, keywordListName);
   keymodel
     = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (keywordList)));
@@ -220,7 +220,7 @@ handleKeywordListUpdate (GladeXML * xml,
   gtk_list_store_append (keymodel, &iter);
   gtk_list_store_set (keymodel, &iter, 0, keyword, -1);
   gtk_entry_set_text (GTK_ENTRY (entryLine), "");
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 }
 
 void
@@ -239,7 +239,7 @@ handleMetaDataListUpdate (GladeXML * xml,
   GtkTreeIter iter;
   char *stype;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   metaList = glade_xml_get_widget (xml, metaDataListName);
   metamodel
     = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (metaList)));
@@ -262,7 +262,7 @@ handleMetaDataListUpdate (GladeXML * xml,
                       META_STYPE, stype, META_VALUE, value, -1);
   gtk_entry_set_text (GTK_ENTRY (entryLine), "");
   GNUNET_free_non_null (stype);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
 }
 
 static void
@@ -323,8 +323,7 @@ getMetaDataFromList (GladeXML * xml,
 
   preview = glade_xml_get_widget (xml, previewName);
 
-  if (GTK_IMAGNUNET_GEPIXBUF ==
-      gtk_image_get_storage_type (GTK_IMAGE (preview)))
+  if (GTK_IMAGE_PIXBUF == gtk_image_get_storage_type (GTK_IMAGE (preview)))
     {
       pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (preview));
       if (pixbuf == NULL)
@@ -380,7 +379,7 @@ getKeywordURIFromList (GladeXML * xml, const char *name)
   unsigned int kpos;
   unsigned int ksize;
 
-  DEBUG_BEGIN ();
+  GNUNET_GTK_DEBUG_BEGIN ();
   keyList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
   keymodel = gtk_tree_view_get_model (keyList);
 
@@ -401,11 +400,11 @@ getKeywordURIFromList (GladeXML * xml, const char *name)
     }
   keywords[kpos] = NULL;
 
-  keywordURI = GNUNET_ECRS_keyword_string_to_uri ((const char **) keywords);
+  keywordURI = GNUNET_ECRS_keyword_strings_to_uri ((const char **) keywords);
   while (kpos > 0)
     GNUNET_free (keywords[--kpos]);
   GNUNET_array_grow (keywords, ksize, 0);
-  DEBUG_END ();
+  GNUNET_GTK_DEBUG_END ();
   return keywordURI;
 }