Bug #691126 - Fix warnings find by Clang

diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 152556b..4c1e4df 100644 (file)
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -125,12 +125,12 @@ typedef struct {
                /* OP_MODIFY_OBJECTS */
                struct _mo {
                        GSList *calobjs;
-                       EDataCalObjModType mod;
+                       CalObjModType mod; /* corresponds to EDataCalObjModType */
                } mo;
                /* OP_REMOVE_OBJECTS */
                struct _ro {
                        GSList *ids;
-                       EDataCalObjModType mod;
+                       CalObjModType mod; /* corresponds to EDataCalObjModType */
                } ro;
                /* OP_GET_TIMEZONE */
                gchar *tzid;

diff --git a/camel/camel-imapx-server.c b/camel/camel-imapx-server.c
index 76f6fdc..d106189 100644 (file)
--- a/camel/camel-imapx-server.c
+++ b/camel/camel-imapx-server.c
@@ -6036,7 +6036,7 @@ imapx_command_delete_folder_done (CamelIMAPXServer *is,
                                   GError **error)
 {
        CamelIMAPXJob *job;
-       gboolean success;
+       gboolean success = TRUE;
 
        job = camel_imapx_command_get_job (ic);
        g_return_val_if_fail (CAMEL_IS_IMAPX_JOB (job), FALSE);

diff --git a/camel/camel-imapx-utils.c b/camel/camel-imapx-utils.c
index 1d72d3f..aa300ec 100644 (file)
--- a/camel/camel-imapx-utils.c
+++ b/camel/camel-imapx-utils.c
@@ -132,7 +132,6 @@ imapx_parse_flags (CamelIMAPXStream *stream,
 
                                }
                        found:
-                               tok = tok; /* fixes stupid warning */
                                g_free (upper);
                        } else if (tok != ')') {
                                g_set_error (error, CAMEL_IMAPX_ERROR, 1, "expecting flag");