[evolution-data-server] CamelIMAPXSettings: Remove unused "mobile-mode" property.



commit 9df9e5df0142e0f01f584397c7da193f436d5df9
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Nov 28 12:23:13 2013 -0500

    CamelIMAPXSettings: Remove unused "mobile-mode" property.
    
    Not used by Evolution and not clear what this mode even means.
    
    Removing it makes a bunch of confusing complexity drop out, which is
    justication enough for me.

 camel/providers/imapx/camel-imapx-server.c   |   84 +++-----------------------
 camel/providers/imapx/camel-imapx-settings.c |   68 ---------------------
 camel/providers/imapx/camel-imapx-settings.h |    5 --
 camel/providers/imapx/camel-imapx-store.c    |   18 +-----
 docs/reference/camel/camel-sections.txt      |    2 -
 5 files changed, 9 insertions(+), 168 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 56cbdce..3cf1adb 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -5309,7 +5309,6 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
        gint i;
        CamelIMAPXSettings *settings;
        guint batch_count;
-       gboolean mobile_mode;
        GError *local_error = NULL;
 
        job = camel_imapx_command_get_job (ic);
@@ -5330,7 +5329,6 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
 
        settings = camel_imapx_server_ref_settings (is);
        batch_count = camel_imapx_settings_get_batch_fetch_count (settings);
-       mobile_mode = camel_imapx_settings_get_mobile_mode (settings);
        g_object_unref (settings);
 
        i = data->index;
