[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33733 - gnunet-gtk/src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33733 - gnunet-gtk/src/conversation |
Date: |
Wed, 18 Jun 2014 21:22:29 +0200 |
Author: grothoff
Date: 2014-06-18 21:22:28 +0200 (Wed, 18 Jun 2014)
New Revision: 33733
Modified:
gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
Log:
-fix #3450
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-18
12:48:06 UTC (rev 33732)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-18
19:22:28 UTC (rev 33733)
@@ -244,7 +244,7 @@
/**
* Name of conversation partner.
*/
- char *caller_id;
+ char *caller_id_str;
/**
* Location of this call in the list.
@@ -450,7 +450,7 @@
GNUNET_CONVERSATION_call_stop (oc->call);
oc->call = NULL;
}
- GNUNET_free (oc->caller_id);
+ GNUNET_free (oc->caller_id_str);
if (NULL != oc->rr)
gtk_tree_row_reference_free (oc->rr);
GNUNET_free (oc);
@@ -510,7 +510,7 @@
break;
case IN_STATE_CONNECTED:
GCG_update_status_bar (_("In a conversation with `%s'."),
- active_in->caller_id);
+ active_in->caller_id_str);
GCG_set_status_icon ("gnunet-conversation-call-active");
break;
case IN_STATE_SUSPENDED_LOCAL:
@@ -518,7 +518,7 @@
break;
case IN_STATE_SUSPENDED_REMOTE:
GCG_update_status_bar (_("On hold in a conversation with `%s'."),
- active_in->caller_id);
+ active_in->caller_id_str);
GCG_set_status_icon ("gnunet-conversation-call-on-hold");
break;
case IN_STATE_SUSPENDED_BOTH:
@@ -536,17 +536,17 @@
break;
case OUT_STATE_RESOLVING:
GCG_update_status_bar (_("Resolving `%s'."),
- active_out->caller_id);
+ active_out->caller_id_str);
GCG_set_status_icon ("gnunet-conversation-gtk-tray-call-pending");
break;
case OUT_STATE_RINGING:
GCG_update_status_bar (_("Calling `%s'."),
- active_out->caller_id);
+ active_out->caller_id_str);
GCG_set_status_icon ("gnunet-conversation-gtk-tray-call-ringing");
break;
case OUT_STATE_CONNECTED:
GCG_update_status_bar (_("In a conversation with `%s'."),
- active_out->caller_id);
+ active_out->caller_id_str);
GCG_set_status_icon ("gnunet-conversation-call-active");
break;
case OUT_STATE_SUSPENDED_LOCAL:
@@ -554,7 +554,7 @@
break;
case OUT_STATE_SUSPENDED_REMOTE:
GCG_update_status_bar (_("On hold in a conversation with `%s'."),
- active_out->caller_id);
+ active_out->caller_id_str);
GCG_set_status_icon ("gnunet-conversation-call-on-hold");
break;
case OUT_STATE_SUSPENDED_BOTH:
@@ -1186,7 +1186,7 @@
return;
}
GCG_HISTORY_add (GCG_HISTORY_TYPE_HANGUP,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
set_outgoing_call_state (oc,
OUT_STATE_NONE);
@@ -1260,10 +1260,10 @@
set_outgoing_call_state (oc,
OUT_STATE_CONNECTED);
GCG_HISTORY_add (GCG_HISTORY_TYPE_RESUMED_LOCAL,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
gtk_entry_set_text (address_entry,
- active_out->caller_id);
+ active_out->caller_id_str);
update_gui ();
return;
}
@@ -1295,7 +1295,7 @@
{
/* outgoing */
GCG_HISTORY_add (GCG_HISTORY_TYPE_SUSPEND_LOCAL,
- active_out->caller_id,
+ active_out->caller_id_str,
active_out->caller_num);
switch ((os = active_out->state))
{
@@ -1386,7 +1386,7 @@
{
/* if current call is outgoing, stop it */
GCG_HISTORY_add (GCG_HISTORY_TYPE_HANGUP,
- active_out->caller_id,
+ active_out->caller_id_str,
active_out->caller_num);
set_outgoing_call_state (active_out,
OUT_STATE_NONE);
@@ -1429,7 +1429,7 @@
{
case GNUNET_CONVERSATION_EC_CALL_RINGING:
GCG_HISTORY_add (GCG_HISTORY_TYPE_OUTGOING_RINGING,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
GNUNET_break (OUT_STATE_RESOLVING == oc->state);
GNUNET_break (active_out == oc);
@@ -1439,7 +1439,7 @@
break;
case GNUNET_CONVERSATION_EC_CALL_PICKED_UP:
GCG_HISTORY_add (GCG_HISTORY_TYPE_OUTGOING_ACCEPTED,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
GNUNET_break (OUT_STATE_RINGING == oc->state);
set_outgoing_call_state (oc, OUT_STATE_CONNECTED);
@@ -1449,7 +1449,7 @@
break;
case GNUNET_CONVERSATION_EC_CALL_GNS_FAIL:
GCG_HISTORY_add (GCG_HISTORY_TYPE_FAILED,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
GNUNET_break (OUT_STATE_RESOLVING == oc->state);
GNUNET_break (active_out == oc);
@@ -1462,7 +1462,7 @@
break;
case GNUNET_CONVERSATION_EC_CALL_HUNG_UP:
GCG_HISTORY_add (GCG_HISTORY_TYPE_HANGUP,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
set_outgoing_call_state (oc, OUT_STATE_NONE);
GNUNET_break (active_out == oc);
@@ -1473,7 +1473,7 @@
break;
case GNUNET_CONVERSATION_EC_CALL_SUSPENDED:
GCG_HISTORY_add (GCG_HISTORY_TYPE_SUSPEND_REMOTE,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
os = oc->state;
switch (oc->state)
@@ -1505,7 +1505,7 @@
break;
case GNUNET_CONVERSATION_EC_CALL_RESUMED:
GCG_HISTORY_add (GCG_HISTORY_TYPE_RESUMED_REMOTE,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
os = oc->state;
switch (oc->state)
@@ -1539,7 +1539,7 @@
break;
case GNUNET_CONVERSATION_EC_CALL_ERROR:
GCG_HISTORY_add (GCG_HISTORY_TYPE_FAILED,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
set_outgoing_call_state (oc, OUT_STATE_NONE);
oc->call = NULL;
@@ -1581,11 +1581,11 @@
return;
}
oc = GNUNET_new (struct OutgoingCall);
- oc->caller_id = GNUNET_strdup (arg);
+ oc->caller_id_str = GNUNET_strdup (arg);
oc->state = OUT_STATE_RESOLVING;
oc->caller_num = caller_num_gen++;
GCG_HISTORY_add (GCG_HISTORY_TYPE_OUTGOING_CALL,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
oc->call =
GNUNET_CONVERSATION_call_start (GCG_get_configuration (),
@@ -1597,7 +1597,7 @@
if (NULL == oc->call)
{
GCG_HISTORY_add (GCG_HISTORY_TYPE_FAILED,
- oc->caller_id,
+ oc->caller_id_str,
oc->caller_num);
destroy_out (oc);
return;
@@ -1606,7 +1606,7 @@
gtk_list_store_insert_with_values (active_liststore,
&iter,
-1,
- GCG_PHONE_LS_REMOTE_USER_NAME,
oc->caller_id,
+ GCG_PHONE_LS_REMOTE_USER_NAME,
oc->caller_id_str,
GCG_PHONE_LS_INCOMING_CALL, NULL,
GCG_PHONE_LS_NUMBER, oc->caller_num,
GCG_PHONE_LS_IN_CALL_STATE, IN_STATE_NONE,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33733 - gnunet-gtk/src/conversation,
gnunet <=