gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r33495 - in gnunet-gtk: contrib src/conversation


From: gnunet
Subject: [GNUnet-SVN] r33495 - in gnunet-gtk: contrib src/conversation
Date: Tue, 3 Jun 2014 11:34:36 +0200

Author: grothoff
Date: 2014-06-03 11:34:36 +0200 (Tue, 03 Jun 2014)
New Revision: 33495

Modified:
   gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
   gnunet-gtk/src/conversation/gnunet-conversation-gtk_use_current.c
Log:
-fixing callback names

Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-06-03 09:34:15 UTC (rev 33494)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-06-03 09:34:36 UTC (rev 33495)
@@ -411,7 +411,7 @@
                                         <property 
name="receives_default">True</property>
                                         <property 
name="use_stock">True</property>
                                         <property 
name="image_position">top</property>
-                                        <signal name="clicked" 
handler="gnunet_conversation_gtk_on_pause_clicked" swapped="no"/>
+                                        <signal name="clicked" 
handler="gnunet_conversation_gtk_suspend_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -429,7 +429,7 @@
                                         <property 
name="receives_default">True</property>
                                         <property 
name="use_stock">True</property>
                                         <property 
name="image_position">top</property>
-                                        <signal name="clicked" 
handler="gnunet_conversation_gtk_on_hangup_clicked" swapped="no"/>
+                                        <signal name="clicked" 
handler="gnunet_conversation_gtk_hangup_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -561,7 +561,7 @@
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">True</property>
                                             <property 
name="xalign">0.4699999988079071</property>
-                                            <signal name="clicked" 
handler="gnunet_conversation_gtk_use_current_button_clicked" swapped="no"/>
+                                            <signal name="clicked" 
handler="gnunet_conversation_gtk_add_contact_button_clicked_cb" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -578,7 +578,7 @@
                                             <property 
name="sensitive">False</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">True</property>
-                                            <signal name="clicked" 
handler="GNUNET_CONVERSATION_GTK_on_accept_clicked" swapped="no"/>
+                                            <signal name="clicked" 
handler="gnunet_conversation_gtk_accept_button_clicked_cb" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -595,7 +595,7 @@
                                             <property 
name="sensitive">False</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">True</property>
-                                            <signal name="clicked" 
handler="gnunet_conversation_gtk_on_resume_clicked" swapped="no"/>
+                                            <signal name="clicked" 
handler="gnunet_conversation_gtk_refuse_button_clicked_cb" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -612,6 +612,7 @@
                                             <property 
name="sensitive">False</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">True</property>
+                                            <signal name="clicked" 
handler="gnunet_conversation_gtk_resume_button_clicked_cb" swapped="no"/>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-03 
09:34:15 UTC (rev 33494)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_phone.c 2014-06-03 
09:34:36 UTC (rev 33495)
@@ -980,8 +980,8 @@
  * @param user_data builder (unused)
  */
 void
-GNUNET_CONVERSATION_GTK_on_accept_clicked (GtkButton *button,
-                                           gpointer user_data)
+gnunet_conversation_gtk_accept_button_clicked_cb (GtkButton *button,
+                                                  gpointer user_data)
 {
   struct IncomingCall *ic;
   GtkTreeSelection *sel;
@@ -1034,8 +1034,8 @@
  * @param user_data builder (unused)
  */
 void
-GNUNET_CONVERSATION_GTK_on_reject_clicked (GtkButton *button,
-                                           gpointer user_data)
+gnunet_conversation_gtk_refuse_button_clicked_cb (GtkButton *button,
+                                                  gpointer user_data)
 {
   struct IncomingCall *ic;
   struct OutgoingCall *oc;
@@ -1106,8 +1106,8 @@
  * @param user_data builder (unused)
  */
 void
-gnunet_conversation_gtk_on_resume_clicked (GtkButton *button,
-                                           gpointer user_data)
+gnunet_conversation_gtk_resume_button_clicked_cb (GtkButton *button,
+                                                  gpointer user_data)
 {
   struct IncomingCall *ic;
   struct OutgoingCall *oc;
@@ -1175,8 +1175,8 @@
  * @param user_data builder (unused)
  */
 void
-gnunet_conversation_gtk_on_pause_clicked (GtkButton *button,
-                                          gpointer user_data)
+gnunet_conversation_gtk_suspend_button_clicked_cb (GtkButton *button,
+                                                   gpointer user_data)
 {
   enum OutCallState os;
   enum InCallState is;
@@ -1283,8 +1283,8 @@
  * @param user_data builder (unused)
  */
 void
-gnunet_conversation_gtk_on_hangup_clicked (GtkButton *button,
-                                           gpointer user_data)
+gnunet_conversation_gtk_hangup_button_clicked_cb (GtkButton *button,
+                                                  gpointer user_data)
 {
   if ( (NULL == active_in) &&
        (NULL == active_out) )

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_use_current.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_use_current.c   
2014-06-03 09:34:15 UTC (rev 33494)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_use_current.c   
2014-06-03 09:34:36 UTC (rev 33495)
@@ -204,8 +204,8 @@
  * @param user_data main loop context (unused)
  */
 void
-gnunet_conversation_gtk_use_current_button_clicked (GtkButton *button,
-                                                    gpointer *user_data)
+gnunet_conversation_gtk_add_contact_button_clicked_cb (GtkButton *button,
+                                                       gpointer *user_data)
 {
   GtkBuilder *builder;
   GtkWidget *dialog;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]