[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32319 - gnunet-gtk/src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32319 - gnunet-gtk/src/conversation |
Date: |
Tue, 11 Feb 2014 23:49:54 +0100 |
Author: yids
Date: 2014-02-11 23:49:54 +0100 (Tue, 11 Feb 2014)
New Revision: 32319
Modified:
gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
gnunet-gtk/src/conversation/gnunet-conversation-gtk.h
Log:
- fixed importing address from incomming call
- fixed adding contacts
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-02-11
19:27:34 UTC (rev 32318)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-02-11
22:49:54 UTC (rev 32319)
@@ -1308,7 +1308,7 @@
static void
run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- //GtkTreeIter iter;
+ GtkTreeIter iterContactsInit;
GtkWindow *main_window;
//line = 0;
@@ -1400,6 +1400,9 @@
id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
+ gtk_tree_model_get_iter_first(zone_treemodel, &iterContactsInit);
+ gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit);
+ gtk_combo_box_set_active_iter(GTK_WIDGET (get_object
("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
// zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
}
@@ -1624,10 +1627,22 @@
static void *data;
static size_t data_size;
struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
+
+ struct GNUNET_IDENTITY_Ego *tempEgo;
+ char *tempName;
+ GtkTreeIter testIter;
+ gtk_combo_box_get_active_iter(GTK_WIDGET (get_object
("gnunet_conversation_gtk_contacts_zone_combobox")), &testIter);
+ gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
+ &testIter,
+ 0, &tempName,
+ 1, &tempEgo,
+ -1);
+
+
GNUNET_CRYPTO_ecdsa_public_key_from_string (address, strlen (address),
&pkey);
rde = &rd;
- zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (currentAddressBookEgo);
+ zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (tempEgo);
rd.data = &pkey;
rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
@@ -1726,10 +1741,11 @@
gpointer * user_data)
{
GtkEntry *addressEntry;
- FPRINTF(stderr,"on current clicked %s\n",callerName);
-
+// FPRINTF(stderr,"on current clicked %s\n",callerName);
+ char *strippedAddress;
addressEntry = GTK_ENTRY (get_object ("GNUNET_GTK_conversation_addressAdd"));
- gtk_entry_set_text(addressEntry, callerName);
+ currentlySelectedCallAddress[52] = '\0';
+ gtk_entry_set_text(addressEntry, currentlySelectedCallAddress);
}
@@ -1921,7 +1937,9 @@
if (caller_selected == cl_caller)
{
// LOG (_("info for active call:%s number: %u row: %u"),
str_data,int_data,row_count);
- //break ;
+ currentlySelectedCallAddress = str_data;
+ FPRINTF(stderr,"cal addr: %s\n",currentlySelectedCallAddress);
+ break ;
}
g_free (str_data);
row_count++;
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.h
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.h 2014-02-11
19:27:34 UTC (rev 32318)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.h 2014-02-11
22:49:54 UTC (rev 32319)
@@ -555,6 +555,6 @@
static struct GNUNET_IDENTITY_Ego *currentAddressBookEgo;
+char *currentlySelectedCallAddress;
-
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32319 - gnunet-gtk/src/conversation,
gnunet <=