From 2c4ae5e7685c462f8d464448e4617b8dea029e72 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 9 Nov 2012 22:40:00 -0500 Subject: Coding style and whitespace cleanup. --- modules/calendar/e-cal-shell-backend.c | 13 +++++++++---- modules/calendar/e-cal-shell-view-private.c | 6 ++++-- modules/calendar/e-memo-shell-content.c | 2 +- modules/calendar/e-memo-shell-view-actions.c | 2 +- modules/calendar/e-task-shell-content.c | 4 ++-- modules/calendar/e-task-shell-view-actions.c | 2 +- modules/calendar/e-task-shell-view.c | 2 +- 7 files changed, 19 insertions(+), 12 deletions(-) (limited to 'modules/calendar') diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index cb5fb243e9..84193d9623 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -577,17 +577,22 @@ ensure_alarm_notify_is_running (void) filename = g_build_filename (base_dir, "evolution-alarm-notify", NULL); - if (g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_EXECUTABLE)) { + if (g_file_test (filename, G_FILE_TEST_IS_EXECUTABLE)) { gchar *argv[2]; GError *error = NULL; argv[0] = filename; argv[1] = NULL; - if (!g_spawn_async (base_dir, argv, NULL, 0, NULL, NULL, NULL, &error)) - g_message ("Failed to start '%s': %s", filename, error ? error->message : "Unknown error"); + g_spawn_async ( + base_dir, argv, NULL, 0, NULL, NULL, NULL, &error); - g_clear_error (&error); + if (error != NULL) { + g_message ( + "Failed to start '%s': %s", + filename, error->message); + g_error_free (error); + } } g_free (filename); diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 9eb8d66dcc..8d20cd974a 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -204,7 +204,8 @@ cal_shell_view_date_navigator_selection_changed_cb (ECalShellView *cal_shell_vie gnome_calendar_notify_dates_shown_changed (calendar); - g_signal_handlers_block_by_func (calitem, + g_signal_handlers_block_by_func ( + calitem, cal_shell_view_date_navigator_selection_changed_cb, cal_shell_view); /* make sure the selected days in the calendar matches shown days */ @@ -217,7 +218,8 @@ cal_shell_view_date_navigator_selection_changed_cb (ECalShellView *cal_shell_vie e_calendar_item_set_selection (calitem, &start_date, &end_date); - g_signal_handlers_unblock_by_func (calitem, + g_signal_handlers_unblock_by_func ( + calitem, cal_shell_view_date_navigator_selection_changed_cb, cal_shell_view); } diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c index ab9f3180be..bb92852956 100644 --- a/modules/calendar/e-memo-shell-content.c +++ b/modules/calendar/e-memo-shell-content.c @@ -745,7 +745,7 @@ e_memo_shell_content_set_preview_visible (EMemoShellContent *memo_shell_content, { g_return_if_fail (E_IS_MEMO_SHELL_CONTENT (memo_shell_content)); - if ((memo_shell_content->priv->preview_visible ? 1 : 0) == (preview_visible ? 1 : 0)) + if (memo_shell_content->priv->preview_visible == preview_visible) return; memo_shell_content->priv->preview_visible = preview_visible; diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c index 1550afeae8..f1ae7ffefb 100644 --- a/modules/calendar/e-memo-shell-view-actions.c +++ b/modules/calendar/e-memo-shell-view-actions.c @@ -959,7 +959,7 @@ e_memo_shell_view_actions_init (EMemoShellView *memo_shell_view) ACTION (MEMO_VIEW_VERTICAL), "current-value", G_SETTINGS_BIND_DEFAULT); - g_object_unref (G_OBJECT (memo_settings)); + g_object_unref (memo_settings); /* Fine tuning. */ diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c index 3fe5f68f51..89d4bde096 100644 --- a/modules/calendar/e-task-shell-content.c +++ b/modules/calendar/e-task-shell-content.c @@ -301,7 +301,7 @@ task_shell_content_restore_state_cb (EShellWindow *shell_window, priv->paned, "vposition", G_SETTINGS_BIND_DEFAULT); - g_object_unref (G_OBJECT (settings)); + g_object_unref (settings); } static GtkOrientation @@ -770,7 +770,7 @@ e_task_shell_content_set_preview_visible (ETaskShellContent *task_shell_content, { g_return_if_fail (E_IS_TASK_SHELL_CONTENT (task_shell_content)); - if ((task_shell_content->priv->preview_visible ? 1 : 0) == (preview_visible ? 1 : 0)) + if (task_shell_content->priv->preview_visible == preview_visible) return; task_shell_content->priv->preview_visible = preview_visible; diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c index e9898fe971..21043fb998 100644 --- a/modules/calendar/e-task-shell-view-actions.c +++ b/modules/calendar/e-task-shell-view-actions.c @@ -1158,7 +1158,7 @@ e_task_shell_view_actions_init (ETaskShellView *task_shell_view) ACTION (TASK_VIEW_VERTICAL), "current-value", G_SETTINGS_BIND_DEFAULT); - g_object_unref (G_OBJECT (settings)); + g_object_unref (settings); /* Fine tuning. */ diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c index f8e8323c3e..b7684a30d8 100644 --- a/modules/calendar/e-task-shell-view.c +++ b/modules/calendar/e-task-shell-view.c @@ -531,7 +531,7 @@ e_task_shell_view_set_confirm_purge (ETaskShellView *task_shell_view, { g_return_if_fail (E_IS_TASK_SHELL_VIEW (task_shell_view)); - if ((task_shell_view->priv->confirm_purge ? 1 : 0) == (confirm_purge ? 1 : 0)) + if (task_shell_view->priv->confirm_purge == confirm_purge) return; task_shell_view->priv->confirm_purge = confirm_purge; -- cgit v1.2.3