[evolution] Remove unused arguments in mail_fetch_mail().



commit 7c407a88e26baa741832cd60772e1e78c8ac055f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Nov 28 10:53:16 2013 -0500

    Remove unused arguments in mail_fetch_mail().
    
    The 'fetch_type' and 'fetch_count' arguments are not used.

 libemail-engine/mail-ops.c |   23 +++--------------------
 libemail-engine/mail-ops.h |    4 +---
 mail/mail-send-recv.c      |   13 +++++--------
 3 files changed, 9 insertions(+), 31 deletions(-)
---
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index ad6e1c1..df90596 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -76,15 +76,12 @@ struct _fetch_mail_msg {
        GCancellable *cancellable;      /* we have our own cancellation
                                         * struct, the other should be empty */
        gint keep;                      /* keep on server? */
-       gint fetch_count;
-       CamelFetchType fetch_type;
-       gint still_more;
 
        MailProviderFetchLockFunc provider_lock;
        MailProviderFetchUnlockFunc provider_unlock;
        MailProviderFetchInboxFunc provider_fetch_inbox;
 
-       void (*done)(gint still_more, gpointer data);
+       void (*done)(gpointer data);
        gpointer data;
 };
 
@@ -326,13 +323,6 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
 
        parent_store = camel_folder_get_parent_store (folder);
 
-       if (m->fetch_count > 0) {
-               /* We probably should fetch some old messages first. */
-               m->still_more = camel_folder_fetch_messages_sync (
-                       folder, m->fetch_type,
-                       m->fetch_count, cancellable, error) ? 1 : 0;
-       }
-
        service = CAMEL_SERVICE (parent_store);
        data_dir = camel_service_get_user_data_dir (service);
 
@@ -472,7 +462,7 @@ static void
 fetch_mail_done (struct _fetch_mail_msg *m)
 {
        if (m->done)
-               m->done (m->still_more, m->data);
+               m->done (m->data);
 }
 
 static void
@@ -498,8 +488,6 @@ static MailMsgInfo fetch_mail_info = {
 /* ouch, a 'do everything' interface ... */
 void
 mail_fetch_mail (CamelStore *store,
-                 CamelFetchType fetch_type,
-                 gint fetch_count,
                  const gchar *type,
                  MailProviderFetchLockFunc lock_func,
                  MailProviderFetchUnlockFunc unlock_func,
@@ -509,8 +497,7 @@ mail_fetch_mail (CamelStore *store,
                  gpointer get_data,
                  CamelFilterStatusFunc *status,
                  gpointer status_data,
-                 void (*done)(gint still_more,
-                 gpointer data),
+                 void (*done)(gpointer data),
                  gpointer data)
 {
        struct _fetch_mail_msg *m;
@@ -531,10 +518,6 @@ mail_fetch_mail (CamelStore *store,
        m->done = done;
        m->data = data;
 
-       m->fetch_count = fetch_count;
-       m->fetch_type = fetch_type;
-       m->still_more = -1;
-
        m->provider_lock = lock_func;
        m->provider_unlock = unlock_func;
        m->provider_fetch_inbox = fetch_inbox_func;
diff --git a/libemail-engine/mail-ops.h b/libemail-engine/mail-ops.h
index ec9ab73..7841b09 100644
--- a/libemail-engine/mail-ops.h
+++ b/libemail-engine/mail-ops.h
@@ -79,8 +79,6 @@ typedef CamelFolder *
                                                 GError **error);
 
 void           mail_fetch_mail                 (CamelStore *store,
-                                                CamelFetchType fetch_type,
-                                                gint fetch_count,
                                                 const gchar *type,
                                                 MailProviderFetchLockFunc lock_func,
                                                 MailProviderFetchUnlockFunc unlock_func,
@@ -90,7 +88,7 @@ void          mail_fetch_mail                 (CamelStore *store,
                                                 gpointer get_data,
                                                 CamelFilterStatusFunc *status,
                                                 gpointer status_data,
-                                                void (*done)(gint still_more, gpointer data),
+                                                void (*done)(gpointer data),
                                                 gpointer data);
 
 void           mail_filter_folder              (EMailSession *session,
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index d524242..dbdf629 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -824,8 +824,7 @@ receive_status (CamelFilterDriver *driver,
 
 /* when receive/send is complete */
 static void
-receive_done (gint still_more,
-              gpointer data)
+receive_done (gpointer data)
 {
        struct _send_info *info = data;
        const gchar *uid;
@@ -908,7 +907,7 @@ receive_done (gint still_more,
 static void
 send_done (gpointer data)
 {
-       receive_done (-1, data);
+       receive_done (data);
 }
 /* although we dont do anythign smart here yet, there is no need for this interface to
  * be available to anyone else.
@@ -1087,7 +1086,7 @@ exit:
 static void
 refresh_folders_done (struct _refresh_folders_msg *m)
 {
-       receive_done (-1, m->info);
+       receive_done (m->info);
 }
 
 static void
@@ -1149,7 +1148,7 @@ receive_update_got_folderinfo (GObject *source_object,
                mail_msg_unordered_push (m);
 
        } else {
-               receive_done (-1, send_info);
+               receive_done (send_info);
        }
 }
 
@@ -1177,7 +1176,7 @@ receive_update_got_store (CamelStore *store,
                        folder_cache, store, info->cancellable,
                        receive_update_got_folderinfo, info);
        } else {
-               receive_done (-1, info);
+               receive_done (info);
        }
 }
 
@@ -1265,7 +1264,6 @@ send_receive (GtkWindow *parent,
                case SEND_RECEIVE:
                        mail_fetch_mail (
                                CAMEL_STORE (info->service),
-                               CAMEL_FETCH_OLD_MESSAGES, -1,
                                E_FILTER_SOURCE_INCOMING,
                                NULL, NULL, NULL,
                                info->cancellable,
@@ -1364,7 +1362,6 @@ mail_receive_service (CamelService *service)
        case SEND_RECEIVE:
                mail_fetch_mail (
                        CAMEL_STORE (service),
-                       CAMEL_FETCH_OLD_MESSAGES, -1,
                        E_FILTER_SOURCE_INCOMING,
                        NULL, NULL, NULL,
                        info->cancellable,


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