From ec73f5522ff2d6f8c476f02a9daaff32ef1db069 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 30 Jan 2010 15:32:08 -0500 Subject: Coding style and whitespace cleanup. --- plugins/bbdb/bbdb.c | 6 ++-- plugins/bbdb/gaimbuddies.c | 40 ++++++++++++------------ plugins/external-editor/external-editor.c | 2 +- plugins/groupwise-features/camel-gw-listener.c | 2 +- plugins/groupwise-features/proxy.c | 6 ++-- plugins/groupwise-features/share-folder.c | 6 ++-- plugins/hula-account-setup/camel-hula-listener.c | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) (limited to 'plugins') diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index f48745a364..e3666f94de 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -343,7 +343,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email) return; /* don't miss the entry if the mail has only e-mail id and no name */ - if (name == NULL || ! strcmp (name, "")) { + if (name == NULL || !strcmp (name, "")) { temp_name = g_strndup (email, delim - email); name = temp_name; } @@ -400,7 +400,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email) contact = (EContact *) contacts->data; add_email_to_contact (contact, email); - if (! e_book_commit_contact (book, contact, &error)) { + if (!e_book_commit_contact (book, contact, &error)) { g_warning ("bbdb: Could not modify contact: %s\n", error->message); g_error_free (error); } @@ -419,7 +419,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email) add_email_to_contact (contact, email); g_free (temp_name); - if (! e_book_add_contact (book, contact, &error)) { + if (!e_book_add_contact (book, contact, &error)) { g_warning ("bbdb: Failed to add new contact: %s\n", error->message); g_error_free (error); return; diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 13744187f9..184c071e39 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -105,7 +105,7 @@ bbdb_sync_buddy_list_check (void) /* Reprocess the buddy list if it's been updated. */ gconf = gconf_client_get_default (); last_sync_str = gconf_client_get_string (gconf, GCONF_KEY_GAIM_LAST_SYNC_TIME, NULL); - if (last_sync_str == NULL || ! strcmp ((const gchar *)last_sync_str, "")) + if (last_sync_str == NULL || !strcmp ((const gchar *)last_sync_str, "")) last_sync_time = (time_t) 0; else last_sync_time = (time_t) g_ascii_strtoull (last_sync_str, NULL, 10); @@ -237,7 +237,7 @@ bbdb_sync_buddy_list_in_thread (gpointer data) continue; } - if (! e_book_add_contact (std->book, c, &error)) { + if (!e_book_add_contact (std->book, c, &error)) { g_warning ("bbdb: Failed to add new contact: %s\n", error->message); g_error_free (error); goto finish; @@ -321,7 +321,7 @@ im_list_contains_buddy (GList *ims, GaimBuddy *b) for (l = ims; l != NULL; l = l->next) { gchar *im = (gchar *) l->data; - if (! strcmp (im, b->account_name)) + if (!strcmp (im, b->account_name)) return TRUE; } @@ -342,7 +342,7 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c) /* Set the IM account */ field = proto_to_contact_field (b->proto); ims = e_contact_get (c, field); - if (! im_list_contains_buddy (ims, b)) { + if (!im_list_contains_buddy (ims, b)) { ims = g_list_append (ims, (gpointer) b->account_name); e_contact_set (c, field, (gpointer) ims); dirty = TRUE; @@ -388,19 +388,19 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c) static EContactField proto_to_contact_field (const gchar *proto) { - if (! strcmp (proto, "prpl-oscar")) + if (!strcmp (proto, "prpl-oscar")) return E_CONTACT_IM_AIM; - if (! strcmp (proto, "prpl-novell")) + if (!strcmp (proto, "prpl-novell")) return E_CONTACT_IM_GROUPWISE; - if (! strcmp (proto, "prpl-msn")) + if (!strcmp (proto, "prpl-msn")) return E_CONTACT_IM_MSN; - if (! strcmp (proto, "prpl-icq")) + if (!strcmp (proto, "prpl-icq")) return E_CONTACT_IM_ICQ; - if (! strcmp (proto, "prpl-yahoo")) + if (!strcmp (proto, "prpl-yahoo")) return E_CONTACT_IM_YAHOO; - if (! strcmp (proto, "prpl-jabber")) + if (!strcmp (proto, "prpl-jabber")) return E_CONTACT_IM_JABBER; - if (! strcmp (proto, "prpl-gg")) + if (!strcmp (proto, "prpl-gg")) return E_CONTACT_IM_GADUGADU; return E_CONTACT_IM_AIM; @@ -440,7 +440,7 @@ bbdb_get_gaim_buddy_list (void) buddy_xml = xmlParseFile (blist_path); g_free (blist_path); - if (! buddy_xml) { + if (!buddy_xml) { fprintf (stderr, "bbdb: Could not open Pidgin buddy list.\n"); return NULL; } @@ -453,7 +453,7 @@ bbdb_get_gaim_buddy_list (void) } for (child = root->children; child != NULL; child = child->next) { - if (! strcmp ((const gchar *)child->name, "privacy")) { + if (!strcmp ((const gchar *)child->name, "privacy")) { get_all_blocked (child, &blocked); break; } @@ -461,7 +461,7 @@ bbdb_get_gaim_buddy_list (void) blist = NULL; for (child = root->children; child != NULL; child = child->next) { - if (! strcmp ((const gchar *)child->name, "blist")) { + if (!strcmp ((const gchar *)child->name, "blist")) { blist = child; break; } @@ -473,7 +473,7 @@ bbdb_get_gaim_buddy_list (void) } for (child = blist->children; child != NULL; child = child->next) { - if (! strcmp ((const gchar *)child->name, "group")) + if (!strcmp ((const gchar *)child->name, "group")) parse_buddy_group (child, &buddies, blocked); } @@ -541,7 +541,7 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) gboolean is_blocked = FALSE; for (child = contact->children; child != NULL; child = child->next) { - if (! strcmp ((const gchar *)child->name, "buddy")) { + if (!strcmp ((const gchar *)child->name, "buddy")) { buddy = child; break; } @@ -559,20 +559,20 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) gb->proto = e_xml_get_string_prop_by_name (buddy, (const guchar *)"proto"); for (child = buddy->children; child != NULL && !is_blocked; child = child->next) { - if (! strcmp ((const gchar *)child->name, "setting")) { + if (!strcmp ((const gchar *)child->name, "setting")) { gchar *setting_type; setting_type = e_xml_get_string_prop_by_name (child, (const guchar *)"name"); - if (! strcmp ((const gchar *)setting_type, "buddy_icon")) + if (!strcmp ((const gchar *)setting_type, "buddy_icon")) gb->icon = get_buddy_icon_from_setting (child); g_free (setting_type); - } else if (! strcmp ((const gchar *)child->name, "name")) { + } else if (!strcmp ((const gchar *)child->name, "name")) { gb->account_name = get_node_text (child); is_blocked = g_slist_find_custom ( blocked, gb->account_name, (GCompareFunc) strcmp) != NULL; - } else if (! strcmp ((const gchar *)child->name, "alias")) + } else if (!strcmp ((const gchar *)child->name, "alias")) gb->alias = get_node_text (child); } diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 5b10072a2d..60d37800f4 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -273,7 +273,7 @@ async_external_editor (EMsgComposer *composer) gconf = gconf_client_get_default (); editor_cmd = gconf_client_get_string (gconf, EDITOR_GCONF_KEY_COMMAND, NULL); if (!editor_cmd) { - if (! (editor_cmd = g_strdup (g_getenv ("EDITOR"))) ) + if (!(editor_cmd = g_strdup (g_getenv ("EDITOR"))) ) /* Make gedit the default external editor, if the default schemas are not installed and no $EDITOR is set. */ diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c index b65ba9768f..b9385ab390 100644 --- a/plugins/groupwise-features/camel-gw-listener.c +++ b/plugins/groupwise-features/camel-gw-listener.c @@ -876,7 +876,7 @@ account_changed (EAccountList *account_listener, EAccount *account) g_free (existing_account_info->source_url); g_free (existing_account_info); - } else if ( existing_account_info != NULL && is_gw_account ) { + } else if (existing_account_info != NULL && is_gw_account) { if (!account->enabled) { account_removed (account_listener, account); diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 625789c370..6654844bb7 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -349,7 +349,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa email, NULL); return -1; } - if (! g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) { + if (!g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) { e_alert_run_dialog_for_args (parent, "org.gnome.evolution.proxy:invalid-user", email, NULL); @@ -361,7 +361,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa for (;existing_list; existing_list = g_list_next(existing_list)) { new_proxy = (proxyHandler *) existing_list->data; - if ( !g_ascii_strcasecmp (new_proxy->proxy_email, email) ) { + if (!g_ascii_strcasecmp (new_proxy->proxy_email, email)) { if (new_proxy->flags & E_GW_PROXY_DELETED) { new_proxy->permissions = proxy_get_permissions_from_dialog (account); if (new_proxy->flags & E_GW_PROXY_NEW) @@ -621,7 +621,7 @@ proxy_update_tree_view (EAccount *account) for (;list_iter; list_iter = g_list_next(list_iter)) { aclInstance = (proxyHandler *) list_iter->data; - if (! (aclInstance->flags & E_GW_PROXY_DELETED )) { + if (!(aclInstance->flags & E_GW_PROXY_DELETED )) { gtk_tree_store_append (priv->store, &iter, NULL); gtk_tree_store_set (priv->store, &iter, 0, broken_image, 1, g_strconcat(aclInstance->proxy_name,"\n",aclInstance->proxy_email, NULL), -1); } diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index cae99e77d0..7470337995 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -587,7 +587,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) gtk_tree_path_free (path); return; } - if (! usr->flag) /* if user was already existing one change the flag to update*/ + if (!usr->flag) /* if user was already existing one change the flag to update*/ usr->flag = usr->flag | 0x2; user = usr->user_node; if (!right) { @@ -620,7 +620,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) gtk_tree_path_free (path); return; } - if (! usr->flag) /* if user was already existing one change the flag to update*/ + if (!usr->flag) /* if user was already existing one change the flag to update*/ usr->flag = usr->flag | 0x2; user = usr->user_node; @@ -654,7 +654,7 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) gtk_tree_path_free (path); return; } - if (! usr->flag) /* if user was already existing one change the flag to update*/ + if (!usr->flag) /* if user was already existing one change the flag to update*/ usr->flag = usr->flag | 0x2; user = usr->user_node; if (!right) { diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index ca045f0533..3b1c3bfb43 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -482,7 +482,7 @@ account_changed (EAccountList *account_listener, EAccount *account) g_free (existing_account_info->source_url); g_free (existing_account_info); - } else if ( existing_account_info != NULL && is_hula ) { + } else if (existing_account_info != NULL && is_hula) { if (!account->enabled) { account_removed (account_listener, account); -- cgit v1.2.3