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/publish-calendar/publish-calendar.c | 124 +++++++++++++++++-------- plugins/publish-calendar/publish-format-fb.c | 15 ++- plugins/publish-calendar/publish-format-ical.c | 16 +++- plugins/publish-calendar/publish-location.c | 3 +- plugins/publish-calendar/url-editor-dialog.c | 75 ++++++++++----- 5 files changed, 162 insertions(+), 71 deletions(-) (limited to 'plugins/publish-calendar') diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 8fad76f79f..c55782985c 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -97,7 +97,8 @@ remove_notification (gpointer data) } static void -update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) +update_publish_notification (GtkMessageType msg_type, + const gchar *msg_text) { static GString *actual_msg = NULL; #ifdef HAVE_LIBNOTIFY @@ -194,7 +195,10 @@ publish_uri_async (EPublishUri *uri) } static void -publish_online (EPublishUri *uri, GFile *file, GError **perror, gboolean can_report_success) +publish_online (EPublishUri *uri, + GFile *file, + GError **perror, + gboolean can_report_success) { GOutputStream *stream; GError *error = NULL; @@ -242,14 +246,16 @@ publish_online (EPublishUri *uri, GFile *file, GError **perror, gboolean can_rep } static void -unmount_done_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) +unmount_done_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { GError *error = NULL; #if GLIB_CHECK_VERSION(2,21,3) - g_mount_unmount_with_operation_finish (G_MOUNT (source_object), res, &error); + g_mount_unmount_with_operation_finish (G_MOUNT (source_object), result, &error); #else - g_mount_unmount_finish (G_MOUNT (source_object), res, &error); + g_mount_unmount_finish (G_MOUNT (source_object), result, &error); #endif if (error) { @@ -268,13 +274,15 @@ struct mnt_struct { }; static void -mount_ready_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) +mount_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { struct mnt_struct *ms = (struct mnt_struct *) user_data; GError *error = NULL; GMount *mount; - g_file_mount_enclosing_volume_finish (G_FILE (source_object), res, &error); + g_file_mount_enclosing_volume_finish (G_FILE (source_object), result, &error); if (error) { error_queue_add (g_strdup_printf (_("Mount of %s failed:"), ms->uri->location), error); @@ -307,7 +315,12 @@ mount_ready_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) } static void -ask_password (GMountOperation *op, const gchar *message, const gchar *default_user, const gchar *default_domain, GAskPasswordFlags flags, gpointer user_data) +ask_password (GMountOperation *op, + const gchar *message, + const gchar *default_user, + const gchar *default_domain, + GAskPasswordFlags flags, + gpointer user_data) { struct mnt_struct *ms = (struct mnt_struct *) user_data; gchar *username, *password; @@ -330,7 +343,7 @@ ask_password (GMountOperation *op, const gchar *message, const gchar *default_us gboolean remember = FALSE; password = e_passwords_ask_password (_("Enter password"), NULL, ms->uri->location, message, - E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET|E_PASSWORDS_ONLINE, + E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET | E_PASSWORDS_ONLINE, &remember, NULL); @@ -357,7 +370,9 @@ ask_password (GMountOperation *op, const gchar *message, const gchar *default_us } static void -ask_question (GMountOperation *op, const gchar *message, const gchar *choices[]) +ask_question (GMountOperation *op, + const gchar *message, + const gchar *choices[]) { /* this has been stolen from file-chooser */ GtkWidget *dialog; @@ -408,7 +423,9 @@ ask_question (GMountOperation *op, const gchar *message, const gchar *choices[]) } static void -mount_first (EPublishUri *uri, GFile *file, gboolean can_report_success) +mount_first (EPublishUri *uri, + GFile *file, + gboolean can_report_success) { struct mnt_struct *ms = g_malloc (sizeof (struct mnt_struct)); @@ -424,7 +441,8 @@ mount_first (EPublishUri *uri, GFile *file, gboolean can_report_success) } static void -publish (EPublishUri *uri, gboolean can_report_success) +publish (EPublishUri *uri, + gboolean can_report_success) { if (online) { GError *error = NULL; @@ -592,7 +610,8 @@ url_list_changed (PublishUIData *ui) } static void -update_url_enable_button (EPublishUri *url, GtkWidget *url_enable) +update_url_enable_button (EPublishUri *url, + GtkWidget *url_enable) { g_return_if_fail (url_enable != NULL); g_return_if_fail (GTK_IS_BUTTON (url_enable)); @@ -602,8 +621,8 @@ update_url_enable_button (EPublishUri *url, GtkWidget *url_enable) static void url_list_enable_toggled (GtkCellRendererToggle *renderer, - const gchar *path_string, - PublishUIData *ui) + const gchar *path_string, + PublishUIData *ui) { EPublishUri *url = NULL; GtkTreeModel *model; @@ -629,7 +648,8 @@ url_list_enable_toggled (GtkCellRendererToggle *renderer, } static void -selection_changed (GtkTreeSelection *selection, PublishUIData *ui) +selection_changed (GtkTreeSelection *selection, + PublishUIData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -650,7 +670,8 @@ selection_changed (GtkTreeSelection *selection, PublishUIData *ui) } static void -url_add_clicked (GtkButton *button, PublishUIData *ui) +url_add_clicked (GtkButton *button, + PublishUIData *ui) { GtkTreeModel *model; GtkTreeIter iter; @@ -664,10 +685,11 @@ url_add_clicked (GtkButton *button, PublishUIData *ui) uri = URL_EDITOR_DIALOG (url_editor)->uri; if (uri->location) { gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - URL_LIST_ENABLED_COLUMN, uri->enabled, - URL_LIST_LOCATION_COLUMN, uri->location, - URL_LIST_URL_COLUMN, uri, -1); + gtk_list_store_set ( + GTK_LIST_STORE (model), &iter, + URL_LIST_ENABLED_COLUMN, uri->enabled, + URL_LIST_LOCATION_COLUMN, uri->location, + URL_LIST_URL_COLUMN, uri, -1); url_list_changed (ui); publish_uris = g_slist_prepend (publish_uris, uri); add_timeout (uri); @@ -680,7 +702,8 @@ url_add_clicked (GtkButton *button, PublishUIData *ui) } static void -url_edit_clicked (GtkButton *button, PublishUIData *ui) +url_edit_clicked (GtkButton *button, + PublishUIData *ui) { GtkTreeSelection *selection; GtkTreeModel *model; @@ -714,16 +737,17 @@ url_edit_clicked (GtkButton *button, PublishUIData *ui) } static void -url_list_double_click (GtkTreeView *treeview, - GtkTreePath *path, - GtkTreeViewColumn *column, - PublishUIData *ui) +url_list_double_click (GtkTreeView *treeview, + GtkTreePath *path, + GtkTreeViewColumn *column, + PublishUIData *ui) { url_edit_clicked (NULL, ui); } static void -url_remove_clicked (GtkButton *button, PublishUIData *ui) +url_remove_clicked (GtkButton *button, + PublishUIData *ui) { EPublishUri *url = NULL; GtkTreeSelection *selection; @@ -775,7 +799,8 @@ url_remove_clicked (GtkButton *button, PublishUIData *ui) } static void -url_enable_clicked (GtkButton *button, PublishUIData *ui) +url_enable_clicked (GtkButton *button, + PublishUIData *ui) { EPublishUri *url = NULL; GtkTreeSelection *selection; @@ -805,7 +830,8 @@ online_state_changed (EShell *shell) } GtkWidget * -publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) +publish_calendar_locations (EPlugin *epl, + EConfigHookItemFactoryData *data) { GtkBuilder *builder; GtkCellRenderer *renderer; @@ -827,28 +853,42 @@ publish_calendar_locations (EPlugin *epl, EConfigHookItemFactoryData *data) gtk_tree_view_set_model (GTK_TREE_VIEW (ui->treeview), GTK_TREE_MODEL (store)); renderer = gtk_cell_renderer_toggle_new (); - g_object_set (G_OBJECT (renderer), "activatable", TRUE, NULL); + g_object_set (renderer, "activatable", TRUE, NULL); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Enabled"), renderer, "active", URL_LIST_ENABLED_COLUMN, NULL); - g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (url_list_enable_toggled), ui); + g_signal_connect ( + renderer, "toggled", + G_CALLBACK (url_list_enable_toggled), ui); renderer = gtk_cell_renderer_text_new (); gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (ui->treeview), -1, _("Location"), renderer, "text", URL_LIST_LOCATION_COLUMN, NULL); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed), ui); + g_signal_connect ( + selection, "changed", + G_CALLBACK (selection_changed), ui); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ui->treeview), TRUE); - g_signal_connect (G_OBJECT (ui->treeview), "row-activated", G_CALLBACK (url_list_double_click), ui); + g_signal_connect ( + ui->treeview, "row-activated", + G_CALLBACK (url_list_double_click), ui); ui->url_add = e_builder_get_widget (builder, "url add"); ui->url_edit = e_builder_get_widget (builder, "url edit"); ui->url_remove = e_builder_get_widget (builder, "url remove"); ui->url_enable = e_builder_get_widget (builder, "url enable"); update_url_enable_button (NULL, ui->url_enable); - g_signal_connect (G_OBJECT (ui->url_add), "clicked", G_CALLBACK (url_add_clicked), ui); - g_signal_connect (G_OBJECT (ui->url_edit), "clicked", G_CALLBACK (url_edit_clicked), ui); - g_signal_connect (G_OBJECT (ui->url_remove), "clicked", G_CALLBACK (url_remove_clicked), ui); - g_signal_connect (G_OBJECT (ui->url_enable), "clicked", G_CALLBACK (url_enable_clicked), ui); + g_signal_connect ( + ui->url_add, "clicked", + G_CALLBACK (url_add_clicked), ui); + g_signal_connect ( + ui->url_edit, "clicked", + G_CALLBACK (url_edit_clicked), ui); + g_signal_connect ( + ui->url_remove, "clicked", + G_CALLBACK (url_remove_clicked), ui); + g_signal_connect ( + ui->url_enable, "clicked", + G_CALLBACK (url_enable_clicked), ui); gtk_widget_set_sensitive (GTK_WIDGET (ui->url_edit), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (ui->url_remove), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (ui->url_enable), FALSE); @@ -926,7 +966,8 @@ publish_uris_set_timeout (GSList *uris) } gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { GSList *uris; GConfClient *client; @@ -1024,7 +1065,8 @@ error_queue_show_idle (gpointer user_data) } void -error_queue_add (gchar *description, GError *error) +error_queue_add (gchar *description, + GError *error) { struct eq_data *data; @@ -1052,8 +1094,8 @@ action_calendar_publish_cb (GtkAction *action, thread = g_thread_create ((GThreadFunc) publish_urls, NULL, FALSE, &error); if (!thread) { /* To Translators: This is shown to a user when creation of a new thread, - where the publishing should be done, fails. Basically, this shouldn't - ever happen, and if so, then something is really wrong. */ + * where the publishing should be done, fails. Basically, this shouldn't + * ever happen, and if so, then something is really wrong. */ error_queue_add (g_strdup (_("Could not create publish thread.")), error); } } diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index 65762e0c8a..1059e1d5be 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -37,7 +37,9 @@ #include "publish-format-fb.h" static void -free_busy_data_cb (ECalClient *client, const GSList *free_busy_ecalcomps, GSList **pobjects) +free_busy_data_cb (ECalClient *client, + const GSList *free_busy_ecalcomps, + GSList **pobjects) { const GSList *iter; @@ -52,7 +54,12 @@ free_busy_data_cb (ECalClient *client, const GSList *free_busy_ecalcomps, GSList } static gboolean -write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *stream, gint dur_type, gint dur_value, GError **error) +write_calendar (const gchar *uid, + ESourceList *source_list, + GOutputStream *stream, + gint dur_type, + gint dur_value, + GError **error) { ESource *source; ECalClient *client = NULL; @@ -133,7 +140,9 @@ write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *strea } void -publish_calendar_as_fb (GOutputStream *stream, EPublishUri *uri, GError **error) +publish_calendar_as_fb (GOutputStream *stream, + EPublishUri *uri, + GError **error) { GSList *l; ESourceList *source_list; diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c index de6b342c3d..b28a57aceb 100644 --- a/plugins/publish-calendar/publish-format-ical.c +++ b/plugins/publish-calendar/publish-format-ical.c @@ -40,7 +40,8 @@ typedef struct { } CompTzData; static void -insert_tz_comps (icalparameter *param, gpointer cb_data) +insert_tz_comps (icalparameter *param, + gpointer cb_data) { const gchar *tzid; CompTzData *tdata = cb_data; @@ -64,13 +65,18 @@ insert_tz_comps (icalparameter *param, gpointer cb_data) } static void -append_tz_to_comp (gpointer key, gpointer value, icalcomponent *toplevel) +append_tz_to_comp (gpointer key, + gpointer value, + icalcomponent *toplevel) { icalcomponent_add_component (toplevel, (icalcomponent *) value); } static gboolean -write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *stream, GError **error) +write_calendar (const gchar *uid, + ESourceList *source_list, + GOutputStream *stream, + GError **error) { ESource *source; ECalClient *client = NULL; @@ -128,7 +134,9 @@ write_calendar (const gchar *uid, ESourceList *source_list, GOutputStream *strea } void -publish_calendar_as_ical (GOutputStream *stream, EPublishUri *uri, GError **error) +publish_calendar_as_ical (GOutputStream *stream, + EPublishUri *uri, + GError **error) { GSList *l; ESourceList *source_list; diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c index f864d8a9ae..4bb4271037 100644 --- a/plugins/publish-calendar/publish-location.c +++ b/plugins/publish-calendar/publish-location.c @@ -33,7 +33,8 @@ #include static EPublishUri * -migrateURI (const gchar *xml, xmlDocPtr doc) +migrateURI (const gchar *xml, + xmlDocPtr doc) { GConfClient *client; GSList *uris, *l, *events = NULL; diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index c2e68b9069..9467705040 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -151,13 +151,15 @@ fail: } static void -source_selection_changed (ESourceSelector *selector, UrlEditorDialog *dialog) +source_selection_changed (ESourceSelector *selector, + UrlEditorDialog *dialog) { check_input (dialog); } static void -publish_service_changed (GtkComboBox *combo, UrlEditorDialog *dialog) +publish_service_changed (GtkComboBox *combo, + UrlEditorDialog *dialog) { gint selected = gtk_combo_box_get_active (combo); EPublishUri *uri; @@ -226,7 +228,8 @@ publish_service_changed (GtkComboBox *combo, UrlEditorDialog *dialog) } static void -type_selector_changed (GtkComboBox *combo, UrlEditorDialog *dialog) +type_selector_changed (GtkComboBox *combo, + UrlEditorDialog *dialog) { gint selected = gtk_combo_box_get_active (combo); EPublishUri *uri; @@ -238,7 +241,8 @@ type_selector_changed (GtkComboBox *combo, UrlEditorDialog *dialog) } static void -frequency_changed_cb (GtkComboBox *combo, UrlEditorDialog *dialog) +frequency_changed_cb (GtkComboBox *combo, + UrlEditorDialog *dialog) { gint selected = gtk_combo_box_get_active (combo); @@ -249,34 +253,40 @@ frequency_changed_cb (GtkComboBox *combo, UrlEditorDialog *dialog) } static void -server_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +server_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { check_input (dialog); } static void -file_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +file_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { check_input (dialog); } static void -port_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +port_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { } static void -username_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +username_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { } static void -password_entry_changed (GtkEntry *entry, UrlEditorDialog *dialog) +password_entry_changed (GtkEntry *entry, + UrlEditorDialog *dialog) { } static void -remember_pw_toggled (GtkToggleButton *toggle, UrlEditorDialog *dialog) +remember_pw_toggled (GtkToggleButton *toggle, + UrlEditorDialog *dialog) { } @@ -455,17 +465,37 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) frequency_changed_cb (GTK_COMBO_BOX (dialog->publish_frequency), dialog); publish_service_changed (GTK_COMBO_BOX (dialog->publish_service), dialog); - g_signal_connect (G_OBJECT (dialog->publish_service), "changed", G_CALLBACK (publish_service_changed), dialog); - g_signal_connect (G_OBJECT (dialog->type_selector), "changed", G_CALLBACK (type_selector_changed), dialog); - g_signal_connect (G_OBJECT (dialog->publish_frequency), "changed", G_CALLBACK (frequency_changed_cb), dialog); - g_signal_connect (G_OBJECT (dialog->events_selector), "selection_changed", G_CALLBACK (source_selection_changed), dialog); - - g_signal_connect (G_OBJECT (dialog->server_entry), "changed", G_CALLBACK (server_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->file_entry), "changed", G_CALLBACK (file_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->port_entry), "changed", G_CALLBACK (port_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->username_entry), "changed", G_CALLBACK (username_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->password_entry), "changed", G_CALLBACK (password_entry_changed), dialog); - g_signal_connect (G_OBJECT (dialog->remember_pw), "toggled", G_CALLBACK (remember_pw_toggled), dialog); + g_signal_connect ( + dialog->publish_service, "changed", + G_CALLBACK (publish_service_changed), dialog); + g_signal_connect ( + dialog->type_selector, "changed", + G_CALLBACK (type_selector_changed), dialog); + g_signal_connect ( + dialog->publish_frequency, "changed", + G_CALLBACK (frequency_changed_cb), dialog); + g_signal_connect ( + dialog->events_selector, "selection_changed", + G_CALLBACK (source_selection_changed), dialog); + + g_signal_connect ( + dialog->server_entry, "changed", + G_CALLBACK (server_entry_changed), dialog); + g_signal_connect ( + dialog->file_entry, "changed", + G_CALLBACK (file_entry_changed), dialog); + g_signal_connect ( + dialog->port_entry, "changed", + G_CALLBACK (port_entry_changed), dialog); + g_signal_connect ( + dialog->username_entry, "changed", + G_CALLBACK (username_entry_changed), dialog); + g_signal_connect ( + dialog->password_entry,"changed", + G_CALLBACK (password_entry_changed), dialog); + g_signal_connect ( + dialog->remember_pw, "toggled", + G_CALLBACK (remember_pw_toggled), dialog); g_object_unref (gconf); @@ -475,7 +505,8 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) } GtkWidget * -url_editor_dialog_new (GtkTreeModel *url_list_model, EPublishUri *uri) +url_editor_dialog_new (GtkTreeModel *url_list_model, + EPublishUri *uri) { UrlEditorDialog *dialog; -- cgit v1.2.3