aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-shell.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ephy-shell.c')
-rw-r--r--src/ephy-shell.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index d1144f816..c7dc315c5 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -30,6 +30,7 @@
#include "ephy-file-helpers.h"
#include "ephy-favicon-cache.h"
#include "ephy-window.h"
+#include "ephy-bookmarks-ui.h"
#include "ephy-bookmarks-import.h"
#include "ephy-bookmarks-editor.h"
#include "ephy-history-window.h"
@@ -938,19 +939,10 @@ ephy_shell_get_toolbars_model (EphyShell *shell, gboolean fullscreen)
{
if (shell->priv->toolbars_model == NULL)
{
- EphyBookmarks *bookmarks;
- GObject *bookmarksbar_model;
-
shell->priv->toolbars_model = ephy_toolbars_model_new ();
-
- /* get the bookmarks toolbars model. we have to do this
- * before loading the toolbars model from disk, since
- * this will connect the get_item_* signals
- */
- bookmarks = ephy_shell_get_bookmarks (shell);
- bookmarksbar_model = ephy_bookmarks_get_toolbars_model (bookmarks);
-
- /* ok, now we can load the model */
+
+ ephy_bookmarks_ui_attach_toolbar_model (shell->priv->toolbars_model);
+
ephy_toolbars_model_load
(EPHY_TOOLBARS_MODEL (shell->priv->toolbars_model));
}
ns'>-1/+0 * -remove MD5Olli Hauer2011-07-031-1/+0 * Sync to new bsd.autotools.mkAde Lovett2010-12-041-1/+1 * Punt autoconf267->autoconf268Ade Lovett2010-10-161-1/+1 * Round one migration of ports from automake{19,110} to automake111Ade Lovett2010-10-061-1/+1 * Autotools update. Read ports/UPDATING 20100915 for details.Ade Lovett2010-09-161-2/+2 * -Repocopy devel/libtool15 -> libtool22 and libltdl15 -> libltdl22.Jeremy Messenger2009-08-031-1/+1 * Conversion from (now defunct) autoconf-2.61 to autoconf-2.62Ade Lovett2008-08-201-1/+1 * Make use of the @rmtry macroEdwin Groothuis2008-04-191-2/+2 * Switch autoconf dependencies from 2.53 or 2.59 to 2.61.Mark Linimon2007-09-301-2/+2 * - Change my email.Stanislav Sedov2007-03-281-1/+1 * - Fix bug in Listener::create_local_client() (incorrect tmp path)Stanislav Sedov2007-01-112-4/+13 * - FAM doesn't build if some stale files exist in share/aclocal. To avoidMichael Landin2006-08-161-6/+7 * - Update to 2.6.10Pav Lucistnik2006-08-1315-223/+306 * Reset mbr due to no answer to an email inquiry about his status, andMark Linimon2006-04-151-1/+1 * Conversion to a single libtool environment.Ade Lovett2006-02-231-1/+3 * SHA256ifyEdwin Groothuis2006-01-221-0/+2 * Really fix the build on recent -CURRENT by patching the correct version ofJoe Marcus Clarke2005-12-062-12/+2 * Fix the build on recent -CURRENT.Joe Marcus Clarke2005-12-051-0/+12 * Mass-conversion to the USE_AUTOTOOLS New World Order. The code presentAde Lovett2005-11-151-3/+1 * At Kris's request, back out the MACHINE_ARCH spelling correction untilDavid E. O'Brien2005-04-121-1/+1 * Assist getting more ports working on AMD64 by obeying theDavid E. O'Brien2005-04-111-1/+1 * Register a conflict with devel/gamin.Joe Marcus Clarke2005-04-031-0/+2 * Put the libtool archive back.Michael Nottebrock2004-08-032-2/+3 * Fix Fam after recent gcc 3.4 import.Martin Blapp2004-08-024-5/+71 * Sync with new bsd.autotools.mkAde Lovett2004-06-051-0/+1 * - Fix configure warningKirill Ponomarev2004-04-181-0/+1 * Whoa there, boy, that's a mighty big commit y'all have there...Ade Lovett2004-03-141-1/+1 * Take maintainership.Martin Blapp2004-02-221-1/+1 * Bump PORTREVISION on all ports that depend on gettext to aid with upgrading.Joe Marcus Clarke2004-02-041-1/+1 * SIZEify.Trevor Johnson2004-01-291-0/+2 * Bump PORTREVISION because of changes in distfileKirill Ponomarev2003-07-261-1/+1 * Move tarball and .patch to DIST_SUBDIRKirill Ponomarev2003-07-262-2/+3 * REST IN PEACEWill Andrews2003-06-091-1/+1 * Point out that fam requires portmapper to be running.Pete Fritchman2003-05-171-0/+9 * Clear moonlight beckons.Ade Lovett2003-03-072-1/+1 * Remove the StUdLyCaPs from maintainer name, 'cause some folks won't realizeAlan Eldridge2002-11-011-1/+1 * Changed MAINTAINER to my FreeBSD address.Alan Eldridge2002-11-011-1/+1 * Make compile a lot quieter on -current. Thanks to Martin Blapp.Alan Eldridge2002-09-111-0/+2 * Include std:: prefix on references to string class for gcc 3.2, which isAlan Eldridge2002-09-101-6/+6 * Replace the mntent emulation code with my own versions, which are GPL'd,Alan Eldridge2002-09-103-5/+229 * Oops! Forgot this one. Removal of etc/rc.d/fam.sh.sample.Alan Eldridge2002-09-071-1/+0 * Do not support running fam standalone (started from /usr/local/etc/rc.d)Alan Eldridge2002-09-072-22/+1 * Patch for gcc 3.x.y.Alan Eldridge2002-09-061-0/+14 * Updated to version 2.6.9. SGI incorporated as much of our patches as theyAlan Eldridge2002-09-0421-471/+31 * remove accidentally committed patch(1) garbage.Alfred Perlstein2002-06-0920-523/+0 * Update to 2.6.8.Alfred Perlstein2002-06-0941-7/+471 * - update pkg-message; now gives instructions to the user on how to run famPete Fritchman2002-06-084-2/+27 * Change maintainership to "Alan E".Trevor Johnson2002-06-071-1/+1 * First round of auto* cleanups:Will Andrews2002-01-061-1/+1