From fc17a49138e2134bf14816950fd764f21f08df34 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 18 Dec 2005 09:48:25 +0000 Subject: Use gstdio wrappers. Construct glade file name at run-time. 2005-12-18 Tor Lillqvist * e-send-options.c: Use gstdio wrappers. Construct glade file name at run-time. svn path=/trunk/; revision=30866 --- widgets/misc/ChangeLog | 3 ++- widgets/misc/e-send-options.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index df27004111..c90312575a 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -6,7 +6,8 @@ instead of privlib (no difference on Unix). Use -no-undefined on Win32. Link with all required libraries. - * e-attachment.c: Use gstdio wrappers. Construct glade file name + * e-attachment.c + * e-send-options.c: Use gstdio wrappers. Construct glade file name at run-time. * e-map.c: Construct map file name at run-time. diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c index 57d945881f..eb1586adf2 100644 --- a/widgets/misc/e-send-options.c +++ b/widgets/misc/e-send-options.c @@ -31,6 +31,9 @@ #include #include #include + +#include "e-util/e-util-private.h" + #include "e-dateedit.h" #include "e-send-options.h" @@ -622,11 +625,17 @@ e_sendoptions_dialog_run (ESendOptionsDialog *sod, GtkWidget *parent, Item_type { ESendOptionsDialogPrivate *priv; GtkWidget *toplevel; + gchar *filename; g_return_val_if_fail (sod != NULL || E_IS_SENDOPTIONS_DIALOG (sod), FALSE); priv = sod->priv; - priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-send-options.glade", NULL, NULL); + + filename = g_build_filename (EVOLUTION_GLADEDIR, + "e-send-options.glade", + NULL); + priv->xml = glade_xml_new (filename, NULL, NULL); + g_free (filename); if (!priv->xml) { g_message ( G_STRLOC ": Could not load the Glade XML file "); -- cgit v1.2.3