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

[gnunet]

Author: hark
Date: 2014-01-30 22:38:04 +0100 (Thu, 30 Jan 2014)
New Revision: 32129

Modified:
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.h
Log:
fixed 3289 and some stuff for active call list


Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-01-30 
21:09:48 UTC (rev 32128)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-01-30 
21:38:04 UTC (rev 32129)
@@ -39,7 +39,7 @@
 
 
 
-/*
+/**
  * macro's
  */
 
@@ -62,7 +62,7 @@
   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 @@
 
 }
 
-/*
+/**
  * does nothing
  */
 
@@ -102,7 +102,7 @@
 //    LOG('update_state called',NULL);
 }
 
-/*
+/**
  * update status
  *
  * @param message Message to put in statusbar
@@ -1095,7 +1095,6 @@
   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 @@
       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 @@
                       ("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 @@
 
   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 @@
   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);
+
+
+
 }

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.h
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.h       2014-01-30 
21:09:48 UTC (rev 32128)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.h       2014-01-30 
21:38:04 UTC (rev 32129)
@@ -304,10 +304,23 @@
 };
 
 /**
+ * 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.
  */