Usability fix: The "Leave Fullscreen" button is now using the

"gtk-leave-fullscreen" stock id instead of "gtk-fullscreen".

diff --git a/src/empathy-call-window-fullscreen.ui b/src/empathy-call-window-fullscreen.ui
index 90ac333d76238a0efa0b83a315ecf4e7afbe4d17..5bf5e509b3c263f663ccb04e7c48f717002d9d7b 100644 (file)
--- a/src/empathy-call-window-fullscreen.ui
+++ b/src/empathy-call-window-fullscreen.ui
@@ -12,7 +12,7 @@
     <signal name="motion_notify_event" handler="empathy_call_window_fullscreen_motion_notify_cb"/>
     <child>
       <object class="GtkButton" id="leave_fullscreen_button">
-        <property name="label" translatable="yes">gtk-fullscreen</property>
+        <property name="label" translatable="yes">gtk-leave-fullscreen</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="receives_default">True</property>

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index fe633045a69b455855862891816d12f7473eec7e..c15b5a6b51f51400f78d08c296e7dded48fe209d 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -88,6 +88,7 @@ struct _EmpathyCallWindowPriv
   GtkWidget *toolbar;
   GtkWidget *pane;
   GtkAction *send_video;
+  GtkAction *menu_fullscreen;
 
   /* We keep a reference on the hbox which contains the main content so we can
      easilly repack everything when toggling fullscreen */
@@ -524,6 +525,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
     "toolbar", &priv->toolbar,
     "send_video", &priv->send_video,
     "ui_manager", &priv->ui_manager,
+    "menufullscreen", &priv->menu_fullscreen,
     NULL);
 
   empathy_builder_connect (gui, self,
@@ -1335,6 +1337,8 @@ empathy_call_window_state_event_cb (GtkWidget *widget,
           set_fullscreen);
       show_controls (window, set_fullscreen);
       show_borders (window, set_fullscreen);
+      gtk_action_set_stock_id(priv->menu_fullscreen,
+          (set_fullscreen ? "gtk-leave-fullscreen" : "gtk-fullscreen"));
       priv->is_fullscreen = set_fullscreen;
   }
 

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 33a71eef624d59741d1a7fa40a9d17836c11f7ab..a0e1e1304a4f8feac8278479c9def2291dac8ad1 100644 (file)
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -40,7 +40,6 @@
           <object class="GtkAction" id="menufullscreen">
             <property name="stock_id">gtk-fullscreen</property>
             <property name="name">menufullscreen</property>
-            <property name="label" translatable="yes">Fullscreen</property>
           </object>
           <accelerator key="F11"/>
         </child>