callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include e-util-private.h to get redefinition of compile-time pathnames as

Browse Source 
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
This commit is contained in:
Tor Lillqvist
2005-11-26 02:43:22 +00:00
committed by Tor Lillqvist
parent 906edb0380
commit 4172f09580
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
composer/ChangeLog
View File

@ -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):

10
composer/e-msg-composer-attachment.c
View File

@ -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;