aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-12-18 12:43:33 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-12-18 12:43:33 +0800
commitcc8628aa9e4c8da853422a0e49f751b18c1e4ed2 (patch)
treeec9c54c77a0c428c03e630337de6f0817fd5ecdb
parent7dbeb5b6f526d1c6b5893e4f59fe8e99121ddcb1 (diff)
downloadgsoc2013-evolution-cc8628aa9e4c8da853422a0e49f751b18c1e4ed2.tar.gz
gsoc2013-evolution-cc8628aa9e4c8da853422a0e49f751b18c1e4ed2.tar.zst
gsoc2013-evolution-cc8628aa9e4c8da853422a0e49f751b18c1e4ed2.zip
Use gstdio wrappers. Construct pathnames of glade files at run-time.
2005-12-18 Tor Lillqvist <tml@novell.com> * em-account-prefs.c: Use gstdio wrappers. Construct pathnames of glade files at run-time. svn path=/trunk/; revision=30852
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/em-account-prefs.c9
2 files changed, 10 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 08c56acd4a..9a7c08d97e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -2,7 +2,8 @@
* Makefile.am: Use THREADS_CFLAGS and _LIBS. Don't need CAMEL_LIBS.
- * em-account-editor.c: Use gstdio wrappers. Construct pathnames of
+ * em-account-editor.c
+ * em-account-prefs.c: Use gstdio wrappers. Construct pathnames of
glade files at run-time.
2005-12-17 Tor Lillqvist <tml@novell.com>
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index a3c2256525..0f9f37e7ee 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -42,6 +42,7 @@
#include "e-util/e-account-list.h"
#include "e-util/e-error.h"
+#include "e-util/e-util-private.h"
#include "em-account-prefs.h"
@@ -537,8 +538,14 @@ em_account_prefs_construct (EMAccountPrefs *prefs)
GtkWidget *toplevel, *widget;
GtkCellRenderer *renderer;
GladeXML *gui;
+ char *gladefile;
- gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", "accounts_tab", NULL);
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "mail-config.glade",
+ NULL);
+ gui = glade_xml_new (gladefile, "accounts_tab", NULL);
+ g_free (gladefile);
+
prefs->gui = gui;
/* get our toplevel widget */