@@ -5363,11 +5361,8 @@ imapx_command_step_fetch_done (CamelIMAPXServer *is,
 
                data->last_index = i;
 
-               /* If its mobile client and when total=0 (new account setup)
-                * fetch only one batch of mails, on futher attempts download
-                * all new mails as per the limit. */
                for (; i < data->infos->len &&
-                       (!mobile_mode || (total && i == 0) ||
+                       ((total && i == 0) ||
                        ((fetch_limit != -1 && i < fetch_limit) ||
                        (fetch_limit == -1 && i < batch_count))); i++) {
 
@@ -5486,7 +5481,7 @@ imapx_job_scan_changes_done (CamelIMAPXServer *is,
        RefreshInfoData *data;
        GCancellable *cancellable;
        guint uidset_size;
-       gboolean mobile_mode;
+       guint32 unseen;
        GError *local_error = NULL;
 
        job = camel_imapx_command_get_job (ic);
@@ -5508,7 +5503,6 @@ imapx_job_scan_changes_done (CamelIMAPXServer *is,
 
        settings = camel_imapx_server_ref_settings (is);
        uidset_size = camel_imapx_settings_get_batch_fetch_count (settings);
-       mobile_mode = camel_imapx_settings_get_mobile_mode (settings);
        g_object_unref (settings);
 
        if (camel_imapx_command_set_error_if_failed (ic, &local_error)) {
@@ -5661,17 +5655,10 @@ imapx_job_scan_changes_done (CamelIMAPXServer *is,
 
        refresh_info_data_infos_free (data);
 
-       /* There's no sane way to get the server-side unseen count on the
-        * select mailbox. So just work it out from the flags if its not in
-        * mobile mode. In mobile mode we would have this filled up already
-        * with a STATUS command.
-        **/
-       if (!mobile_mode) {
-               guint32 unseen;
-
-               unseen = camel_folder_summary_get_unread_count (folder->summary);
-               camel_imapx_mailbox_set_unseen (mailbox, unseen);
-       }
+       /* There's no sane way to get the server-side unseen count
+        * on the select mailbox, so just work it out from the flags. */
+       unseen = camel_folder_summary_get_unread_count (folder->summary);
+       camel_imapx_mailbox_set_unseen (mailbox, unseen);
 
        g_object_unref (folder);
        g_object_unref (mailbox);
@@ -5689,9 +5676,6 @@ imapx_job_scan_changes_start (CamelIMAPXJob *job,
        CamelIMAPXCommand *ic;
        CamelIMAPXMailbox *mailbox;
        RefreshInfoData *data;
-       CamelIMAPXSettings *settings;
-       gboolean mobile_mode;
-       gchar *uid = NULL;
 
        data = camel_imapx_job_get_data (job);
        g_return_val_if_fail (data != NULL, FALSE);
@@ -5702,13 +5686,6 @@ imapx_job_scan_changes_start (CamelIMAPXJob *job,
        folder = imapx_server_ref_folder (is, mailbox);
        g_return_val_if_fail (folder != NULL, FALSE);
 
-       settings = camel_imapx_server_ref_settings (is);
-       mobile_mode = camel_imapx_settings_get_mobile_mode (settings);
-       g_object_unref (settings);
-
-       if (mobile_mode)
-               uid = camel_imapx_dup_uid_from_summary_index (folder, 0);
-
        job->pop_operation_msg = TRUE;
 
        camel_operation_push_message (
@@ -5716,14 +5693,9 @@ imapx_job_scan_changes_start (CamelIMAPXJob *job,
                _("Scanning for changed messages in '%s'"),
                camel_folder_get_display_name (folder));
 
-       e (
-               'E', "Scanning from %s in %s\n",
-               uid ? uid : "start",
-               camel_imapx_mailbox_get_name (mailbox));
-
        ic = camel_imapx_command_new (
                is, "FETCH", mailbox,
-               "UID FETCH %s:* (UID FLAGS)", uid ? uid : "1");
+               "UID FETCH 1:* (UID FLAGS)");
        camel_imapx_command_set_job (ic, job);
        ic->complete = imapx_job_scan_changes_done;
 
@@ -5736,8 +5708,6 @@ imapx_job_scan_changes_start (CamelIMAPXJob *job,
 
        camel_imapx_command_unref (ic);
 
-       g_free (uid);
-
        g_object_unref (folder);
        g_object_unref (mailbox);
 
@@ -5938,7 +5908,6 @@ imapx_job_refresh_info_start (CamelIMAPXJob *job,
                               GCancellable *cancellable,
                               GError **error)
 {
-       CamelIMAPXSettings *settings;
        CamelIMAPXSummary *isum;
        CamelFolder *folder;
        CamelIMAPXMailbox *mailbox;
@@ -5946,7 +5915,6 @@ imapx_job_refresh_info_start (CamelIMAPXJob *job,
        gboolean need_rescan = FALSE;
        gboolean is_selected = FALSE;
        gboolean can_qresync = FALSE;
-       gboolean mobile_mode;
        gboolean success;
        guint32 messages;
        guint32 unseen;
@@ -5961,10 +5929,6 @@ imapx_job_refresh_info_start (CamelIMAPXJob *job,
        folder = imapx_server_ref_folder (is, mailbox);
        g_return_val_if_fail (folder != NULL, FALSE);
 
-       settings = camel_imapx_server_ref_settings (is);
-       mobile_mode = camel_imapx_settings_get_mobile_mode (settings);
-       g_object_unref (settings);
-
        isum = CAMEL_IMAPX_SUMMARY (folder->summary);
 
        full_name = camel_folder_get_full_name (folder);
@@ -6063,28 +6027,6 @@ imapx_job_refresh_info_start (CamelIMAPXJob *job,
                    camel_folder_summary_get_unread_count (folder->summary) != unseen ||
                    (!is_selected && isum->modseq != highestmodseq))
                        need_rescan = TRUE;
-
-       } else if (mobile_mode) {
-               /* We need to issue Status command to get the total unread count */
-               CamelIMAPXCommand *ic;
-
-               ic = camel_imapx_command_new (
-                       is, "STATUS", NULL, "STATUS %M (%t)",
-                       mailbox, is->priv->status_data_items);
-               camel_imapx_command_set_job (ic, job);
-               ic->pri = job->pri;
-
-               success = imapx_command_run_sync (
-                       is, ic, cancellable, error);
-
-               camel_imapx_command_unref (ic);
-
-               if (!success) {
-                       g_prefix_error (
-                               error, "%s: ",
-                               _("Error refreshing folder"));
-                       goto done;
-               }
        }
 
        messages = camel_imapx_mailbox_get_messages (mailbox);
@@ -6943,8 +6885,6 @@ imapx_command_sync_changes_done (CamelIMAPXServer *is,
        CamelStore *parent_store;
        SyncChangesData *data;
        const gchar *full_name;
-       CamelIMAPXSettings *settings;
-       gboolean mobile_mode;
        GError *local_error = NULL;
 
        job = camel_imapx_command_get_job (ic);
@@ -6959,10 +6899,6 @@ imapx_command_sync_changes_done (CamelIMAPXServer *is,
        folder = imapx_server_ref_folder (is, mailbox);
        g_return_if_fail (folder != NULL);
 
-       settings = camel_imapx_server_ref_settings (is);
-       mobile_mode = camel_imapx_settings_get_mobile_mode (settings);
-       g_object_unref (settings);
-
        job->commands--;
 
        full_name = camel_folder_get_full_name (folder);
@@ -7031,11 +6967,7 @@ imapx_command_sync_changes_done (CamelIMAPXServer *is,
                                if (si->total != camel_folder_summary_get_saved_count (folder->summary) ||
                                    si->unread != camel_folder_summary_get_unread_count (folder->summary)) {
                                        si->total = camel_folder_summary_get_saved_count (folder->summary);
-                                       /* Don't mess with server's unread
-                                        * count in mobile mode, as what we
-                                        * have downloaded is little. */
-                                       if (!mobile_mode)
-                                               si->unread = camel_folder_summary_get_unread_count 
(folder->summary);
+                                       si->unread = camel_folder_summary_get_unread_count (folder->summary);
                                        camel_store_summary_touch (CAMEL_IMAPX_STORE (parent_store)->summary);
                                }
 
diff --git a/camel/providers/imapx/camel-imapx-settings.c b/camel/providers/imapx/camel-imapx-settings.c
index 2619e20..c84c37c 100644
--- a/camel/providers/imapx/camel-imapx-settings.c
+++ b/camel/providers/imapx/camel-imapx-settings.c
@@ -40,7 +40,6 @@ struct _CamelIMAPXSettingsPrivate {
        gboolean filter_junk;
        gboolean filter_junk_inbox;
        gboolean use_idle;
-       gboolean use_mobile_mode;
        gboolean use_namespace;
        gboolean use_qresync;
        gboolean use_real_junk_path;
@@ -63,7 +62,6 @@ enum {
        PROP_FILTER_JUNK,
        PROP_FILTER_JUNK_INBOX,
        PROP_HOST,
-       PROP_MOBILE_MODE,
        PROP_NAMESPACE,
        PROP_PORT,
        PROP_REAL_JUNK_PATH,
@@ -148,12 +146,6 @@ imapx_settings_set_property (GObject *object,
                                g_value_get_string (value));
                        return;
 
-               case PROP_MOBILE_MODE:
-                       camel_imapx_settings_set_mobile_mode (
-                               CAMEL_IMAPX_SETTINGS (object),
-                               g_value_get_boolean (value));
-                       return;
-
                case PROP_NAMESPACE:
                        camel_imapx_settings_set_namespace (
                                CAMEL_IMAPX_SETTINGS (object),
@@ -312,13 +304,6 @@ imapx_settings_get_property (GObject *object,
                                CAMEL_NETWORK_SETTINGS (object)));
                        return;
 
-               case PROP_MOBILE_MODE:
-                       g_value_set_boolean (
-                               value,
-                               camel_imapx_settings_get_mobile_mode (
-                               CAMEL_IMAPX_SETTINGS (object)));
-                       return;
-
                case PROP_NAMESPACE:
                        g_value_take_string (
                                value,
@@ -542,18 +527,6 @@ camel_imapx_settings_class_init (CamelIMAPXSettingsClass *class)
                        G_PARAM_CONSTRUCT |
                        G_PARAM_STATIC_STRINGS));
 
-       g_object_class_install_property (
-               object_class,
-               PROP_MOBILE_MODE,
-               g_param_spec_boolean (
-                       "mobile-mode",
-                       "Mobile Mode",
-                       "Mobile mode which adjusts the IMAPX for Mobile clients",
-                       FALSE,
-                       G_PARAM_READWRITE |
-                       G_PARAM_CONSTRUCT |
-                       G_PARAM_STATIC_STRINGS));
-
        /* Inherited from CamelNetworkSettings. */
        g_object_class_override_property (
                object_class,
@@ -1021,47 +994,6 @@ camel_imapx_settings_set_filter_junk_inbox (CamelIMAPXSettings *settings,
 }
 
 /**
- * camel_imapx_settings_get_mobile_mode:
- * @settings: a #CamelIMAPXSettings
- *
- * Returns whether the backend is operating in mobile mode.
- *
- * Since: 3.2
- **/
-gboolean
-camel_imapx_settings_get_mobile_mode (CamelIMAPXSettings *settings)
-{
-       g_return_val_if_fail (
-               CAMEL_IS_IMAPX_SETTINGS (settings),
-               CAMEL_SORT_ASCENDING);
-
-       return settings->priv->use_mobile_mode;
-}
-
-/**
- * camel_imapx_settings_set_mobile_mode:
- * @settings: a #CamelIMAPXSettings
- * @mobile_mode: whether to operate in mobile mode.
- *
- * Sets the mode of operation as mobile or not for the backend.
- *
- * Since: 3.2
- **/
-void
-camel_imapx_settings_set_mobile_mode (CamelIMAPXSettings *settings,
-                                      gboolean mobile_mode)
-{
-       g_return_if_fail (CAMEL_IS_IMAPX_SETTINGS (settings));
-
-       if (settings->priv->use_mobile_mode == mobile_mode)
-               return;
-
-       settings->priv->use_mobile_mode = mobile_mode;
-
-       g_object_notify (G_OBJECT (settings), "mobile-mode");
-}
-
-/**
  * camel_imapx_settings_get_namespace:
  * @settings: a #CamelIMAPXSettings
  *
diff --git a/camel/providers/imapx/camel-imapx-settings.h b/camel/providers/imapx/camel-imapx-settings.h
index 69dc5a5..cfe077e 100644
--- a/camel/providers/imapx/camel-imapx-settings.h
+++ b/camel/providers/imapx/camel-imapx-settings.h
@@ -91,11 +91,6 @@ gboolean     camel_imapx_settings_get_filter_junk_inbox
 void           camel_imapx_settings_set_filter_junk_inbox
                                                (CamelIMAPXSettings *settings,
                                                 gboolean filter_junk_inbox);
-gboolean       camel_imapx_settings_get_mobile_mode
-                                               (CamelIMAPXSettings *settings);
-void           camel_imapx_settings_set_mobile_mode
-                                               (CamelIMAPXSettings *settings,
-                                                gboolean mobile_mode);
 const gchar *  camel_imapx_settings_get_namespace
                                                (CamelIMAPXSettings *settings);
 gchar *                camel_imapx_settings_dup_namespace
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 3af09c7..02096d0 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -1133,16 +1133,6 @@ fill_fi (CamelStore *store,
          CamelFolderInfo *fi)
 {
        CamelFolder *folder;
-       CamelService *service = (CamelService *) store;
-       CamelSettings *settings;
-       gboolean mobile_mode;
-
-       settings = camel_service_ref_settings (service);
-
-       mobile_mode = camel_imapx_settings_get_mobile_mode (
-               CAMEL_IMAPX_SETTINGS (settings));
-
-       g_object_unref (settings);
 
        folder = camel_object_bag_peek (store->folders, fi->full_name);
        if (folder) {
@@ -1158,13 +1148,7 @@ fill_fi (CamelStore *store,
                imapx_folder = CAMEL_IMAPX_FOLDER (folder);
                mailbox = camel_imapx_folder_ref_mailbox (imapx_folder);
 
-               /* Mobile clients would still love to see the total unread of actual mails
-                * than what they just have downloaded. So we override that information by giving 
-                * what the server has instead of what we have downloaded. */
-               if (mobile_mode && mailbox != NULL)
-                       fi->unread = camel_imapx_mailbox_get_unseen (mailbox);
-               else
-                       fi->unread = camel_folder_summary_get_unread_count ((CamelFolderSummary *) ims);
+               fi->unread = camel_folder_summary_get_unread_count ((CamelFolderSummary *) ims);
                fi->total = camel_folder_summary_get_saved_count ((CamelFolderSummary *) ims);
 
                g_clear_object (&mailbox);
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 535d9a6..c206e08 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -3596,8 +3596,6 @@ camel_imapx_settings_get_filter_junk
 camel_imapx_settings_set_filter_junk
 camel_imapx_settings_get_filter_junk_inbox
 camel_imapx_settings_set_filter_junk_inbox
-camel_imapx_settings_get_mobile_mode
-camel_imapx_settings_set_mobile_mode
 camel_imapx_settings_get_namespace
 camel_imapx_settings_dup_namespace
 camel_imapx_settings_set_namespace


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]