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

[gnunet]

Author: yids
Date: 2014-01-28 14:51:20 +0100 (Tue, 28 Jan 2014)
New Revision: 32061

Modified:
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
Log:
refixed defaulting to phone-ego ego


Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-01-28 
13:31:58 UTC (rev 32060)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-01-28 
13:51:20 UTC (rev 32061)
@@ -133,7 +133,7 @@
 /*
  * adds a item to the call history 
  * 
- * @param type type of call: 1: accepted 2: rejected
+ * @param type type of call: 0: accepted 1: rejected 2: outgoing call
  * @return void 
  */
 
@@ -142,10 +142,28 @@
 {
   GtkTreeIter iter;
   time_t t;
-
+  char *event;
+  switch (type) 
+  {
+   case 0: 
+       event = "Accepted";
+       break;
+   case 1: 
+       event = "Rejected";
+       break;
+   case 2: 
+       event = "Outgoing";
+       break;
+   case 3:
+        event = "Hangup";
+        break;
+   case 4:
+        event = "Missed";
+        break;
+  }
   time (&t);
   gtk_list_store_append (history_liststore, &iter);
-  gtk_list_store_set (history_liststore, &iter, 1, type, 0, ctime (&t), 2,
+  gtk_list_store_set (history_liststore, &iter, 1, event, 0, ctime (&t), 2,
                       contactName, -1);
 }
 
@@ -275,8 +293,8 @@
     cl->caller_id = GNUNET_strdup (caller_id);
     cl->caller_num = caller_num_gen++;
     GNUNET_CONTAINER_DLL_insert (cl_head, cl_tail, cl);
-    strncpy (&callerName, &caller_id, 50);
-    callerName[52] = '\0';
+    //strncpy (&callerName, &caller_id, 50);
+    //callerName[52] = '\0';
     quick_message ("der is een beller", caller_id);
 
     break;
@@ -465,6 +483,7 @@
                                       &call_event_handler, NULL);
   UPDATE_STATUS (_("We are calling `%s', his phone should be ringing.\n"),
                      peer_name);
+  history_add(2,peer_name);
 }
 
 
@@ -493,7 +512,7 @@
     break;
   case PS_LISTEN:
     /* this is the expected state */
-    break;
+   break;
   case PS_ACCEPTED:
     LOG (_
          ("You are answering call from `%s', hang up or suspend that call 
first!\n"),
@@ -523,13 +542,14 @@
     LOG (_("There is no incoming call `%s' to accept right now!\n"), args);
     return;
   }
-  cl_active = cl;
-  GNUNET_free_non_null (peer_name);
-  peer_name = GNUNET_strdup (cl->caller_id);
-  phone_state = PS_ACCEPTED;
-  GNUNET_CONVERSATION_caller_pick_up (cl->caller, &caller_event_handler, cl,
+    cl_active = cl;
+    GNUNET_free_non_null (peer_name);
+    peer_name = GNUNET_strdup (cl->caller_id);
+    phone_state = PS_ACCEPTED;
+    GNUNET_CONVERSATION_caller_pick_up (cl->caller, &caller_event_handler, cl,
                                       speaker, mic);
-  history_add ("1", peer_name);
+   
+  history_add (0, peer_name);
 
 }
 
@@ -775,7 +795,7 @@
     break;
   }
   //FPRINTF(stderr,"blaalalal %s",peer_name);
-  history_add ("2", peer_name);
+  history_add (1, peer_name);
 
 }
 
@@ -1158,10 +1178,10 @@
   {
     ego_name = "phone-ego";
     LOG ("%s", _("No ego given, using default \"phone-ego\" \n"));
-    return;
+    //return;
   }
+  FPRINTF(stderr, "ego: %s \n", ego_name);
 
-
   id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
 
 //  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
@@ -1252,7 +1272,7 @@
                do_accept("0");       
                break;
        case GTK_RESPONSE_REJECT :
-                do_reject(NULL);
+                do_reject("0");
                do_status(""); 
                 gtk_widget_destroy(GTK_WIDGET(dialog));
                break;
@@ -1299,8 +1319,9 @@
 
 
   //FPRINTF (stderr, "hangup clicked \n");
-  do_reject ("");
+  do_reject (NULL);
   do_status ("");
+  history_add(3,peer_name);
 }
 
 /**
@@ -1602,4 +1623,11 @@
 }
 
 /* end of gnunet-conversation-gtk.c */
-
+void GNUNET_contact_test()
+{
+       history_add(0,"test");
+        history_add(1,"test");
+        history_add(2,"test");
+        history_add(3,"test");
+        history_add(4,"test");
+}