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

[gnunet]

Author: grothoff
Date: 2012-06-17 08:50:45 +0200 (Sun, 17 Jun 2012)
New Revision: 22054

Modified:
   gnunet-gtk/src/fs/gnunet-fs-gtk.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
   gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h
Log:
-fixing shutdown issues from #2217

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk.c   2012-06-16 21:47:37 UTC (rev 22053)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk.c   2012-06-17 06:50:45 UTC (rev 22054)
@@ -199,13 +199,14 @@
  */
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
+{  
   GNUNET_GTK_main_loop_quit (ml);
   if (fs != NULL)
   {
     GNUNET_FS_stop (fs);
     fs = NULL;
   }
+  GNUNET_FS_GTK_close_uri_tab_ ();
 }
 
 

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-06-16 21:47:37 UTC 
(rev 22053)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.c     2012-06-17 06:50:45 UTC 
(rev 22054)
@@ -1046,7 +1046,8 @@
   if (NULL != tab->atv)
     GNUNET_GTK_animation_tree_view_unregister (tab->atv);
   GNUNET_free (tab);
-  if (NULL == search_tab_head)
+  if ( (NULL == search_tab_head) &&
+       (NULL == uri_tab) )
   {
     GNUNET_GTK_animation_context_destroy (animation_downloading);
     animation_downloading = NULL;
@@ -1058,12 +1059,22 @@
     animation_searching_sources = NULL;
     GNUNET_GTK_animation_context_destroy (animation_found_sources);
     animation_found_sources = NULL;
-
   }
 }
 
 
 /**
+ * Close the 'uri_tab'.
+ */ 
+void
+GNUNET_FS_GTK_close_uri_tab_ ()
+{
+  if (NULL != uri_tab)
+    close_search_tab (uri_tab);
+}
+
+
+/**
  * Copy all of the children of 'src_iter' from the 'src_model' to
  * become children of 'dst_iter' in the 'dst_model'.  The models are
  * both 'GNUNET_GTK_file_sharing_result_tree_store' models.
@@ -2605,6 +2616,7 @@
                       SEARCH_TAB_MC_COMPLETED, (guint64) completed,
                       SEARCH_TAB_MC_FILENAME, de->filename,
                       SEARCH_TAB_MC_DOWNLOADED_ANONYMITY, de->anonymity,
+                     SEARCH_TAB_MC_STATUS_ICON,
                      GNUNET_GTK_animation_context_get_pixbuf 
(animation_download_stalled),
                       -1);
   return de;

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h     2012-06-16 21:47:37 UTC 
(rev 22053)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_event-handler.h     2012-06-17 06:50:45 UTC 
(rev 22054)
@@ -269,5 +269,12 @@
                              const struct GNUNET_FS_ProgressInfo *info);
 
 
+/**
+ * Close the 'uri_tab'.
+ */ 
+void
+GNUNET_FS_GTK_close_uri_tab_ ();
+
+
 #endif
 /* end of gnunet-fs-gtk-event_handler.h */