diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-04-25 19:40:44 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-04-25 19:40:44 +0800 |
| commit | 22bf87253ddffa6a7225ecaad60c15cd0815c974 (patch) | |
| tree | 1af0677192450246e702ed0efcf97c6410f03ae2 /src/ephy-window.c | |
| parent | 8b97477b0882b666962c56ed2c20d26c615b9db3 (diff) | |
| download | gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.gz gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.bz2 gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.lz gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.xz gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.tar.zst gsoc2013-epiphany-22bf87253ddffa6a7225ecaad60c15cd0815c974.zip | |
Update from egg
2003-04-25 Marco Pesenti Gritti <marco@it.gnome.org>
* data/ui/epiphany-toolbar.xml.in:
* lib/egg/Makefile.am:
* lib/egg/egg-editable-toolbar.c:
* lib/egg/egg-editable-toolbar.h:
* lib/egg/egg-menu-merge.c:
* lib/egg/egg-radio-action.c:
* lib/egg/eggmarshalers.c:
* lib/egg/eggmarshalers.h:
* lib/egg/eggmarshalers.list:
* lib/egg/eggtoggletoolbutton.c:
* lib/egg/eggtoggletoolbutton.h:
* lib/egg/eggtoolbar.c:
* lib/egg/eggtoolbar.h:
* lib/egg/eggtoolbutton.c:
* lib/egg/eggtoolbutton.h:
* lib/egg/eggtoolitem.c:
* lib/egg/eggtoolitem.h:
* lib/egg/eggtreemodelfilter.c:
Update from egg
* src/Makefile.am:
* src/ephy-location-action.c: (create_tool_item):
* src/ephy-shell.c: (ephy_shell_init), (ephy_shell_get_bookmarks),
* src/ephy-shell.h:
* src/ephy-window.c: (setup_window), (ephy_window_finalize),
(ephy_window_set_chrome):
* src/toolbar.c: (toolbar_class_init), (toolbar_set_window),
(topic_remove_cb), (bookmark_remove_cb), (toolbar_init),
(toolbar_new):
* src/window-commands.c: (window_cmd_edit_toolbar):
Use the new toolbar editor api. This is incomplete, if you
use bookmarks toolbars please still do not update.
Diffstat (limited to 'src/ephy-window.c')
| -rw-r--r-- | src/ephy-window.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c index 84d930d88..357c4e84d 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -517,6 +517,10 @@ setup_window (EphyWindow *window) g_signal_connect (menu, "activate", G_CALLBACK (menu_activate_cb), window); window->priv->toolbar = toolbar_new (window); + gtk_widget_show (GTK_WIDGET (window->priv->toolbar)); + gtk_box_pack_start (GTK_BOX (window->priv->menu_dock), + GTK_WIDGET (window->priv->toolbar), + FALSE, FALSE, 0); g_signal_connect(window, "key-press-event", @@ -650,11 +654,6 @@ ephy_window_finalize (GObject *object) g_object_unref (window->priv->fav_menu); g_object_unref (window->priv->enc_menu); - if (window->priv->toolbar) - { - g_object_unref (window->priv->toolbar); - } - if (window->priv->ppview_toolbar) { g_object_unref (window->priv->ppview_toolbar); @@ -831,13 +830,13 @@ ephy_window_set_chrome (EphyWindow *window, if (flags & EMBED_CHROME_TOOLBARON) { - egg_editable_toolbar_show - (EGG_EDITABLE_TOOLBAR (window->priv->toolbar)); +/* egg_editable_toolbar_show + (EGG_EDITABLE_TOOLBAR (window->priv->toolbar));*/ } else { - egg_editable_toolbar_hide - (EGG_EDITABLE_TOOLBAR (window->priv->toolbar)); +/* egg_editable_toolbar_hide + (EGG_EDITABLE_TOOLBAR (window->priv->toolbar));*/ } if (flags & EMBED_CHROME_STATUSBARON) |