[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33548 - gnunet-gtk/src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33548 - gnunet-gtk/src/conversation |
Date: |
Thu, 5 Jun 2014 23:54:24 +0200 |
Author: grothoff
Date: 2014-06-05 23:54:24 +0200 (Thu, 05 Jun 2014)
New Revision: 33548
Modified:
gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
Log:
-use zone from address book for resolution, not zone from caller ID
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-06-05
21:54:01 UTC (rev 33547)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-06-05
21:54:24 UTC (rev 33548)
@@ -195,7 +195,7 @@
&shutdown_task,
NULL);
if (NULL == ego_name)
- ego_name = GNUNET_strdup ("phone-ego");
+ ego_name = GNUNET_strdup ("gns-master");
GCG_HISTORY_init ();
GCG_ZONES_init (ego_name);
GCG_EGOS_init (ego_name);
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-05
21:54:01 UTC (rev 33547)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-05
21:54:24 UTC (rev 33548)
@@ -570,6 +570,8 @@
sens = FALSE;
if (NULL == phone)
sens = FALSE;
+ if (NULL == GCG_ZONES_get_selected_zone ())
+ sens = FALSE;
gtk_widget_set_sensitive (b_call, sens);
}
@@ -1521,7 +1523,7 @@
const char *arg;
arg = gtk_entry_get_text (address_entry);
- caller_id = GCG_EGOS_get_selected_ego ();
+ caller_id = GCG_ZONES_get_selected_zone ();
if ( (NULL == caller_id) ||
(NULL != active_out) ||
(NULL != active_in) )
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33548 - gnunet-gtk/src/conversation,
gnunet <=