aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-12-18 12:45:01 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-12-18 12:45:01 +0800
commit2f1a024be76933ba28ab80e76a52ff46358e33dd (patch)
tree730028ed54766ffc66a4dac14cfb3e2ad782fc14
parentcc8628aa9e4c8da853422a0e49f751b18c1e4ed2 (diff)
downloadgsoc2013-evolution-2f1a024be76933ba28ab80e76a52ff46358e33dd.tar
gsoc2013-evolution-2f1a024be76933ba28ab80e76a52ff46358e33dd.tar.gz
gsoc2013-evolution-2f1a024be76933ba28ab80e76a52ff46358e33dd.tar.bz2
gsoc2013-evolution-2f1a024be76933ba28ab80e76a52ff46358e33dd.tar.lz
gsoc2013-evolution-2f1a024be76933ba28ab80e76a52ff46358e33dd.tar.xz
gsoc2013-evolution-2f1a024be76933ba28ab80e76a52ff46358e33dd.tar.zst
gsoc2013-evolution-2f1a024be76933ba28ab80e76a52ff46358e33dd.zip
Use gstdio wrappers. Construct pathnames of glade files at run-time.
2005-12-18 Tor Lillqvist <tml@novell.com> * em-filter-editor.c: Use gstdio wrappers. Construct pathnames of glade files at run-time. svn path=/trunk/; revision=30853
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/em-filter-editor.c10
2 files changed, 11 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9a7c08d97e..de99445184 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -3,7 +3,8 @@
* Makefile.am: Use THREADS_CFLAGS and _LIBS. Don't need CAMEL_LIBS.
* em-account-editor.c
- * em-account-prefs.c: Use gstdio wrappers. Construct pathnames of
+ * em-account-prefs.c
+ * em-filter-editor.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-filter-editor.c b/mail/em-filter-editor.c
index 32f7ff1a48..49837c775f 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -28,6 +28,8 @@
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
+#include "e-util/e-util-private.h"
+
#include "em-filter-editor.h"
#include "em-filter-rule.h"
@@ -105,8 +107,14 @@ em_filter_editor_new (EMFilterContext *fc, const EMFilterSource *source_names)
{
EMFilterEditor *fe = (EMFilterEditor *) g_object_new (em_filter_editor_get_type(), NULL);
GladeXML *gui;
+ char *gladefile;
+
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "filter.glade",
+ NULL);
+ gui = glade_xml_new (gladefile, "rule_editor", NULL);
+ g_free (gladefile);
- gui = glade_xml_new (EVOLUTION_GLADEDIR "/filter.glade", "rule_editor", NULL);
em_filter_editor_construct (fe, fc, gui, source_names);
g_object_unref (gui);