[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32365 - in gnunet-gtk: contrib src/conversation
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r32365 - in gnunet-gtk: contrib src/conversation |
|
Date: |
Mon, 17 Feb 2014 04:36:45 +0100 |
Author: hark
Date: 2014-02-17 04:36:45 +0100 (Mon, 17 Feb 2014)
New Revision: 32365
Modified:
gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
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
Log:
- extra hangup button
- make compiler happy
Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-02-17 03:08:34 UTC (rev 32364)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-02-17 03:36:45 UTC (rev 32365)
@@ -2,22 +2,6 @@
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkAction" id="action1"/>
- <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
- <columns>
- <!-- column-name contactName -->
- <column type="gchararray"/>
- <!-- column-name contactType -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore"
id="gnunet_conversation_gtk_contacts_zone_liststore">
- <columns>
- <!-- column-name ego_name -->
- <column type="gchararray"/>
- <!-- column-name ego -->
- <column type="gpointer"/>
- </columns>
- </object>
<object class="GtkWindow" id="GNUNET_GTK_conversation_window">
<property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK |
GDK_STRUCTURE_MASK</property>
@@ -336,6 +320,21 @@
</packing>
</child>
<child>
+ <object class="GtkButton"
id="GNUNET_GTK_conversation_hangup_button_extra">
+ <property name="label"
translatable="yes">hangup</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkImage"
id="GNUNET_GTK_status_icon">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -346,7 +345,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -922,17 +921,23 @@
<column type="gint"/>
</columns>
</object>
- <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
+ <object class="GtkListStore"
id="gnunet_conversation_gtk_caller_id_zone_liststore">
<columns>
- <!-- column-name logTime -->
+ <!-- column-name ego_name -->
<column type="gchararray"/>
- <!-- column-name logEvent -->
+ <!-- column-name ego -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="gnunet_conversation_gtk_contacts_liststore">
+ <columns>
+ <!-- column-name contactName -->
<column type="gchararray"/>
- <!-- column-name logContact -->
+ <!-- column-name contactType -->
<column type="gchararray"/>
</columns>
</object>
- <object class="GtkListStore"
id="gnunet_conversation_gtk_outgoing_zone_liststore">
+ <object class="GtkListStore"
id="gnunet_conversation_gtk_contacts_zone_liststore">
<columns>
<!-- column-name ego_name -->
<column type="gchararray"/>
@@ -940,4 +945,14 @@
<column type="gpointer"/>
</columns>
</object>
+ <object class="GtkListStore" id="gnunet_conversation_gtk_history_liststore">
+ <columns>
+ <!-- column-name logTime -->
+ <column type="gchararray"/>
+ <!-- column-name logEvent -->
+ <column type="gchararray"/>
+ <!-- column-name logContact -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
</interface>
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-02-17
03:08:34 UTC (rev 32364)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-02-17
03:36:45 UTC (rev 32365)
@@ -34,21 +34,25 @@
* common *
*************/
+/**
+ * Handle to our main loop.
+ */
+static struct GNUNET_GTK_MainLoop *ml;
+
+
/**
* Get our configuration.
*
* @return configuration handle
- */
-const struct GNUNET_CONFIGURATION_Handle *
-GIG_get_configuration ();
+ **/
+extern struct GNUNET_CONFIGURATION_Handle *
+GIG_get_configuration ()
+{
+ return GNUNET_GTK_main_loop_get_configuration (ml);
+}
/**
- * Our configurations.
- */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
-
-/**
* Name of our ego.
*/
static char *ego_name;
@@ -222,19 +226,13 @@
/**
* zone tree model
*/
-static GtkTreeModel *zone_treemodel;
+//static GtkTreeModel *zone_treemodel;
/**
* Our ego.
*/
static struct GNUNET_IDENTITY_Ego *caller_id;
-
-/**
- * Handle to our main loop.
- */
-static struct GNUNET_GTK_MainLoop *ml;
-
/************
* extern's *
* **********/
@@ -293,7 +291,187 @@
{
// LOG('update_state called',NULL);
}
+/*
+ * @brief print info for currently selected call
+ */
+void
+print_call_info()
+{
+ GtkTreeIter gtkiter;
+ gboolean valid;
+ gint row_count = 0;
+ valid = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( active_liststore ),
>kiter );
+
+ if (!valid)
+ GNUNET_break(0);
+
+ while (valid)
+ {
+ gchar *str_data;
+ gint int_data;
+ gpointer cl_caller;
+
+ gtk_tree_model_get (GTK_TREE_MODEL(active_liststore), >kiter,
+ AL_caller, &cl_caller,
+ AL_caller_id,&str_data,
+ AL_caller_num,&int_data,-1);
+ if (caller_selected == cl_caller)
+ {
+ // LOG (_("info for active call:%s number: %u row: %u"),
str_data,int_data,row_count);
+ currentlySelectedCallAddress = str_data;
+// FPRINTF(stderr,"cal addr: %s\n",currentlySelectedCallAddress);
+ break ;
+ }
+ g_free (str_data);
+ row_count++;
+ valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(active_liststore),
>kiter);
+ }
+
+
+
+}
+
+
+
+/*
+ * @brief sets caller_selected, and enables or disables the active call list
buttons
+ */
+void
+update_active_call_list_buttons()
+{
+ gchar *caller_id;
+ gpointer cl_caller;
+ gint cl_caller_state;
+ //gint cl_caller_type;
+ GtkTreeSelection *active_selection;
+ GtkTreeIter gcl_selected;
+// active_liststore_selection =
get_object(ml,"GNUNET_CONVERSATION_GTK_active_calls_selection");
+
+ active_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW
(active_treeview));
+
+
+ if (gtk_tree_selection_get_selected(active_selection,NULL,&gcl_selected))
+ {
+
+ gtk_tree_model_get (GTK_TREE_MODEL(active_liststore), &gcl_selected,
+ AL_caller, &cl_caller,
+ AL_caller_id, &caller_id,
+ AL_caller_state, &cl_caller_state,
+ -1);
+
+ caller_selected = cl_caller;
+
+
gtk_widget_show(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons"
)));
+
+
+ // make global?
+ GtkWidget *b_contact, *b_accept, *b_hangup, *b_suspend, *b_resume;
+ b_contact = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_use_current_button"));
+ b_accept = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_accept_button"));
+ b_hangup = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_hangup_button"));
+ b_suspend = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_suspend_button"));
+ b_resume = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_resume_button"));
+
+ LOG("caller state: %u phone_state: %u",cl_caller_state, phone_state);
+
+ switch (cl_caller_state)
+ {
+ /* buttons:
+ * contact
+ * accept
+ * hangup
+ * suspend
+ * resume
+ *
+ * TODO: check if there is incoming or outgoing call,
+ * disable resume and accept buttons.
+ * or suspend that other call
+ */
+
+ case CT_active:
+ // hangup, pause
+ //LOG("CT_active state: %u ",cl_caller_state);
+ gtk_widget_set_sensitive(b_contact, 1);
+ gtk_widget_set_sensitive(b_accept, 0);
+ gtk_widget_set_sensitive(b_hangup, 1);
+ gtk_widget_set_sensitive(b_suspend, 1);
+ gtk_widget_set_sensitive(b_resume, 0);
+ break;
+ case CT_ringing:
+ // pickup, phonebook
+ //LOG("CT_ring show button");
+ gtk_widget_set_sensitive(b_contact, 1);
+ if (phone_state == PS_LISTEN)
+ {
+ gtk_widget_set_sensitive(b_accept, 1);
+ }else{
+ gtk_widget_set_sensitive(b_accept, 0);
+ }
+
+
+ gtk_widget_set_sensitive(b_hangup, 0);
+ gtk_widget_set_sensitive(b_suspend, 0);
+ gtk_widget_set_sensitive(b_resume, 0);
+ break;
+ case CT_rejected:
+ //add to phonebook
+ //LOG("CT_rejected ");
+ gtk_widget_set_sensitive(b_contact, 1);
+ gtk_widget_set_sensitive(b_accept, 0);
+ gtk_widget_set_sensitive(b_hangup, 0);
+ gtk_widget_set_sensitive(b_suspend, 0);
+ gtk_widget_set_sensitive(b_resume, 0);
+
+ break;
+ case CT_suspended:
+ // resume, hangup
+ //LOG("CT_suspended ");
+ gtk_widget_set_sensitive(b_contact, 1 );
+ gtk_widget_set_sensitive(b_accept, 0);
+ gtk_widget_set_sensitive(b_hangup, 1);
+ gtk_widget_set_sensitive(b_suspend, 0);
+
+ if (phone_state == PS_LISTEN)
+ {
+ LOG("enable resume button");
+ gtk_widget_set_sensitive(b_resume, 1);
+ }else{
+ LOG("disable resume button");
+ gtk_widget_set_sensitive(b_resume, 0);
+ }
+ break;
+ default:
+ GNUNET_break(0);
+ break;
+ }
+ print_call_info();
+ }
+ else
+ {
+
+ LOG("nothing selected");
+
+
gtk_widget_hide(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons"
)));
+
+ }
+
+} //end function
+
+
+
+/*
+ * @brief executed when selecting a different item in active call list
+ */
+
+void
+GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed()
+{
+ update_active_call_list_buttons();
+}
+
+
+
/**
* update status
*
@@ -341,11 +519,8 @@
void
set_status_icon (const char *icon_name)
{
- GtkWindow *main_window;
GtkImage *status_icon;
- main_window = GTK_WINDOW (get_object ("GNUNET_GTK_conversation_window"));
-
status_icon = GTK_IMAGE (get_object ("GNUNET_GTK_status_icon"));
gtk_image_set_from_icon_name (status_icon, icon_name, GTK_ICON_SIZE_BUTTON);
@@ -619,7 +794,7 @@
}
//GNUNET_assert (NULL == phone);
phone =
- GNUNET_CONVERSATION_phone_create (cfg, caller_id, &phone_event_handler,
+ GNUNET_CONVERSATION_phone_create (GIG_get_configuration(), caller_id,
&phone_event_handler,
NULL);
/* FIXME: get record and print full GNS record info later here... */
if (NULL == phone)
@@ -730,7 +905,7 @@
call_state = CS_RESOLVING;
GNUNET_assert (NULL == call);
call =
- GNUNET_CONVERSATION_call_start (cfg, caller_id, arg, speaker, mic,
+ GNUNET_CONVERSATION_call_start (GIG_get_configuration(), caller_id, arg,
speaker, mic,
&call_event_handler, NULL);
UPDATE_STATUS (_("We are calling `%s', his phone should be ringing."),
peer_name);
@@ -747,7 +922,7 @@
do_accept (struct GNUNET_CONVERSATION_Caller *sel_caller)
{
struct CallList *cl;
- char buf[32];
+ //char buf[32];
if ((NULL != call) && (CS_SUSPENDED != call_state))
@@ -805,6 +980,7 @@
set_incoming_call_state(sel_caller,CT_active);
+ cl = NULL;
GNUNET_CONVERSATION_caller_pick_up (sel_caller, &caller_event_handler, cl,
speaker, mic);
@@ -955,8 +1131,8 @@
static void
do_resume (struct GNUNET_CONVERSATION_Caller *sel_caller)
{
- struct CallList *cl;
- char buf[32];
+ //struct CallList *cl;
+ //char buf[32];
/*
if (NULL != call)
{
@@ -1024,8 +1200,8 @@
static void
do_reject (struct GNUNET_CONVERSATION_Caller *sel_caller)
{
- struct CallList *cl;
- char buf[32];
+ //struct CallList *cl;
+ //char buf[32];
/*
if (NULL != call)
@@ -1114,9 +1290,9 @@
identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
const char *name)
{
- struct GNUNET_CRYPTO_EcdsaPublicKey pk;
- char *s;
- GtkTreeIter iter;
+ // struct GNUNET_CRYPTO_EcdsaPublicKey pk;
+ // char *s;
+// GtkTreeIter iter;
if (NULL == name)
return;
@@ -1138,7 +1314,9 @@
return;
}
caller_id = ego;
- GNUNET_CONFIGURATION_set_value_number (cfg, "CONVERSATION", "LINE", line);
+
+
+ //GNUNET_CONFIGURATION_set_value_number (GIG_get_configuration(),
"CONVERSATION_GTK", "LINE", line);
//zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
// ns = GNUNET_NAMESTORE_connect (cfg);
@@ -1147,20 +1325,9 @@
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.
*
@@ -1268,7 +1435,7 @@
/* setup main window */
main_window = GTK_WINDOW (get_object ("GNUNET_GTK_conversation_window"));
main_window =
- GTK_WIDGET (GNUNET_GTK_plug_me
+ GTK_WINDOW (GNUNET_GTK_plug_me
("GNUNET_CONVERSATION_GTK_PLUG", GTK_WIDGET (main_window)));
gtk_window_set_default_size (main_window, 700, 700);
@@ -1278,7 +1445,7 @@
active_treeview =
GTK_TREE_VIEW (get_object
("gnunet_conversation_gtk_active_calls_treeview"));
- GNUNET_CONVERSATION_GTK_history_init();
+ GNUNET_CONVERSATION_GTK_CONTACTS_init();
//gtk_tree_view_set_activate_on_single_click(contacts_treeview, TRUE);
@@ -1307,7 +1474,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 ());
@@ -1318,7 +1485,7 @@
LOG (_("No ego given, using default: %s "), ego_name);
}
- id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
+ id = GNUNET_IDENTITY_connect (GIG_get_configuration(), &identity_cb, NULL);
GNUNET_CONVERSATION_GTK_CONTACTS_init ();
}
@@ -1369,13 +1536,11 @@
void
GNUNET_CONVERSATION_GTK_on_call_clicked ()
{
- char *to_addr;
GtkEntry *address_entry;
address_entry = GTK_ENTRY (get_object ("GNUNET_GTK_conversation_address"));
- to_addr = gtk_entry_get_text (address_entry);
- do_call (to_addr);
+ do_call (gtk_entry_get_text(address_entry));
//disable_button ("GNUNET_GTK_conversation_accept_button");
do_status ();
// free(to_addr);
@@ -1473,8 +1638,8 @@
GtkTreeIter iter;
struct GNUNET_IDENTITY_Ego *tempEgo;
char *tempName;
- struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
- GtkTreeSelection *selection;
+ //struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
+ //GtkTreeSelection *selection;
gtk_combo_box_get_active_iter(widget, &iter);
@@ -1484,7 +1649,7 @@
0, &tempName,
1, &tempEgo,
-1);
- LOG(stderr,"outgoing ego: %s", tempName);
+ //LOG(stderr,"outgoing ego: %s", tempName);
// caller_id = tempEgo;
/*
if ( NULL != phone)
@@ -1497,181 +1662,6 @@
}
/*
- * @brief print info for currently selected call
- */
-void
-print_call_info()
-{
- GtkTreeIter gtkiter;
- gboolean valid;
- gint row_count = 0;
-
- valid = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( active_liststore ),
>kiter );
-
- if (!valid)
- GNUNET_break(0);
-
- while (valid)
- {
- gchar *str_data;
- gint int_data;
- gpointer cl_caller;
-
- gtk_tree_model_get (GTK_TREE_MODEL(active_liststore), >kiter,
- AL_caller, &cl_caller,
- AL_caller_id,&str_data,
- AL_caller_num,&int_data,-1);
- if (caller_selected == cl_caller)
- {
- // LOG (_("info for active call:%s number: %u row: %u"),
str_data,int_data,row_count);
- currentlySelectedCallAddress = str_data;
-// FPRINTF(stderr,"cal addr: %s\n",currentlySelectedCallAddress);
- break ;
- }
- g_free (str_data);
- row_count++;
- valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(active_liststore),
>kiter);
- }
-
-
-
-}
-
-/*
- * @brief executed when selecting a different item in active call list
- */
-
-void
-GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed()
-{
- update_active_call_list_buttons();
-}
-
-/*
- * @brief sets caller_selected, and enables or disables the active call list
buttons
- */
-void
-update_active_call_list_buttons()
-{
- gchar *caller_id;
- gpointer cl_caller;
- gint cl_caller_state;
- gint cl_caller_type;
- GtkTreeSelection *active_selection;
- GtkTreeIter gcl_selected;
-// active_liststore_selection =
get_object(ml,"GNUNET_CONVERSATION_GTK_active_calls_selection");
-
- active_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW
(active_treeview));
-
-
- if (gtk_tree_selection_get_selected(active_selection,NULL,&gcl_selected))
- {
-
- gtk_tree_model_get (GTK_TREE_MODEL(active_liststore), &gcl_selected,
- AL_caller, &cl_caller,
- AL_caller_id, &caller_id,
- AL_caller_state, &cl_caller_state,
- -1);
-
- caller_selected = cl_caller;
-
-
gtk_widget_show(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons"
)));
-
-
- // make global?
- GtkWidget *b_contact, *b_accept, *b_hangup, *b_suspend, *b_resume;
- b_contact = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_use_current_button"));
- b_accept = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_accept_button"));
- b_hangup = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_hangup_button"));
- b_suspend = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_suspend_button"));
- b_resume = GTK_WIDGET (get_object
("GNUNET_GTK_conversation_resume_button"));
-
- LOG("caller state: %u phone_state: %u",cl_caller_state, phone_state);
-
- switch (cl_caller_state)
- {
- /* buttons:
- * contact
- * accept
- * hangup
- * suspend
- * resume
- *
- * TODO: check if there is incoming or outgoing call,
- * disable resume and accept buttons.
- * or suspend that other call
- */
-
- case CT_active:
- // hangup, pause
- //LOG("CT_active state: %u ",cl_caller_state);
- gtk_widget_set_sensitive(b_contact, 1);
- gtk_widget_set_sensitive(b_accept, 0);
- gtk_widget_set_sensitive(b_hangup, 1);
- gtk_widget_set_sensitive(b_suspend, 1);
- gtk_widget_set_sensitive(b_resume, 0);
- break;
- case CT_ringing:
- // pickup, phonebook
- //LOG("CT_ring show button");
- gtk_widget_set_sensitive(b_contact, 1);
- if (phone_state == PS_LISTEN)
- {
- gtk_widget_set_sensitive(b_accept, 1);
- }else{
- gtk_widget_set_sensitive(b_accept, 0);
- }
-
-
- gtk_widget_set_sensitive(b_hangup, 0);
- gtk_widget_set_sensitive(b_suspend, 0);
- gtk_widget_set_sensitive(b_resume, 0);
- break;
- case CT_rejected:
- //add to phonebook
- //LOG("CT_rejected ");
- gtk_widget_set_sensitive(b_contact, 1);
- gtk_widget_set_sensitive(b_accept, 0);
- gtk_widget_set_sensitive(b_hangup, 0);
- gtk_widget_set_sensitive(b_suspend, 0);
- gtk_widget_set_sensitive(b_resume, 0);
-
- break;
- case CT_suspended:
- // resume, hangup
- //LOG("CT_suspended ");
- gtk_widget_set_sensitive(b_contact, 1 );
- gtk_widget_set_sensitive(b_accept, 0);
- gtk_widget_set_sensitive(b_hangup, 1);
- gtk_widget_set_sensitive(b_suspend, 0);
-
- if (phone_state == PS_LISTEN)
- {
- LOG("enable resume button");
- gtk_widget_set_sensitive(b_resume, 1);
- }else{
- LOG("disable resume button");
- gtk_widget_set_sensitive(b_resume, 0);
- }
- break;
- default:
- GNUNET_break(0);
- break;
- }
- print_call_info();
- }
- else
- {
-
- LOG("nothing selected");
-
-
gtk_widget_hide(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons"
)));
-
- }
-
-} //end function
-
-/*
* @brief active call list type data function
*/
void
@@ -1744,7 +1734,7 @@
GNUNET_CONVERSATION_GTK_test_button_two()
{
GtkTreeViewColumn *column;
- GtkCellRenderer *cell;
+// GtkCellRenderer *cell;
GtkCellRenderer *renderer;
//LOG("test");
// treeview = get_object(ml,"gnunet_conversation_gtk_active_calls_treeview");
@@ -1754,7 +1744,7 @@
// cell = get_object(ml,"GNUNET_CONVERSATION_GTK_active_calls_type");
// gtk_tree_view_column_set_cell_data_func(column, cell,
active_calls_type_data_function, NULL, NULL );
- column = get_object("caller_testcolumn");
+ column = GTK_TREE_VIEW_COLUMN(get_object("caller_testcolumn"));
gtk_tree_view_column_set_title(column, "test stateC");
renderer = gtk_cell_renderer_text_new();
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.h
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.h 2014-02-17
03:08:34 UTC (rev 32364)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.h 2014-02-17
03:36:45 UTC (rev 32365)
@@ -25,10 +25,15 @@
#ifndef GNUNET_CONVERSATION_GTK_H
#define GNUNET_CONVERSATION_GTK_H
-/*
- * macro's
- */
+ /** Get our configuration.
+ *
+ * @return configuration handle
+ **/
+extern struct GNUNET_CONFIGURATION_Handle *
+GIG_get_configuration ();
+
+
extern GObject *
GNUNET_CONVERSATION_GTK_get_main_window_object (const char *);
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
2014-02-17 03:08:34 UTC (rev 32364)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
2014-02-17 03:36:45 UTC (rev 32365)
@@ -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 (cfg);
+ ns = GNUNET_NAMESTORE_connect (GIG_get_configuration ());
// list_it =
@@ -386,7 +386,7 @@
struct GNUNET_IDENTITY_Ego *tempEgo;
char *tempName;
GtkTreeIter testIter;
- gtk_combo_box_get_active_iter(GTK_WIDGET
(GNUNET_CONVERSATION_GTK_get_main_window_object
("gnunet_conversation_gtk_contacts_zone_combobox")), &testIter);
+ gtk_combo_box_get_active_iter(GTK_COMBO_BOX
(GNUNET_CONVERSATION_GTK_get_main_window_object
("gnunet_conversation_gtk_contacts_zone_combobox")), &testIter);
gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
&testIter,
@@ -466,7 +466,7 @@
GTK_DIALOG_DESTROY_WITH_PARENT, _("Yes"),
GTK_RESPONSE_ACCEPT, _("No"), GTK_RESPONSE_CANCEL, NULL));
content_area =
- GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (confirm)));
+ GTK_HBOX (gtk_dialog_get_content_area (GTK_DIALOG (confirm)));
notification =
GTK_LABEL (gtk_label_new
("Do you really want to remove this contact?"));
@@ -497,7 +497,7 @@
{
GtkEntry *addressEntry;
// FPRINTF(stderr,"on current clicked %s\n",callerName);
- char *strippedAddress;
+ //char *strippedAddress;
addressEntry = GTK_ENTRY (GNUNET_CONVERSATION_GTK_get_main_window_object
("GNUNET_GTK_conversation_addressAdd"));
currentlySelectedCallAddress[52] = '\0';
gtk_entry_set_text(addressEntry, currentlySelectedCallAddress);
@@ -535,11 +535,11 @@
g_print ("type @row active%s", type);
if (strcmp (type, "PKEY") == 0)
{
- GNUNET_asprintf (&callAddress, "call\.%s\.gnu", name);
+ GNUNET_asprintf (&callAddress, "call.%s.gnu", name);
}
if (strcmp (type, "PHONE") == 0)
{
- GNUNET_asprintf (&callAddress, "%s\.gnu", name);
+ GNUNET_asprintf (&callAddress, "%s.gnu", name);
}
// else { GNUNET_asprintf(&callAddress, "%s", peer_id);}
@@ -566,7 +566,7 @@
// GNUNET_free (s);
}
*/
-GNUNET_IDENTITY_EgoCallback
+static void
setCurrentAddressbookEgo(void *cls, struct GNUNET_IDENTITY_Ego *ego)
{
currentAddressBookEgo = ego;
@@ -587,8 +587,8 @@
struct GNUNET_IDENTITY_Ego *tempEgo;
char *tempName;
struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
- GtkTreeSelection *selection;
- GtkTreeIter iterA;
+ //GtkTreeSelection *selection;
+ //GtkTreeIter iterA;
gtk_combo_box_get_active_iter(widget, &contacts_zone_iter);
@@ -631,7 +631,7 @@
{
GtkTreeIter iterContactsInit;
- cfg = GIG_get_configuration ();
+ //cfg = GIG_get_configuration ();
// contacts
@@ -655,9 +655,9 @@
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
(GNUNET_CONVERSATION_GTK_get_main_window_object
("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
+ 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 (cfg, &identity_cb, NULL);
+ id = GNUNET_IDENTITY_connect (GIG_get_configuration (), &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);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32365 - in gnunet-gtk: contrib src/conversation,
gnunet <=