fixed 3289 and some stuff for active call list

2 files changed, 50 insertions, 7 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index c20a77e4..0d1120fb 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -39,7 +39,7 @@
 
 
 
-/*
+/**
  * macro's
  */
 
@@ -62,7 +62,7 @@ get_object (const char *name)
   return GNUNET_GTK_main_loop_get_object (ml, name);
 }
 
-/*
+/**
  * log a message to gtk log textbuffer
  * @param Message to be logged
  */
@@ -92,7 +92,7 @@ log_message (const char *message)
 
 }
 
-/*
+/**
  * does nothing
  */
 
@@ -102,7 +102,7 @@ update_state ()
 //    LOG('update_state called',NULL);
 }
 
-/*
+/**
  * update status
  *
  * @param message Message to put in statusbar
@@ -1095,7 +1095,6 @@ GNUNET_GTK_conversation_quit_cb (GObject * object, gpointer user_data)
   speaker = NULL;
   GNUNET_MICROPHONE_destroy (mic);
   mic = NULL;
-  GNUNET_free (ego_name);
   ego_name = NULL;
   GNUNET_free_non_null (peer_name);
   phone_state = PS_ERROR;
@@ -1135,6 +1134,15 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       GTK_WIDGET (GNUNET_GTK_plug_me
                   ("GNUNET_CONVERSATION_GTK_PLUG", GTK_WIDGET (main_window)));
   gtk_window_set_default_size (main_window, 300, 700);
+  
+  // active calls
+  active_liststore =
+     GTK_LIST_STORE (get_object ("gnunet_conversation_gtk_active_calls_liststore"));
+  active_treeview =
+      GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_active_calls_treeview"));
+
+
+  // contacts
   contacts_liststore =
       GTK_LIST_STORE (get_object
                       ("gnunet_conversation_gtk_contacts_liststore"));
@@ -1145,6 +1153,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                       ("gnunet_conversation_gtk_contacts_treestore"));
   contacts_treemodel = GTK_TREE_MODEL (contacts_treestore);
 
+  // call history
   history_liststore =
       GTK_LIST_STORE (get_object ("gnunet_conversation_gtk_history_liststore"));
   history_treeview =
@@ -1661,8 +1670,11 @@ set_status_icon (const char *icon_name)
 
   gtk_image_set_from_icon_name (status_icon, icon_name, GTK_ICON_SIZE_BUTTON);
 
-  GNUNET_GTK_tray_icon_change (ml, GTK_WINDOW (main_window), icon_name,
-                               "gnunet-conversation-gtk-status");
+  LOG (_("Tray icon changed to: `%s' "), icon_name);
+
+
+
+  GNUNET_GTK_tray_icon_change (icon_name, "gnunet-conversation-gtk-status");
 }
 
 
@@ -1676,4 +1688,22 @@ GNUNET_contact_test ()
   history_add (2, "test");
   history_add (3, "test");
   history_add (4, "test");
+
+  GtkTreeIter iter;
+  char *caller_id = "testje";
+  int  caller_num = 10; 
+
+ /*
+ * active_liststore:
+ * 0: *gchar caller_id
+ * 1: pointer caller
+ * 2: gint caller_num
+ */
+
+  gtk_list_store_append (active_liststore, &iter);
+
+  gtk_list_store_set (active_liststore, &iter, 2, caller_num, 0, caller_id, -1);
+
+
+
 }
diff --git a/src/conversation/gnunet-conversation-gtk.h b/src/conversation/gnunet-conversation-gtk.h
index e4907361..e4e007e0 100644
--- a/src/conversation/gnunet-conversation-gtk.h
+++ b/src/conversation/gnunet-conversation-gtk.h
@@ -304,10 +304,23 @@ enum CONVERSATION_ModelColumns
 };
 
 /**
+ * List of active calls
+ */
+static GtkListStore *active_liststore;
+
+/**
+ * List of active calls
+ */
+static GtkTreeView *active_treeview;
+
+
+
+/**
  * List of all known zones/egos.
  */
 static GtkListStore *contacts_liststore;
 
+
 /**
  * List of contacts.
  */