1 files changed, 28 insertions, 3 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 094b41b2..a475a964 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -804,15 +804,18 @@ do_reject (const char *args)
     peer_name = GNUNET_strdup (cl->caller_id);
     GNUNET_free (cl->caller_id);
     GNUNET_free (cl);
+//    caller_num_gen--;
     break;
   case PS_ACCEPTED:
     /* expected state, do rejection logic */
     history_add (CH_REJECTED, peer_name);
     GNUNET_assert (NULL != cl_active);
     GNUNET_CONVERSATION_caller_hang_up (cl_active->caller);
+    GNUNET_free (cl_active->caller_id);
     GNUNET_free (cl_active);
-
-//    cl_active = NULL;
+    GNUNET_assert (caller_num_gen > 0);
+//    caller_num_gen--;
+    cl_active = NULL;
     phone_state = PS_LISTEN;
     break;
   }
@@ -1140,7 +1143,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   main_window =
       GTK_WIDGET (GNUNET_GTK_plug_me
                   ("GNUNET_CONVERSATION_GTK_PLUG", GTK_WIDGET (main_window)));
-  gtk_window_set_default_size (main_window, 300, 700);
+  gtk_window_set_default_size (main_window, 700, 700);
   
   // active calls
   active_liststore =
@@ -1431,6 +1434,7 @@ add_contact (const gchar * name, const gchar * address)
   static size_t data_size;
   struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
 
+
   GNUNET_CRYPTO_ecdsa_public_key_from_string (address, strlen (address), &pkey);
   rde = &rd;
   zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
@@ -1652,3 +1656,24 @@ GNUNET_contact_test ()
 
 
 }
+
+void
+test_button_clicked()
+{
+  FPRINTF(stderr,"testbt click \n");
+    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);
+
+}