[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32364 - gnunet-gtk/src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32364 - gnunet-gtk/src/conversation |
Date: |
Mon, 17 Feb 2014 04:08:34 +0100 |
Author: yids
Date: 2014-02-17 04:08:34 +0100 (Mon, 17 Feb 2014)
New Revision: 32364
Modified:
gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.h
Log:
- fixed quiting
- added some global functions to contacts header
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-02-17
02:19:55 UTC (rev 32363)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-02-17
03:08:34 UTC (rev 32364)
@@ -1229,7 +1229,7 @@
// GNUNET_NAMESTORE_disconnect (ns);
// ns = NULL;
//}
-
+ GNUNET_CONVERSATION_GTK_CONTACTS_shutdown();
GNUNET_SPEAKER_destroy (speaker);
speaker = NULL;
GNUNET_MICROPHONE_destroy (mic);
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
2014-02-17 02:19:55 UTC (rev 32363)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
2014-02-17 03:08:34 UTC (rev 32364)
@@ -548,7 +548,7 @@
address_entry = GTK_ENTRY ( GNUNET_CONVERSATION_GTK_get_main_window_object
("GNUNET_GTK_conversation_address"));
gtk_entry_set_text (address_entry, callAddress);
- //do_call (callAddress);
+ do_call (callAddress);
}
/*
@@ -642,13 +642,15 @@
GTK_TREE_VIEW (GNUNET_CONVERSATION_GTK_get_main_window_object
("gnunet_conversation_gtk_treeview"));
contacts_treemodel = GTK_TREE_MODEL (contacts_liststore);
+ // zone list
+ zone_liststore =
+ GTK_LIST_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object
("gnunet_conversation_gtk_contacts_zone_liststore"));
- // zone list
- 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_treemodel = GTK_TREE_MODEL (zone_liststore);
+ zone_treeview =
+ GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview"));
gtk_tree_model_get_iter_first(zone_treemodel, &iterContactsInit);
gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit);
@@ -665,7 +667,8 @@
extern void
GNUNET_CONVERSATION_GTK_CONTACTS_shutdown()
{
- GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
+ GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
+ GNUNET_IDENTITY_disconnect(id);
}
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.h
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.h
2014-02-17 02:19:55 UTC (rev 32363)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.h
2014-02-17 03:08:34 UTC (rev 32364)
@@ -34,19 +34,17 @@
extern char *currentlySelectedCallAddress;
/**
- * List of contacts (records).
- */
-extern GtkListStore *contacts_liststore;
+ * function to initialize the contact list
+*/
+extern void
+GNUNET_CONVERSATION_GTK_CONTACTS_init ();
-/**
- * List of contacts.
- */
-//static GtkTreeStore *contacts_treestore;
+/**
+ * function to shutdown the contact list
+*/
-/**
- * The main tree view for 'gns' that shows the records.
- */
-extern GtkTreeView *contacts_treeview;
+extern void
+GNUNET_CONVERSATION_GTK_CONTACTS_shutdown();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32364 - gnunet-gtk/src/conversation,
gnunet <=