diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-01-31 00:32:55 +0800 |
---|---|---|
committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:29 +0800 |
commit | dbc22f9de50142b8339fa843575a5e15bd3fe8ff (patch) | |
tree | 6daf0c4fdc32fcde76c4529cbc6fdba4121c7242 /calendar/gui/dialogs | |
parent | 726ac1a8bb57a7015d72022784ea7dec135ae1d5 (diff) | |
download | gsoc2013-evolution-dbc22f9de50142b8339fa843575a5e15bd3fe8ff.tar gsoc2013-evolution-dbc22f9de50142b8339fa843575a5e15bd3fe8ff.tar.gz gsoc2013-evolution-dbc22f9de50142b8339fa843575a5e15bd3fe8ff.tar.bz2 gsoc2013-evolution-dbc22f9de50142b8339fa843575a5e15bd3fe8ff.tar.lz gsoc2013-evolution-dbc22f9de50142b8339fa843575a5e15bd3fe8ff.tar.xz gsoc2013-evolution-dbc22f9de50142b8339fa843575a5e15bd3fe8ff.tar.zst gsoc2013-evolution-dbc22f9de50142b8339fa843575a5e15bd3fe8ff.zip |
More whitespace cleanup.
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r-- | calendar/gui/dialogs/alarm-dialog.c | 99 | ||||
-rw-r--r-- | calendar/gui/dialogs/alarm-list-dialog.c | 2 | ||||
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 2 | ||||
-rw-r--r-- | calendar/gui/dialogs/delete-comp.c | 2 | ||||
-rw-r--r-- | calendar/gui/dialogs/event-page.c | 28 | ||||
-rw-r--r-- | calendar/gui/dialogs/select-source-dialog.c | 4 |
6 files changed, 69 insertions, 68 deletions
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 418bf8a704..6d4219c2b4 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -129,7 +129,7 @@ static const gint action_map[] = { static const gchar *action_map_cap[] = { CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS, CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS, - CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS, + CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS, CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS }; @@ -499,46 +499,46 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) static void alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm ) { - ENameSelectorModel *name_selector_model; - EDestinationStore *destination_store; - ECalComponentText description; - GtkTextBuffer *text_buffer; - GSList *attendee_list, *l; - gint len; - - /* Attendees */ - name_selector_model = e_name_selector_peek_model (dialog->name_selector); - e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store); - - e_cal_component_alarm_get_attendee_list (alarm, &attendee_list); - len = g_slist_length (attendee_list); - if (len > 0) { - for (l = attendee_list; l; l = g_slist_next (l)) { - ECalComponentAttendee *a = l->data; - EDestination *dest; - - dest = e_destination_new (); - if (a->cn != NULL && *a->cn) - e_destination_set_name (dest, a->cn); - if (a->value != NULL && *a->value) { - if (!strncasecmp (a->value, "MAILTO:", 7)) - e_destination_set_email (dest, a->value + 7); - else - e_destination_set_email (dest, a->value); - } - e_destination_store_append_destination (destination_store, dest); - g_object_unref (G_OBJECT (dest)); - } - e_cal_component_free_attendee_list (attendee_list); - } - - /* Description */ - e_cal_component_alarm_get_description (alarm, &description); - if (description.value) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->malarm_message), TRUE); - text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description)); - gtk_text_buffer_set_text (text_buffer, description.value, -1); - } + ENameSelectorModel *name_selector_model; + EDestinationStore *destination_store; + ECalComponentText description; + GtkTextBuffer *text_buffer; + GSList *attendee_list, *l; + gint len; + + /* Attendees */ + name_selector_model = e_name_selector_peek_model (dialog->name_selector); + e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store); + + e_cal_component_alarm_get_attendee_list (alarm, &attendee_list); + len = g_slist_length (attendee_list); + if (len > 0) { + for (l = attendee_list; l; l = g_slist_next (l)) { + ECalComponentAttendee *a = l->data; + EDestination *dest; + + dest = e_destination_new (); + if (a->cn != NULL && *a->cn) + e_destination_set_name (dest, a->cn); + if (a->value != NULL && *a->value) { + if (!strncasecmp (a->value, "MAILTO:", 7)) + e_destination_set_email (dest, a->value + 7); + else + e_destination_set_email (dest, a->value); + } + e_destination_store_append_destination (destination_store, dest); + g_object_unref (G_OBJECT (dest)); + } + e_cal_component_free_attendee_list (attendee_list); + } + + /* Description */ + e_cal_component_alarm_get_description (alarm, &description); + if (description.value) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->malarm_message), TRUE); + text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description)); + gtk_text_buffer_set_text (text_buffer, description.value, -1); + } } /* Fills the widgets from procedure alarm data */ @@ -634,8 +634,8 @@ populate_widgets_from_alarm (Dialog *dialog) case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END: e_dialog_combo_box_set (dialog->time_combo, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END, time_map); break; - default: - g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type); + default: + g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type); } switch (trigger->u.rel_duration.is_neg) { @@ -692,8 +692,8 @@ populate_widgets_from_alarm (Dialog *dialog) case E_CAL_COMPONENT_ALARM_PROCEDURE: alarm_to_palarm_widgets (dialog, dialog->alarm); break; - default: - g_warning ("%s: Unexpected alarm action (%d)", G_STRLOC, *action); + default: + g_warning ("%s: Unexpected alarm action (%d)", G_STRLOC, *action); } } @@ -1085,8 +1085,8 @@ check_custom_email (Dialog *dialog) } static void -malarm_addresses_changed_cb (GtkWidget *editable, - gpointer data) +malarm_addresses_changed_cb (GtkWidget *editable, + gpointer data) { Dialog *dialog = data; @@ -1241,8 +1241,9 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) gtk_window_set_icon_name ( GTK_WINDOW (dialog.toplevel), "x-office-calendar"); - gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel), - GTK_WINDOW (parent)); + gtk_window_set_transient_for ( + GTK_WINDOW (dialog.toplevel), + GTK_WINDOW (parent)); response_id = gtk_dialog_run (GTK_DIALOG (dialog.toplevel)); diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 0fb09c6c29..0dbf9f81d0 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -131,7 +131,7 @@ add_clicked_cb (GtkButton *button, gpointer data) icalcomp = e_cal_component_alarm_get_icalcomponent (alarm); icalprop = icalproperty_new_x ("1"); icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION"); - icalcomponent_add_property (icalcomp, icalprop); + icalcomponent_add_property (icalcomp, icalprop); if (alarm_dialog_run (dialog->toplevel, dialog->ecal, alarm)) { e_alarm_list_append (dialog->list_store, &iter, alarm); diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 0115f85a0e..7628f7f1bb 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -229,7 +229,7 @@ static void attachment_store_changed_cb (CompEditor *editor) { /* Mark the editor as changed so it prompts about unsaved - changes on close */ + changes on close */ comp_editor_set_changed (editor, TRUE); } diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index b0ccb953b2..850728449e 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -88,7 +88,7 @@ delete_component_dialog (ECalComponent *comp, switch (vtype) { case E_CAL_COMPONENT_EVENT: - attendees = e_cal_component_has_attendees (comp); + attendees = e_cal_component_has_attendees (comp); if (arg0) { if (attendees) id = "calendar:prompt-delete-titled-meeting"; diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 5bf870e512..7d7e1d4859 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -847,7 +847,7 @@ sensitize_widgets (EventPage *epage) gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 1); else gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 0); - } else + } else gtk_combo_box_set_active (GTK_COMBO_BOX (priv->end_time_combo), 1); gtk_widget_set_sensitive (priv->hour_selector, sensitize); @@ -1673,16 +1673,16 @@ void update_end_time_combo (EventPage *epage) priv = epage->priv; e_date_edit_get_date (E_DATE_EDIT (priv->start_time), - &start_tt.year, - &start_tt.month, - &start_tt.day); - e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time), + &start_tt.year, + &start_tt.month, + &start_tt.day); + e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time), &start_tt.hour, &start_tt.minute); e_date_edit_get_date (E_DATE_EDIT (priv->end_time), - &end_tt.year, - &end_tt.month, - &end_tt.day); + &end_tt.year, + &end_tt.month, + &end_tt.day); e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time), &end_tt.hour, &end_tt.minute); @@ -1720,12 +1720,12 @@ hour_minute_changed (EventPage *epage) priv = epage->priv; e_date_edit_get_date (E_DATE_EDIT (priv->start_time), - &end_tt.year, - &end_tt.month, - &end_tt.day); - e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time), - &end_tt.hour, - &end_tt.minute); + &end_tt.year, + &end_tt.month, + &end_tt.day); + e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time), + &end_tt.hour, + &end_tt.minute); for_hours = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->hour_selector)); for_minutes = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->minute_selector)); diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index e517819c6b..79905d5f01 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -48,7 +48,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type, ESource *excep gconf_key = "/apps/evolution/calendar/sources"; else if (obj_type == E_CAL_SOURCE_TYPE_TODO) gconf_key = "/apps/evolution/tasks/sources"; - else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) + else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) gconf_key = "/apps/evolution/memos/sources"; else return NULL; @@ -63,7 +63,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type, ESource *excep icon_name = "x-office-calendar"; else if (obj_type == E_CAL_SOURCE_TYPE_TODO) icon_name = "stock_todo"; - else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) + else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) icon_name = "stock_journal"; if (icon_name) |