diff options
Diffstat (limited to 'mail')
34 files changed, 420 insertions, 315 deletions
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c index a33f8c98b8..21a298c56d 100644 --- a/mail/e-mail-attachment-bar.c +++ b/mail/e-mail-attachment-bar.c @@ -326,7 +326,10 @@ mail_attachment_bar_constructed (GObject *object) /* Set up property-to-GSettings bindings. */ settings = g_settings_new ("org.gnome.evolution.shell"); - g_settings_bind (settings, "attachment-view", object, "active-view", G_SETTINGS_BIND_DEFAULT); + g_settings_bind ( + settings, "attachment-view", + object, "active-view", + G_SETTINGS_BIND_DEFAULT); g_object_unref (settings); /* Chain up to parent's constructed() method. */ diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 597a770222..f2e8fb9962 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -61,6 +61,10 @@ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_BACKEND, EMailBackendPrivate)) +#define E_MAIL_BACKEND_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_MAIL_BACKEND, EMailBackendPrivate)) + #define QUIT_POLL_INTERVAL 1 /* seconds */ struct _EMailBackendPrivate { @@ -589,13 +593,16 @@ mail_backend_folder_changed_cb (MailFolderCache *folder_cache, folder_uri = e_mail_folder_uri_build (store, folder_name); - if (folder_uri) { + if (folder_uri != NULL) { CamelFolder *folder = NULL; - if (mail_folder_cache_get_folder_from_uri (folder_cache, folder_uri, &folder)) - if (folder && !mail_folder_cache_get_folder_info_flags (folder_cache, folder, &flags)) + if (mail_folder_cache_get_folder_from_uri ( + folder_cache, folder_uri, &folder)) + if (folder != NULL && + !mail_folder_cache_get_folder_info_flags ( + folder_cache, folder, &flags)) g_return_if_reached (); - if (folder) + if (folder != NULL) g_object_unref (folder); } @@ -612,8 +619,14 @@ mail_backend_folder_changed_cb (MailFolderCache *folder_cache, target->display_name = em_folder_tree_model_get_folder_name ( model, store, folder_name); - if (target->new > 0) - e_shell_event (e_shell_backend_get_shell (E_SHELL_BACKEND (mail_backend)), "mail-icon", (gpointer) "mail-unread"); + if (target->new > 0) { + EShell *shell; + EShellBackend *shell_backend; + + shell_backend = E_SHELL_BACKEND (mail_backend); + shell = e_shell_backend_get_shell (shell_backend); + e_shell_event (shell, "mail-icon", (gpointer) "mail-unread"); + } /** * @Event: folder.changed diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index 663d25cc75..0dbb3d01e3 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -702,8 +702,11 @@ mail_browser_constructed (GObject *object) settings = g_settings_new ("org.gnome.evolution.mail"); - object = G_OBJECT (reader); - g_settings_bind (settings, "show-deleted", object, "show-deleted", G_SETTINGS_BIND_DEFAULT); + g_settings_bind ( + settings, "show-deleted", + reader, "show-deleted", + G_SETTINGS_BIND_DEFAULT); + g_object_unref (settings); id = "org.gnome.evolution.mail.browser"; diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c index bc9cb5ab3e..706aaac5e9 100644 --- a/mail/e-mail-label-list-store.c +++ b/mail/e-mail-label-list-store.c @@ -32,6 +32,10 @@ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_LABEL_LIST_STORE, EMailLabelListStorePrivate)) +#define E_MAIL_LABEL_LIST_STORE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_MAIL_LABEL_LIST_STORE, EMailLabelListStorePrivate)) + struct _EMailLabelListStorePrivate { GHashTable *tag_index; GSettings *mail_settings; @@ -52,6 +56,9 @@ static struct { /* Forward Declarations */ static void e_mail_label_list_store_interface_init (GtkTreeModelIface *interface); +static void labels_settings_changed_cb (GSettings *settings, + const gchar *key, + gpointer user_data); G_DEFINE_TYPE_WITH_CODE ( EMailLabelListStore, @@ -197,8 +204,6 @@ mail_label_list_store_finalize (GObject *object) finalize (object); } -static void labels_settings_changed_cb (GSettings *settings, const gchar *key, gpointer user_data); - static void labels_model_changed_cb (GtkTreeModel *model, GtkTreePath *path, @@ -208,33 +213,45 @@ labels_model_changed_cb (GtkTreeModel *model, EMailLabelListStore *store; GPtrArray *array; GtkTreeIter tmp_iter; - gboolean res; + gboolean iter_set; store = E_MAIL_LABEL_LIST_STORE (user_data); /* Make sure we don't enter an infinite synchronizing loop */ - g_signal_handlers_block_by_func (store->priv->mail_settings, labels_settings_changed_cb, store); + g_signal_handlers_block_by_func ( + store->priv->mail_settings, + labels_settings_changed_cb, store); /* Build list to store in GSettings */ + array = g_ptr_array_new (); - res = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &tmp_iter); - while (res) { + + iter_set = gtk_tree_model_get_iter_first ( + GTK_TREE_MODEL (store), &tmp_iter); + + while (iter_set) { gchar *string; - gtk_tree_model_get (GTK_TREE_MODEL (store), &tmp_iter, - 0, &string, -1); + gtk_tree_model_get ( + GTK_TREE_MODEL (store), &tmp_iter, + 0, &string, -1); g_ptr_array_add (array, string); - res = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &tmp_iter); + iter_set = gtk_tree_model_iter_next ( + GTK_TREE_MODEL (store), &tmp_iter); } g_ptr_array_add (array, NULL); + g_settings_set_strv ( store->priv->mail_settings, "labels", (const gchar * const *) array->pdata); g_ptr_array_free (array, TRUE); - g_signal_handlers_unblock_by_func (store->priv->mail_settings, labels_settings_changed_cb, store); + + g_signal_handlers_unblock_by_func ( + store->priv->mail_settings, + labels_settings_changed_cb, store); } static void @@ -249,23 +266,24 @@ labels_settings_changed_cb (GSettings *settings, store = E_MAIL_LABEL_LIST_STORE (user_data); /* Make sure we don't enter an infinite synchronizing loop */ - g_signal_handlers_block_by_func (store, labels_model_changed_cb, store); + g_signal_handlers_block_by_func ( + store, labels_model_changed_cb, store); gtk_list_store_clear (GTK_LIST_STORE (store)); strv = g_settings_get_strv (store->priv->mail_settings, "labels"); + for (i = 0; strv[i] != NULL; i++) { GtkTreeIter iter; - gtk_list_store_insert_with_values (GTK_LIST_STORE (store), - &iter, -1, - 0, strv[i], - -1); + gtk_list_store_insert_with_values ( + GTK_LIST_STORE (store), &iter, -1, 0, strv[i], -1); } g_strfreev (strv); - g_signal_handlers_unblock_by_func (store, labels_model_changed_cb, store); + g_signal_handlers_unblock_by_func ( + store, labels_model_changed_cb, store); } static void @@ -280,7 +298,8 @@ mail_label_list_store_constructed (GObject *object) g_signal_connect ( store->priv->mail_settings, "changed::labels", G_CALLBACK (labels_settings_changed_cb), store); - labels_settings_changed_cb (store->priv->mail_settings, "labels", store); + labels_settings_changed_cb ( + store->priv->mail_settings, "labels", store); /* Connect to ListStore change notifications */ g_signal_connect ( diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c index 311d5d2359..0d2381ffa0 100644 --- a/mail/e-mail-migrate.c +++ b/mail/e-mail-migrate.c @@ -778,7 +778,9 @@ change_sent_and_drafts_local_folders (EShellBackend *shell_backend) camel_url_free (url); - tmp_uri = g_strconcat ("mbox:", g_get_home_dir (), "/.evolution/mail/local", NULL); + tmp_uri = g_strconcat ( + "mbox:", g_get_home_dir (), + "/.evolution/mail/local", NULL); url = camel_url_new (tmp_uri, NULL); g_free (tmp_uri); @@ -801,7 +803,8 @@ change_sent_and_drafts_local_folders (EShellBackend *shell_backend) continue; uri = e_account_get_string (account, E_ACCOUNT_DRAFTS_FOLDER_URI); - if (g_strcmp0 (uri, drafts_uri) == 0 || g_strcmp0 (uri, old_drafts_uri) == 0) { + if (g_strcmp0 (uri, drafts_uri) == 0 || + g_strcmp0 (uri, old_drafts_uri) == 0) { changed = TRUE; e_account_set_string ( account, E_ACCOUNT_DRAFTS_FOLDER_URI, @@ -1167,7 +1170,7 @@ em_ensure_proxy_ignore_hosts_being_list (void) static void em_rename_view_in_folder (gpointer data, - gpointer user_data) + gpointer user_data) { const gchar *filename = data; const gchar *views_dir = user_data; @@ -1188,6 +1191,7 @@ em_rename_view_in_folder (gpointer data, if (folderpos < dotpos && g_str_equal (dotpos, ".xml")) { GChecksum *checksum; gchar *oldname, *newname, *newfile; + const gchar *md5_string; *dotpos = 0; @@ -1196,7 +1200,8 @@ em_rename_view_in_folder (gpointer data, g_checksum_update (checksum, (const guchar *) folderpos, -1); *folderpos = 0; - newfile = g_strconcat (filename, g_checksum_get_string (checksum), ".xml", NULL); + md5_string = g_checksum_get_string (checksum); + newfile = g_strconcat (filename, md5_string, ".xml", NULL); *folderpos = 'f'; *dotpos = '.'; diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c index 5d100cfc21..64995bc8ef 100644 --- a/mail/e-mail-notebook-view.c +++ b/mail/e-mail-notebook-view.c @@ -1089,8 +1089,9 @@ mail_netbook_view_open_mail (EMailView *view, page = e_mail_tab_picker_get_tab_no (priv->tab_picker, tab); e_mail_tab_picker_set_current_tab (priv->tab_picker, page); - g_signal_connect (tab , "closed", - G_CALLBACK (mnv_tab_closed), nview); + g_signal_connect ( + tab , "closed", + G_CALLBACK (mnv_tab_closed), nview); g_object_ref (tab); timeline = clutter_timeline_new (150); @@ -1323,14 +1324,19 @@ mail_notebook_view_set_folder (EMailReader *reader, #endif } else { priv->inited = TRUE; - gtk_notebook_set_tab_label (priv->book, (GtkWidget *) priv->current_view, - create_tab_label (E_MAIL_NOTEBOOK_VIEW (reader), - priv->current_view, - camel_folder_get_full_name (folder))); + gtk_notebook_set_tab_label ( + priv->book, + GTK_WIDGET (priv->current_view), + create_tab_label ( + E_MAIL_NOTEBOOK_VIEW (reader), + priv->current_view, + camel_folder_get_full_name (folder))); #if HAVE_CLUTTER - tab = e_mail_tab_picker_get_tab (priv->tab_picker, - e_mail_tab_picker_get_current_tab (priv->tab_picker)); + tab = e_mail_tab_picker_get_tab ( + priv->tab_picker, + e_mail_tab_picker_get_current_tab ( + priv->tab_picker)); g_object_set_data ((GObject *)tab, "page", priv->current_view); g_object_set_data ((GObject *)priv->current_view, "page", tab); g_object_set_data ((GObject *)priv->current_view, "tab", tab); @@ -1345,8 +1351,9 @@ mail_notebook_view_set_folder (EMailReader *reader, #if HAVE_CLUTTER list = e_mail_reader_get_message_list (E_MAIL_READER (priv->current_view)); - g_signal_connect (tab , "closed", - G_CALLBACK (mnv_tab_closed), reader); + g_signal_connect ( + tab , "closed", + G_CALLBACK (mnv_tab_closed), reader); g_object_set_data ((GObject *)priv->current_view, "stage", priv->stage); g_object_set_data ((GObject *)list, "stage", priv->stage); g_object_set_data ((GObject *)list, "actor", priv->actor); @@ -1567,14 +1574,18 @@ e_mail_notebook_view_new (EShellView *shell_view) widget = g_object_new ( E_TYPE_MAIL_NOTEBOOK_VIEW, "shell-view", shell_view, NULL); - g_signal_connect (widget, "show-folder", - G_CALLBACK (emnv_show_folder), widget); - g_signal_connect (widget, "show-next-tab", - G_CALLBACK (emnv_show_nexttab), widget); - g_signal_connect (widget, "show-previous-tab", - G_CALLBACK (emnv_show_prevtab), widget); - g_signal_connect (widget, "close-tab", - G_CALLBACK (emnv_close_tab), widget); + g_signal_connect ( + widget, "show-folder", + G_CALLBACK (emnv_show_folder), widget); + g_signal_connect ( + widget, "show-next-tab", + G_CALLBACK (emnv_show_nexttab), widget); + g_signal_connect ( + widget, "show-previous-tab", + G_CALLBACK (emnv_show_prevtab), widget); + g_signal_connect ( + widget, "close-tab", + G_CALLBACK (emnv_close_tab), widget); return widget; } diff --git a/mail/e-mail-pane.c b/mail/e-mail-pane.c deleted file mode 100644 index c982ab0267..0000000000 --- a/mail/e-mail-pane.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Srinivasa Ragavan <sragavan@gnome.org> - * - * Copyright (C) 2010 Intel corporation. (www.intel.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <glib/gi18n.h> -#include "e-mail-pane.h" - -G_DEFINE_TYPE (EMailPane, e_mail_pane, GTK_TYPE_VBOX) - -enum { - PANE_CLOSE, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - -static void -e_mail_pane_init (EMailPane *shell) -{ - shell->priv = g_new0 (EMailPanePrivate, 1); -} - -static void -e_mail_pane_finalize (GObject *object) -{ - /* EMailPane *shell = (EMailPane *)object; */ - - G_OBJECT_CLASS (e_mail_pane_parent_class)->finalize (object); -} - -static void -e_mail_pane_class_init (EMailPaneClass *klass) -{ - GObjectClass * object_class = G_OBJECT_CLASS (klass); - - e_mail_pane_parent_class = g_type_class_peek_parent (klass); - object_class->finalize = e_mail_pane_finalize; - - signals[PANE_CLOSE] = - g_signal_new ("pane-close", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EMailPaneClass , view_close), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - -} - diff --git a/mail/e-mail-pane.h b/mail/e-mail-pane.h deleted file mode 100644 index 2e20dd772d..0000000000 --- a/mail/e-mail-pane.h +++ /dev/null @@ -1,65 +0,0 @@ -/* - * e-mail-pane.h - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Srinivasa Ragavan <sragavan@gnome.org> - * - * Copyright (C) 2010 Intel corporation. (www.intel.com) - * - */ - -#ifndef E_MAIL_PANE_H -#define E_MAIL_PANE_H - -#include <gtk/gtk.h> - -#define E_TYPE_MAIL_PANE \ - (e_mail_pane_get_type ()) -#define E_MAIL_PANE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), E_TYPE_MAIL_PANE, MailFolderView)) -#define E_MAIL_PANE_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), E_TYPE_MAIL_PANE, MailFolderViewClass)) -#define E_IS_MAIL_PANE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), E_TYPE_MAIL_PANE)) -#define E_IS_MAIL_PANE_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), E_TYPE_MAIL_PANE)) -#define E_MAIL_PANE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), E_TYPE_MAIL_PANE, EMailPaneClass)) - -G_BEGIN_DECLS - -typedef struct _EMailPane EMailPane; -typedef struct _EMailPaneClass EMailPaneClass; -typedef struct _EMailPanePrivate EMailPanePrivate; - -struct _EMailPane { - GtkVBox parent; - EMailPanePrivate *priv; -}; - -struct _EMailPaneClass { - GtkVBoxClass parent_class; -}; - -G_END_DECLS - -#endif /* E_MAIL_PANE_H */ diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index ea017c758b..e1779a8c3e 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -222,7 +222,6 @@ mail_paned_view_restore_state_cb (EShellWindow *shell_window, { EMailPanedViewPrivate *priv; GSettings *settings; - GObject *object; priv = E_MAIL_PANED_VIEW (view)->priv; @@ -230,11 +229,15 @@ mail_paned_view_restore_state_cb (EShellWindow *shell_window, settings = g_settings_new ("org.gnome.evolution.mail"); - object = G_OBJECT (priv->paned); - g_settings_bind (settings, "hpaned-size", object, "hposition", G_SETTINGS_BIND_DEFAULT); + g_settings_bind ( + settings, "hpaned-size", + priv->paned, "hposition", + G_SETTINGS_BIND_DEFAULT); - object = G_OBJECT (priv->paned); - g_settings_bind (settings, "paned-size", object, "vposition", G_SETTINGS_BIND_DEFAULT); + g_settings_bind ( + settings, "paned-size", + priv->paned, "vposition", + G_SETTINGS_BIND_DEFAULT); g_object_unref (settings); } diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index c814435119..0981fb327b 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -855,7 +855,9 @@ e_mail_reader_reply_to_message (EMailReader *reader, if (curl && curl->path && *curl->path) { address = camel_internet_address_new (); - if (camel_address_decode (CAMEL_ADDRESS (address), curl->path) < 0) { + if (camel_address_decode ( + CAMEL_ADDRESS (address), + curl->path) < 0) { g_object_unref (address); address = NULL; } diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index ef2449eb15..b471e981cb 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1356,8 +1356,10 @@ action_mail_reply_sender_check (CamelFolder *folder, settings = g_settings_new ("org.gnome.evolution.mail"); - ask_ignore_list_reply_to = g_settings_get_boolean (settings, "composer-ignore-list-reply-to"); - ask_list_reply_to = g_settings_get_boolean (settings, "prompt-on-list-reply-to"); + ask_ignore_list_reply_to = g_settings_get_boolean ( + settings, "composer-ignore-list-reply-to"); + ask_list_reply_to = g_settings_get_boolean ( + settings, "prompt-on-list-reply-to"); munged_list_message = em_utils_is_munged_list_message (message); @@ -1389,7 +1391,8 @@ action_mail_reply_sender_check (CamelFolder *folder, active = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (check)); if (active) { - g_settings_set_boolean (settings, "prompt-on-private-list-reply", FALSE); + g_settings_set_boolean ( + settings, "prompt-on-private-list-reply", FALSE); } gtk_widget_destroy (dialog); @@ -1435,12 +1438,14 @@ action_mail_reply_sender_check (CamelFolder *folder, active = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (check_again)); if (active) { - g_settings_set_boolean (settings, "prompt-on-list-reply-to", FALSE); + g_settings_set_boolean ( + settings, "prompt-on-list-reply-to", FALSE); } active = gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (check_always_ignore)); - g_settings_set_boolean (settings, "composer-ignore-list-reply-to", active); + g_settings_set_boolean ( + settings, "composer-ignore-list-reply-to", active); gtk_widget_destroy (dialog); @@ -1482,8 +1487,10 @@ action_mail_reply_sender_cb (GtkAction *action, state = e_mail_reader_check_state (reader); settings = g_settings_new ("org.gnome.evolution.mail"); - ask_list_reply_to = g_settings_get_boolean (settings, "prompt-on-list-reply-to"); - ask_private_list_reply = g_settings_get_boolean (settings, "prompt-on-private-list-reply"); + ask_list_reply_to = g_settings_get_boolean ( + settings, "prompt-on-list-reply-to"); + ask_private_list_reply = g_settings_get_boolean ( + settings, "prompt-on-private-list-reply"); g_object_unref (settings); ask = (ask_private_list_reply || ask_list_reply_to); @@ -3670,11 +3677,15 @@ e_mail_reader_init (EMailReader *reader, action_name = "mail-caret-mode"; action = e_mail_reader_get_action (reader, action_name); - g_settings_bind (settings, "caret-mode", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind ( + settings, "caret-mode", + action, "active", G_SETTINGS_BIND_DEFAULT); action_name = "mail-show-all-headers"; action = e_mail_reader_get_action (reader, action_name); - g_settings_bind (settings, "show-all-headers", G_OBJECT (action), "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind ( + settings, "show-all-headers", + action, "active", G_SETTINGS_BIND_DEFAULT); g_object_unref (settings); diff --git a/mail/e-mail-tab-picker.c b/mail/e-mail-tab-picker.c index 8732d4a9c1..d2267dc142 100644 --- a/mail/e-mail-tab-picker.c +++ b/mail/e-mail-tab-picker.c @@ -36,6 +36,9 @@ G_DEFINE_TYPE_WITH_CODE ( G_IMPLEMENT_INTERFACE ( MX_TYPE_DROPPABLE, mx_droppable_iface_init)) +#define TAB_PICKER_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), E_MAIL_TYPE_TAB_PICKER, EMailTabPickerPrivate)) + enum { PROP_0, diff --git a/mail/e-mail-tab.c b/mail/e-mail-tab.c index b50b14fe2b..d79edf40e8 100644 --- a/mail/e-mail-tab.c +++ b/mail/e-mail-tab.c @@ -770,11 +770,13 @@ e_mail_tab_allocate (ClutterActor *actor, /* Allocate for label */ if ((priv->preview_height_progress <= TAB_S1_ANIM) || (!priv->preview)) { if (priv->icon) - child_box.x1 = E_MAIL_PIXBOUND (padding.left + icon_width + priv->spacing); + child_box.x1 = E_MAIL_PIXBOUND ( + padding.left + icon_width + priv->spacing); else child_box.x1 = E_MAIL_PIXBOUND (padding.left); child_box.x2 = (box->x2 - box->x1 - padding.right); - child_box.y1 = E_MAIL_PIXBOUND ((box->y2 - box->y1) / 2 - label_height / 2); + child_box.y1 = E_MAIL_PIXBOUND ( + (box->y2 - box->y1) / 2 - label_height / 2); child_box.y2 = child_box.y1 + label_height; /* If close button is visible, don't overlap it */ @@ -1879,12 +1881,6 @@ e_mail_tab_alert_cb (EMailTab *tab) if (priv->alert_count < 4) return TRUE; - /* This call isn't needed, it should be in the correct state as long as - * the above check always checks for < (an even number) - */ - /*if (!priv->preview_mode) - clutter_actor_set_name (CLUTTER_ACTOR (tab), - priv->private ? "private-tab" : NULL);*/ priv->alert_source = 0; return FALSE; diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c index 70c4515b47..1d32cc74a7 100644 --- a/mail/e-mail-ui-session.c +++ b/mail/e-mail-ui-session.c @@ -230,7 +230,8 @@ user_message_exec (struct _user_message_msg *m, list = gtk_application_get_windows (GTK_APPLICATION (shell)); - /* ...then iterate through all opened windows and pick one which has it */ + /* ...then iterate through all opened + * windows and pick one which has it */ for (iter = list; iter != NULL && !shell_content; iter = g_list_next (iter)) { if (E_IS_SHELL_WINDOW (iter->data)) { shell_window = iter->data; @@ -241,11 +242,13 @@ user_message_exec (struct _user_message_msg *m, } } - /* when no shell-content found, which might not happen, but just in case, - * process the information alert like usual, through an EAlertDialog machinery - */ + /* When no shell-content found, which might not happen, + * but just in case, process the information alert like + * usual, through an EAlertDialog machinery. */ if (shell_content) { - e_alert_submit (E_ALERT_SINK (shell_content), error_type, m->prompt, NULL); + e_alert_submit ( + E_ALERT_SINK (shell_content), + error_type, m->prompt, NULL); return; } else if (!m->ismain && user_message_dialog != NULL) { g_queue_push_tail (&user_message_queue, mail_msg_ref (m)); diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index d2ff491b82..a82d0899df 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -88,6 +88,10 @@ * better visual clarity. This specifies how far to the right. */ #define INDENT_MARGIN 24 +#define EM_ACCOUNT_EDITOR_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), EM_TYPE_ACCOUNT_EDITOR, EMAccountEditorPrivate)) + #define d(x) /* econfig item for the extra config hings */ @@ -1658,9 +1662,15 @@ emae_setup_signatures (EMAccountEditor *emae, signatures = e_get_signature_list (); if (p->sig_added_id == 0) { - p->sig_added_id = g_signal_connect (signatures, "signature-added", G_CALLBACK(emae_signature_added), emae); - p->sig_removed_id = g_signal_connect (signatures, "signature-removed", G_CALLBACK(emae_signature_removed), emae); - p->sig_changed_id = g_signal_connect (signatures, "signature-changed", G_CALLBACK(emae_signature_changed), emae); + p->sig_added_id = g_signal_connect ( + signatures, "signature-added", + G_CALLBACK (emae_signature_added), emae); + p->sig_removed_id = g_signal_connect ( + signatures, "signature-removed", + G_CALLBACK (emae_signature_removed), emae); + p->sig_changed_id = g_signal_connect ( + signatures, "signature-changed", + G_CALLBACK (emae_signature_changed), emae); } /* we need to count the 'none' entry before using the index */ @@ -1691,10 +1701,14 @@ emae_setup_signatures (EMAccountEditor *emae, gtk_combo_box_set_model (dropdown, (GtkTreeModel *) store); gtk_combo_box_set_active (dropdown, active); - g_signal_connect (dropdown, "changed", G_CALLBACK(emae_signaturetype_changed), emae); + g_signal_connect ( + dropdown, "changed", + G_CALLBACK (emae_signaturetype_changed), emae); button = e_builder_get_widget (builder, "sigAddNew"); - g_signal_connect (button, "clicked", G_CALLBACK(emae_signature_new), emae); + g_signal_connect ( + button, "clicked", + G_CALLBACK (emae_signature_new), emae); return (GtkWidget *) dropdown; } @@ -1765,7 +1779,9 @@ emae_setup_receipt_policy (EMAccountEditor *emae, gtk_combo_box_set_active (dropdown, active); - g_signal_connect (dropdown, "changed", G_CALLBACK(emae_receipt_policy_changed), emae); + g_signal_connect ( + dropdown, "changed", + G_CALLBACK (emae_receipt_policy_changed), emae); return (GtkWidget *) dropdown; } @@ -1805,7 +1821,9 @@ emae_account_entry (EMAccountEditor *emae, if (text) gtk_entry_set_text (entry, text); g_object_set_data ((GObject *)entry, "account-item", GINT_TO_POINTER(item)); - g_signal_connect (entry, "changed", G_CALLBACK(emae_account_entry_changed), emae); + g_signal_connect ( + entry, "changed", + G_CALLBACK (emae_account_entry_changed), emae); return entry; } @@ -1943,7 +1961,9 @@ emae_account_folder (EMAccountEditor *emae, g_object_set_data ((GObject *)folder, "account-item", GINT_TO_POINTER(item)); g_object_set_data ((GObject *)folder, "folder-default", GINT_TO_POINTER(deffolder)); - g_signal_connect (folder, "selected", G_CALLBACK(emae_account_folder_changed), emae); + g_signal_connect ( + folder, "selected", + G_CALLBACK (emae_account_folder_changed), emae); gtk_widget_show ((GtkWidget *) folder); return folder; @@ -1999,7 +2019,9 @@ smime_sign_key_select (GtkWidget *button, w = e_cert_selector_new (E_CERT_SELECTOR_SIGNER, gtk_entry_get_text (priv->smime_sign_key)); gtk_window_set_modal ((GtkWindow *) w, TRUE); gtk_window_set_transient_for ((GtkWindow *) w, (GtkWindow *) gtk_widget_get_toplevel (button)); - g_signal_connect (w, "selected", G_CALLBACK(smime_sign_key_selected), emae); + g_signal_connect ( + w, "selected", + G_CALLBACK (smime_sign_key_selected), emae); gtk_widget_show (w); } @@ -2038,7 +2060,9 @@ smime_encrypt_key_select (GtkWidget *button, w = e_cert_selector_new (E_CERT_SELECTOR_RECIPIENT, gtk_entry_get_text (priv->smime_encrypt_key)); gtk_window_set_modal ((GtkWindow *) w, TRUE); gtk_window_set_transient_for ((GtkWindow *) w, (GtkWindow *) gtk_widget_get_toplevel (button)); - g_signal_connect (w, "selected", G_CALLBACK(smime_encrypt_key_selected), emae); + g_signal_connect ( + w, "selected", + G_CALLBACK (smime_encrypt_key_selected), emae); gtk_widget_show (w); } @@ -3109,15 +3133,15 @@ emae_receive_page (EConfig *ec, GtkWidget *vbox, *child; child = (GtkWidget *)g_object_get_data ((GObject *)emae->pages[1], "old-child"); - if (child) - gtk_container_remove ((GtkContainer *)emae->pages[1], child); + if (child) + gtk_container_remove ((GtkContainer *) emae->pages[1], child); vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); gtk_widget_show (vbox); - gtk_box_pack_start ((GtkBox *)vbox, w, TRUE, TRUE, 0); + gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0); g_object_set_data ((GObject *)emae->pages[1], "old-child", vbox); - gtk_box_pack_start ((GtkBox *)emae->pages[1], vbox, TRUE, TRUE, 0); + gtk_box_pack_start ((GtkBox *) emae->pages[1], vbox, TRUE, TRUE, 0); w = page; } else if (((EConfig *) priv->config)->type == E_CONFIG_ASSISTANT) { @@ -3155,8 +3179,8 @@ emae_receive_page (EConfig *ec, static void emae_set_option_dependency (EMAccountEditorService *service, - CamelProviderConfEntry *conf, - GtkWidget *widget) + CamelProviderConfEntry *conf, + GtkWidget *widget) { if (conf->depname != NULL) { const gchar *depname = conf->depname; @@ -3727,18 +3751,18 @@ emae_send_page (EConfig *ec, GtkWidget *vbox, *child; child = (GtkWidget *)g_object_get_data ((GObject *)emae->pages[3], "old-child"); - if (child) - gtk_container_remove ((GtkContainer *)emae->pages[3], child); + if (child) + gtk_container_remove ((GtkContainer *) emae->pages[3], child); vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); gtk_widget_show (vbox); - gtk_box_pack_start ((GtkBox *)vbox, w, TRUE, TRUE, 0); + gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0); g_object_set_data ((GObject *)emae->pages[3], "old-child", vbox); - gtk_box_pack_start ((GtkBox *)emae->pages[3], vbox, TRUE, TRUE, 0); + gtk_box_pack_start ((GtkBox *) emae->pages[3], vbox, TRUE, TRUE, 0); - w = page; + w = page; } else if (((EConfig *) priv->config)->type == E_CONFIG_ASSISTANT) { GtkWidget *page; @@ -4148,7 +4172,9 @@ emae_account_hash_algo_combo (EMAccountEditor *emae, gtk_combo_box_set_active (combobox, index); g_object_set_data (G_OBJECT (combobox), "account-item", GINT_TO_POINTER (item)); - g_signal_connect (combobox, "changed", G_CALLBACK (emae_account_hash_algo_combo_changed_cb), emae); + g_signal_connect ( + combobox, "changed", + G_CALLBACK (emae_account_hash_algo_combo_changed_cb), emae); return combobox; } @@ -4187,8 +4213,12 @@ emae_security_page (EConfig *ec, priv->smime_sign_key = emae_account_entry (emae, "smime_sign_key", E_ACCOUNT_SMIME_SIGN_KEY, builder); priv->smime_sign_key_select = (GtkButton *)e_builder_get_widget (builder, "smime_sign_key_select"); priv->smime_sign_key_clear = (GtkButton *)e_builder_get_widget (builder, "smime_sign_key_clear"); - g_signal_connect (priv->smime_sign_key_select, "clicked", G_CALLBACK(smime_sign_key_select), emae); - g_signal_connect (priv->smime_sign_key_clear, "clicked", G_CALLBACK(smime_sign_key_clear), emae); + g_signal_connect ( + priv->smime_sign_key_select, "clicked", + G_CALLBACK (smime_sign_key_select), emae); + g_signal_connect ( + priv->smime_sign_key_clear, "clicked", + G_CALLBACK (smime_sign_key_clear), emae); emae_account_hash_algo_combo (emae, "smime_hash_algo", E_ACCOUNT_SMIME_HASH_ALGORITHM, builder); priv->smime_sign_default = emae_account_toggle (emae, "smime_sign_default", E_ACCOUNT_SMIME_SIGN_DEFAULT, builder); @@ -4196,8 +4226,12 @@ emae_security_page (EConfig *ec, priv->smime_encrypt_key = emae_account_entry (emae, "smime_encrypt_key", E_ACCOUNT_SMIME_ENCRYPT_KEY, builder); priv->smime_encrypt_key_select = (GtkButton *)e_builder_get_widget (builder, "smime_encrypt_key_select"); priv->smime_encrypt_key_clear = (GtkButton *)e_builder_get_widget (builder, "smime_encrypt_key_clear"); - g_signal_connect (priv->smime_encrypt_key_select, "clicked", G_CALLBACK(smime_encrypt_key_select), emae); - g_signal_connect (priv->smime_encrypt_key_clear, "clicked", G_CALLBACK(smime_encrypt_key_clear), emae); + g_signal_connect ( + priv->smime_encrypt_key_select, "clicked", + G_CALLBACK (smime_encrypt_key_select), emae); + g_signal_connect ( + priv->smime_encrypt_key_clear, "clicked", + G_CALLBACK (smime_encrypt_key_clear), emae); priv->smime_encrypt_default = emae_account_toggle (emae, "smime_encrypt_default", E_ACCOUNT_SMIME_ENCRYPT_DEFAULT, builder); priv->smime_encrypt_to_self = emae_account_toggle (emae, "smime_encrypt_to_self", E_ACCOUNT_SMIME_ENCRYPT_TO_SELF, builder); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 3dd93c1891..23c1755687 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1454,31 +1454,40 @@ static void emu_update_composers_security (EMsgComposer *composer, guint32 validity_found) { - GtkToggleAction *action; EShell *shell; EShellSettings *shell_settings; + GtkAction *action; + gboolean sign_by_default; g_return_if_fail (composer != NULL); shell = e_msg_composer_get_shell (composer); shell_settings = e_shell_get_shell_settings (shell); + sign_by_default = + (validity_found & EM_FORMAT_VALIDITY_FOUND_SIGNED) != 0 && + e_shell_settings_get_boolean ( + shell_settings, "composer-sign-reply-if-signed"); + /* Pre-set only for encrypted messages, not for signed */ - if ((validity_found & EM_FORMAT_VALIDITY_FOUND_SIGNED) != 0 - && e_shell_settings_get_boolean (shell_settings, "composer-sign-reply-if-signed")) { + if (sign_by_default) { if (validity_found & EM_FORMAT_VALIDITY_FOUND_SMIME) - action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_SMIME_SIGN (composer)); + action = E_COMPOSER_ACTION_SMIME_SIGN (composer); else - action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_PGP_SIGN (composer)); - gtk_toggle_action_set_active (action, TRUE); + action = E_COMPOSER_ACTION_PGP_SIGN (composer); + + gtk_toggle_action_set_active ( + GTK_TOGGLE_ACTION (action), TRUE); } if (validity_found & EM_FORMAT_VALIDITY_FOUND_ENCRYPTED) { if (validity_found & EM_FORMAT_VALIDITY_FOUND_SMIME) - action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_SMIME_ENCRYPT (composer)); + action = E_COMPOSER_ACTION_SMIME_ENCRYPT (composer); else - action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_PGP_ENCRYPT (composer)); - gtk_toggle_action_set_active (action, TRUE); + action = E_COMPOSER_ACTION_PGP_ENCRYPT (composer); + + gtk_toggle_action_set_active ( + GTK_TOGGLE_ACTION (action), TRUE); } } @@ -1775,7 +1784,8 @@ forward_got_messages_cb (CamelFolder *folder, * @folder: folder containing messages to forward * @uids: uids of messages to forward * @style: the forward style to use - * @destroy_when_done: a #GtkWidget to destroy with gtk_widget_destroy() when done; can be NULL + * @destroy_when_done: a #GtkWidget to destroy with gtk_widget_destroy() + * when done; can be NULL * * Forwards a group of messages in the given style. * @@ -2130,7 +2140,8 @@ get_reply_to (CamelMimeMessage *message) gboolean ignore_list_reply_to; settings = g_settings_new ("org.gnome.evolution.mail"); - ignore_list_reply_to = g_settings_get_boolean (settings, "composer-ignore-list-reply-to"); + ignore_list_reply_to = g_settings_get_boolean ( + settings, "composer-ignore-list-reply-to"); g_object_unref (settings); if (ignore_list_reply_to && em_utils_is_munged_list_message (message)) diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index 0785d08163..1d60acdec6 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -154,7 +154,9 @@ em_filter_editor_construct (EMFilterEditor *fe, } gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0); - g_signal_connect (combobox, "changed", G_CALLBACK (select_source), fe); + g_signal_connect ( + combobox, "changed", + G_CALLBACK (select_source), fe); g_object_set_data_full (G_OBJECT (combobox), "sources", sources, free_sources); gtk_widget_show (combobox); diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 90e82e5744..a02b70fcaf 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -372,7 +372,9 @@ get_rule_part_widget (EMFilterContext *f, } gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), current); - g_signal_connect (combobox, "changed", G_CALLBACK (part_combobox_changed), data); + g_signal_connect ( + combobox, "changed", + G_CALLBACK (part_combobox_changed), data); gtk_widget_show (combobox); gtk_box_pack_start (GTK_BOX (hbox), combobox, FALSE, FALSE, 0); @@ -433,7 +435,9 @@ attach_rule (GtkWidget *rule, remove = gtk_button_new_from_stock (GTK_STOCK_REMOVE); g_object_set_data((GObject *)remove, "rule", rule); /*gtk_button_set_relief(GTK_BUTTON(remove), GTK_RELIEF_NONE);*/ - g_signal_connect (remove, "clicked", G_CALLBACK(less_parts), data); + g_signal_connect ( + remove, "clicked", + G_CALLBACK (less_parts), data); gtk_table_attach (GTK_TABLE (data->parts), remove, 1, 2, row, row + 1, 0, 0, 0, 0); gtk_widget_show (remove); @@ -488,7 +492,9 @@ more_parts (GtkWidget *button, if (w) { GtkAdjustment *adjustment; - adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w)); + adjustment = gtk_scrolled_window_get_vadjustment ( + GTK_SCROLLED_WINDOW (w)); + if (adjustment) { gdouble upper; @@ -553,7 +559,9 @@ get_widget (EFilterRule *fr, gtk_button_set_image ( GTK_BUTTON (add), gtk_image_new_from_stock ( GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON)); - g_signal_connect (add, "clicked", G_CALLBACK(more_parts), data); + g_signal_connect ( + add, "clicked", + G_CALLBACK (more_parts), data); gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 3); diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 69c72b3144..08ed28df59 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -189,7 +189,7 @@ emfp_get_folder_item (EConfig *ec, } } - if (context->folder) { + if (context->folder != NULL) { CamelStore *store; CamelSession *session; CamelFolderInfoFlags fi_flags = 0; @@ -197,10 +197,13 @@ emfp_get_folder_item (EConfig *ec, store = camel_folder_get_parent_store (context->folder); session = camel_service_get_session (CAMEL_SERVICE (store)); - folder_cache = e_mail_session_get_folder_cache (E_MAIL_SESSION (session)); + folder_cache = e_mail_session_get_folder_cache ( + E_MAIL_SESSION (session)); - can_apply_filters = !CAMEL_IS_VEE_FOLDER (context->folder) && - mail_folder_cache_get_folder_info_flags (folder_cache, context->folder, &fi_flags) && + can_apply_filters = + !CAMEL_IS_VEE_FOLDER (context->folder) && + mail_folder_cache_get_folder_info_flags ( + folder_cache, context->folder, &fi_flags) && (fi_flags & CAMEL_FOLDER_TYPE_MASK) != CAMEL_FOLDER_TYPE_INBOX; } diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 7ee385c892..623fd55edd 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -59,6 +59,10 @@ #define d(x) +#define EM_FOLDER_TREE_MODEL_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), EM_TYPE_FOLDER_TREE_MODEL, EMFolderTreeModelPrivate)) + struct _EMFolderTreeModelPrivate { /* This is set by EMailShellSidebar. It allows new EMFolderTree * instances to initialize their selection and expanded states to @@ -573,7 +577,8 @@ em_folder_tree_model_set_session (EMFolderTreeModel *model, MailFolderCache *folder_cache; folder_cache = e_mail_session_get_folder_cache (session); - account_store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION (session)); + account_store = e_mail_ui_session_get_account_store ( + E_MAIL_UI_SESSION (session)); /* Keep our own reference since we connect to its signals. */ g_warn_if_fail (model->priv->account_store == NULL); diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 46a8c108e8..43b0e246f1 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -73,6 +73,10 @@ typedef struct _AsyncContext AsyncContext; +#define EM_FOLDER_TREE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), EM_TYPE_FOLDER_TREE, EMFolderTreePrivate)) + struct _selected_uri { gchar *key; /* store:path or account/path */ gchar *uri; @@ -2682,11 +2686,13 @@ tree_drag_motion (GtkWidget *widget, if (priv->autoexpand_id != 0) { GtkTreePath *autoexpand_path; - autoexpand_path = gtk_tree_row_reference_get_path (priv->autoexpand_row); + autoexpand_path = gtk_tree_row_reference_get_path ( + priv->autoexpand_row); if (gtk_tree_path_compare (autoexpand_path, path) != 0) { /* row changed, restart timer */ gtk_tree_row_reference_free (priv->autoexpand_row); - priv->autoexpand_row = gtk_tree_row_reference_new (model, path); + priv->autoexpand_row = + gtk_tree_row_reference_new (model, path); g_source_remove (priv->autoexpand_id); priv->autoexpand_id = g_timeout_add ( 600, (GSourceFunc) @@ -2698,7 +2704,8 @@ tree_drag_motion (GtkWidget *widget, priv->autoexpand_id = g_timeout_add ( 600, (GSourceFunc) tree_autoexpand, folder_tree); - priv->autoexpand_row = gtk_tree_row_reference_new (model, path); + priv->autoexpand_row = + gtk_tree_row_reference_new (model, path); } } else if (priv->autoexpand_id != 0) { gtk_tree_row_reference_free (priv->autoexpand_row); @@ -2718,7 +2725,8 @@ tree_drag_motion (GtkWidget *widget, case DND_DROP_TYPE_UID_LIST: case DND_DROP_TYPE_FOLDER: chosen_action = suggested_action; - if (chosen_action == GDK_ACTION_COPY && (actions & GDK_ACTION_MOVE)) + if (chosen_action == GDK_ACTION_COPY && + (actions & GDK_ACTION_MOVE)) chosen_action = GDK_ACTION_MOVE; gtk_tree_view_set_drag_dest_row ( tree_view, path, diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index 7777914577..233805561b 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -172,7 +172,8 @@ emfh_construct (EPluginHook *eph, d(printf("loading format hook\n")); - if (((EPluginHookClass *) em_format_hook_parent_class)->construct (eph, ep, root) == -1) + if (((EPluginHookClass *) em_format_hook_parent_class)-> + construct (eph, ep, root) == -1) return -1; node = root->children; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 7e796b1c2a..013e1ac731 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -72,6 +72,10 @@ #define d(x) +#define EM_FORMAT_HTML_DISPLAY_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), EM_TYPE_FORMAT_HTML_DISPLAY, EMFormatHTMLDisplayPrivate)) + struct _EMFormatHTMLDisplayPrivate { GHashTable *attachment_views; /* weak reference; message_part_id->EAttachmentView */ gboolean attachment_expanded; @@ -200,7 +204,9 @@ efhd_xpkcs7mime_viewcert_clicked (GtkWidget *button, /* oddly enough certificate_viewer_show doesn't ... */ gtk_widget_show (w); - g_signal_connect (w, "response", G_CALLBACK(gtk_widget_destroy), NULL); + g_signal_connect ( + w, "response", + G_CALLBACK (gtk_widget_destroy), NULL); if (w && po->widget) gtk_window_set_transient_for ((GtkWindow *) w, (GtkWindow *) po->widget); @@ -253,7 +259,9 @@ efhd_xpkcs7mime_add_cert_table (GtkWidget *grid, w = gtk_button_new_with_mnemonic(_("_View Certificate")); gtk_table_attach (table, w, 1, 2, n, n + 1, 0, 0, 3, 3); g_object_set_data((GObject *)w, "e-cert-info", info); - g_signal_connect (w, "clicked", G_CALLBACK(efhd_xpkcs7mime_viewcert_clicked), po); + g_signal_connect ( + w, "clicked", + G_CALLBACK (efhd_xpkcs7mime_viewcert_clicked), po); if (info->cert_data) ec = e_cert_new (CERT_DupCertificate (info->cert_data)); @@ -358,7 +366,10 @@ efhd_xpkcs7mime_validity_clicked (GtkWidget *button, g_object_unref (builder); - g_signal_connect (po->widget, "response", G_CALLBACK(efhd_xpkcs7mime_info_response), po); + g_signal_connect ( + po->widget, "response", + G_CALLBACK (efhd_xpkcs7mime_info_response), po); + gtk_widget_show (po->widget); } @@ -1420,7 +1431,9 @@ efhd_attachment_optional (EMFormatHTML *efh, web_view = em_format_html_get_web_view (efh); gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation); gtk_widget_set_size_request (scroll, allocation.width - 48, 250); - g_signal_connect (scroll, "size_allocate", G_CALLBACK(efhd_resize), efh); + g_signal_connect ( + scroll, "size_allocate", + G_CALLBACK (efhd_resize), efh); gtk_widget_show (scroll); if (!info->shown) diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 97a7627c6d..0de9e2303d 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -231,7 +231,10 @@ em_format_html_print_message (EMFormatHTMLPrint *efhp, folder, message_uid, message, (EMFormat *) efhp->source, NULL); } else { - em_format_html_clone_sync (folder, message_uid, message, (EMFormatHTML *) efhp, (EMFormat *) efhp->source); + em_format_html_clone_sync ( + folder, message_uid, message, + (EMFormatHTML *) efhp, + (EMFormat *) efhp->source); emfhp_complete (efhp); } } diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 5406223f10..ae2782d568 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -73,6 +73,10 @@ #define d(x) +#define EM_FORMAT_HTML_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), EM_TYPE_FORMAT_HTML, EMFormatHTMLPrivate)) + #define EFM_MESSAGE_START_ANAME "evolution#message#start" #define EFH_MESSAGE_START "<A name=\"" EFM_MESSAGE_START_ANAME "\"></A>" @@ -3177,10 +3181,11 @@ efh_format_headers (EMFormatHTML *efh, !photo_name && !g_ascii_strcasecmp (header->name, "From")) photo_name = header->value; - if (!mailer_shown && mailer && (!g_ascii_strcasecmp (header->name, "X-Mailer") || - !g_ascii_strcasecmp (header->name, "User-Agent") || - !g_ascii_strcasecmp (header->name, "X-Newsreader") || - !g_ascii_strcasecmp (header->name, "X-MimeOLE"))) { + if (!mailer_shown && mailer && ( + !g_ascii_strcasecmp (header->name, "X-Mailer") || + !g_ascii_strcasecmp (header->name, "User-Agent") || + !g_ascii_strcasecmp (header->name, "X-Newsreader") || + !g_ascii_strcasecmp (header->name, "X-MimeOLE"))) { struct _camel_header_raw xmailer, *use_header = NULL; if (!g_ascii_strcasecmp (header->name, "X-MimeOLE")) { @@ -3213,8 +3218,11 @@ efh_format_headers (EMFormatHTML *efh, while (*cp == ' ') cp++; - face_header_value = g_base64_decode (cp, &face_header_len); - face_header_value = g_realloc (face_header_value, face_header_len + 1); + face_header_value = g_base64_decode ( + cp, &face_header_len); + face_header_value = g_realloc ( + face_header_value, + face_header_len + 1); face_header_value[face_header_len] = 0; face_decoded = TRUE; /* Showing an encoded "Face" header makes little sense */ diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c index a8869b6485..f695a88d87 100644 --- a/mail/em-subscription-editor.c +++ b/mail/em-subscription-editor.c @@ -36,6 +36,10 @@ #include "em-folder-utils.h" +#define EM_SUBSCRIPTION_EDITOR_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditorPrivate)) + #define FOLDER_CAN_SELECT(folder_info) \ ((folder_info) != NULL && \ ((folder_info)->flags & CAMEL_FOLDER_NOSELECT) == 0) @@ -230,7 +234,8 @@ subscription_editor_populate (EMSubscriptionEditor *editor, if (folder_info->child != NULL) subscription_editor_populate ( - editor, folder_info->child, &iter, expand_paths); + editor, folder_info->child, + &iter, expand_paths); folder_info = folder_info->next; } @@ -345,7 +350,9 @@ subscription_editor_subscribe_folder_done (CamelSubscribable *subscribable, if (error == NULL) tree_row_data->folder_info->flags |= CAMEL_FOLDER_SUBSCRIBED; else { - e_notice (GTK_WINDOW (context->editor), GTK_MESSAGE_ERROR, "%s", error->message); + e_notice ( + GTK_WINDOW (context->editor), + GTK_MESSAGE_ERROR, "%s", error->message); g_error_free (error); tree_row_data_free (tree_row_data); goto exit; @@ -473,7 +480,9 @@ subscription_editor_unsubscribe_folder_done (CamelSubscribable *subscribable, if (error == NULL) tree_row_data->folder_info->flags &= ~CAMEL_FOLDER_SUBSCRIBED; else { - e_notice (GTK_WINDOW (context->editor), GTK_MESSAGE_ERROR, "%s", error->message); + e_notice ( + GTK_WINDOW (context->editor), + GTK_MESSAGE_ERROR, "%s", error->message); g_error_free (error); tree_row_data_free (tree_row_data); goto exit; @@ -583,7 +592,8 @@ subscription_editor_create_menu_item (const gchar *label, gtk_widget_show (item); - g_signal_connect_swapped (item, "activate", activate_cb, editor); + g_signal_connect_swapped ( + item, "activate", activate_cb, editor); return item; } @@ -605,7 +615,8 @@ position_below_widget_cb (GtkMenu *menu, gint monitor_num; widget = under_widget; - gtk_widget_get_preferred_size (GTK_WIDGET (menu), &menu_requisition, NULL); + gtk_widget_get_preferred_size ( + GTK_WIDGET (menu), &menu_requisition, NULL); window = gtk_widget_get_parent_window (widget); screen = gtk_widget_get_screen (GTK_WIDGET (menu)); @@ -701,7 +712,9 @@ pick_all_cb (GtkTreeModel *model, if (can_pick_folder_info (tree_row_data->folder_info, data->mode) && (data->skip_folder_infos == NULL || - !g_hash_table_lookup_extended (data->skip_folder_infos, tree_row_data->folder_info, NULL, NULL))) { + !g_hash_table_lookup_extended ( + data->skip_folder_infos, + tree_row_data->folder_info, NULL, NULL))) { g_queue_push_tail (data->out_tree_rows, tree_row_data); } else tree_row_data_free (tree_row_data); @@ -765,7 +778,8 @@ subscription_editor_pick_shown (EMSubscriptionEditor *editor, tree_row_data_free (tree_row_data); } - if (is_expanded && gtk_tree_model_iter_children (tree_model, &iter2, &iter)) { + if (is_expanded && gtk_tree_model_iter_children ( + tree_model, &iter2, &iter)) { iter = iter2; found = TRUE; } else { @@ -774,9 +788,11 @@ subscription_editor_pick_shown (EMSubscriptionEditor *editor, iter = iter2; found = TRUE; } else { - while (found = gtk_tree_model_iter_parent (tree_model, &iter2, &iter), found) { + while (found = gtk_tree_model_iter_parent ( + tree_model, &iter2, &iter), found) { iter = iter2; - if (gtk_tree_model_iter_next (tree_model, &iter2)) { + if (gtk_tree_model_iter_next ( + tree_model, &iter2)) { iter = iter2; break; } diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index 91bf46128e..c45f3d02e7 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -48,6 +48,10 @@ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), EM_TYPE_VFOLDER_RULE, EMVFolderRulePrivate)) +#define EM_VFOLDER_RULE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), EM_TYPE_VFOLDER_RULE, EMVFolderRulePrivate)) + struct _EMVFolderRulePrivate { EMailSession *session; }; @@ -627,23 +631,28 @@ source_remove (GtkWidget *widget, gtk_tree_path_append_index (path, index); if (gtk_tree_selection_path_is_selected (selection, path)) { - gtk_tree_model_get_iter (GTK_TREE_MODEL (data->model), &iter, path); + gtk_tree_model_get_iter ( + GTK_TREE_MODEL (data->model), &iter, path); em_vfolder_rule_remove_source (data->vr, source); gtk_list_store_remove (data->model, &iter); gtk_tree_path_free (path); /* now select the next rule */ - n = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (data->model), NULL); + n = gtk_tree_model_iter_n_children ( + GTK_TREE_MODEL (data->model), NULL); index = index >= n ? n - 1 : index; if (index >= 0) { path = gtk_tree_path_new (); gtk_tree_path_append_index (path, index); - gtk_tree_model_get_iter (GTK_TREE_MODEL (data->model), &iter, path); + gtk_tree_model_get_iter ( + GTK_TREE_MODEL (data->model), + &iter, path); gtk_tree_path_free (path); - gtk_tree_selection_select_iter (selection, &iter); + gtk_tree_selection_select_iter ( + selection, &iter); gtk_tree_model_get ( GTK_TREE_MODEL (data->model), &iter, 0, &data->current, -1); @@ -693,7 +702,9 @@ get_widget (EFilterRule *fr, for (i = 0; i < BUTTON_LAST; i++) { data->buttons[i] =(GtkButton *) e_builder_get_widget (builder, edit_buttons[i].name); - g_signal_connect (data->buttons[i], "clicked", edit_buttons[i].func, data); + g_signal_connect ( + data->buttons[i], "clicked", + edit_buttons[i].func, data); } object = gtk_builder_get_object (builder, "source_list"); @@ -715,7 +726,9 @@ get_widget (EFilterRule *fr, g_free (markup); } - g_signal_connect (data->list, "cursor-changed", G_CALLBACK(select_source), data); + g_signal_connect ( + data->list, "cursor-changed", + G_CALLBACK (select_source), data); rb = (GtkRadioButton *)e_builder_get_widget (builder, "local_rb"); g_signal_connect ( diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 288d9fb736..bebcf97dd9 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -225,9 +225,11 @@ elm_import_done (struct _elm_import_msg *m) if (m->base.error == NULL) { GConfClient *gconf; + const gchar *key; gconf = gconf_client_get_default (); - gconf_client_set_bool(gconf, "/apps/evolution/importer/elm/mail", TRUE, NULL); + key = "/apps/evolution/importer/elm/mail"; + gconf_client_set_bool (gconf, key, TRUE, NULL); g_object_unref (gconf); } @@ -350,7 +352,9 @@ elm_getwidget (EImport *ei, w = gtk_check_button_new_with_label(_("Mail")); gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_mail); - g_signal_connect (w, "toggled", G_CALLBACK(checkbox_toggle_cb), target); + g_signal_connect ( + w, "toggled", + G_CALLBACK (checkbox_toggle_cb), target); gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 0); gtk_widget_show_all (box); diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index f6e5c63613..24a63c3af0 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -152,7 +152,9 @@ mbox_getwidget (EImport *ei, EM_FOLDER_SELECTION_BUTTON (w), select_uri); folder_selected ( EM_FOLDER_SELECTION_BUTTON (w), (EImportTargetURI *) target); - g_signal_connect (w, "selected", G_CALLBACK(folder_selected), target); + g_signal_connect ( + w, "selected", + G_CALLBACK (folder_selected), target); gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, TRUE, 6); w = gtk_vbox_new (FALSE, 0); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 3ecfbbc5df..911cb69a99 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -459,12 +459,16 @@ pine_getwidget (EImport *ei, w = gtk_check_button_new_with_label(_("Mail")); gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_mail); - g_signal_connect (w, "toggled", G_CALLBACK(checkbox_mail_toggle_cb), target); + g_signal_connect ( + w, "toggled", + G_CALLBACK (checkbox_mail_toggle_cb), target); gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 0); w = gtk_check_button_new_with_label(_("Address Book")); gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_addr); - g_signal_connect (w, "toggled", G_CALLBACK(checkbox_addr_toggle_cb), target); + g_signal_connect ( + w, "toggled", + G_CALLBACK (checkbox_addr_toggle_cb), target); gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 0); gtk_widget_show_all (box); diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index 1a6a7c831d..9a8671063a 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -402,7 +402,8 @@ filter_gui_add_from_message (EMailSession *session, e_filter_rule_set_source (rule, source); - e_rule_context_add_rule_gui ((ERuleContext *)fc, rule, _("Add Filter Rule"), user); + e_rule_context_add_rule_gui ( + (ERuleContext *)fc, rule, _("Add Filter Rule"), user); g_free (user); g_object_unref (fc); } diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 266a740d87..9cfbb8661a 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -772,7 +772,9 @@ build_dialog (GtkWindow *parent, if (parent != NULL) gtk_widget_show (GTK_WIDGET (gd)); - g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data); + g_signal_connect ( + gd, "response", + G_CALLBACK (dialog_response), data); g_object_weak_ref ((GObject *) gd, (GWeakNotify) dialog_destroy_cb, data); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 13f2c903d1..cc7407f4f8 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -719,7 +719,8 @@ rule_changed (EFilterRule *rule, CAMEL_SESSION (session), E_MAIL_SESSION_VFOLDER_UID); g_return_if_fail (CAMEL_IS_SERVICE (service)); - /* if the folder has changed name, then add it, then remove the old manually */ + /* If the folder has changed name, then + * add it, then remove the old manually. */ if (strcmp (full_name, rule->name) != 0) { gchar *oldname; @@ -727,15 +728,18 @@ rule_changed (EFilterRule *rule, gpointer oldfolder; G_LOCK (vfolder); - d(printf("Changing folder name in hash table to '%s'\n", rule->name)); - if (g_hash_table_lookup_extended (vfolder_hash, full_name, &key, &oldfolder)) { + if (g_hash_table_lookup_extended ( + vfolder_hash, full_name, &key, &oldfolder)) { g_hash_table_remove (vfolder_hash, key); g_free (key); - g_hash_table_insert (vfolder_hash, g_strdup (rule->name), folder); + g_hash_table_insert ( + vfolder_hash, g_strdup (rule->name), folder); G_UNLOCK (vfolder); } else { G_UNLOCK (vfolder); - g_warning("couldn't find a vfolder rule in our table? %s", full_name); + g_warning ( + "couldn't find a vfolder rule " + "in our table? %s", full_name); } oldname = g_strdup (full_name); @@ -822,7 +826,9 @@ context_rule_added (ERuleContext *ctx, folder = camel_store_get_folder_sync ( CAMEL_STORE (service), rule->name, 0, NULL, NULL); if (folder) { - g_signal_connect (rule, "changed", G_CALLBACK(rule_changed), folder); + g_signal_connect ( + rule, "changed", + G_CALLBACK (rule_changed), folder); G_LOCK (vfolder); g_hash_table_insert (vfolder_hash, g_strdup (rule->name), folder); @@ -943,7 +949,9 @@ store_folder_renamed_cb (CamelStore *store, rule, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, rule_changed, folder); e_filter_rule_set_name (rule, info->full_name); - g_signal_connect (rule, "changed", G_CALLBACK(rule_changed), folder); + g_signal_connect ( + rule, "changed", + G_CALLBACK (rule_changed), folder); config_dir = mail_session_get_config_dir (); user = g_build_filename (config_dir, "vfolders.xml", NULL); @@ -1126,11 +1134,16 @@ vfolder_edit_response_cb (GtkWidget *dialog, gpointer user_data) { if (response_id == GTK_RESPONSE_OK) { - EFilterRule *rule = g_object_get_data (G_OBJECT (dialog), "vfolder-rule"); - EFilterRule *newrule = g_object_get_data (G_OBJECT (dialog), "vfolder-newrule"); + GObject *object; + EFilterRule *rule; + EFilterRule *newrule; const gchar *config_dir; gchar *user; + object = G_OBJECT (dialog); + rule = g_object_get_data (object, "vfolder-rule"); + newrule = g_object_get_data (object, "vfolder-newrule"); + e_filter_rule_copy (rule, newrule); config_dir = mail_session_get_config_dir (); user = g_build_filename (config_dir, "vfolders.xml", NULL); @@ -1198,10 +1211,16 @@ vfolder_edit_rule (EMailSession *session, gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); gtk_widget_show (widget); - g_object_set_data_full (G_OBJECT (dialog), "vfolder-rule", rule, g_object_unref); - g_object_set_data_full (G_OBJECT (dialog), "vfolder-newrule", newrule, g_object_unref); + g_object_set_data_full ( + G_OBJECT (dialog), "vfolder-rule", + rule, (GDestroyNotify) g_object_unref); + g_object_set_data_full ( + G_OBJECT (dialog), "vfolder-newrule", + newrule, (GDestroyNotify) g_object_unref); - g_signal_connect (dialog, "response", G_CALLBACK (vfolder_edit_response_cb), NULL); + g_signal_connect ( + dialog, "response", + G_CALLBACK (vfolder_edit_response_cb), NULL); gtk_widget_show (dialog); } @@ -1300,10 +1319,16 @@ vfolder_gui_add_rule (EMVFolderRule *rule) gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500); gtk_box_pack_start (GTK_BOX (container), w, TRUE, TRUE, 0); gtk_widget_show ((GtkWidget *) gd); - g_object_set_data_full(G_OBJECT(gd), "rule", rule, (GDestroyNotify)g_object_unref); - g_signal_connect (rule, "changed", G_CALLBACK (new_rule_changed_cb), gd); + g_object_set_data_full ( + G_OBJECT (gd), "rule", rule, + (GDestroyNotify) g_object_unref); + g_signal_connect ( + rule, "changed", + G_CALLBACK (new_rule_changed_cb), gd); new_rule_changed_cb ((EFilterRule *) rule, gd); - g_signal_connect (gd, "response", G_CALLBACK(new_rule_clicked), NULL); + g_signal_connect ( + gd, "response", + G_CALLBACK (new_rule_clicked), NULL); gtk_widget_show ((GtkWidget *) gd); } diff --git a/mail/message-list.c b/mail/message-list.c index fc35e3f47f..6e0e5f2064 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2575,9 +2575,15 @@ message_list_init (MessageList *message_list) gtk_selection_add_target (p->invisible, GDK_SELECTION_CLIPBOARD, matom, 0); gtk_selection_add_target (p->invisible, GDK_SELECTION_CLIPBOARD, GDK_SELECTION_TYPE_STRING, 2); - g_signal_connect (p->invisible, "selection_get", G_CALLBACK(ml_selection_get), message_list); - g_signal_connect (p->invisible, "selection_clear_event", G_CALLBACK(ml_selection_clear_event), message_list); - g_signal_connect (p->invisible, "selection_received", G_CALLBACK(ml_selection_received), message_list); + g_signal_connect ( + p->invisible, "selection_get", + G_CALLBACK (ml_selection_get), message_list); + g_signal_connect ( + p->invisible, "selection_clear_event", + G_CALLBACK (ml_selection_clear_event), message_list); + g_signal_connect ( + p->invisible, "selection_received", + G_CALLBACK (ml_selection_received), message_list); /* FIXME This is currently unused. */ target_list = gtk_target_list_new (NULL, 0); |