[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32021 - gnunet-gtk/src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r32021 - gnunet-gtk/src/conversation |
Date: |
Thu, 23 Jan 2014 17:25:34 +0100 |
Author: hark
Date: 2014-01-23 17:25:34 +0100 (Thu, 23 Jan 2014)
New Revision: 32021
Modified:
gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
Log:
use phone-ego as default
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-01-23
16:06:30 UTC (rev 32020)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-01-23
16:25:34 UTC (rev 32021)
@@ -338,8 +338,6 @@
{
struct GNUNET_GNSRECORD_Data rd;
- LOG ("start_phone\n");
-
if (NULL == caller_id)
{
LOG (_("Ego `%s' no longer available, phone is now down.\n"), ego_name);
@@ -472,7 +470,6 @@
static void
do_accept (const char *args)
{
- FPRINTF (stderr, "do_accept run");
struct CallList *cl;
char buf[32];
@@ -718,7 +715,6 @@
static void
do_reject (const char *args)
{
- FPRINTF (stderr, "doing reject");
struct CallList *cl;
char buf[32];
@@ -807,9 +803,6 @@
GNUNET_NAMESTORE_zone_iterator_next (list_it);
return;
}
- //FPRINTF (stdout,
-// "%s:\n",
-// rname);
for (i = 0; i < rd_len; i++)
{
@@ -1115,15 +1108,13 @@
speaker = GNUNET_SPEAKER_create_from_hardware (cfg);
mic = GNUNET_MICROPHONE_create_from_hardware (cfg);
-// ego_name = "phone_ego";
- if (NULL == ego_name)
+ if (ego_name == NULL)
{
- ego_name = "phone-ego";
- LOG ("%s", _("No ego given, using default \"phone-ego\" \n"));
- return;
+ ego_name = "phone-ego";
+
+ LOG (_("No ego given, using default: %s "), ego_name);
}
-
id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
// zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
@@ -1149,12 +1140,15 @@
{'e', "ego", "ego",
gettext_noop ("select ego to use"), 1,
&GNUNET_GETOPT_set_string, &ego_name},
-
{'t', "tray", NULL,
gettext_noop ("start in tray mode"), 0,
&GNUNET_GETOPT_set_one, &tray_only},
GNUNET_GETOPT_OPTION_END
};
+
+
+
+
if (GNUNET_OK !=
GNUNET_GTK_main_loop_start ("gnunet-conversation-gtk",
"GTK GUI for conversation", argc, argv,
@@ -1163,7 +1157,6 @@
&run))
return 1;
return 0;
- FPRINTF (stderr, "line %i", line);
}
/* gui stuff start */
@@ -1242,8 +1235,6 @@
address_entry = GTK_ENTRY (get_object ("GNUNET_GTK_conversation_address"));
to_addr = gtk_entry_get_text (address_entry);
-// FPRINTF (stderr, _("calling: %s \n"), to_addr );
-
do_call (to_addr);
disable_button ("GNUNET_GTK_conversation_accept_button");
do_status ("");
@@ -1260,7 +1251,6 @@
enable_button ("GNUNET_GTK_conversation_call_button");
- //FPRINTF (stderr, "hangup clicked \n");
do_reject ("");
do_status ("");
}
@@ -1271,7 +1261,6 @@
void
GNUNET_CONVERSATION_GTK_on_accept_clicked ()
{
- FPRINTF (stderr, "accept clicked \n");
do_accept (0);
// hide_infobar ();
}
@@ -1293,14 +1282,7 @@
void
GNUNET_CONVERSATION_GTK_on_pause_clicked ()
{
-// GtkEntry *entry;
do_suspend("0");
- //FPRINTF (stderr, "pause clicked \n");
- //do_pause("");
- // entry = GTK_ENTRY((get_object ("GNUNET_GTK_conversation_address")));
- //FPRINTF (stderr, gtk_entry_get_text (entry));
-// gtk_entry_set_text (entry, "testtextje");
-// show_infobar ();
}
/**
@@ -1309,7 +1291,6 @@
void
GNUNET_CONVERSATION_GTK_on_resume_clicked ()
{
- //FPRINTF (stderr, "reject clicked \n");
do_resume ("");
}
@@ -1319,39 +1300,11 @@
void
GNUNET_CONVERSATION_GTK_on_status_clicked ()
{
-
- FPRINTF (stderr, "status clicked \n");
-
-// do_accept("0");
do_status (" ");
- //quick_message('hee blaaat you have a call from blaat');
}
-/*
-void
-GNUNET_contact_test ()
-{
-FPRINTF (stderr, "gnunet contact test"
-}
-*/
-void
-use_current_incoming_address ()
-{
- FPRINTF (stderr, "use cur addr");
-}
-
-
/*
-void
-test_function (gint response_id)
-{
- FPRINTF (stderr, "teest %u", response_id);
-}
-*/
-
-
-/*
* add a new contact
* @param name
* @param address
@@ -1390,7 +1343,6 @@
{
// gint response_id;
- FPRINTF (stderr, "add clicked \n");
//unused: *anotherArea, *labelName, *labelAddres *caller_name
GtkLabel *notification;
@@ -1417,10 +1369,7 @@
_("Cancel"), GTK_RESPONSE_CANCEL, NULL);
gtk_dialog_add_action_widget (dialog, GTK_WIDGET(currentCheckButton),
GTK_RESPONSE_OK);
// FPRINTF (stderr, "response id : %u", response_id);
- g_signal_connect (GTK_BUTTON (currentCheckButton), "clicked",
- G_CALLBACK (use_current_incoming_address), NULL);
-
-
+
gtk_dialog_add_action_widget (dialog, GTK_WIDGET(nameEntry), 2);
gtk_dialog_add_action_widget (dialog, GTK_WIDGET(addressEntry), 3);
@@ -1438,14 +1387,12 @@
switch (gtk_dialog_run (dialog))
{
case GTK_RESPONSE_ACCEPT:
- FPRINTF (stderr, "accept clicked");
do_status ("");
add_contact (gtk_entry_get_text (nameEntry),
gtk_entry_get_text (addressEntry));
gtk_widget_destroy (GTK_WIDGET(dialog));
break;
case GTK_RESPONSE_CANCEL:
- FPRINTF (stderr, "cancel clicked");
do_status ("");
gtk_widget_destroy (GTK_WIDGET(dialog));
break;
@@ -1463,11 +1410,15 @@
}
+/**
+ * clicked contact remove button
+ */
void
GNUNET_CONVERSATION_GTK_on_remove_clicked (GtkButton * button,
gpointer * user_data)
{
- FPRINTF (stderr, "remove clicked \n");
+ // FIXME: make this work
+ FPRINTF (stderr, "TODO:remove clicked \n");
}
@@ -1483,7 +1434,6 @@
gchar *callAddress;
gchar *type;
- FPRINTF (stderr, "row activated \n");
GtkTreeSelection *selection;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r32021 - gnunet-gtk/src/conversation,
gnunet <=