diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-12-18 16:38:44 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-12-18 16:38:44 +0800 |
| commit | 35ab6ff7ffab5bf3305f6bf32dab857044ba0ce1 (patch) | |
| tree | 18c6199512c6b7623e5d8103a41eb3f2503b40e8 | |
| parent | ee8ca653e1d5c8706b6a7208becd5a22ea3fd161 (diff) | |
| download | gsoc2013-evolution-35ab6ff7ffab5bf3305f6bf32dab857044ba0ce1.tar gsoc2013-evolution-35ab6ff7ffab5bf3305f6bf32dab857044ba0ce1.tar.gz gsoc2013-evolution-35ab6ff7ffab5bf3305f6bf32dab857044ba0ce1.tar.bz2 gsoc2013-evolution-35ab6ff7ffab5bf3305f6bf32dab857044ba0ce1.tar.lz gsoc2013-evolution-35ab6ff7ffab5bf3305f6bf32dab857044ba0ce1.tar.xz gsoc2013-evolution-35ab6ff7ffab5bf3305f6bf32dab857044ba0ce1.tar.zst gsoc2013-evolution-35ab6ff7ffab5bf3305f6bf32dab857044ba0ce1.zip | |
Construct glade file pathname at run-time.
2005-12-18 Tor Lillqvist <tml@novell.com>
* e-timezone-dialog/e-timezone-dialog.c
(e_timezone_dialog_construct): Construct glade file pathname at
run-time.
svn path=/trunk/; revision=30860
| -rw-r--r-- | widgets/ChangeLog | 4 | ||||
| -rw-r--r-- | widgets/e-timezone-dialog/e-timezone-dialog.c | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index c8130fb9ff..104f3b4186 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -2,6 +2,10 @@ * e-timezone-dialog/Makefile.am: Link with libeutil. + * e-timezone-dialog/e-timezone-dialog.c + (e_timezone_dialog_construct): Construct glade file pathname at + run-time. + 2005-12-12 Irene Huang <Irene.Huang@sun.com> reviewed by: Veerapuram Varadhan <vvaradhan@novell.com> diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index 7204d60079..ef899811cb 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -32,6 +32,8 @@ #include <glade/glade.h> #include <misc/e-map.h> +#include "e-util/e-util-private.h" + #include "e-timezone-dialog.h" #define E_TIMEZONE_DIALOG_MAP_POINT_NORMAL_RGBA 0xc070a0ff @@ -224,6 +226,7 @@ e_timezone_dialog_construct (ETimezoneDialog *etd) { ETimezoneDialogPrivate *priv; GtkWidget *map; + gchar *filename; g_return_val_if_fail (etd != NULL, NULL); g_return_val_if_fail (E_IS_TIMEZONE_DIALOG (etd), NULL); @@ -232,7 +235,12 @@ e_timezone_dialog_construct (ETimezoneDialog *etd) /* Load the content widgets */ - priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-timezone-dialog.glade", NULL, NULL); + filename = g_build_filename (EVOLUTION_GLADEDIR, + "e-timezone-dialog.glade", + NULL); + priv->xml = glade_xml_new (filename, NULL, NULL); + g_free (filename); + if (!priv->xml) { g_message ("e_timezone_dialog_construct(): Could not load the Glade XML file!"); goto error; |