diff options
author | yids <yids@140774ce-b5e7-0310-ab8b-a85725594a96> | 2014-02-24 19:18:52 +0000 |
---|---|---|
committer | yids <yids@140774ce-b5e7-0310-ab8b-a85725594a96> | 2014-02-24 19:18:52 +0000 |
commit | a5dfa795b421ab18c5578768003c206cf811a005 (patch) | |
tree | f4fadda9a1064da6681e23d0e8a35d1d93d0a0ff | |
parent | 44f5310b98b27509d09ad86da157ff255700cd2c (diff) | |
download | gnunet-gtk-a5dfa795b421ab18c5578768003c206cf811a005.tar.gz gnunet-gtk-a5dfa795b421ab18c5578768003c206cf811a005.zip |
- some work on the quiting problem
- buttons now don't disapear anymore
-rw-r--r-- | src/conversation/gnunet-conversation-gtk.c | 2 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation-gtk_contacts.c | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c index 28c7319c..897ba078 100644 --- a/src/conversation/gnunet-conversation-gtk.c +++ b/src/conversation/gnunet-conversation-gtk.c | |||
@@ -451,7 +451,7 @@ update_active_call_list_buttons() | |||
451 | 451 | ||
452 | LOG("nothing selected"); | 452 | LOG("nothing selected"); |
453 | 453 | ||
454 | gtk_widget_hide(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons" ))); | 454 | //gtk_widget_hide(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons" ))); |
455 | 455 | ||
456 | } | 456 | } |
457 | 457 | ||
diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c index 6619363e..808306ff 100644 --- a/src/conversation/gnunet-conversation-gtk_contacts.c +++ b/src/conversation/gnunet-conversation-gtk_contacts.c | |||
@@ -646,8 +646,8 @@ GNUNET_CONVERSATION_GTK_CONTACTS_init () | |||
646 | zone_liststore = | 646 | zone_liststore = |
647 | GTK_LIST_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_liststore")); | 647 | GTK_LIST_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_liststore")); |
648 | 648 | ||
649 | zone_treestore = | 649 | // zone_treestore = |
650 | GTK_TREE_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_treestore")); | 650 | // GTK_TREE_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_treestore")); |
651 | zone_treemodel = GTK_TREE_MODEL (zone_liststore); | 651 | zone_treemodel = GTK_TREE_MODEL (zone_liststore); |
652 | zone_treeview = | 652 | zone_treeview = |
653 | GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview")); | 653 | GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview")); |
@@ -668,7 +668,16 @@ extern void | |||
668 | GNUNET_CONVERSATION_GTK_CONTACTS_shutdown() | 668 | GNUNET_CONVERSATION_GTK_CONTACTS_shutdown() |
669 | { | 669 | { |
670 | GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey); | 670 | GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey); |
671 | GNUNET_IDENTITY_disconnect(id); | 671 | if (NULL != id) |
672 | { | ||
673 | GNUNET_IDENTITY_disconnect (id); | ||
674 | id = NULL; | ||
675 | } | ||
676 | if (NULL != ns) | ||
677 | { | ||
678 | GNUNET_NAMESTORE_disconnect (ns); | ||
679 | ns = NULL; | ||
680 | } | ||
672 | } | 681 | } |
673 | 682 | ||
674 | 683 | ||