[evince] ev-toolbar: Fix ev_toolbar_has_visible_popups after cb3d4b2
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] ev-toolbar: Fix ev_toolbar_has_visible_popups after cb3d4b2
- Date: Sun, 17 Jul 2016 08:49:25 +0000 (UTC)
commit 8df182541ea814a9a5387c996f2f7862b9008c79
Author: Carlos Garcia Campos <carlosgc gnome org>
Date: Sun Jul 17 10:46:27 2016 +0200
ev-toolbar: Fix ev_toolbar_has_visible_popups after cb3d4b2
The toolbar was changed to use popovers for the view and actions menus,
but ev_toolbar_has_visible_popups was still checking if the actions had
a GtkMenu visible.
shell/ev-toolbar.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/shell/ev-toolbar.c b/shell/ev-toolbar.c
index eff5a08..fdc3fc1 100644
--- a/shell/ev-toolbar.c
+++ b/shell/ev-toolbar.c
@@ -318,19 +318,19 @@ ev_toolbar_new (EvWindow *window)
gboolean
ev_toolbar_has_visible_popups (EvToolbar *ev_toolbar)
{
- GtkMenu *popup_menu;
+ GtkPopover *popover;
EvToolbarPrivate *priv;
g_return_val_if_fail (EV_IS_TOOLBAR (ev_toolbar), FALSE);
priv = ev_toolbar->priv;
- popup_menu = gtk_menu_button_get_popup (GTK_MENU_BUTTON (priv->view_menu_button));
- if (gtk_widget_get_visible (GTK_WIDGET (popup_menu)))
+ popover = gtk_menu_button_get_popover (GTK_MENU_BUTTON (priv->view_menu_button));
+ if (gtk_widget_get_visible (GTK_WIDGET (popover)))
return TRUE;
- popup_menu = gtk_menu_button_get_popup (GTK_MENU_BUTTON (priv->action_menu_button));
- if (gtk_widget_get_visible (GTK_WIDGET (popup_menu)))
+ popover = gtk_menu_button_get_popover (GTK_MENU_BUTTON (priv->action_menu_button));
+ if (gtk_widget_get_visible (GTK_WIDGET (popover)))
return TRUE;
if (ev_zoom_action_get_popup_shown (EV_ZOOM_ACTION (ev_toolbar->priv->zoom_action)))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]