diff options
| author | jtellier <jtellier@Jospin.localdomain> | 2009-05-12 01:57:32 +0800 |
|---|---|---|
| committer | jtellier <jonathan.tellier@collabora.co.uk> | 2009-05-12 23:45:50 +0800 |
| commit | 5bbe4a3b2586f04a855c1aaf5d58b09921adac4b (patch) | |
| tree | 85ee041870687547dd7e8eb88a536f2e7aa7255d | |
| parent | bb9f071a1edf595f89ce23b9d3cfb0955c89ab1d (diff) | |
| download | gsoc2013-empathy-5bbe4a3b2586f04a855c1aaf5d58b09921adac4b.tar gsoc2013-empathy-5bbe4a3b2586f04a855c1aaf5d58b09921adac4b.tar.gz gsoc2013-empathy-5bbe4a3b2586f04a855c1aaf5d58b09921adac4b.tar.bz2 gsoc2013-empathy-5bbe4a3b2586f04a855c1aaf5d58b09921adac4b.tar.lz gsoc2013-empathy-5bbe4a3b2586f04a855c1aaf5d58b09921adac4b.tar.xz gsoc2013-empathy-5bbe4a3b2586f04a855c1aaf5d58b09921adac4b.tar.zst gsoc2013-empathy-5bbe4a3b2586f04a855c1aaf5d58b09921adac4b.zip | |
Usability fix: The "Leave Fullscreen" button is now using the
"gtk-leave-fullscreen" stock id instead of "gtk-fullscreen".
| -rw-r--r-- | src/empathy-call-window-fullscreen.ui | 2 | ||||
| -rw-r--r-- | src/empathy-call-window.c | 4 | ||||
| -rw-r--r-- | src/empathy-call-window.ui | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/empathy-call-window-fullscreen.ui b/src/empathy-call-window-fullscreen.ui index 90ac333d7..5bf5e509b 100644 --- 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 fe633045a..c15b5a6b5 100644 --- 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 33a71eef6..a0e1e1304 100644 --- 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> |