From fcbbdfbd18e15b4ee8322a0217cf03a689a5e033 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. --- modules/calendar/e-cal-shell-content.c | 7 ++-- modules/calendar/e-cal-shell-migrate.c | 16 ++++----- modules/calendar/e-cal-shell-view-actions.c | 3 +- modules/calendar/e-cal-shell-view-private.c | 3 +- modules/calendar/e-cal-shell-view.c | 6 ++-- modules/calendar/e-calendar-preferences.c | 52 ++++++++++++++++++++--------- modules/calendar/e-memo-shell-migrate.c | 6 ++-- modules/calendar/e-task-shell-migrate.c | 6 ++-- 8 files changed, 63 insertions(+), 36 deletions(-) (limited to 'modules/calendar') diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index b4297b9fcd..81fc76b3cb 100644 --- a/modules/calendar/e-cal-shell-content.c +++ b/modules/calendar/e-cal-shell-content.c @@ -303,7 +303,8 @@ cal_shell_content_dispose (GObject *object) } static time_t -gc_get_default_time (ECalModel *model, gpointer user_data) +gc_get_default_time (ECalModel *model, + gpointer user_data) { GnomeCalendar *gcal = user_data; time_t res = 0, end; @@ -321,8 +322,8 @@ cal_shell_content_constructed (GObject *object) { ECalShellContentPrivate *priv; ECalendarView *calendar_view; - ECalModel *memo_model=NULL; - ECalModel *task_model=NULL; + ECalModel *memo_model = NULL; + ECalModel *task_model = NULL; EShell *shell; EShellContent *shell_content; EShellView *shell_view; diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c index 3c9f79a309..dd76049171 100644 --- a/modules/calendar/e-cal-shell-migrate.c +++ b/modules/calendar/e-cal-shell-migrate.c @@ -75,11 +75,11 @@ create_calendar_contact_source (ESourceList *source_list) static void create_calendar_sources (EShellBackend *shell_backend, - ESourceList *source_list, - ESourceGroup **on_this_computer, - ESource **personal_source, - ESourceGroup **on_the_web, - ESourceGroup **contacts) + ESourceList *source_list, + ESourceGroup **on_this_computer, + ESource **personal_source, + ESourceGroup **on_the_web, + ESourceGroup **contacts) { EShell *shell; EShellSettings *shell_settings; @@ -134,7 +134,7 @@ create_calendar_sources (EShellBackend *shell_backend, if (*on_this_computer) { /* make sure "Personal" shows up as a source under - this group */ + * this group */ GSList *sources = e_source_group_peek_sources (*on_this_computer); GSList *s; for (s = sources; s; s = s->next) { @@ -224,8 +224,8 @@ e_cal_shell_backend_migrate (EShellBackend *shell_backend, g_object_get (shell_backend, "source-list", &source_list, NULL); /* we call this unconditionally now - create_groups either - creates the groups/sources or it finds the necessary - groups/sources. */ + * creates the groups/sources or it finds the necessary + * groups/sources. */ create_calendar_sources ( shell_backend, source_list, &on_this_computer, &personal_source, &on_the_web, &contacts); diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 53b2a0e6c7..21472453ef 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -1205,7 +1205,8 @@ exit: } static void -edit_event_as (ECalShellView *cal_shell_view, gboolean as_meeting) +edit_event_as (ECalShellView *cal_shell_view, + gboolean as_meeting) { ECalShellContent *cal_shell_content; GnomeCalendarViewType view_type; diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 7a9fdaac69..c2f39c5f9b 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -828,7 +828,8 @@ struct ForeachTzidData }; static void -add_timezone_to_cal_cb (icalparameter *param, gpointer data) +add_timezone_to_cal_cb (icalparameter *param, + gpointer data) { struct ForeachTzidData *ftd = data; icaltimezone *tz = NULL; diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c index 03914f1793..61a2d9c27a 100644 --- a/modules/calendar/e-cal-shell-view.c +++ b/modules/calendar/e-cal-shell-view.c @@ -227,7 +227,8 @@ cal_shell_view_execute_search (EShellView *shell_view) } static icalproperty * -get_attendee_prop (icalcomponent *icalcomp, const gchar *address) +get_attendee_prop (icalcomponent *icalcomp, + const gchar *address) { icalproperty *prop; @@ -252,7 +253,8 @@ get_attendee_prop (icalcomponent *icalcomp, const gchar *address) } static gboolean -is_delegated (icalcomponent *icalcomp, const gchar *user_email) +is_delegated (icalcomponent *icalcomp, + const gchar *user_email) { icalproperty *prop; icalparameter *param; diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c index 115226dcf3..85eddd9736 100644 --- a/modules/calendar/e-calendar-preferences.c +++ b/modules/calendar/e-calendar-preferences.c @@ -191,7 +191,8 @@ update_day_second_zone_caption (ECalendarPreferences *prefs) } static void -on_set_day_second_zone (GtkWidget *item, ECalendarPreferences *prefs) +on_set_day_second_zone (GtkWidget *item, + ECalendarPreferences *prefs) { if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item))) return; @@ -201,7 +202,8 @@ on_set_day_second_zone (GtkWidget *item, ECalendarPreferences *prefs) } static void -on_select_day_second_zone (GtkWidget *item, ECalendarPreferences *prefs) +on_select_day_second_zone (GtkWidget *item, + ECalendarPreferences *prefs) { g_return_if_fail (prefs != NULL); @@ -210,7 +212,8 @@ on_select_day_second_zone (GtkWidget *item, ECalendarPreferences *prefs) } static void -day_second_zone_clicked (GtkWidget *widget, ECalendarPreferences *prefs) +day_second_zone_clicked (GtkWidget *widget, + ECalendarPreferences *prefs) { GtkWidget *menu, *item; GSList *group = NULL, *recent_zones, *s; @@ -263,7 +266,8 @@ day_second_zone_clicked (GtkWidget *widget, ECalendarPreferences *prefs) } static void -start_of_day_changed (GtkWidget *widget, ECalendarPreferences *prefs) +start_of_day_changed (GtkWidget *widget, + ECalendarPreferences *prefs) { gint start_hour, start_minute, end_hour, end_minute; EDateEdit *start, *end; @@ -292,7 +296,8 @@ start_of_day_changed (GtkWidget *widget, ECalendarPreferences *prefs) } static void -end_of_day_changed (GtkWidget *widget, ECalendarPreferences *prefs) +end_of_day_changed (GtkWidget *widget, + ECalendarPreferences *prefs) { gint start_hour, start_minute, end_hour, end_minute; EDateEdit *start, *end; @@ -321,7 +326,8 @@ end_of_day_changed (GtkWidget *widget, ECalendarPreferences *prefs) } static void -notify_with_tray_toggled (GtkToggleButton *toggle, ECalendarPreferences *prefs) +notify_with_tray_toggled (GtkToggleButton *toggle, + ECalendarPreferences *prefs) { GConfClient *gconf; @@ -333,7 +339,8 @@ notify_with_tray_toggled (GtkToggleButton *toggle, ECalendarPreferences *prefs) } static void -alarms_selection_changed (ESourceSelector *selector, ECalendarPreferences *prefs) +alarms_selection_changed (ESourceSelector *selector, + ECalendarPreferences *prefs) { ESourceList *source_list = prefs->alarms_list; GSList *selection; @@ -358,7 +365,7 @@ alarms_selection_changed (ESourceSelector *selector, ECalendarPreferences *prefs } /* then we loop over the selector's selection, setting the - property on those sources */ + * property on those sources */ selection = e_source_selector_get_selection (selector); for (l = selection; l; l = l->next) { source = E_SOURCE (l->data); @@ -402,17 +409,30 @@ update_system_tz_widgets (EShellSettings *shell_settings, static void setup_changes (ECalendarPreferences *prefs) { - g_signal_connect (G_OBJECT (prefs->day_second_zone), "clicked", G_CALLBACK (day_second_zone_clicked), prefs); + g_signal_connect ( + prefs->day_second_zone, "clicked", + G_CALLBACK (day_second_zone_clicked), prefs); - g_signal_connect (G_OBJECT (prefs->start_of_day), "changed", G_CALLBACK (start_of_day_changed), prefs); - g_signal_connect (G_OBJECT (prefs->end_of_day), "changed", G_CALLBACK (end_of_day_changed), prefs); + g_signal_connect ( + prefs->start_of_day, "changed", + G_CALLBACK (start_of_day_changed), prefs); - g_signal_connect (G_OBJECT (prefs->notify_with_tray), "toggled", G_CALLBACK (notify_with_tray_toggled), prefs); - g_signal_connect (G_OBJECT (prefs->alarm_list_widget), "selection_changed", G_CALLBACK (alarms_selection_changed), prefs); + g_signal_connect ( + prefs->end_of_day, "changed", + G_CALLBACK (end_of_day_changed), prefs); + + g_signal_connect ( + prefs->notify_with_tray, "toggled", + G_CALLBACK (notify_with_tray_toggled), prefs); + + g_signal_connect ( + prefs->alarm_list_widget, "selection_changed", + G_CALLBACK (alarms_selection_changed), prefs); } static void -initialize_selection (ESourceSelector *selector, ESourceList *source_list) +initialize_selection (ESourceSelector *selector, + ESourceList *source_list) { GSList *groups; @@ -497,7 +517,9 @@ static ECalConfigItem eccp_items[] = { }; static void -eccp_free (EConfig *ec, GSList *items, gpointer data) +eccp_free (EConfig *ec, + GSList *items, + gpointer data) { g_slist_free (items); } diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c index 55f57996cb..6402cf1e0a 100644 --- a/modules/calendar/e-memo-shell-migrate.c +++ b/modules/calendar/e-memo-shell-migrate.c @@ -89,7 +89,7 @@ create_memo_sources (EShellBackend *shell_backend, if (*on_this_computer) { /* make sure "Personal" shows up as a source under - this group */ + * this group */ GSList *sources = e_source_group_peek_sources (*on_this_computer); GSList *s; for (s = sources; s; s = s->next) { @@ -172,8 +172,8 @@ e_memo_shell_backend_migrate (EShellBackend *shell_backend, g_object_get (shell_backend, "source-list", &source_list, NULL); /* we call this unconditionally now - create_groups either - creates the groups/sources or it finds the necessary - groups/sources. */ + * creates the groups/sources or it finds the necessary + * groups/sources. */ create_memo_sources ( shell_backend, source_list, &on_this_computer, &on_the_web, &personal_source); diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c index bf2d07ed8b..60499d673f 100644 --- a/modules/calendar/e-task-shell-migrate.c +++ b/modules/calendar/e-task-shell-migrate.c @@ -101,7 +101,7 @@ create_task_sources (EShellBackend *shell_backend, if (*on_this_computer) { /* make sure "Personal" shows up as a source under - this group */ + * this group */ GSList *sources = e_source_group_peek_sources (*on_this_computer); GSList *s; for (s = sources; s; s = s->next) { @@ -183,8 +183,8 @@ e_task_shell_backend_migrate (EShellBackend *shell_backend, g_object_get (shell_backend, "source-list", &source_list, NULL); /* we call this unconditionally now - create_groups either - creates the groups/sources or it finds the necessary - groups/sources. */ + * creates the groups/sources or it finds the necessary + * groups/sources. */ create_task_sources ( shell_backend, source_list, &on_this_computer, &on_the_web, &personal_source); -- cgit v1.2.3