aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-window.c
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@src.gnome.org>2003-09-01 02:10:11 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-09-01 02:10:11 +0800
commitc91ff321c1ba587317e022e9bb13e1d28857dee7 (patch)
tree08fbca19fec4496186ef4af792359f54cd708de4 /src/ephy-window.c
parent3d58425833b6950f57fbc7578081f76befd17c14 (diff)
downloadgsoc2013-epiphany-c91ff321c1ba587317e022e9bb13e1d28857dee7.tar
gsoc2013-epiphany-c91ff321c1ba587317e022e9bb13e1d28857dee7.tar.gz
gsoc2013-epiphany-c91ff321c1ba587317e022e9bb13e1d28857dee7.tar.bz2
gsoc2013-epiphany-c91ff321c1ba587317e022e9bb13e1d28857dee7.tar.lz
gsoc2013-epiphany-c91ff321c1ba587317e022e9bb13e1d28857dee7.tar.xz
gsoc2013-epiphany-c91ff321c1ba587317e022e9bb13e1d28857dee7.tar.zst
gsoc2013-epiphany-c91ff321c1ba587317e022e9bb13e1d28857dee7.zip
*** empty log message ***
Diffstat (limited to 'src/ephy-window.c')
-rw-r--r--src/ephy-window.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 241bd01c1..779fb46c8 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -69,7 +69,7 @@ static GtkActionEntry ephy_menu_entries [] = {
{ "Go", NULL, N_("_Go") },
{ "Tabs", NULL, N_("_Tabs") },
{ "Help", NULL, N_("_Help") },
- { "PopupMenu", NULL, "" },
+ { "PopupAction", NULL, "" },
/* File menu */
{ "FileNewWindow", GTK_STOCK_NEW, N_("_New Window"), "<control>N",
@@ -154,7 +154,7 @@ static GtkActionEntry ephy_menu_entries [] = {
{ "ViewZoomNormal", GTK_STOCK_ZOOM_100, N_("_Normal Size"), NULL,
N_("Use the normal text size"),
G_CALLBACK (window_cmd_view_zoom_normal) },
- { "ViewEncoding", N_("_Encoding"), NULL, NULL, NULL, NULL },
+ { "ViewEncoding", NULL, N_("_Encoding") },
{ "ViewPageSource", EPHY_STOCK_VIEWSOURCE, N_("_Page Source"), "<control>U",
N_("View the source code of the page"),
G_CALLBACK (window_cmd_view_page_source) },
@@ -643,6 +643,10 @@ setup_window (EphyWindow *window)
g_clear_error (&err);
}
+ /* FIXME trick to force update */
+ gtk_ui_manager_get_widget (GTK_UI_MANAGER (window->ui_merge),
+ "/menubar");
+
window->priv->toolbar = toolbar_new (window);
gtk_widget_show (GTK_WIDGET (window->priv->toolbar));
gtk_box_pack_end (GTK_BOX (window->priv->menu_dock),
@@ -1368,7 +1372,7 @@ ephy_window_init (EphyWindow *window)
g_object_ref (ephy_shell);
- /* Initializ the menus */
+ /* Initialize the menus */
window->priv->tabs_menu = ephy_tabs_menu_new (window);
window->priv->fav_menu = ephy_favorites_menu_new (window);
window->priv->enc_menu = ephy_encoding_menu_new (window);