From cd76c782bdfdae2efec7ff718fcc85c5559862c2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 7 Jul 2013 11:25:07 -0400 Subject: Miscellaneous cleanups. --- modules/addressbook/e-book-shell-view-actions.c | 6 +++--- modules/cal-config-google/e-google-chooser.c | 2 +- modules/cal-config-google/evolution-cal-config-google.c | 3 ++- modules/calendar/e-cal-shell-content.c | 13 ++++++++----- modules/calendar/e-memo-shell-content.c | 7 ++++--- modules/calendar/e-task-shell-content.c | 7 ++++--- 6 files changed, 22 insertions(+), 16 deletions(-) (limited to 'modules') diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index fe43821eaf..d2fe86e0ca 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -202,8 +202,8 @@ action_address_book_properties_cb (GtkAction *action, static void address_book_refresh_done_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { EClient *client; GError *error = NULL; @@ -228,7 +228,7 @@ address_book_refresh_done_cb (GObject *source_object, static void action_address_book_refresh_cb (GtkAction *action, - EBookShellView *book_shell_view) + EBookShellView *book_shell_view) { EBookShellSidebar *book_shell_sidebar; ESourceSelector *selector; diff --git a/modules/cal-config-google/e-google-chooser.c b/modules/cal-config-google/e-google-chooser.c index 1a4ebbcfb8..ed3365ce44 100644 --- a/modules/cal-config-google/e-google-chooser.c +++ b/modules/cal-config-google/e-google-chooser.c @@ -627,7 +627,7 @@ e_google_chooser_apply_selected (EGoogleChooser *chooser) void e_google_chooser_construct_default_uri (SoupURI *soup_uri, - const gchar *username) + const gchar *username) { gchar *decoded_user, *path; diff --git a/modules/cal-config-google/evolution-cal-config-google.c b/modules/cal-config-google/evolution-cal-config-google.c index 9f6310b036..5b095150a3 100644 --- a/modules/cal-config-google/evolution-cal-config-google.c +++ b/modules/cal-config-google/evolution-cal-config-google.c @@ -127,7 +127,8 @@ cal_config_google_commit_changes (ESourceConfigBackend *backend, ESourceAuthentication *authentication_extension = e_source_get_extension (scratch_source, E_SOURCE_EXTENSION_AUTHENTICATION); - e_google_chooser_construct_default_uri (soup_uri, + e_google_chooser_construct_default_uri ( + soup_uri, e_source_authentication_get_user (authentication_extension)); } diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index cccc9993e8..6e35a1fc66 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -319,8 +319,8 @@ gc_get_default_time (ECalModel *model, static void cal_shell_content_is_editing_changed_cb (gpointer cal_view_tasks_memos_table, - GParamSpec *param, - EShellView *shell_view) + GParamSpec *param, + EShellView *shell_view) { g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); @@ -408,7 +408,8 @@ cal_shell_content_constructed (GObject *object) for (ii = 0; ii < GNOME_CAL_LAST_VIEW; ii++) { calendar_view = gnome_calendar_get_calendar_view (calendar, ii); - g_signal_connect (calendar_view, "notify::is-editing", + g_signal_connect ( + calendar_view, "notify::is-editing", G_CALLBACK (cal_shell_content_is_editing_changed_cb), shell_view); gtk_notebook_append_page ( @@ -465,7 +466,8 @@ cal_shell_content_constructed (GObject *object) G_CALLBACK (e_cal_shell_view_taskpad_open_task), shell_view); - g_signal_connect (widget, "notify::is-editing", + g_signal_connect ( + widget, "notify::is-editing", G_CALLBACK (cal_shell_content_is_editing_changed_cb), shell_view); container = priv->vpaned; @@ -510,7 +512,8 @@ cal_shell_content_constructed (GObject *object) G_CALLBACK (e_cal_shell_view_memopad_open_memo), shell_view); - g_signal_connect (widget, "notify::is-editing", + g_signal_connect ( + widget, "notify::is-editing", G_CALLBACK (cal_shell_content_is_editing_changed_cb), shell_view); /* Load the view instance. */ diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index ec97019f65..bf715ec4d9 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -292,8 +292,8 @@ memo_shell_content_restore_state_cb (EShellWindow *shell_window, static void memo_shell_content_is_editing_changed_cb (EMemoTable *memo_table, - GParamSpec *param, - EShellView *shell_view) + GParamSpec *param, + EShellView *shell_view) { g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); @@ -532,7 +532,8 @@ memo_shell_content_constructed (GObject *object) G_CALLBACK (memo_shell_content_selection_change_cb), object); - g_signal_connect (priv->memo_table, "notify::is-editing", + g_signal_connect ( + priv->memo_table, "notify::is-editing", G_CALLBACK (memo_shell_content_is_editing_changed_cb), shell_view); g_signal_connect_swapped ( diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index 33c65081c4..cff476d4b0 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -291,8 +291,8 @@ task_shell_content_restore_state_cb (EShellWindow *shell_window, static void task_shell_content_is_editing_changed_cb (ETaskTable *task_table, - GParamSpec *param, - EShellView *shell_view) + GParamSpec *param, + EShellView *shell_view) { g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); @@ -531,7 +531,8 @@ task_shell_content_constructed (GObject *object) G_CALLBACK (task_shell_content_selection_change_cb), object); - g_signal_connect (priv->task_table, "notify::is-editing", + g_signal_connect ( + priv->task_table, "notify::is-editing", G_CALLBACK (task_shell_content_is_editing_changed_cb), shell_view); g_signal_connect_swapped ( -- cgit v1.2.3