diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2014-02-16 22:36:49 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2014-03-03 08:36:01 +0800 |
commit | c53fbc0b8f3b98827d6816a627bdd4d467b84f74 (patch) | |
tree | 10eb8683b6d413f9ae6946dcaf303c29027a84ef /mail | |
parent | 1e3d8b5c68754c377c54423f1fb9a322eb3ec9e8 (diff) | |
download | gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.gz gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.bz2 gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.lz gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.xz gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.tar.zst gsoc2013-evolution-c53fbc0b8f3b98827d6816a627bdd4d467b84f74.zip |
Miscellaneous cleanups.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/e-mail-backend.c | 78 | ||||
-rw-r--r-- | mail/e-mail-config-assistant.c | 16 | ||||
-rw-r--r-- | mail/e-mail-display.c | 2 | ||||
-rw-r--r-- | mail/e-mail-reader.c | 36 | ||||
-rw-r--r-- | mail/e-mail-reader.h | 36 | ||||
-rw-r--r-- | mail/e-mail-request.c | 6 | ||||
-rw-r--r-- | mail/e-mail-sidebar.h | 20 | ||||
-rw-r--r-- | mail/e-mail-tag-editor.c | 3 | ||||
-rw-r--r-- | mail/e-mail-view.c | 2 | ||||
-rw-r--r-- | mail/em-composer-utils.c | 6 | ||||
-rw-r--r-- | mail/em-folder-tree.c | 57 | ||||
-rw-r--r-- | mail/em-folder-tree.h | 2 | ||||
-rw-r--r-- | mail/message-list.c | 11 |
13 files changed, 158 insertions, 117 deletions
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 8e45ae101f..4d80c6371a 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -112,24 +112,27 @@ static gboolean mail_backend_any_store_requires_downsync (EMailAccountStore *account_store) { GQueue queue = G_QUEUE_INIT; - gboolean any_requires_downsync = FALSE; g_return_val_if_fail (E_IS_MAIL_ACCOUNT_STORE (account_store), FALSE); e_mail_account_store_queue_enabled_services (account_store, &queue); + while (!g_queue_is_empty (&queue)) { CamelService *service; + CamelOfflineStore *offline_store; service = g_queue_pop_head (&queue); - if (service == NULL) + + if (!CAMEL_IS_OFFLINE_STORE (service)) continue; - if (CAMEL_IS_OFFLINE_STORE (service)) - any_requires_downsync = any_requires_downsync || - camel_offline_store_requires_downsync (CAMEL_OFFLINE_STORE (service)); + offline_store = CAMEL_OFFLINE_STORE (service); + + if (camel_offline_store_requires_downsync (offline_store)) + return TRUE; } - return any_requires_downsync; + return FALSE; } /* Callback for various asynchronous CamelStore operations where @@ -148,25 +151,28 @@ mail_backend_store_operation_done_cb (CamelStore *store, static void mail_backend_local_trash_expunge_done_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { CamelFolder *folder = CAMEL_FOLDER (source_object); EActivity *activity = user_data; - GError *error = NULL; + GError *local_error = NULL; - if (!e_mail_folder_expunge_finish (folder, result, &error)) { - g_warning ("%s: Failed to expunge local trash: %s", G_STRFUNC, error ? error->message : "Unknown error"); - } + e_mail_folder_expunge_finish (folder, result, &local_error); - g_clear_error (&error); + if (local_error != NULL) { + g_warning ( + "%s: Failed to expunge local trash: %s", + G_STRFUNC, local_error->message); + g_error_free (local_error); + } g_object_unref (activity); } static void mail_backend_set_session_offline_cb (gpointer user_data, - GObject *object) + GObject *object) { CamelSession *session = user_data; @@ -197,12 +203,17 @@ mail_backend_prepare_for_offline_cb (EShell *shell, camel_session_set_online (CAMEL_SESSION (session), FALSE); if (e_shell_backend_is_started (shell_backend)) { + gboolean ask_to_synchronize; gboolean synchronize = FALSE; - if (e_shell_get_network_available (shell) && - mail_backend_any_store_requires_downsync (account_store)) + ask_to_synchronize = + e_shell_get_network_available (shell) && + mail_backend_any_store_requires_downsync (account_store); + + if (ask_to_synchronize) { synchronize = em_utils_prompt_user ( window, NULL, "mail:ask-quick-offline", NULL); + } if (!synchronize) { e_shell_backend_cancel_all (shell_backend); @@ -220,7 +231,10 @@ mail_backend_prepare_for_offline_cb (EShell *shell, e_shell_backend_add_activity (shell_backend, activity); } - g_object_weak_ref (G_OBJECT (activity), mail_backend_set_session_offline_cb, g_object_ref (session)); + g_object_weak_ref ( + G_OBJECT (activity), + mail_backend_set_session_offline_cb, + g_object_ref (session)); e_mail_account_store_queue_enabled_services (account_store, &queue); while (!g_queue_is_empty (&queue)) { @@ -385,24 +399,36 @@ mail_backend_prepare_for_quit_cb (EShell *shell, for (link = list; link != NULL; link = g_list_next (link)) { CamelService *service; + gboolean store_is_local; + const gchar *uid; service = CAMEL_SERVICE (link->data); - if (!CAMEL_IS_STORE (service) || - !mail_backend_service_is_enabled (registry, service)) + if (!CAMEL_IS_STORE (service)) + continue; + + if (!mail_backend_service_is_enabled (registry, service)) continue; - if (empty_trash && g_strcmp0 (camel_service_get_uid (service), E_MAIL_SESSION_LOCAL_UID) == 0) { + uid = camel_service_get_uid (service); + store_is_local = g_strcmp0 (uid, E_MAIL_SESSION_LOCAL_UID); + + if (empty_trash && store_is_local) { /* local trash requires special handling, - due to POP3's "delete-expunged" option */ + * due to POP3's "delete-expunged" option */ CamelFolder *local_trash; - GCancellable *cancellable = e_activity_get_cancellable (activity); + GCancellable *cancellable; + + cancellable = e_activity_get_cancellable (activity); - /* This should be lightning-fast, it's a local trash folder */ - local_trash = camel_store_get_trash_folder_sync (CAMEL_STORE (service), cancellable, NULL); + /* This should be lightning-fast since + * it's just the local trash folder. */ + local_trash = camel_store_get_trash_folder_sync ( + CAMEL_STORE (service), cancellable, NULL); - if (local_trash) { - e_mail_folder_expunge (local_trash, + if (local_trash != NULL) { + e_mail_folder_expunge ( + local_trash, G_PRIORITY_DEFAULT, cancellable, mail_backend_local_trash_expunge_done_cb, g_object_ref (activity)); diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c index e847493c6b..df5799ee6c 100644 --- a/mail/e-mail-config-assistant.c +++ b/mail/e-mail-config-assistant.c @@ -380,6 +380,7 @@ mail_config_assistant_select_account_node (const gchar *account_uid) EShellSidebar *shell_sidebar; EMFolderTree *folder_tree = NULL; GtkWindow *active_window; + const gchar *active_view; g_return_if_fail (account_uid != NULL); @@ -390,8 +391,9 @@ mail_config_assistant_select_account_node (const gchar *account_uid) return; shell_window = E_SHELL_WINDOW (active_window); + active_view = e_shell_window_get_active_view (shell_window); - if (g_strcmp0 (e_shell_window_get_active_view (shell_window), "mail") != 0) + if (g_strcmp0 (active_view, "mail") != 0) return; shell_view = e_shell_window_get_shell_view (shell_window, "mail"); @@ -437,11 +439,15 @@ mail_config_assistant_close_cb (GObject *object, g_error_free (error); } else { - ESource *account; + ESource *source; + + source = e_mail_config_assistant_get_account_source (assistant); + if (source != NULL) { + const gchar *uid; - account = e_mail_config_assistant_get_account_source (assistant); - if (account) - mail_config_assistant_select_account_node (e_source_get_uid (account)); + uid = e_source_get_uid (source); + mail_config_assistant_select_account_node (uid); + } gtk_widget_destroy (GTK_WIDGET (assistant)); } diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 4b6f91cc8b..f063fd237b 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -473,7 +473,7 @@ mail_display_attachment_count_changed (EAttachmentStore *store, GList *children; children = gtk_container_get_children (GTK_CONTAINER (box)); - g_return_if_fail (children && children->data); + g_return_if_fail (children && children->data); element = g_object_get_data (children->data, "parent_element"); g_list_free (children); diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index b3dadcf6d5..d0a851296c 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -85,14 +85,14 @@ struct _EMailReaderPrivate { * restoration after a folder switch from automatically * marking the message as read. We only want that to * happen when the -user- selects a message. */ - guint folder_was_just_selected : 1; + guint folder_was_just_selected : 1; guint restoring_message_selection : 1; - guint avoid_next_mark_as_seen : 1; + guint avoid_next_mark_as_seen : 1; guint group_by_threads : 1; /* to be able to start the mark_seen timeout only after - the message is loaded into the EMailDisplay */ + * the message is loaded into the EMailDisplay */ gboolean schedule_mark_seen; guint schedule_mark_seen_interval; }; @@ -385,7 +385,7 @@ action_mail_delete_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED; - guint32 set = CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED; + guint32 set = CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED; if (!e_mail_reader_confirm_delete (reader)) return; @@ -649,7 +649,7 @@ action_mail_mark_important_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_DELETED; - guint32 set = CAMEL_MESSAGE_FLAGGED; + guint32 set = CAMEL_MESSAGE_FLAGGED; e_mail_reader_mark_selected (reader, mask, set); } @@ -717,7 +717,7 @@ action_mail_mark_read_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_SEEN; - guint32 set = CAMEL_MESSAGE_SEEN; + guint32 set = CAMEL_MESSAGE_SEEN; e_mail_reader_mark_selected (reader, mask, set); } @@ -727,7 +727,7 @@ action_mail_mark_unimportant_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_FLAGGED; - guint32 set = 0; + guint32 set = 0; e_mail_reader_mark_selected (reader, mask, set); } @@ -740,7 +740,7 @@ action_mail_mark_unread_cb (GtkAction *action, EMFolderTreeModel *model; CamelFolder *folder; guint32 mask = CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED; - guint32 set = 0; + guint32 set = 0; guint n_marked; message_list = e_mail_reader_get_message_list (reader); @@ -894,7 +894,7 @@ action_mail_next_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_NEXT; flags = 0; - mask = 0; + mask = 0; message_list = e_mail_reader_get_message_list (reader); @@ -912,7 +912,7 @@ action_mail_next_important_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_NEXT | MESSAGE_LIST_SELECT_WRAP; flags = CAMEL_MESSAGE_FLAGGED; - mask = CAMEL_MESSAGE_FLAGGED; + mask = CAMEL_MESSAGE_FLAGGED; message_list = e_mail_reader_get_message_list (reader); @@ -941,7 +941,7 @@ action_mail_next_unread_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_NEXT | MESSAGE_LIST_SELECT_WRAP; flags = 0; - mask = CAMEL_MESSAGE_SEEN; + mask = CAMEL_MESSAGE_SEEN; message_list = e_mail_reader_get_message_list (reader); @@ -959,7 +959,7 @@ action_mail_previous_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_PREVIOUS; flags = 0; - mask = 0; + mask = 0; message_list = e_mail_reader_get_message_list (reader); @@ -977,7 +977,7 @@ action_mail_previous_important_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_PREVIOUS | MESSAGE_LIST_SELECT_WRAP; flags = CAMEL_MESSAGE_FLAGGED; - mask = CAMEL_MESSAGE_FLAGGED; + mask = CAMEL_MESSAGE_FLAGGED; message_list = e_mail_reader_get_message_list (reader); @@ -1006,7 +1006,7 @@ action_mail_previous_unread_cb (GtkAction *action, direction = MESSAGE_LIST_SELECT_PREVIOUS | MESSAGE_LIST_SELECT_WRAP; flags = 0; - mask = CAMEL_MESSAGE_SEEN; + mask = CAMEL_MESSAGE_SEEN; message_list = e_mail_reader_get_message_list (reader); @@ -1735,7 +1735,7 @@ action_mail_undelete_cb (GtkAction *action, EMailReader *reader) { guint32 mask = CAMEL_MESSAGE_DELETED; - guint32 set = 0; + guint32 set = 0; e_mail_reader_mark_selected (reader, mask, set); } @@ -2649,8 +2649,8 @@ schedule_timeout_mark_seen (EMailReader *reader) static void mail_reader_load_status_changed_cb (EMailReader *reader, - GParamSpec *pspec, - EMailDisplay *display) + GParamSpec *pspec, + EMailDisplay *display) { EMailReaderPrivate *priv; @@ -3196,7 +3196,7 @@ mail_reader_message_seen (EMailReader *reader, guint32 mask, set; mask = CAMEL_MESSAGE_SEEN; - set = CAMEL_MESSAGE_SEEN; + set = CAMEL_MESSAGE_SEEN; folder = e_mail_reader_ref_folder (reader); camel_folder_set_message_flags (folder, message_uid, mask, set); diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h index 2094da9692..90e86f425c 100644 --- a/mail/e-mail-reader.h +++ b/mail/e-mail-reader.h @@ -69,24 +69,24 @@ typedef enum { } EMailReaderActionGroup; enum { - E_MAIL_READER_HAVE_ENABLED_ACCOUNT = 1 << 0, - E_MAIL_READER_SELECTION_SINGLE = 1 << 1, - E_MAIL_READER_SELECTION_MULTIPLE = 1 << 2, - E_MAIL_READER_SELECTION_CAN_ADD_SENDER = 1 << 3, - E_MAIL_READER_SELECTION_FLAG_CLEAR = 1 << 4, - E_MAIL_READER_SELECTION_FLAG_COMPLETED = 1 << 5, - E_MAIL_READER_SELECTION_FLAG_FOLLOWUP = 1 << 6, - E_MAIL_READER_SELECTION_HAS_DELETED = 1 << 7, - E_MAIL_READER_SELECTION_HAS_IMPORTANT = 1 << 8, - E_MAIL_READER_SELECTION_HAS_JUNK = 1 << 9, - E_MAIL_READER_SELECTION_HAS_NOT_JUNK = 1 << 10, - E_MAIL_READER_SELECTION_HAS_READ = 1 << 11, - E_MAIL_READER_SELECTION_HAS_UNDELETED = 1 << 12, - E_MAIL_READER_SELECTION_HAS_UNIMPORTANT = 1 << 13, - E_MAIL_READER_SELECTION_HAS_UNREAD = 1 << 14, - E_MAIL_READER_SELECTION_HAS_ATTACHMENTS = 1 << 15, - E_MAIL_READER_SELECTION_IS_MAILING_LIST = 1 << 16, - E_MAIL_READER_FOLDER_IS_JUNK = 1 << 17 + E_MAIL_READER_HAVE_ENABLED_ACCOUNT = 1 << 0, + E_MAIL_READER_SELECTION_SINGLE = 1 << 1, + E_MAIL_READER_SELECTION_MULTIPLE = 1 << 2, + E_MAIL_READER_SELECTION_CAN_ADD_SENDER = 1 << 3, + E_MAIL_READER_SELECTION_FLAG_CLEAR = 1 << 4, + E_MAIL_READER_SELECTION_FLAG_COMPLETED = 1 << 5, + E_MAIL_READER_SELECTION_FLAG_FOLLOWUP = 1 << 6, + E_MAIL_READER_SELECTION_HAS_DELETED = 1 << 7, + E_MAIL_READER_SELECTION_HAS_IMPORTANT = 1 << 8, + E_MAIL_READER_SELECTION_HAS_JUNK = 1 << 9, + E_MAIL_READER_SELECTION_HAS_NOT_JUNK = 1 << 10, + E_MAIL_READER_SELECTION_HAS_READ = 1 << 11, + E_MAIL_READER_SELECTION_HAS_UNDELETED = 1 << 12, + E_MAIL_READER_SELECTION_HAS_UNIMPORTANT = 1 << 13, + E_MAIL_READER_SELECTION_HAS_UNREAD = 1 << 14, + E_MAIL_READER_SELECTION_HAS_ATTACHMENTS = 1 << 15, + E_MAIL_READER_SELECTION_IS_MAILING_LIST = 1 << 16, + E_MAIL_READER_FOLDER_IS_JUNK = 1 << 17 }; struct _EMailReaderInterface { diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c index 8c1bbc19bb..898a3e54b5 100644 --- a/mail/e-mail-request.c +++ b/mail/e-mail-request.c @@ -367,9 +367,9 @@ mail_request_send_async (SoupRequest *request, G_PRIORITY_DEFAULT, cancellable); } else { /* Process e-mail mail requests in this thread, which should be - the main/UI thread, because any EMailFormatter can create - GtkWidget-s, or manipulate with them, which should be always - done in the main/UI thread. */ + * the main/UI thread, because any EMailFormatter can create + * GtkWidget-s, or manipulate with them, which should be always + * done in the main/UI thread. */ handle_mail_request (simple, G_OBJECT (request), cancellable); g_simple_async_result_complete_in_idle (simple); } diff --git a/mail/e-mail-sidebar.h b/mail/e-mail-sidebar.h index 2e3fa215cd..a85c609243 100644 --- a/mail/e-mail-sidebar.h +++ b/mail/e-mail-sidebar.h @@ -51,16 +51,16 @@ typedef struct _EMailSidebarPrivate EMailSidebarPrivate; /* Flags describing the selected folder. */ enum { - E_MAIL_SIDEBAR_FOLDER_ALLOWS_CHILDREN = 1 << 0, - E_MAIL_SIDEBAR_FOLDER_CAN_DELETE = 1 << 1, - E_MAIL_SIDEBAR_FOLDER_IS_JUNK = 1 << 2, - E_MAIL_SIDEBAR_FOLDER_IS_OUTBOX = 1 << 3, - E_MAIL_SIDEBAR_FOLDER_IS_STORE = 1 << 4, - E_MAIL_SIDEBAR_FOLDER_IS_TRASH = 1 << 5, - E_MAIL_SIDEBAR_FOLDER_IS_VIRTUAL = 1 << 6, - E_MAIL_SIDEBAR_STORE_IS_BUILTIN = 1 << 7, - E_MAIL_SIDEBAR_STORE_IS_SUBSCRIBABLE = 1 << 8, - E_MAIL_SIDEBAR_STORE_CAN_BE_DISABLED = 1 << 9 + E_MAIL_SIDEBAR_FOLDER_ALLOWS_CHILDREN = 1 << 0, + E_MAIL_SIDEBAR_FOLDER_CAN_DELETE = 1 << 1, + E_MAIL_SIDEBAR_FOLDER_IS_JUNK = 1 << 2, + E_MAIL_SIDEBAR_FOLDER_IS_OUTBOX = 1 << 3, + E_MAIL_SIDEBAR_FOLDER_IS_STORE = 1 << 4, + E_MAIL_SIDEBAR_FOLDER_IS_TRASH = 1 << 5, + E_MAIL_SIDEBAR_FOLDER_IS_VIRTUAL = 1 << 6, + E_MAIL_SIDEBAR_STORE_IS_BUILTIN = 1 << 7, + E_MAIL_SIDEBAR_STORE_IS_SUBSCRIBABLE = 1 << 8, + E_MAIL_SIDEBAR_STORE_CAN_BE_DISABLED = 1 << 9 }; struct _EMailSidebar { diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c index 9a0fe04c14..ad2eff357d 100644 --- a/mail/e-mail-tag-editor.c +++ b/mail/e-mail-tag-editor.c @@ -237,7 +237,8 @@ e_mail_tag_editor_init (EMailTagEditor *editor) gtk_window_set_title (window, _("Flag to Follow Up")); gtk_window_set_icon_name (window, "stock_mail-flag-for-followup"); - gtk_dialog_add_buttons (dialog, + gtk_dialog_add_buttons ( + dialog, _("_Cancel"), GTK_RESPONSE_CANCEL, _("_OK"), GTK_RESPONSE_OK, NULL); diff --git a/mail/e-mail-view.c b/mail/e-mail-view.c index 2408e1a963..36b9d69026 100644 --- a/mail/e-mail-view.c +++ b/mail/e-mail-view.c @@ -37,7 +37,7 @@ struct _EMailViewPrivate { EMailView *previous_view; guint preview_visible : 1; - guint show_deleted : 1; + guint show_deleted : 1; }; enum { diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index e6a8cb2f91..969f194953 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1164,8 +1164,8 @@ em_utils_get_composer_recipients_as_message (EMsgComposer *composer) message = camel_mime_message_new (); - to_addr = camel_internet_address_new (); - cc_addr = camel_internet_address_new (); + to_addr = camel_internet_address_new (); + cc_addr = camel_internet_address_new (); bcc_addr = camel_internet_address_new (); /* To */ @@ -2373,7 +2373,7 @@ get_reply_recipient (CamelMimeMessage *message, CamelInternetAddress *address) { CamelMedium *medium; - const gchar *posthdr = NULL; + const gchar *posthdr = NULL; medium = CAMEL_MEDIUM (message); diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index be0bc766f8..460fb9cb23 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -563,17 +563,20 @@ folder_tree_maybe_expand_row (EMFolderTreeModel *model, static void folder_tree_row_changed_cb (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - EMFolderTree *folder_tree) + GtkTreePath *path, + GtkTreeIter *iter, + EMFolderTree *folder_tree) { - gboolean is_store = FALSE; CamelService *service = NULL; + gboolean is_store = FALSE; + gboolean select_store = FALSE; g_return_if_fail (EM_IS_FOLDER_TREE (folder_tree)); - if (!folder_tree->priv->select_store_uid_when_added || - gtk_tree_path_get_depth (path) != 1) + if (!folder_tree->priv->select_store_uid_when_added) + return; + + if (gtk_tree_path_get_depth (path) != 1) return; gtk_tree_model_get (model, iter, @@ -581,19 +584,29 @@ folder_tree_row_changed_cb (GtkTreeModel *model, COL_BOOL_IS_STORE, &is_store, -1); - if (is_store && service && - g_strcmp0 (folder_tree->priv->select_store_uid_when_added, camel_service_get_uid (service)) == 0) { + if (is_store && service != NULL) { + const gchar *uid1; + const gchar *uid2; + + uid1 = camel_service_get_uid (service); + uid2 = folder_tree->priv->select_store_uid_when_added; + select_store = (g_strcmp0 (uid1, uid2) == 0); + } + + if (select_store) { + GtkTreeView *tree_view; GtkTreeSelection *selection; g_free (folder_tree->priv->select_store_uid_when_added); folder_tree->priv->select_store_uid_when_added = NULL; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_tree)); + tree_view = GTK_TREE_VIEW (folder_tree); + selection = gtk_tree_view_get_selection (tree_view); gtk_tree_selection_select_iter (selection, iter); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (folder_tree), path, NULL, FALSE); + gtk_tree_view_set_cursor (tree_view, path, NULL, FALSE); folder_tree->priv->cursor_set = TRUE; - gtk_tree_view_expand_row (GTK_TREE_VIEW (folder_tree), path, FALSE); + gtk_tree_view_expand_row (tree_view, path, FALSE); } g_clear_object (&service); @@ -604,8 +617,9 @@ folder_tree_clear_selected_list (EMFolderTree *folder_tree) { EMFolderTreePrivate *priv = folder_tree->priv; - g_slist_foreach (priv->select_uris, (GFunc) folder_tree_free_select_uri, NULL); - g_slist_free (priv->select_uris); + g_slist_free_full ( + priv->select_uris, + (GDestroyNotify) folder_tree_free_select_uri); g_hash_table_destroy (priv->select_uris_table); priv->select_uris = NULL; priv->select_uris_table = g_hash_table_new (g_str_hash, g_str_equal); @@ -1184,21 +1198,14 @@ folder_tree_finalize (GObject *object) priv = EM_FOLDER_TREE_GET_PRIVATE (object); - if (priv->select_uris != NULL) { - g_slist_foreach ( - priv->select_uris, - (GFunc) folder_tree_free_select_uri, NULL); - g_slist_free (priv->select_uris); - priv->select_uris = NULL; - } + g_slist_free_full ( + priv->select_uris, + (GDestroyNotify) folder_tree_free_select_uri); - if (priv->select_uris_table) { + if (priv->select_uris_table != NULL) g_hash_table_destroy (priv->select_uris_table); - priv->select_uris_table = NULL; - } g_free (priv->select_store_uid_when_added); - priv->select_store_uid_when_added = NULL; /* Chain up to parent's finalize() method. */ G_OBJECT_CLASS (em_folder_tree_parent_class)->finalize (object); @@ -3172,7 +3179,7 @@ em_folder_tree_select_next_path (EMFolderTree *folder_tree, break; } else { if (has_parent) { - iter = parent; + iter = parent; } else { /* Reached end. Wrapup*/ if (gtk_tree_model_get_iter_first (model, &iter)) diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index 0972888613..98fcf56081 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -38,7 +38,7 @@ (G_TYPE_CHECK_CLASS_CAST \ ((cls), EM_TYPE_FOLDER_TREE, EMFolderTreeClass)) #define EM_IS_FOLDER_TREE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ + (G_TYPE_CHECK_INSTANCE_TYPE \ ((obj), EM_TYPE_FOLDER_TREE)) #define EM_IS_FOLDER_TREE_CLASS(cls) \ (G_TYPE_CHECK_CLASS_TYPE \ diff --git a/mail/message-list.c b/mail/message-list.c index 28296f4e5d..4cb5fa4f14 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1550,8 +1550,8 @@ get_trimmed_subject (CamelMessageInfo *info) if (mlist_len && *subject == '[' && - !g_ascii_strncasecmp ((gchar *) subject + 1, mlist, mlist_len) && - subject[1 + mlist_len] == ']') { + !g_ascii_strncasecmp ((gchar *) subject + 1, mlist, mlist_len) && + subject[1 + mlist_len] == ']') { subject += 1 + mlist_len + 1; /* jump over "[mailing-list]" */ found_mlist = TRUE; @@ -3891,7 +3891,7 @@ build_tree (MessageList *message_list, } /* Do not update cursor on folder change signal, to not lose user's - scroll bar position */ + * scroll bar position */ if (!folder_changed || !table_item) { /* We need to set the cursor before we freeze, as * the thaw will restore it to the pre-freeze value. */ @@ -4131,7 +4131,7 @@ build_subtree_diff (MessageList *message_list, static void build_flat (MessageList *message_list, GPtrArray *summary, - gboolean folder_changed) + gboolean folder_changed) { gchar *saveuid = NULL; gint i; @@ -4285,7 +4285,8 @@ message_list_folder_changed (CamelFolder *folder, hide_junk = message_list_get_hide_junk (message_list, folder); hide_deleted = message_list_get_hide_deleted (message_list, folder); - d (printf ("%s: changes:%p added:%d removed:%d changed:%d recent:%d for '%s'\n", G_STRFUNC, changes, + d ( + printf ("%s: changes:%p added:%d removed:%d changed:%d recent:%d for '%s'\n", G_STRFUNC, changes, changes ? changes->uid_added->len : -1, changes ? changes->uid_removed->len : -1, changes ? changes->uid_changed->len : -1, |