From 777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- plugins/bbdb/bbdb.c | 40 ++++++++++++++++++++++++++-------------- plugins/bbdb/bbdb.h | 4 ++-- plugins/bbdb/gaimbuddies.c | 22 +++++++++++++++------- 3 files changed, 43 insertions(+), 23 deletions(-) (limited to 'plugins/bbdb') diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 2c53eaf56c..d24e75480c 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -67,7 +67,8 @@ static GtkWidget *create_addressbook_combo_box (struct bbdb_stuff *stuff, gint t static void cleanup_cb (GObject *o, gpointer data); static ESource * -find_esource_by_uri (ESourceList *source_list, const gchar *target_uri) +find_esource_by_uri (ESourceList *source_list, + const gchar *target_uri) { GSList *groups; @@ -135,7 +136,8 @@ get_check_interval (void) } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { static guint update_source = 0; @@ -229,7 +231,8 @@ bbdb_do_in_thread (gpointer data) } static void -bbdb_do_thread (const gchar *name, const gchar *email) +bbdb_do_thread (const gchar *name, + const gchar *email) { todo_struct *td; @@ -243,7 +246,7 @@ bbdb_do_thread (const gchar *name, const gchar *email) G_LOCK (todo); if (todo) { /* the list isn't empty, which means there is a thread taking - care of that, thus just add it to the queue */ + * care of that, thus just add it to the queue */ todo = g_slist_append (todo, td); } else { GError *error = NULL; @@ -303,7 +306,8 @@ walk_destinations_and_free (EDestination **dests) } void -bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target) +bbdb_handle_send (EPlugin *ep, + EMEventTargetComposer *target) { EComposerHeaderTable *table; GConfClient *gconf; @@ -325,7 +329,9 @@ bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target) } static void -bbdb_do_it (EBookClient *client, const gchar *name, const gchar *email) +bbdb_do_it (EBookClient *client, + const gchar *name, + const gchar *email) { gchar *query_string, *delim, *temp_name = NULL, *uid; GSList *contacts = NULL; @@ -377,8 +383,8 @@ bbdb_do_it (EBookClient *client, const gchar *name, const gchar *email) g_free (query_string); if (contacts != NULL || !status) { /* FIXME: If there's more than one contact with this - name, just give up; we're not smart enough for - this. */ + * name, just give up; we're not smart enough for + * this. */ if (!status || contacts->next != NULL) { e_client_util_free_object_slist (contacts); g_free (temp_name); @@ -492,7 +498,8 @@ bbdb_check_gaim_enabled (void) } static void -add_email_to_contact (EContact *contact, const gchar *email) +add_email_to_contact (EContact *contact, + const gchar *email) { GList *emails; @@ -504,7 +511,8 @@ add_email_to_contact (EContact *contact, const gchar *email) /* Code to implement the configuration user interface follows */ static void -enable_toggled_cb (GtkWidget *widget, gpointer data) +enable_toggled_cb (GtkWidget *widget, + gpointer data) { struct bbdb_stuff *stuff = (struct bbdb_stuff *) data; gboolean active; @@ -543,7 +551,8 @@ enable_toggled_cb (GtkWidget *widget, gpointer data) } static void -enable_gaim_toggled_cb (GtkWidget *widget, gpointer data) +enable_gaim_toggled_cb (GtkWidget *widget, + gpointer data) { struct bbdb_stuff *stuff = (struct bbdb_stuff *) data; gboolean active; @@ -613,7 +622,8 @@ gaim_source_changed_cb (ESourceComboBox *source_combo_box, } static GtkWidget * -create_addressbook_combo_box (struct bbdb_stuff *stuff, gint type) +create_addressbook_combo_box (struct bbdb_stuff *stuff, + gint type) { GtkWidget *combo_box; ESourceList *source_list; @@ -645,7 +655,8 @@ create_addressbook_combo_box (struct bbdb_stuff *stuff, gint type) } GtkWidget * -bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) +bbdb_page_factory (EPlugin *ep, + EConfigHookItemFactoryData *hook_data) { struct bbdb_stuff *stuff; EABConfigTargetPrefs *target = (EABConfigTargetPrefs *) hook_data->config->target; @@ -762,7 +773,8 @@ bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) } static void -cleanup_cb (GObject *o, gpointer data) +cleanup_cb (GObject *o, + gpointer data) { struct bbdb_stuff *stuff = data; diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h index cbeb4ebb42..82951a7566 100644 --- a/plugins/bbdb/bbdb.h +++ b/plugins/bbdb/bbdb.h @@ -42,11 +42,11 @@ /* bbdb.c */ /* creates an EBookClient for a given type (gaim or contacts), but doesn't open it; - this function should be called in a main thread. */ + * this function should be called in a main thread. */ EBookClient *bbdb_create_book_client (gint type); /* opens an EBookClient. Returns false if it fails, and unrefs the book too; - this function can be called in any thread */ + * this function can be called in any thread */ gboolean bbdb_open_book_client (EBookClient *client); gboolean bbdb_check_gaim_enabled (void); diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c index 7e42066638..d2e3c0016c 100644 --- a/plugins/bbdb/gaimbuddies.c +++ b/plugins/bbdb/gaimbuddies.c @@ -250,8 +250,8 @@ bbdb_sync_buddy_list_in_thread (gpointer data) if (contacts != NULL) { /* FIXME: If there's more than one contact with this - name, just give up; we're not smart enough for - this. */ + * name, just give up; we're not smart enough for + * this. */ if (contacts->next != NULL) { e_client_util_free_object_slist (contacts); continue; @@ -360,7 +360,8 @@ bbdb_sync_buddy_list (void) } static gboolean -im_list_contains_buddy (GList *ims, GaimBuddy *b) +im_list_contains_buddy (GList *ims, + GaimBuddy *b) { GList *l; @@ -375,7 +376,9 @@ im_list_contains_buddy (GList *ims, GaimBuddy *b) } static gboolean -bbdb_merge_buddy_to_contact (EBookClient *client, GaimBuddy *b, EContact *c) +bbdb_merge_buddy_to_contact (EBookClient *client, + GaimBuddy *b, + EContact *c) { EContactField field; GList *ims; @@ -450,7 +453,8 @@ proto_to_contact_field (const gchar *proto) } static void -get_all_blocked (xmlNodePtr node, GSList **blocked) +get_all_blocked (xmlNodePtr node, + GSList **blocked) { xmlNodePtr child; @@ -578,7 +582,9 @@ get_buddy_icon_from_setting (xmlNodePtr setting) } static void -parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) +parse_contact (xmlNodePtr contact, + GList **buddies, + GSList *blocked) { xmlNodePtr child; xmlNodePtr buddy = NULL; @@ -631,7 +637,9 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked) } static void -parse_buddy_group (xmlNodePtr group, GList **buddies, GSList *blocked) +parse_buddy_group (xmlNodePtr group, + GList **buddies, + GSList *blocked) { xmlNodePtr child; -- cgit v1.2.3