aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2003-07-23 22:57:22 +0800
committerDan Winship <danw@src.gnome.org>2003-07-23 22:57:22 +0800
commitf5ed342cd3980242c3d3403dd49b6056e658b664 (patch)
treeff5c6536e7d4e76bf9246f4805cea0600f28e5d7
parent64a3e0a91c24b5b6677bfc1149505e620ddc4875 (diff)
downloadgsoc2013-evolution-f5ed342cd3980242c3d3403dd49b6056e658b664.tar.gz
gsoc2013-evolution-f5ed342cd3980242c3d3403dd49b6056e658b664.tar.zst
gsoc2013-evolution-f5ed342cd3980242c3d3403dd49b6056e658b664.zip
#include camel-file-utils.h for camel_read()
* camel-block-file.c: #include camel-file-utils.h for camel_read() * camel-uid-cache.c (camel_uid_cache_save): Remove unused variable and label. * camel-url.c: #include camel-string-utils.h for camel_strdown * providers/pop3/camel-pop3-store.c (pop3_try_authenticate): Cast an (unsigned char *) to (char *) to fix a warning svn path=/trunk/; revision=21902
-rw-r--r--camel/ChangeLog12
-rw-r--r--camel/camel-block-file.c1
-rw-r--r--camel/camel-uid-cache.c2
-rw-r--r--camel/camel-url.c1
-rw-r--r--camel/providers/pop3/camel-pop3-store.c2
5 files changed, 15 insertions, 3 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 8a607b8bfe..50d88a7a67 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,15 @@
+2003-07-23 Dan Winship <danw@ximian.com>
+
+ * camel-block-file.c: #include camel-file-utils.h for camel_read()
+
+ * camel-uid-cache.c (camel_uid_cache_save): Remove unused variable
+ and label.
+
+ * camel-url.c: #include camel-string-utils.h for camel_strdown
+
+ * providers/pop3/camel-pop3-store.c (pop3_try_authenticate): Cast
+ an (unsigned char *) to (char *) to fix a warning
+
2003-07-17 Jeffrey Stedfast <fejj@ximian.com>
* camel-mime-message.c (find_best_encoding): Updated to convert
diff --git a/camel/camel-block-file.c b/camel/camel-block-file.c
index bf444ca403..68008502b4 100644
--- a/camel/camel-block-file.c
+++ b/camel/camel-block-file.c
@@ -36,6 +36,7 @@
#include "e-util/e-msgport.h"
#include "camel-block-file.h"
+#include "camel-file-utils.h"
#define d(x) /*(printf("%s(%d):%s: ", __FILE__, __LINE__, __PRETTY_FUNCTION__),(x))*/
diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c
index c31c2761b2..2a2a52daeb 100644
--- a/camel/camel-uid-cache.c
+++ b/camel/camel-uid-cache.c
@@ -148,7 +148,6 @@ maybe_write_uid (gpointer key, gpointer value, gpointer data)
gboolean
camel_uid_cache_save (CamelUIDCache *cache)
{
- struct stat st;
char *filename;
int errnosav;
int fd;
@@ -167,7 +166,6 @@ camel_uid_cache_save (CamelUIDCache *cache)
if (cache->fd == -1)
goto exception;
- overwrite:
if (fsync (fd) == -1)
goto exception;
diff --git a/camel/camel-url.c b/camel/camel-url.c
index 95d234977e..d6ed6d97a7 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -36,6 +36,7 @@
#include "camel-exception.h"
#include "camel-mime-utils.h"
#include "camel-object.h"
+#include "camel-string-utils.h"
static void copy_param (GQuark key_id, gpointer data, gpointer user_data);
static void output_param (GQuark key_id, gpointer data, gpointer user_data);
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 8b674e019e..7570f21e5e 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -530,7 +530,7 @@ pop3_try_authenticate (CamelService *service, gboolean reprompt, const char *err
_("Unable to connect to POP server %s.\n"
"Error sending password: %s"),
CAMEL_SERVICE (store)->url->host,
- store->engine->line ? store->engine->line : _("Unknown error"));
+ store->engine->line ? (char *)store->engine->line : _("Unknown error"));
camel_pop3_engine_command_free(store->engine, pcp);