[evolution-ews/gnome-3-8] Bug #705658 - Fix errors found by CLANG - Removing dead assignments

[Fabiano Fidêncio <ffidencio src gnome org>]

commit c2e447a4e90bbbffdfcac07508050380b5086bc2
Author: Fabiano Fidêncio <fidencio redhat com>
Date:   Thu Aug 8 09:28:54 2013 +0200

    Bug #705658 - Fix errors found by CLANG - Removing dead assignments

 src/addressbook/e-book-backend-ews.c   |    3 +--
 src/calendar/e-cal-backend-ews-utils.c |   11 +++++------
 src/camel/camel-ews-folder.c           |    7 +------
 src/camel/camel-ews-store.c            |    2 --
 src/server/e-ews-connection.c          |    7 -------
 5 files changed, 7 insertions(+), 23 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 98026e2..9a7867b 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -2737,7 +2737,7 @@ e_book_backend_ews_start_view (EBookBackend *backend,
        gboolean is_autocompletion = FALSE;
        gchar *auto_comp_str = NULL;
        GCancellable *cancellable;
-       GSList *ids = NULL, *mailboxes = NULL, *l, *contacts = NULL, *c;
+       GSList *mailboxes = NULL, *l, *contacts = NULL, *c;
        EwsFolderId *fid;
        ESource *source;
        ESourceEwsFolder *extension;
@@ -2813,7 +2813,6 @@ e_book_backend_ews_start_view (EBookBackend *backend,
        fid = g_new0 (EwsFolderId, 1);
        fid->id = g_strdup (priv->folder_id);
        fid->change_key = e_source_ews_folder_dup_change_key (extension);
-       ids = g_slist_append (ids, fid);
 
        /* We do not scan until we reach the last_item as it might be good enough to show first 100
         * items during auto-completion. Change it if needed. TODO, Personal Address-book should start using
diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
index 32c6611..a326391 100644
--- a/src/calendar/e-cal-backend-ews-utils.c
+++ b/src/calendar/e-cal-backend-ews-utils.c
@@ -750,12 +750,11 @@ e_ews_collect_organizer (icalcomponent *comp)
        org = icalproperty_get_organizer (org_prop);
        if (!org)
                org = "";
-       else {
-               if (!g_ascii_strncasecmp (org, "MAILTO:", 7))
-                       org_email_address = (org) + 7;
-               else
-                       org_email_address = org;
-       }
+
+       if (g_ascii_strncasecmp (org, "MAILTO:", 7) == 0)
+               org_email_address = (org) + 7;
+       else
+               org_email_address = org;
 
        return org_email_address;
 }
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index 673d50c..ab45472 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -356,10 +356,8 @@ ews_update_mgtrequest_mime_calendar_itemid (const gchar *mime_fname,
                g_remove (mime_fname);
                success = TRUE;
  exit_save:
-               if (fd != -1) {
+               if (fd != -1)
                        close (fd);
-                       fd = -1;
-               }
                g_free (dir);
                if (newstream)
                        g_object_unref (newstream);
@@ -373,7 +371,6 @@ ews_update_mgtrequest_mime_calendar_itemid (const gchar *mime_fname,
  exit_parser:
        g_object_unref (mimeparser);
        close (fd_old);
-       fd_old = -1;
 
        // must be freed in the caller
        return mime_fname_new;
@@ -918,8 +915,6 @@ ews_move_to_junk_folder (CamelFolder *folder,
                return TRUE;
        }
 
-       ews_store = CAMEL_EWS_STORE (camel_folder_get_parent_store (folder));
-
        parent_store = camel_folder_get_parent_store (folder);
        ews_folder = CAMEL_EWS_FOLDER (folder);
        ews_store = CAMEL_EWS_STORE (parent_store);
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index 3732d7d..d083e10 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -1654,8 +1654,6 @@ ews_get_folder_info_sync (CamelStore *store,
                camel_ews_store_summary_store_string_val (ews_store->summary, "sync_state", "");
                camel_ews_store_summary_clear (ews_store->summary);
 
-               initial_setup = TRUE;
-
                success = e_ews_connection_sync_folder_hierarchy_sync (connection, EWS_PRIORITY_MEDIUM, NULL,
                        &new_sync_state, &includes_last_folder, &folders_created, &folders_updated, 
&folders_deleted,
                        cancellable, &local_error);
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index 8b37879..4a65931 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -2269,7 +2269,6 @@ e_ews_autodiscover_ws_url (CamelEwsSettings *settings,
                            GAsyncReadyCallback callback,
                            gpointer user_data)
 {
-       CamelNetworkSettings *network_settings;
        GSimpleAsyncResult *simple;
        struct _autodiscover_data *ad;
        xmlOutputBuffer *buf;
@@ -2280,7 +2279,6 @@ e_ews_autodiscover_ws_url (CamelEwsSettings *settings,
        SoupURI *soup_uri = NULL;
        gboolean use_secure = TRUE;
        const gchar *host_url;
-       const gchar *user;
        GError *error = NULL;
 
        g_return_if_fail (CAMEL_IS_EWS_SETTINGS (settings));
@@ -2331,11 +2329,6 @@ e_ews_autodiscover_ws_url (CamelEwsSettings *settings,
        url3 = g_strdup_printf ("http%s://%s/autodiscover/autodiscover.xml", use_secure ? "s" : "", domain);
        url4 = g_strdup_printf ("http%s://autodiscover.%s/autodiscover/autodiscover.xml", use_secure ? "s" : 
"", domain);
 
-       network_settings = CAMEL_NETWORK_SETTINGS (settings);
-       user = camel_network_settings_get_user (network_settings);
-       if (user == NULL || *user == '\0')
-               user = email_address;
-
        cnc = e_ews_connection_new (url3, settings);
        e_ews_connection_set_password (cnc, password);