Call ephy_file() explicitly for each glade file, letting extensions load glade files from any path

4 files changed, 9 insertions, 5 deletions

diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index b0c21fe1f..54f94ea5c 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -433,7 +433,7 @@ downloader_view_build_ui (DownloaderView *dv)
 
 	ephy_dialog_construct (d,
                                properties,
-                               "epiphany.glade",
+			       ephy_file ("epiphany.glade"),
                                "download_manager_dialog");
 
 	/* lookup needed widgets */
diff --git a/embed/find-dialog.c b/embed/find-dialog.c
index 932511cec..4412539bd 100755
--- a/embed/find-dialog.c
+++ b/embed/find-dialog.c
@@ -19,6 +19,7 @@
  */
 
 #include "find-dialog.h"
+#include "ephy-file-helpers.h"
 #include "ephy-prefs.h"
 #include "ephy-embed.h"
 #include "ephy-debug.h"
@@ -252,7 +253,7 @@ find_dialog_init (FindDialog *dialog)
 
 	ephy_dialog_construct (EPHY_DIALOG(dialog),
 			       properties,
-			       "epiphany.glade",
+			       ephy_file ("epiphany.glade"),
 			       "find_dialog");
 	update_navigation_controls (dialog, TRUE, TRUE);
 
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 809ad9fd9..9c54f420c 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -71,6 +71,7 @@
 #include <libgnome/gnome-i18n.h>
 
 #include "GtkNSSDialogs.h"
+#include "ephy-file-helpers.h"
 #include "ephy-glade.h"
 #include "ephy-gui.h"
 
@@ -1253,7 +1254,7 @@ GtkNSSDialogs::ViewCert(nsIInterfaceRequestor *ctx,
 	PRUnichar ** usage;
 	GtkSizeGroup * sizegroup;
 
-	gxml = ephy_glade_widget_new ("certificate-dialogs.glade", 
+	gxml = ephy_glade_widget_new (ephy_file ("certificate-dialogs.glade"),
 				      "viewcert_dialog",
 				      &dialog, NULL);
 
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 9c528b72d..37953f015 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -22,6 +22,7 @@
 #include "print-dialog.h"
 #include "ephy-embed-dialog.h"
 #include "ephy-file-chooser.h"
+#include "ephy-file-helpers.h"
 #include "ephy-stock-icons.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-debug.h"
@@ -330,7 +331,7 @@ ephy_print_dialog_new (GtkWidget *parent,
 	}
 
 	ephy_dialog_construct (dialog,  print_props,
-			       "print.glade", "print_dialog");
+			       ephy_file ("print.glade"), "print_dialog");
 
 	window = ephy_dialog_get_control (dialog, print_props[WINDOW_PROP].id);
 	icon = gtk_widget_render_icon (window, 
@@ -359,7 +360,8 @@ ephy_print_setup_dialog_new (void)
 	dialog = EPHY_DIALOG (g_object_new (EPHY_TYPE_DIALOG, NULL));
 
 	ephy_dialog_construct (dialog, setup_props,
-			       "print.glade", "print_setup_dialog");
+			       ephy_file ("print.glade"),
+			       "print_setup_dialog");
 
 	ephy_dialog_add_enum (dialog, setup_props[PAPER_PROP].id,
 			      n_paper_format_enum, paper_format_enum);