diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | embed/downloader-view.c | 2 | ||||
| -rwxr-xr-x | embed/find-dialog.c | 3 | ||||
| -rw-r--r-- | embed/mozilla/GtkNSSDialogs.cpp | 3 | ||||
| -rwxr-xr-x | embed/print-dialog.c | 6 | ||||
| -rw-r--r-- | lib/ephy-glade.c | 6 | ||||
| -rw-r--r-- | src/ephy-encoding-dialog.c | 3 | ||||
| -rwxr-xr-x | src/pdm-dialog.c | 3 | ||||
| -rw-r--r-- | src/prefs-dialog.c | 6 |
9 files changed, 35 insertions, 14 deletions
@@ -1,3 +1,20 @@ +2004-01-21 Adam Hooper <adamh@cvs.gnome.org> + + * embed/downloader-view.c: (downloader_view_build_ui): + * embed/find-dialog.c: (find_dialog_init): + * embed/mozilla/GtkNSSDialogs.cpp: + * embed/print-dialog.c: (ephy_print_dialog_new), + (ephy_print_setup_dialog_new): + * lib/ephy-glade.c: (ephy_glade_widget_new): + * src/ephy-encoding-dialog.c: (ephy_encoding_dialog_init): + * src/pdm-dialog.c: (pdm_dialog_init): + * src/prefs-dialog.c: (setup_add_language_dialog), + (prefs_dialog_init): + + Explicitly call ephy_file () whenever specifying a Glade file. This + gives the ability to load a Glade file outside of SHARE_DIR (i.e., in + extensions). Fixes Bug #132018. + 2004-01-21 Marco Pesenti Gritti <marco@gnome.org> * embed/mozilla/ContentHandler.cpp: 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); diff --git a/lib/ephy-glade.c b/lib/ephy-glade.c index beb91827f..0c782bae9 100644 --- a/lib/ephy-glade.c +++ b/lib/ephy-glade.c @@ -38,15 +38,11 @@ ephy_glade_widget_new (const char *file, const char *widget_name, GtkWidget **root, gpointer data) { GladeXML *gxml; - const char *glade_file; - - glade_file = ephy_file (file); - g_return_val_if_fail (glade_file != NULL, NULL); /* build the widget */ /* note that libglade automatically caches the parsed file, * so we don't need to worry about the efficiency of this */ - gxml = glade_xml_new (glade_file, widget_name, NULL); + gxml = glade_xml_new (file, widget_name, NULL); g_return_val_if_fail (gxml != NULL, NULL); /* lookup the root widget if requested */ 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, |