1 files changed, 58 insertions, 13 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.h b/src/conversation/gnunet-conversation-gtk.h
index 770fc6dc..d40f960f 100644
--- a/src/conversation/gnunet-conversation-gtk.h
+++ b/src/conversation/gnunet-conversation-gtk.h
@@ -38,7 +38,48 @@
 
 #define LOG(format, ...) log_message(g_strdup_printf (format, ## __VA_ARGS__))
 
-#define MAX_TO_ADDR 124
+
+
+/**
+  * List of active calls
+  */
+ static GtkListStore *active_liststore;
+ 
+ /**
+  * List of active calls
+  */
+ static GtkTreeView *active_treeview;
+
+
+/*
+ * active calls treevieuw columns
+ */
+
+enum {
+  AL_caller_id, //*gchar
+  AL_caller,  //*
+  AL_caller_num, //gint
+  AL_caller_type, //gint
+  AL_caller_state //gint
+};
+/**
+ * callerstate (state of incoming call)
+ */
+enum {
+  CT_active,
+  CT_suspended,
+  CT_ringing,
+  CT_dead,
+  CT_hangup,
+  CT_rejected
+};
+/**
+ * type of call
+ */
+enum {
+    CALL_IN,
+    CALL_OUT
+};
 
 
 /**
@@ -47,7 +88,7 @@
  * @return configuration handle
  */
 const struct GNUNET_CONFIGURATION_Handle *
-GIG_get_configuration (void);
+GIG_get_configuration ();
 
 
 /**
@@ -155,6 +196,11 @@ struct CallList
   struct GNUNET_CONVERSATION_Caller *caller;
 
   /**
+   * Handle to call currently selected in list
+   */
+  struct GNUNET_CONVERSATION_Caller *caller_selected;
+
+  /**
    * String identifying the caller.
    */
   char *caller_id;
@@ -177,21 +223,31 @@ static struct GNUNET_CONVERSATION_Phone *phone;
  * Call handle (for active outgoing call).
  */
 static struct GNUNET_CONVERSATION_Call *call;
+//static struct GtkTreeIter gcall;
 
 /**
  * Caller handle (for active incoming call).
  */
 static struct CallList *cl_active;
+//static GtkTreeIter     gcl_active;
 
 /**
  * Head of calls waiting to be accepted.
  */
 static struct CallList *cl_head;
+//gtk
+//static GtkTreeIter     gcl_head;
+
+/**
+ * currently selected call
+ */
+//static GtkTreeIter gcl_selected;
 
 /**
  * Tail of calls waiting to be accepted.
  */
 static struct CallList *cl_tail;
+//static GtkTreeIter     gcl_tail;
 
 /**
  * Desired phone line.
@@ -296,17 +352,6 @@ static void
 identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
              const char *name);
 
-/**
- * List of active calls
- */
-static GtkListStore *active_liststore;
-
-/**
- * List of active calls
- */
-static GtkTreeView *active_treeview;
-
-
 
 /**
  * List of contacts (records).