From d7c1bdf4fdd6cbf2d74f7503f29b36242deb1444 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 15 Jan 2012 12:13:44 +0000
Subject: -LRN: Harmonize dirmetascanner

---
 contrib/gnunet_fs_gtk_progress_dialog.glade     |  2 +-
 src/fs/gnunet-fs-gtk-main_window_file_publish.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contrib/gnunet_fs_gtk_progress_dialog.glade b/contrib/gnunet_fs_gtk_progress_dialog.glade
index fb2a2543..8f2b1743 100644
--- a/contrib/gnunet_fs_gtk_progress_dialog.glade
+++ b/contrib/gnunet_fs_gtk_progress_dialog.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.24"/>
+  <requires lib="gtk+" version="2.20"/>
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog">
     <property name="can_focus">False</property>
diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
index 502ddddc..bfe71873 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -82,13 +82,13 @@ struct AddDirClientContext
    */
   int keep;
 
-  struct ProcessMetadataContext *pmc;
+  struct GNUNET_FS_ProcessMetadataContext *pmc;
 
   struct MainPublishingDialogContext *ctx;
   struct GNUNET_FS_DirScanner *ds;
 
-  struct ShareTreeItem *directory_scan_result;
-  struct ShareTreeItem *directory_scan_intermediary_result;
+  struct GNUNET_FS_ShareTreeItem *directory_scan_result;
+  struct GNUNET_FS_ShareTreeItem *directory_scan_intermediary_result;
 
   struct GNUNET_FS_BlockOptions directory_scan_bo;
   int directory_scan_do_index;
@@ -891,7 +891,7 @@ insert_progress_dialog_text (struct AddDirClientContext *adcc,
  * without doing anything else
  */
 void
-discard_item (struct ShareTreeItem *item)
+discard_item (struct GNUNET_FS_ShareTreeItem *item)
 {
   GNUNET_CONTAINER_meta_data_destroy (item->meta);
   GNUNET_FS_uri_destroy (item->ksk_uri);
@@ -901,7 +901,7 @@ discard_item (struct ShareTreeItem *item)
 
 void
 add_item (struct AddDirClientContext *adcc, GtkTreeStore *ts,
-  struct ShareTreeItem *item, GtkTreeIter *parent, GtkTreeIter *sibling,
+  struct GNUNET_FS_ShareTreeItem *item, GtkTreeIter *parent, GtkTreeIter *sibling,
   GtkTreeIter *item_iter)
 {
   char *file_size_fancy;
@@ -966,13 +966,13 @@ struct AddShareItemsStack
  */
 void
 add_share_items_to_treestore (struct AddDirClientContext *adcc,
-    struct ShareTreeItem *toplevel, int discard)
+    struct GNUNET_FS_ShareTreeItem *toplevel, int discard)
 {
   struct MainPublishingDialogContext *ctx = adcc->ctx;
   GtkTreeStore *ts = GTK_TREE_STORE (ctx->file_info_treemodel);
   GtkTreeIter *parent_iter;
   GtkTreeIter *sibling_iter;
-  struct ShareTreeItem *item, *next;
+  struct GNUNET_FS_ShareTreeItem *item, *next;
   struct AddShareItemsStack *stack;
 
   if (!discard)
@@ -1124,7 +1124,7 @@ directory_trim_complete (void *cls,
 static int
 directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
     const char *filename, char is_directory,
-    enum GNUNET_DirScannerProgressUpdateReason reason)
+    enum GNUNET_FS_DirScannerProgressUpdateReason reason)
 {
   struct AddDirClientContext *adcc = cls;
   char *s;
-- 
cgit v1.2.3