[GNUnet-SVN] r25180 - gnunet-gtk/src/fs

[gnunet]

Author: grothoff
Date: 2012-12-03 09:37:05 +0100 (Mon, 03 Dec 2012)
New Revision: 25180

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
Log:
-fixing warnings

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2012-12-03 08:26:38 UTC (rev 25179)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2012-12-03 08:37:05 UTC (rev 25180)
@@ -227,8 +227,6 @@
 GNUNET_FS_GTK_menu_quit_activate_cb (GtkMenuItem *object,
                                     gpointer user_data)
 {
-  struct GNUNET_GTK_MainWindowContext *main_context = user_data;
-
   GNUNET_SCHEDULER_shutdown ();
 }
 
@@ -241,11 +239,9 @@
  */
 void
 GNUNET_FS_GTK_delete_event_cb (GtkWidget *object,
-                           GdkEvent *event,
-                           gpointer user_data)
+                              GdkEvent *event,
+                              gpointer user_data)
 {
-  struct GNUNET_GTK_MainWindowContext *main_context = user_data;
-
   /* GNUNET_FS_GTK_delete_event_cb will eventually be called if we shut down
    * the scheduler, because shutting it down will make GTK delete the main
    * window. On the other hand, deleting the main window first (clicking on X

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-12-03 08:26:38 UTC 
(rev 25179)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-12-03 08:37:05 UTC 
(rev 25180)
@@ -499,8 +499,8 @@
   return NULL;
 }
 
-/*
- *
+
+/**
  * finished_chain - non-NULL for top-level call (for the item we're about to 
download), NULL otherwise
  *   function sets it to GNUNET_YES if the item we're about to download was, 
in fact, already downloaded once, and thus we provide a name for it,
  *   returning a finished relative filename that might only need .gnd appended 
to it, nothing else.
@@ -510,24 +510,24 @@
  * anonymity - anonymity level of one of the *parents. Initialize to -1. If 
none were downloaded, remains -1.
  * Returned strings should be freed with GNUNET_free() if not NULL.
  */
-void
+static void
 build_relative_name (GtkTreeModel *tm,
-                                  GtkTreeIter *iter,
-                                   int *finished_chain,
-                                   gchar **root_directory,
-                                   gchar **relative_directory,
-                                  int *anonymity)
+                    GtkTreeIter *iter,
+                    int *finished_chain,
+                    gchar **root_directory,
+                    gchar **relative_directory,
+                    int *anonymity)
 {
   char *filename;
   int downloaded_anonymity;
-  char *parent_filename;
   GtkTreeIter parent;
 
   gtk_tree_model_get (tm, iter,
-      SEARCH_TAB_MC_DOWNLOADED_FILENAME, &filename, 
-      SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, &downloaded_anonymity, -1);
+                     SEARCH_TAB_MC_DOWNLOADED_FILENAME, &filename, 
+                     SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, &downloaded_anonymity,
+                     -1);
 
-  if (!gtk_tree_model_iter_parent (tm, &parent, iter))
+  if (! gtk_tree_model_iter_parent (tm, &parent, iter))
   {
     /* Ok, we're at the top item.
      * bottom == GNUNET_YES is a corner case when we only have one
@@ -624,6 +624,7 @@
   g_free (filename);
 }
 
+
 static char *
 get_suggested_filename_anonymity2 (GtkTreeModel *tm,
                                   GtkTreeIter *iter, 
@@ -637,8 +638,6 @@
   char *tmp;
   int downloaded_anonymity;
   struct GNUNET_CONTAINER_MetaData *meta;
-  GtkTreeIter parent;
-  char *dot;
   size_t tmplen;
   int finished_chain;
 
@@ -946,7 +945,20 @@
   gtk_tree_path_free (path);
 }
 
+
+/**
+ * Selected row has changed in search result tree view, update preview
+ * and metadata areas.
+ *
+ * @param tv the tree view in a search tab where the selection changed
+ * @param user_data the 'struct SearchTab' that contains the tree view
+ */
 void
+GNUNET_FS_GTK_search_treeview_cursor_changed (GtkTreeView *tv, 
+                                             gpointer user_data);
+
+
+static void
 start_download2 ()
 {
   struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context 
();
@@ -1023,6 +1035,7 @@
   GNUNET_FS_GTK_search_treeview_cursor_changed (tv, st);
 }
 
+
 /**
  * User clicked on "Download!" button at the download options panel.
  *
@@ -1748,7 +1761,6 @@
   GdkPixbuf *pixbuf;
   struct SearchResult *sr;
   struct GNUNET_FS_Uri *uri;
-  gchar *filename;
   struct GNUNET_GTK_MainWindowContext *mctx = GNUNET_FS_GTK_get_main_context 
();
 
   GNUNET_assert (tab->query_txt != NULL);