aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Hooper <adamh@src.gnome.org>2004-01-22 04:39:19 +0800
committerAdam Hooper <adamh@src.gnome.org>2004-01-22 04:39:19 +0800
commita37e3c5e53cba57d1338880a7dec1c035779b742 (patch)
treed480c4c61273f8b1d4b6f1c5f667a6a73c893332 /src
parentd9cb8655babc4b628f16869b0f476f9fe49acab3 (diff)
downloadgsoc2013-epiphany-a37e3c5e53cba57d1338880a7dec1c035779b742.tar
gsoc2013-epiphany-a37e3c5e53cba57d1338880a7dec1c035779b742.tar.gz
gsoc2013-epiphany-a37e3c5e53cba57d1338880a7dec1c035779b742.tar.bz2
gsoc2013-epiphany-a37e3c5e53cba57d1338880a7dec1c035779b742.tar.lz
gsoc2013-epiphany-a37e3c5e53cba57d1338880a7dec1c035779b742.tar.xz
gsoc2013-epiphany-a37e3c5e53cba57d1338880a7dec1c035779b742.tar.zst
gsoc2013-epiphany-a37e3c5e53cba57d1338880a7dec1c035779b742.zip
Call ephy_file() explicitly for each glade file, letting extensions load glade files from any path
Diffstat (limited to 'src')
-rw-r--r--src/ephy-encoding-dialog.c3
-rwxr-xr-xsrc/pdm-dialog.c3
-rw-r--r--src/prefs-dialog.c6
3 files changed, 8 insertions, 4 deletions
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 700f15c61..f3df12558 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -27,6 +27,7 @@
#include "ephy-encodings.h"
#include "ephy-embed.h"
#include "ephy-embed-shell.h"
+#include "ephy-file-helpers.h"
#include "ephy-shell.h"
#include "ephy-node.h"
#include "ephy-node-view.h"
@@ -317,7 +318,7 @@ ephy_encoding_dialog_init (EphyEncodingDialog *dialog)
ephy_dialog_construct (EPHY_DIALOG (dialog),
properties,
- "epiphany.glade",
+ ephy_file ("epiphany.glade"),
"encoding_dialog");
dialog->priv->filter = ephy_node_filter_new ();
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 7e56f80e0..6d77006d1 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -26,6 +26,7 @@
#include "pdm-dialog.h"
#include "ephy-shell.h"
#include "ephy-cookie-manager.h"
+#include "ephy-file-helpers.h"
#include "ephy-password-manager.h"
#include "ephy-gui.h"
#include "ephy-ellipsizing-label.h"
@@ -784,7 +785,7 @@ pdm_dialog_init (PdmDialog *dialog)
ephy_dialog_construct (EPHY_DIALOG(dialog),
properties,
- "epiphany.glade",
+ ephy_file ("epiphany.glade"),
"pdm_dialog");
/**
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index be3bf71b4..d0a9b1e4b 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -39,6 +39,7 @@
#include "ephy-debug.h"
#include "ephy-ellipsizing-label.h"
#include "ephy-file-chooser.h"
+#include "ephy-file-helpers.h"
#include "ephy-tree-model-node.h"
#include "ephy-tree-model-sort.h"
@@ -795,7 +796,8 @@ setup_add_language_dialog (PrefsDialog *pd)
NULL));
ephy_dialog_construct (dialog, add_lang_props,
- "prefs-dialog.glade", "add_language_dialog");
+ ephy_file ("prefs-dialog.glade"),
+ "add_language_dialog");
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
@@ -1144,7 +1146,7 @@ prefs_dialog_init (PrefsDialog *pd)
ephy_dialog_construct (dialog,
properties,
- "prefs-dialog.glade",
+ ephy_file ("prefs-dialog.glade"),
"prefs_dialog");
ephy_dialog_add_enum (dialog, properties[ACCEPT_COOKIES_PROP].id,