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

[gnunet]

Author: hark
Date: 2014-02-23 18:43:29 +0100 (Sun, 23 Feb 2014)
New Revision: 32460

Modified:
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
Log:
fixed previous commit


Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-23 
13:56:11 UTC (rev 32459)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-23 
17:43:29 UTC (rev 32460)
@@ -33,26 +33,25 @@
 /*************
  * common    *
  *************/
-
-/**
- * Handle to our main loop.
- */
+/**   
+ *  * Handle to our main loop.
+ *   */ 
 static struct GNUNET_GTK_MainLoop *ml;
 
-
-
 /**
  * Get our configuration.
  *
  * @return configuration handle
- **/
-extern struct GNUNET_CONFIGURATION_Handle *
-GIG_get_configuration ()
-{
-      return GNUNET_GTK_main_loop_get_configuration (ml);
-}
+ */
+const struct GNUNET_CONFIGURATION_Handle *
+GIG_get_configuration ();
 
 /**
+ * Our configurations.
+ */
+static struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
  * Name of our ego.
  */
 static char *ego_name;
@@ -794,7 +793,7 @@
   }
   //GNUNET_assert (NULL == phone);
   phone =
-      GNUNET_CONVERSATION_phone_create (GIG_get_configuration(), caller_id, 
&phone_event_handler,
+      GNUNET_CONVERSATION_phone_create (cfg, caller_id, &phone_event_handler,
                                         NULL);
   /* FIXME: get record and print full GNS record info later here... */
   if (NULL == phone)
@@ -905,7 +904,7 @@
   call_state = CS_RESOLVING;
   GNUNET_assert (NULL == call);
   call =
-     GNUNET_CONVERSATION_call_start (GIG_get_configuration(), caller_id, arg, 
speaker, mic,
+     GNUNET_CONVERSATION_call_start (cfg, caller_id, arg, speaker, mic,
                                       &call_event_handler, NULL);
   UPDATE_STATUS (_("We are calling `%s', his phone should be ringing."),
                  peer_name);
@@ -1314,9 +1313,7 @@
     return;
   }
   caller_id = ego;
-  
-
-  //GNUNET_CONFIGURATION_set_value_number (GIG_get_configuration(), 
"CONVERSATION_GTK", "LINE", line);
+  GNUNET_CONFIGURATION_set_value_number (cfg, "CONVERSATION", "LINE", line);
   //zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
  // ns = GNUNET_NAMESTORE_connect (cfg);
 
@@ -1325,9 +1322,20 @@
        start_phone();
 }
 
+/**
+ * Get our configuration.
+ *
+ * @return configuration handle
+ */
+const struct GNUNET_CONFIGURATION_Handle *
+GIG_get_configuration ()
+{
+  return GNUNET_GTK_main_loop_get_configuration (ml);
+}
 
 
 
+
 /**
  * Task run on shutdown.
  *
@@ -1474,7 +1482,7 @@
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);
   
-  //cfg = GIG_get_configuration ();
+  cfg = GIG_get_configuration ();
 
   speaker = GNUNET_SPEAKER_create_from_hardware (GIG_get_configuration ());
   mic = GNUNET_MICROPHONE_create_from_hardware (GIG_get_configuration ());
@@ -1485,7 +1493,7 @@
     LOG (_("No ego given, using default: %s "), ego_name);
 
   }
-  id = GNUNET_IDENTITY_connect (GIG_get_configuration(), &identity_cb, NULL);
+  id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
  
   GNUNET_CONVERSATION_GTK_CONTACTS_init ();
 }

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c      
2014-02-23 13:56:11 UTC (rev 32459)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c      
2014-02-23 17:43:29 UTC (rev 32460)
@@ -46,7 +46,7 @@
 /**
  * Our configurations.
  */
-//static struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
 /**
  * Name of our ego.
  */
@@ -302,7 +302,7 @@
 
   
 //  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
-  ns = GNUNET_NAMESTORE_connect (GIG_get_configuration ());
+  ns = GNUNET_NAMESTORE_connect (cfg);
 
 
 //  list_it =
@@ -631,7 +631,7 @@
 {
   GtkTreeIter iterContactsInit;
 
-  //cfg = GIG_get_configuration ();
+  cfg = GIG_get_configuration ();
 
 
   // contacts
@@ -657,7 +657,7 @@
 
   gtk_combo_box_set_active_iter(GTK_COMBO_BOX 
(GNUNET_CONVERSATION_GTK_get_main_window_object 
("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
 
-  id = GNUNET_IDENTITY_connect (GIG_get_configuration (), &identity_cb, NULL);
+  id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
 //  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
 //  gtk_combo_box_set_active(GTK_WIDGET (get_object 
("gnunet_conversation_gtk_contacts_zone_combobox")), 1);
 //  gtk_combo_box_set_active(GTK_WIDGET (get_object 
(ml,"gnunet_conversation_gtk_outgoing_zone_combobox")), 1);