diff options
| author | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-10-12 01:41:26 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2003-10-12 01:41:26 +0800 |
| commit | 890b0f0278c284b3f72b17b2a320d7f443683d77 (patch) | |
| tree | 838de9eb530807959804418a6d14f44eb8036e82 /src/ephy-shell.c | |
| parent | 0b5f13ef5a9f6a28812cfa959ad9f5b786312ad2 (diff) | |
| download | gsoc2013-epiphany-890b0f0278c284b3f72b17b2a320d7f443683d77.tar.gz gsoc2013-epiphany-890b0f0278c284b3f72b17b2a320d7f443683d77.tar.zst gsoc2013-epiphany-890b0f0278c284b3f72b17b2a320d7f443683d77.zip | |
Merge completion branch
Diffstat (limited to 'src/ephy-shell.c')
| -rw-r--r-- | src/ephy-shell.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/ephy-shell.c b/src/ephy-shell.c index fa4650b61..17adce496 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -41,7 +41,6 @@ #include "session.h" #include "downloader-view.h" #include "ephy-toolbars-model.h" -#include "ephy-autocompletion.h" #include "ephy-automation.h" #include <string.h> @@ -71,7 +70,6 @@ struct EphyShellPrivate { BonoboGenericFactory *automation_factory; Session *session; - EphyAutocompletion *autocompletion; EphyBookmarks *bookmarks; EphyToolbarsModel *toolbars_model; EggToolbarsModel *fs_toolbars_model; @@ -308,12 +306,6 @@ ephy_shell_finalize (GObject *object) g_object_unref (G_OBJECT (gs->priv->session)); } - LOG ("Unref autocompletion") - if (gs->priv->autocompletion) - { - g_object_unref (gs->priv->autocompletion); - } - LOG ("Unref Bookmarks Editor"); if (gs->priv->bme) { @@ -564,31 +556,6 @@ ephy_shell_get_session (EphyShell *gs) return G_OBJECT (gs->priv->session); } -GObject * -ephy_shell_get_autocompletion (EphyShell *gs) -{ - EphyShellPrivate *p = gs->priv; - - if (!p->autocompletion) - { - static const gchar *prefixes[] = { - EPHY_AUTOCOMPLETION_USUAL_WEB_PREFIXES, - NULL - }; - - EphyHistory *gh = ephy_embed_shell_get_global_history (EPHY_EMBED_SHELL (gs)); - EphyBookmarks *bmk = ephy_shell_get_bookmarks (gs); - p->autocompletion = ephy_autocompletion_new (); - ephy_autocompletion_set_prefixes (p->autocompletion, prefixes); - - ephy_autocompletion_add_source (p->autocompletion, - EPHY_AUTOCOMPLETION_SOURCE (gh)); - ephy_autocompletion_add_source (p->autocompletion, - EPHY_AUTOCOMPLETION_SOURCE (bmk)); - } - return G_OBJECT (p->autocompletion); -} - EphyBookmarks * ephy_shell_get_bookmarks (EphyShell *gs) { |