aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-12-18 01:22:49 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-12-18 01:22:49 +0800
commit0ef40d19c28524082189d8b768db3822072b8dbc (patch)
tree9c1c7566b1854881f6565fd955227e32c0a0bf8c /composer
parenta6b4bade41b7a1f061cb15b2ea031b0007ee5c23 (diff)
downloadgsoc2013-evolution-0ef40d19c28524082189d8b768db3822072b8dbc.tar
gsoc2013-evolution-0ef40d19c28524082189d8b768db3822072b8dbc.tar.gz
gsoc2013-evolution-0ef40d19c28524082189d8b768db3822072b8dbc.tar.bz2
gsoc2013-evolution-0ef40d19c28524082189d8b768db3822072b8dbc.tar.lz
gsoc2013-evolution-0ef40d19c28524082189d8b768db3822072b8dbc.tar.xz
gsoc2013-evolution-0ef40d19c28524082189d8b768db3822072b8dbc.tar.zst
gsoc2013-evolution-0ef40d19c28524082189d8b768db3822072b8dbc.zip
Include <gtk/gtk.h> instead of attempting to hand-pick individual GTK
2005-12-17 Tor Lillqvist <tml@novell.com> * e-msg-composer-attachment.c: Include <gtk/gtk.h> instead of attempting to hand-pick individual GTK headers. Use gstdio wrappers. Use GDir instead of dirent. Use g_mkstemp() instead of mkstemp(). Construct xml file names at run-time. svn path=/trunk/; revision=30832
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog15
-rw-r--r--composer/e-msg-composer-attachment.c15
2 files changed, 16 insertions, 14 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 2c785512ea..6cf0742625 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,11 +1,14 @@
2005-12-17 Tor Lillqvist <tml@novell.com>
- * e-msg-composer.c: Include <gtk/gtk.h> instead of attempting to
- hand-pick individual GTK headers. Use gstdio wrappers. Use GDir
- instead of dirent. Use g_mkstemp() instead of mkstemp(). Construct
- xml file names at run-time.
- (autosave_manager_unregister): Close file before unlinking so we
- don't leave stray autosave files laying around on Win32.
+ * e-msg-composer.c
+ * e-msg-composer-attachment.c: Include <gtk/gtk.h> instead of
+ attempting to hand-pick individual GTK headers. Use gstdio
+ wrappers. Use GDir instead of dirent. Use g_mkstemp() instead of
+ mkstemp(). Construct xml file names at run-time.
+
+ * e-msg-composer.c (autosave_manager_unregister): Close file
+ before unlinking so we don't leave stray autosave files laying
+ around on Win32.
2005-11-23 Johnny Jacob <johnnyjacob@gmail.com>
diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index c7d7fabde4..a8b6b0e726 100644
--- a/composer/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -28,20 +28,19 @@
attachment. Also, this contains the code to let users edit the
attachment manually. */
-#ifdef HAVE_CONFIG_H
#include <config.h>
-#endif
#include <sys/stat.h>
#include <string.h>
#include <errno.h>
-#include <camel/camel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkdialog.h>
+#include <glib.h>
+#include <glib/gstdio.h>
+
+#include <gtk/gtk.h>
#include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnome/gnome-i18n.h>
+#include <camel/camel.h>
#include "e-util/e-mktemp.h"
#include "e-util/e-util-private.h"
@@ -183,7 +182,7 @@ e_msg_composer_attachment_new (const char *file_name,
g_return_val_if_fail (file_name != NULL, NULL);
- if (stat (file_name, &statbuf) < 0) {
+ if (g_stat (file_name, &statbuf) < 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Cannot attach file %s: %s"),
file_name, g_strerror (errno));
@@ -293,7 +292,7 @@ e_msg_composer_attachment_build_remote_file (const char *file_name,
g_return_if_fail (file_name != NULL);
- if (stat (file_name, &statbuf) < 0) {
+ if (g_stat (file_name, &statbuf) < 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Cannot attach file %s: %s"),
file_name, g_strerror (errno));