aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <rburton@src.gnome.org>2004-06-07 19:33:03 +0800
committerRoss Burton <rburton@src.gnome.org>2004-06-07 19:33:03 +0800
commit54dd3d1fe778b2210cb23905148e294cef496fce (patch)
tree2460caf173e0730820f9a3f559d9694db35a1bbf
parentf2e52a9d71ea5c0b927eda12613755d9f2c8f070 (diff)
downloadgsoc2013-epiphany-54dd3d1fe778b2210cb23905148e294cef496fce.tar.gz
gsoc2013-epiphany-54dd3d1fe778b2210cb23905148e294cef496fce.tar.zst
gsoc2013-epiphany-54dd3d1fe778b2210cb23905148e294cef496fce.zip
Also load extensions from /home/users/ross
-rw-r--r--ChangeLog5
-rw-r--r--src/ephy-shell.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c3c8d5d39..461662bd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-07 Ross Burton <ross@burtonini.com>
+
+ * src/ephy-shell.c:
+ Load extensions from ~/.gnome2/epiphany/extensions as well.
+
2004-06-07 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/FilePicker:
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 390ca3032..78060acf6 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -699,12 +699,19 @@ ephy_shell_get_extensions_manager (EphyShell *es)
if (es->priv->extensions_manager == NULL)
{
+ char *path;
+
/* Instantiate extensions manager */
es->priv->extensions_manager = ephy_extensions_manager_new ();
/* load the extensions */
ephy_extensions_manager_load_dir (es->priv->extensions_manager,
EXTENSIONS_DIR);
+
+ path = g_build_filename (ephy_dot_dir (), "extensions", NULL);
+ ephy_extensions_manager_load_dir (es->priv->extensions_manager,
+ path);
+ g_free (path);
}
return G_OBJECT (es->priv->extensions_manager);