aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c20
-rw-r--r--src/ephy-window.c10
2 files changed, 17 insertions, 13 deletions
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index aaf111f39..42f93777e 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -130,7 +130,7 @@ struct EphyBookmarksEditorPrivate
GtkWidget *key_view;
EphyNodeFilter *bookmarks_filter;
GtkWidget *search_entry;
- GtkWidget *menu_dock;
+ GtkWidget *main_vbox;
GtkWidget *window;
GtkUIManager *ui_merge;
GtkActionGroup *action_group;
@@ -153,6 +153,7 @@ static GtkActionEntry ephy_bookmark_popup_entries [] = {
{ "Edit", NULL, N_("_Edit") },
{ "View", NULL, N_("_View") },
{ "Help", NULL, N_("_Help") },
+ { "PopupAction", NULL, "" },
/* File Menu*/
{ "NewTopic", GTK_STOCK_NEW, N_("_New Topic"), "<control>N",
@@ -1119,7 +1120,7 @@ build_search_box (EphyBookmarksEditor *editor)
static void
add_widget (GtkUIManager *merge, GtkWidget *widget, EphyBookmarksEditor *editor)
{
- gtk_box_pack_start (GTK_BOX (editor->priv->menu_dock),
+ gtk_box_pack_start (GTK_BOX (editor->priv->main_vbox),
widget, FALSE, FALSE, 0);
gtk_widget_show (widget);
}
@@ -1207,7 +1208,6 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
EphyNode *node;
GtkUIManager *ui_merge;
GtkActionGroup *action_group;
- GtkAction *action;
GdkPixbuf *icon;
int col_id;
@@ -1222,9 +1222,9 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
g_signal_connect (editor, "delete_event",
G_CALLBACK (delete_event_cb), NULL);
- editor->priv->menu_dock = gtk_vbox_new (FALSE, 0);
- gtk_widget_show (editor->priv->menu_dock);
- gtk_container_add (GTK_CONTAINER (editor), editor->priv->menu_dock);
+ editor->priv->main_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (editor->priv->main_vbox);
+ gtk_container_add (GTK_CONTAINER (editor), editor->priv->main_vbox);
ui_merge = gtk_ui_manager_new ();
g_signal_connect (ui_merge, "add_widget", G_CALLBACK (add_widget), editor);
@@ -1238,17 +1238,17 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
NULL);
gtk_window_add_accel_group (GTK_WINDOW (editor),
gtk_ui_manager_get_accel_group (ui_merge));
- /* FIXME gtk_ui_manager_ensure_update (ui_merge); */
editor->priv->ui_merge = ui_merge;
editor->priv->action_group = action_group;
/* Fixme: We should implement gconf prefs for monitoring this setting */
- action = gtk_action_group_get_action (action_group, "ViewTitle");
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);
+/* action = gtk_action_group_get_action (action_group, "ViewTitle");
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE);*/
hpaned = gtk_hpaned_new ();
gtk_container_set_border_width (GTK_CONTAINER (hpaned), 0);
- gtk_container_add (GTK_CONTAINER (editor->priv->menu_dock), hpaned);
+ gtk_box_pack_end (GTK_BOX (editor->priv->main_vbox), hpaned,
+ TRUE, TRUE, 0);
gtk_widget_show (hpaned);
g_assert (editor->priv->bookmarks);
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);