[GNUnet-SVN] r32468 - gnunet-gtk/src/conversation

[gnunet]

Author: yids
Date: 2014-02-24 20:18:52 +0100 (Mon, 24 Feb 2014)
New Revision: 32468

Modified:
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
Log:
- some work on the quiting problem
- buttons now don't disapear anymore 


Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-24 
18:28:48 UTC (rev 32467)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-24 
19:18:52 UTC (rev 32468)
@@ -451,7 +451,7 @@
     
     LOG("nothing selected");
     
-    
gtk_widget_hide(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons"
 )));
+    
//gtk_widget_hide(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons"
 )));
     
    }
 

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c      
2014-02-24 18:28:48 UTC (rev 32467)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c      
2014-02-24 19:18:52 UTC (rev 32468)
@@ -646,8 +646,8 @@
   zone_liststore =
      GTK_LIST_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object 
("gnunet_conversation_gtk_contacts_zone_liststore")); 
 
- zone_treestore =
-      GTK_TREE_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object 
("gnunet_conversation_gtk_contacts_zone_treestore"));
+// zone_treestore =
+//      GTK_TREE_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object 
("gnunet_conversation_gtk_contacts_zone_treestore"));
   zone_treemodel = GTK_TREE_MODEL (zone_liststore);
  zone_treeview =
       GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview"));
@@ -668,7 +668,16 @@
 GNUNET_CONVERSATION_GTK_CONTACTS_shutdown()
 {
   GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
-  GNUNET_IDENTITY_disconnect(id);
+  if (NULL != id)
+  {
+    GNUNET_IDENTITY_disconnect (id);
+    id = NULL;
+  }
+  if (NULL != ns)
+  {
+    GNUNET_NAMESTORE_disconnect (ns);
+    ns = NULL;
+  }
 }