diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/ephy-navigation-action.c | 10 |
2 files changed, 12 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2004-10-05 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-navigation-action.c: (build_back_or_forward_menu), + (build_up_menu), (menu_activated_cb): + + Fix a warning, noticed by Crispin. + +2004-10-05 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-window.c: (ephy_window_key_press_event): Don't allow activation of the hidden menubar in ppv mode. diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c index 8c1588621..45b7c110f 100644 --- a/src/ephy-navigation-action.c +++ b/src/ephy-navigation-action.c @@ -160,7 +160,7 @@ activate_up_menu_item_cb (GtkWidget *menuitem, ephy_window_load_url (window, url); } -static GtkMenuShell * +static GtkWidget * build_back_or_forward_menu (EphyNavigationAction *action) { EphyWindow *window = action->priv->window; @@ -223,10 +223,10 @@ build_back_or_forward_menu (EphyNavigationAction *action) } } - return menu; + return GTK_WIDGET (menu); } -static GtkMenuShell * +static GtkWidget * build_up_menu (EphyNavigationAction *action) { EphyWindow *window = action->priv->window; @@ -263,14 +263,14 @@ build_up_menu (EphyNavigationAction *action) /* the list data has been consumed */ g_slist_free (list); - return menu; + return GTK_WIDGET (menu); } static void menu_activated_cb (GtkMenuToolButton *button, EphyNavigationAction *action) { - GtkMenuShell *menu = NULL; + GtkWidget *menu = NULL; LOG ("menu_activated_cb dir %d", action->priv->direction) |