diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-11-26 10:43:22 +0800 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-11-26 10:43:22 +0800 |
| commit | 4172f09580fed628681bd683f620c2bc43ea842e (patch) | |
| tree | bed2c46b352cef1d47de2a951207c5e789c9bb5c | |
| parent | 906edb038027f0c8c4d0e4cebf7cf487be8c19c3 (diff) | |
| download | gsoc2013-evolution-4172f09580fed628681bd683f620c2bc43ea842e.tar.gz gsoc2013-evolution-4172f09580fed628681bd683f620c2bc43ea842e.tar.zst gsoc2013-evolution-4172f09580fed628681bd683f620c2bc43ea842e.zip | |
Include e-util-private.h to get redefinition of compile-time pathnames as
2005-11-26 Tor Lillqvist <tml@novell.com>
* e-msg-composer-attachment.c: Include e-util-private.h to get
redefinition of compile-time pathnames as calls to functions on
Windows. Construct the pathnames of files and directories under
the installation prefix at run-time to enable install-anywhere on
Windows. No effect on functionality on Unix.
svn path=/trunk/; revision=30681
| -rw-r--r-- | composer/ChangeLog | 8 | ||||
| -rw-r--r-- | composer/e-msg-composer-attachment.c | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 27b66c5ac7..146fe4cbbb 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,11 @@ +2005-11-26 Tor Lillqvist <tml@novell.com> + + * e-msg-composer-attachment.c: Include e-util-private.h to get + redefinition of compile-time pathnames as calls to functions on + Windows. Construct the pathnames of files and directories under + the installation prefix at run-time to enable install-anywhere on + Windows. No effect on functionality on Unix. + 2005-10-22 Parthasarathi Susarla <sparthasarathi@novell.com> * e-msg-composer.c: (get_file_content): diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c index 4c0e3a0fed..c7d7fabde4 100644 --- a/composer/e-msg-composer-attachment.c +++ b/composer/e-msg-composer-attachment.c @@ -44,6 +44,7 @@ #include <libgnome/gnome-i18n.h> #include "e-util/e-mktemp.h" +#include "e-util/e-util-private.h" #include "e-msg-composer.h" #include "e-msg-composer-attachment.h" @@ -544,6 +545,7 @@ e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, GtkWidget *p DialogData *dialog_data; GladeXML *editor_gui; char *type; + char *gladefile; g_return_if_fail (attachment != NULL); g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT (attachment)); @@ -557,8 +559,12 @@ e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, GtkWidget *p return; } - editor_gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-msg-composer-attachment.glade", - NULL, NULL); + gladefile = g_build_filename (EVOLUTION_GLADEDIR, + "e-msg-composer-attachment.glade", + NULL); + editor_gui = glade_xml_new (gladefile, NULL, NULL); + g_free (gladefile); + if (editor_gui == NULL) { g_warning ("Cannot load `e-msg-composer-attachment.glade'"); return; |