From c30d29425eccafea02e95ea6e81679508c878784 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 1 May 2010 23:18:28 -0400 Subject: Coding style and whitespace cleanup. --- mail/e-mail-reader-utils.c | 36 ++++++++++++++++++++++++------------ mail/em-account-editor.c | 5 ++--- mail/em-folder-tree.c | 8 ++++---- 3 files changed, 30 insertions(+), 19 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 10110734ae..6f7aec337d 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -671,13 +671,16 @@ e_mail_reader_header_free (EMailReaderHeader *header) } static void -headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailReader *reader) +headers_changed_cb (GConfClient *client, + guint cnxn_id, + GConfEntry *entry, + EMailReader *reader) { EMFormat *emf; EMFormatHTMLDisplay *emfhd; GSList *header_config_list, *p; - g_return_if_fail (gconf != NULL); + g_return_if_fail (client != NULL); g_return_if_fail (reader != NULL); emfhd = e_mail_reader_get_html_display (reader); @@ -687,7 +690,9 @@ headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailR emf = EM_FORMAT (emfhd); g_return_if_fail (emf != NULL); - header_config_list = gconf_client_get_list (gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL); + header_config_list = gconf_client_get_list ( + client, "/apps/evolution/mail/display/headers", + GCONF_VALUE_STRING, NULL); em_format_clear_headers (emf); for (p = header_config_list; p; p = g_slist_next(p)) { EMailReaderHeader *h; @@ -715,16 +720,16 @@ headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailR static void remove_header_notify_cb (gpointer data) { - GConfClient *gconf = mail_config_get_gconf_client (); + GConfClient *client = mail_config_get_gconf_client (); guint notify_id; - g_return_if_fail (gconf != NULL); + g_return_if_fail (client != NULL); notify_id = GPOINTER_TO_INT (data); g_return_if_fail (notify_id != 0); - gconf_client_notify_remove (gconf, notify_id); - gconf_client_remove_dir (gconf, "/apps/evolution/mail/display", NULL); + gconf_client_notify_remove (client, notify_id); + gconf_client_remove_dir (client, "/apps/evolution/mail/display", NULL); } /** @@ -737,13 +742,20 @@ remove_header_notify_cb (gpointer data) void e_mail_reader_connect_headers (EMailReader *reader) { - GConfClient *gconf = mail_config_get_gconf_client (); + GConfClient *client = mail_config_get_gconf_client (); guint notify_id; - gconf_client_add_dir (gconf, "/apps/evolution/mail/display", GCONF_CLIENT_PRELOAD_NONE, NULL); - notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/display/headers", (GConfClientNotifyFunc) headers_changed_cb, reader, NULL, NULL); + gconf_client_add_dir ( + client, "/apps/evolution/mail/display", + GCONF_CLIENT_PRELOAD_NONE, NULL); + notify_id = gconf_client_notify_add ( + client, "/apps/evolution/mail/display/headers", + (GConfClientNotifyFunc) headers_changed_cb, + reader, NULL, NULL); - g_object_set_data_full (G_OBJECT (reader), "reader-header-notify-id", GINT_TO_POINTER (notify_id), remove_header_notify_cb); + g_object_set_data_full ( + G_OBJECT (reader), "reader-header-notify-id", + GINT_TO_POINTER (notify_id), remove_header_notify_cb); - headers_changed_cb (gconf, 0, NULL, reader); + headers_changed_cb (client, 0, NULL, reader); } diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 702e63e723..e253770562 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2087,7 +2087,7 @@ emae_create_basic_assistant_page (EMAccountEditor *emae, GtkAssistant *assistant gtk_widget_show (lbl); if (g_ascii_strcasecmp (page_id, "start_page") == 0) - g_hash_table_insert (emae->priv->widgets, (char *)"start_page_label", lbl); + g_hash_table_insert (emae->priv->widgets, (gchar *)"start_page_label", lbl); if (old) { /* keep page on its previous index */ @@ -2118,7 +2118,6 @@ static struct { { "identity_organization", E_ACCOUNT_ID_ORGANIZATION }, }; - static void emae_queue_widgets (EMAccountEditor *emae, GtkBuilder *builder, const gchar *first, ...) { @@ -2126,7 +2125,7 @@ emae_queue_widgets (EMAccountEditor *emae, GtkBuilder *builder, const gchar *fir va_start (ap, first); while (first) { - g_hash_table_insert (emae->priv->widgets, (char *)first, e_builder_get_widget (builder, first)); + g_hash_table_insert (emae->priv->widgets, (gchar *)first, e_builder_get_widget (builder, first)); first = va_arg (ap, const gchar *); } va_end (ap); diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index bab7e7cae9..6e2ba166ba 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -2821,22 +2821,22 @@ em_folder_tree_restore_state (EMFolderTree *folder_tree, goto next; group_name = g_strdup_printf ("Store %s", uri); - + if (e_shell_get_express_mode (shell)) { gboolean system = FALSE; if (strncmp (uri, "vfolder", 7) == 0 || strncmp(uri, "mbox", 4) == 0) system = TRUE; - + if (!system && !g_key_file_has_key (key_file, group_name, key, NULL)) { GtkTreePath *path; - + path = gtk_tree_model_get_path (tree_model, &iter); gtk_tree_view_expand_row (tree_view, path, FALSE); gtk_tree_path_free (path); } - + } else if (!g_key_file_has_key (key_file, group_name, key, NULL)) { GtkTreePath *path; -- cgit v1.2.3