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

[gnunet]

Author: LRN
Date: 2014-03-24 16:58:20 +0100 (Mon, 24 Mar 2014)
New Revision: 32789

Modified:
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.h
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_history.c
Log:
Fix multiple warnings in conversation-gtk

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-03-24 
15:58:16 UTC (rev 32788)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-03-24 
15:58:20 UTC (rev 32789)
@@ -74,23 +74,7 @@
  * phone     *
  *************/
 
-/**                      
- * Current state of iterating elements for the client.
- * NULL if we are not currently iterating.
- */
-static struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
-
 /**
- *name of the incomming caller pkey or record name if known
- */
-static char *callerName;
-
-/**
- * peer id of a contact
- */
-static char *peer_id;
-
-/**
   * List of active calls
   */
 static GtkListStore *active_liststore;
@@ -103,7 +87,7 @@
 /**
  * List of incoming calls
  */
-static struct CallList
+struct CallList
 {
 
   /**
@@ -242,6 +226,11 @@
  */
 static struct GNUNET_IDENTITY_Ego *caller_id;
 
+
+void GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed ();
+
+void set_status_icon (const char *icon_name);
+
 /************
  * extern's *
  * **********/
@@ -713,6 +702,7 @@
 /**
  * set state of outgoing call
  */
+void
 set_outgoing_call_state(struct GNUNET_CONVERSATION_Call *call, int state)
 {
     LOG("set state to: %u", state);
@@ -1276,8 +1266,14 @@
     phone_state = PS_ACCEPTED;
     set_incoming_call_state(sel_caller,CT_active);
     
-    
-    cl = sel_caller;
+    for (cl = cl_head; cl; cl = cl->next)
+    {
+      /* FIXME: this may not be unique enough to identify the right item!
+       * Why not store CallList items in treeview instead of just callers?
+       */
+      if (cl->caller == sel_caller)
+        break;
+    }
     GNUNET_CONVERSATION_caller_pick_up (sel_caller, &caller_event_handler, cl,
                                       speaker, mic);
 
@@ -1463,13 +1459,13 @@
 {
 
   struct GNUNET_CRYPTO_EcdsaPublicKey pk;
-  char *s;
+
   GtkTreeIter iter;
   
   if (NULL != ego) 
   { 
   GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-  s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
+
   fprintf (stderr, "main identity_cb: %s \n", name);
 
 
@@ -1519,6 +1515,7 @@
 const struct GNUNET_CONFIGURATION_Handle *
 GIG_get_configuration ()
 {
+  /* FIXME: Configuration handle returned is const, but we DO alter the config 
*/
   return GNUNET_GTK_main_loop_get_configuration (ml);
 }
 
@@ -1674,8 +1671,8 @@
   
   cfg = GIG_get_configuration ();
 
-  speaker = GNUNET_SPEAKER_create_from_hardware (GIG_get_configuration ());
-  mic = GNUNET_MICROPHONE_create_from_hardware (GIG_get_configuration ());
+  speaker = GNUNET_SPEAKER_create_from_hardware (cfg);
+  mic = GNUNET_MICROPHONE_create_from_hardware (cfg);
 
         b_contact = GTK_WIDGET (get_object 
("GNUNET_GTK_conversation_use_current_button"));
         b_accept  = GTK_WIDGET (get_object 
("GNUNET_GTK_conversation_accept_button"));

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.h
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.h       2014-03-24 
15:58:16 UTC (rev 32788)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.h       2014-03-24 
15:58:20 UTC (rev 32789)
@@ -30,8 +30,8 @@
  * @return configuration handle
  **/
 
-//extern struct GNUNET_CONFIGURATION_Handle * 
-//GIG_get_configuration ();
+extern struct GNUNET_CONFIGURATION_Handle * 
+GIG_get_configuration ();
 
 
 extern GObject *

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c      
2014-03-24 15:58:16 UTC (rev 32788)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c      
2014-03-24 15:58:20 UTC (rev 32789)
@@ -47,10 +47,6 @@
  * Our configurations.
  */
 static struct GNUNET_CONFIGURATION_Handle *cfg;
-/**
- * Name of our ego.
- */
-static char *contacts_ego_name;
 
 /**
  * Our ego.
@@ -61,10 +57,6 @@
 
 //static struct GNUNET_CONFIGURATION_Handle *cfg1;
 //static struct GNUNET_CONFIGURATION_Handle *cfg2;
-/**
- * Be verbose.
- */
-static int verbose = 1;
 
 
 
@@ -89,7 +81,9 @@
 /**
  * zone treestore
  */
+/*
 static GtkTreeStore *zone_treestore;
+*/
 
 /**
  * zone treeview
@@ -145,7 +139,9 @@
 /**
   * Public key of the zone we are currently editing.
   */
+/*
 static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
+*/
 
 
 
@@ -173,10 +169,10 @@
                 const char *rname, unsigned int rd_len,
                 const struct GNUNET_GNSRECORD_Data *rd)
 {
-  const char *typestring;
+/*  const char *typestring;*/
   char *s, *type;
   unsigned int i;
-  const char *ets;
+/*  const char *ets;*/
   struct GNUNET_TIME_Absolute at;
   struct GNUNET_TIME_Relative rt;
   GtkTreeIter display_iter;
@@ -196,7 +192,7 @@
     if ((GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type) &&
         (0 != strcmp (rname, "+")))
       continue;
-    typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+/*    typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);*/
     s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type, rd[i].data,
                                           rd[i].data_size);
     if (NULL == s)
@@ -208,12 +204,12 @@
     if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
     {
       rt.rel_value_us = rd[i].expiration_time;
-      ets = GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_YES);
+/*      ets = GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_YES);*/
     }
     else
     {
       at.abs_value_us = rd[i].expiration_time;
-      ets = GNUNET_STRINGS_absolute_time_to_string (at);
+/*      ets = GNUNET_STRINGS_absolute_time_to_string (at);*/
     }
     if (rd[i].record_type == 65536)
     {
@@ -263,14 +259,18 @@
 identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
              const char *name)
 {
+/*
   struct GNUNET_CRYPTO_EcdsaPublicKey pk;
   char *s;
+*/
   GtkTreeIter iter;
   
   if (NULL != ego) 
   { 
+/*
   GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
   s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
+*/
   fprintf (stderr, "contacts idenity_cb: %s \n", name);
 
 
@@ -546,11 +546,13 @@
 //  GNUNET_free (s);
 }
 */
+/*
 static void 
 setCurrentAddressbookEgo(void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
   currentAddressBookEgo = ego;
 }
+*/
 
 /**
  * A different zone was selected in the zone toggle bar.  Load the

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_history.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_history.c       
2014-03-24 15:58:16 UTC (rev 32788)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_history.c       
2014-03-24 15:58:20 UTC (rev 32789)
@@ -28,6 +28,7 @@
  */
 
 #include "gnunet-conversation-gtk_common.h"
+#include "gnunet-conversation-gtk.h"
 
 
 /*******