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

[gnunet]

Author: hark
Date: 2014-02-13 20:12:36 +0100 (Thu, 13 Feb 2014)
New Revision: 32340

Modified:
   gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
   gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
Log:
fix: didn't show resume button when a call was suspended


Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-02-13 17:26:15 UTC (rev 32339)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade        
2014-02-13 19:12:36 UTC (rev 32340)
@@ -2,6 +2,14 @@
 <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 -->
@@ -224,6 +232,21 @@
                       </packing>
                     </child>
                     <child>
+                      <object class="GtkLabel" 
id="GNUNET_CONVERSATION_GTK_my_address">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="tooltip_text" translatable="yes">This 
is the address the phone is listening on.</property>
+                        <property name="label" translatable="yes">my 
address</property>
+                        <property name="selectable">True</property>
+                        <property name="single_line_mode">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
                       <object class="GtkBox" id="outgoing_ego_chooser_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
@@ -265,7 +288,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
@@ -543,7 +566,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>
@@ -899,14 +922,6 @@
       <column type="gint"/>
     </columns>
   </object>
-  <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_history_liststore">
     <columns>
       <!-- column-name logTime -->

Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-13 
17:26:15 UTC (rev 32339)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c       2014-02-13 
19:12:36 UTC (rev 32340)
@@ -792,12 +792,10 @@
 
 //  GNUNET_assert (NULL != cl_active);
  
-  set_incoming_call_state(sel_caller,CT_suspended);
   GNUNET_CONVERSATION_caller_suspend (sel_caller);
-  
-//  cl_active = NULL;
-  
   phone_state = PS_LISTEN;
+  set_incoming_call_state(sel_caller,CT_suspended);
+
 }
 
 
@@ -1905,6 +1903,7 @@
         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) 
         {
@@ -1962,11 +1961,13 @@
             gtk_widget_set_sensitive(b_accept, 0);
             gtk_widget_set_sensitive(b_hangup, 1);
             gtk_widget_set_sensitive(b_suspend, 0);
-            //gtk_widget_set_sensitive(b_resume, 1);
+            
             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;