diff options
| author | Xan Lopez <xan@igalia.com> | 2012-01-17 00:35:36 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2012-01-17 01:49:35 +0800 |
| commit | 64d06cecbf24c4731acc5f6c0b6dde60a5938027 (patch) | |
| tree | c703252f673cc8e131867553209f2668002818b0 /src/ephy-page-menu-action.c | |
| parent | 3d7377cb22125311566c3699124005cd59181171 (diff) | |
| download | gsoc2013-epiphany-64d06cecbf24c4731acc5f6c0b6dde60a5938027.tar gsoc2013-epiphany-64d06cecbf24c4731acc5f6c0b6dde60a5938027.tar.gz gsoc2013-epiphany-64d06cecbf24c4731acc5f6c0b6dde60a5938027.tar.bz2 gsoc2013-epiphany-64d06cecbf24c4731acc5f6c0b6dde60a5938027.tar.lz gsoc2013-epiphany-64d06cecbf24c4731acc5f6c0b6dde60a5938027.tar.xz gsoc2013-epiphany-64d06cecbf24c4731acc5f6c0b6dde60a5938027.tar.zst gsoc2013-epiphany-64d06cecbf24c4731acc5f6c0b6dde60a5938027.zip | |
Stop using GtkUIManager to create the toolbar
Otherwise it's difficult to get the right layout for theming.
Diffstat (limited to 'src/ephy-page-menu-action.c')
| -rw-r--r-- | src/ephy-page-menu-action.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ephy-page-menu-action.c b/src/ephy-page-menu-action.c index 308d6c1b0..0a7c83d51 100644 --- a/src/ephy-page-menu-action.c +++ b/src/ephy-page-menu-action.c @@ -28,7 +28,7 @@ menu_position_func (GtkMenu *menu, int *x, int *y, gboolean *push_in, - GtkMenuToolButton *button) + GtkToolButton *button) { GtkAllocation allocation; GtkWidget *widget = GTK_WIDGET (button); @@ -68,12 +68,14 @@ ephy_page_menu_action_activate (GtkAction *action) window = _ephy_navigation_action_get_window (EPHY_NAVIGATION_ACTION (action)); manager = GTK_UI_MANAGER (ephy_window_get_ui_manager (window)); - menu = gtk_ui_manager_get_widget (manager, "/PagePopup"); + menu = gtk_ui_manager_get_widget (manager, "/ui/PagePopup"); list = gtk_action_get_proxies (action); if (GTK_IS_TOOL_BUTTON (list->data)) button = GTK_WIDGET (list->data); + g_return_if_fail (GTK_IS_TOOL_BUTTON (button)); + event = gtk_get_current_event (); if (event && event->type == GDK_BUTTON_PRESS) { activate_button = event->button.button; |