From cd53ba990035bdb4861d9660917d457533d4ecb2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 11 Sep 2010 14:56:28 -0400 Subject: Coding style cleanups. --- calendar/gui/dialogs/alarm-dialog.c | 6 ++-- calendar/gui/dialogs/alarm-list-dialog.c | 4 +-- calendar/gui/dialogs/comp-editor-util.c | 2 +- calendar/gui/dialogs/comp-editor.c | 24 ++++++++-------- calendar/gui/dialogs/comp-editor.h | 2 +- calendar/gui/dialogs/event-editor.c | 16 +++++------ calendar/gui/dialogs/event-page.c | 48 ++++++++++++++++---------------- calendar/gui/dialogs/memo-page.c | 28 +++++++++---------- calendar/gui/dialogs/recurrence-page.c | 2 +- calendar/gui/dialogs/save-comp.c | 4 +-- calendar/gui/dialogs/task-details-page.c | 4 +-- calendar/gui/dialogs/task-editor.c | 12 ++++---- calendar/gui/dialogs/task-page.c | 32 ++++++++++----------- calendar/gui/dialogs/task-page.h | 2 +- 14 files changed, 93 insertions(+), 93 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index f7827413b7..acb4423f71 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -481,7 +481,7 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) /* remove the X-EVOLUTION-NEEDS-DESCRIPTION property, so that * we don't re-set the alarm's description */ icalcomp = e_cal_component_alarm_get_icalcomponent (alarm); - icalprop = icalcomponent_get_first_property(icalcomp, ICAL_X_PROPERTY); + icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); while (icalprop) { const gchar *x_name; @@ -527,7 +527,7 @@ alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm ) e_destination_set_email (dest, a->value); } e_destination_store_append_destination (destination_store, dest); - g_object_unref(GTK_OBJECT (dest)); + g_object_unref (GTK_OBJECT (dest)); } e_cal_component_free_attendee_list (attendee_list); } @@ -1217,7 +1217,7 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) e_load_ui_builder_definition (dialog.builder, "alarm-dialog.ui"); if (!get_widgets (&dialog)) { - g_object_unref(dialog.builder); + g_object_unref (dialog.builder); return FALSE; } diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index b8588d666d..0fb09c6c29 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -271,7 +271,7 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store) e_load_ui_builder_definition (dialog.builder, "alarm-list-dialog.ui"); if (!get_widgets (&dialog)) { - g_object_unref(dialog.builder); + g_object_unref (dialog.builder); return FALSE; } @@ -316,7 +316,7 @@ alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store) e_load_ui_builder_definition (dialog->builder, "alarm-list-dialog.ui"); if (!get_widgets (dialog)) { - g_object_unref(dialog->builder); + g_object_unref (dialog->builder); return NULL; } diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 6d3adfe733..259533877a 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -223,7 +223,7 @@ comp_editor_strip_categories (const gchar *categories) start = p; end = p; } else - end = g_utf8_next_char(p) - 1; + end = g_utf8_next_char (p) - 1; } } diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 6c5092e508..69cb2f2479 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -428,7 +428,7 @@ save_comp (CompEditor *editor) } /* retrieve all timezones */ - if (IS_COMP_EDITOR_PAGE(l->data)) + if (IS_COMP_EDITOR_PAGE (l->data)) comp_editor_page_fill_timezones (l->data, timezones); } @@ -520,7 +520,7 @@ save_comp (CompEditor *editor) GTK_BUTTONS_OK, "%s", (error != NULL) ? error->message : _("Could not update object")); - gtk_dialog_run (GTK_DIALOG(dialog)); + gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); if (error) @@ -810,15 +810,15 @@ action_save_cb (GtkAction *action, gboolean response = 1; /*FIXME: Cannot use mail functions from calendar!!!! */ #if 0 - ECalComponentVType vtype = e_cal_component_get_vtype(editor->priv->comp); + ECalComponentVType vtype = e_cal_component_get_vtype (editor->priv->comp); if (vtype == E_CAL_COMPONENT_EVENT) - response = em_utils_prompt_user((GtkWindow *)widget, + response = em_utils_prompt_user ((GtkWindow *)widget, NULL, "calendar:ask-send-event-pending-download", NULL); else - response = em_utils_prompt_user((GtkWindow *)widget, + response = em_utils_prompt_user ((GtkWindow *)widget, NULL, "calendar:ask-send-task-pending-download", NULL); @@ -1872,7 +1872,7 @@ prompt_and_save_changes (CompEditor *editor, gboolean send) if (!priv->changed) return TRUE; - switch (save_component_dialog (GTK_WINDOW(editor), priv->comp)) { + switch (save_component_dialog (GTK_WINDOW (editor), priv->comp)) { case GTK_RESPONSE_YES: /* Save */ if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) { e_alert_run_dialog_for_args ( @@ -2341,7 +2341,7 @@ comp_editor_append_widget (CompEditor *editor, g_signal_connect ( page, "map", G_CALLBACK (page_mapped_cb), page); - g_signal_connect( + g_signal_connect ( page, "unmap", G_CALLBACK (page_unmapped_cb), page); */ @@ -2408,7 +2408,7 @@ comp_editor_append_page (CompEditor *editor, g_signal_connect ( page_widget, "map", G_CALLBACK (page_mapped_cb), page); - g_signal_connect( + g_signal_connect ( page_widget, "unmap", G_CALLBACK (page_unmapped_cb), page); @@ -2642,7 +2642,7 @@ fill_widgets (CompEditor *editor) action, G_CALLBACK (action_classification_cb), editor); for (iter = priv->pages; iter != NULL; iter = iter->next) { - if (IS_COMP_EDITOR_PAGE(iter->data)) + if (IS_COMP_EDITOR_PAGE (iter->data)) comp_editor_page_fill_widgets (iter->data, priv->comp); } @@ -2699,7 +2699,7 @@ set_attendees_for_delegation (ECalComponent *comp, const gchar *attendee = icalproperty_get_attendee (prop); const gchar *delfrom = NULL; - param = icalproperty_get_first_parameter(prop, ICAL_DELEGATEDFROM_PARAMETER); + param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER); if (param) delfrom = icalparameter_get_delegatedfrom (param); if (!(g_str_equal (itip_strip_mailto (attendee), address) || @@ -2901,7 +2901,7 @@ comp_editor_get_current_comp (CompEditor *editor, gboolean *correct) comp_editor_copy_new_attendees (comp, priv->comp); if (priv->changed) { for (l = priv->pages; l != NULL; l = l->next) { - if (IS_COMP_EDITOR_PAGE(l->data)) + if (IS_COMP_EDITOR_PAGE (l->data)) all_ok = comp_editor_page_fill_component (l->data, comp) && all_ok; } } @@ -3076,7 +3076,7 @@ page_dates_changed_cb (CompEditor *editor, GList *l; for (l = priv->pages; l != NULL; l = l->next) - if (page != (CompEditorPage *) l->data && IS_COMP_EDITOR_PAGE(l->data)) + if (page != (CompEditorPage *) l->data && IS_COMP_EDITOR_PAGE (l->data)) comp_editor_page_set_dates (l->data, dates); if (!priv->warned && priv->existing_org && !priv->user_org && diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index bd26ce8b66..09ced8f533 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -150,7 +150,7 @@ void comp_editor_delete_comp (CompEditor *editor); gboolean comp_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean strip_alarms); -GSList * comp_editor_get_mime_attach_list(CompEditor *editor); +GSList * comp_editor_get_mime_attach_list (CompEditor *editor); gboolean comp_editor_close (CompEditor *editor); void comp_editor_sensitize_attachment_bar diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 396b9b8d08..2e727ebbbc 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -326,7 +326,7 @@ event_editor_constructor (GType type, G_CALLBACK (gtk_widget_hide), NULL); g_signal_connect ( priv->recur_window, "delete-event", - G_CALLBACK(gtk_widget_hide_on_delete), NULL); + G_CALLBACK (gtk_widget_hide_on_delete), NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (priv->recur_window)); @@ -358,7 +358,7 @@ event_editor_constructor (GType type, /* Alarm page */ alarm_page = event_page_get_alarm_page (priv->event_page); comp_editor_append_widget (editor, alarm_page, _("Alarm"), TRUE); - g_object_unref(alarm_page); + g_object_unref (alarm_page); } @@ -383,7 +383,7 @@ event_editor_constructor (GType type, if (e_shell_get_express_mode (shell)) { attendee_page = event_page_get_attendee_page (priv->event_page); comp_editor_append_widget (editor, attendee_page, _("Attendees"), TRUE); - g_object_unref(attendee_page); + g_object_unref (attendee_page); } } @@ -673,18 +673,18 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp) EIterator *it; accounts = itip_addresses_get (); - for (it = e_list_get_iterator((EList *)accounts); - e_iterator_is_valid(it); - e_iterator_next(it)) { + for (it = e_list_get_iterator ((EList *)accounts); + e_iterator_is_valid (it); + e_iterator_next (it)) { EMeetingAttendee *ia; - account = (EAccount*)e_iterator_get(it); + account = (EAccount*)e_iterator_get (it); ia = e_meeting_store_find_attendee (priv->model, account->id->address, &row); if (ia != NULL) e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_STATUS); } - g_object_unref(it); + g_object_unref (it); } else if (e_cal_get_organizer_must_attend (client)) { EMeetingAttendee *ia; diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index b221368f94..e4e034fd16 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -455,7 +455,7 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->start_timezone), start_zone); def_zone = calendar_config_get_icaltimezone (); - if (!def_zone || !start_zone || strcmp (icaltimezone_get_tzid(def_zone), icaltimezone_get_tzid (start_zone))) + if (!def_zone || !start_zone || strcmp (icaltimezone_get_tzid (def_zone), icaltimezone_get_tzid (start_zone))) homezone = FALSE; action = comp_editor_get_action (editor, "view-time-zone"); @@ -952,8 +952,8 @@ get_current_account (EventPage *epage) if (!str) return NULL; - for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) { - EAccount *a = (EAccount *)e_iterator_get(it); + for (it = e_list_get_iterator ((EList *)priv->accounts); e_iterator_is_valid (it); e_iterator_next (it)) { + EAccount *a = (EAccount *)e_iterator_get (it); gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); if (!g_ascii_strcasecmp (full, str)) { @@ -1659,8 +1659,8 @@ static void update_end_time_combo (EventPage *epage) { EventPagePrivate *priv; - struct icaltimetype start_tt = icaltime_null_time(); - struct icaltimetype end_tt = icaltime_null_time(); + struct icaltimetype start_tt = icaltime_null_time (); + struct icaltimetype end_tt = icaltime_null_time (); time_t start_timet,end_timet; gint hours,minutes; @@ -1709,7 +1709,7 @@ hour_minute_changed (EventPage *epage) { EventPagePrivate *priv; gint for_hours, for_minutes; - struct icaltimetype end_tt = icaltime_null_time(); + struct icaltimetype end_tt = icaltime_null_time (); priv = epage->priv; @@ -1892,7 +1892,7 @@ remove_clicked_cb (GtkButton *btn, EventPage *epage) for (tmp = paths; tmp; tmp=tmp->next) { path = tmp->data; - gtk_tree_model_get_iter (GTK_TREE_MODEL(priv->model), &iter, path); + gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path); gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1); ia = e_meeting_store_find_attendee (priv->model, address, NULL); @@ -2014,8 +2014,8 @@ void event_page_set_all_day_event (EventPage *epage, gboolean all_day) { EventPagePrivate *priv = epage->priv; - struct icaltimetype start_tt = icaltime_null_time(); - struct icaltimetype end_tt = icaltime_null_time(); + struct icaltimetype start_tt = icaltime_null_time (); + struct icaltimetype end_tt = icaltime_null_time (); CompEditor *editor; GtkAction *action; gboolean date_set; @@ -2171,7 +2171,7 @@ event_page_set_info_string (EventPage *epage, const gchar *icon, const gchar *ms priv = epage->priv; gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON); - gtk_label_set_markup (GTK_LABEL(priv->info_string), msg); + gtk_label_set_markup (GTK_LABEL (priv->info_string), msg); if (msg && icon) gtk_widget_show (priv->info_hbox); @@ -2415,8 +2415,8 @@ static void times_updated (EventPage *epage, gboolean adjust_end_time) { EventPagePrivate *priv; - struct icaltimetype start_tt = icaltime_null_time(); - struct icaltimetype end_tt = icaltime_null_time(); + struct icaltimetype start_tt = icaltime_null_time (); + struct icaltimetype end_tt = icaltime_null_time (); gboolean date_set, all_day_event; gboolean set_start_date = FALSE, set_end_date = FALSE; icaltimezone *start_zone; @@ -2660,7 +2660,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage) if (client) { gchar *backend_addr = NULL; - e_cal_get_cal_address(client, &backend_addr, NULL); + e_cal_get_cal_address (client, &backend_addr, NULL); if (priv->is_meeting) event_page_select_organizer (epage, backend_addr); @@ -2979,7 +2979,7 @@ init_widgets (EventPage *epage) update_end_time_combo ( epage); /* Hour and Minute selector */ - gtk_spin_button_set_range( (GtkSpinButton*) priv->hour_selector, 0, G_MAXINT); + gtk_spin_button_set_range ( (GtkSpinButton*) priv->hour_selector, 0, G_MAXINT); g_signal_connect (priv->hour_selector, "value-changed", G_CALLBACK (hour_sel_changed), epage); g_signal_connect (priv->minute_selector, "value-changed", G_CALLBACK (minute_sel_changed), epage); @@ -3081,7 +3081,7 @@ event_page_select_organizer (EventPage *epage, const gchar *backend_address) ESource *source = NULL; const gchar *user_addr = NULL; - def_account = itip_addresses_get_default(); + def_account = itip_addresses_get_default (); if (def_account && def_account->enabled) def_address = g_strdup_printf("%s <%s>", def_account->id->name, def_account->id->address); @@ -3159,12 +3159,12 @@ event_page_construct (EventPage *epage, EMeetingStore *model) } priv->accounts = itip_addresses_get (); - for (it = e_list_get_iterator((EList *)priv->accounts); - e_iterator_is_valid(it); - e_iterator_next(it)) { + for (it = e_list_get_iterator ((EList *)priv->accounts); + e_iterator_is_valid (it); + e_iterator_next (it)) { gchar *full = NULL; - a = (EAccount *)e_iterator_get(it); + a = (EAccount *)e_iterator_get (it); /* skip disabled accounts */ if (!a->enabled) @@ -3172,10 +3172,10 @@ event_page_construct (EventPage *epage, EMeetingStore *model) full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); - priv->address_strings = g_list_append(priv->address_strings, full); + priv->address_strings = g_list_append (priv->address_strings, full); } - g_object_unref(it); + g_object_unref (it); if (priv->address_strings) { GList *l; @@ -3331,7 +3331,7 @@ event_page_get_alarm_page (EventPage *epage) tmp = GW("dialog-vbox1"); alarm_page = GW("vbox2"); - g_object_ref(alarm_page); + g_object_ref (alarm_page); gtk_container_remove ((GtkContainer *)tmp, alarm_page); return alarm_page; @@ -3349,8 +3349,8 @@ event_page_get_attendee_page (EventPage *epage) priv = epage->priv; apage = priv->list_box; - g_object_ref(apage); - gtk_container_remove ((GtkContainer *)gtk_widget_get_parent(apage), apage); + g_object_ref (apage); + gtk_container_remove ((GtkContainer *)gtk_widget_get_parent (apage), apage); gtk_widget_hide (priv->attendee_box); return apage; diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 735566b837..b7e3095e3f 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -564,8 +564,8 @@ get_current_account (MemoPage *page) if (!str) return NULL; - for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) { - EAccount *a = (EAccount *)e_iterator_get(it); + for (it = e_list_get_iterator ((EList *)priv->accounts); e_iterator_is_valid (it); e_iterator_next (it)) { + EAccount *a = (EAccount *)e_iterator_get (it); gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); if (!g_ascii_strcasecmp (full, str)) { @@ -659,7 +659,7 @@ memo_page_fill_component (CompEditorPage *page, if (i == 50 && uc && uc < (gunichar)-2) sumText.value = txt = g_strdup_printf ("%.*s...", idxToUse, str); else - sumText.value = txt = g_strndup(str, idxToUse); + sumText.value = txt = g_strndup (str, idxToUse); sumText.altrep = NULL; @@ -670,7 +670,7 @@ memo_page_fill_component (CompEditorPage *page, e_cal_component_set_description_list (comp, &l); - g_free(txt); + g_free (txt); } if (str) @@ -779,7 +779,7 @@ memo_page_set_info_string (MemoPage *mpage, const gchar *icon, const gchar *msg) priv = mpage->priv; gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON); - gtk_label_set_markup (GTK_LABEL(priv->info_string), msg); + gtk_label_set_markup (GTK_LABEL (priv->info_string), msg); if (msg && icon) gtk_widget_show (priv->info_hbox); @@ -914,7 +914,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, if (client) { gchar *backend_addr = NULL; - e_cal_get_cal_address(client, &backend_addr, NULL); + e_cal_get_cal_address (client, &backend_addr, NULL); if (flags & COMP_EDITOR_IS_SHARED) memo_page_select_organizer (mpage, backend_addr); @@ -1012,7 +1012,7 @@ init_widgets (MemoPage *mpage) e_buffer_tagger_connect (view); /* Categories button */ - g_signal_connect( + g_signal_connect ( priv->categories_btn, "clicked", G_CALLBACK (categories_clicked_cb), mpage); @@ -1096,7 +1096,7 @@ memo_page_select_organizer (MemoPage *mpage, const gchar *backend_address) ESource *source = NULL; const gchar *user_addr = NULL; - def_account = itip_addresses_get_default(); + def_account = itip_addresses_get_default (); if (def_account && def_account->enabled) def_address = g_strdup_printf("%s <%s>", def_account->id->name, def_account->id->address); @@ -1169,12 +1169,12 @@ memo_page_construct (MemoPage *mpage) if (flags & COMP_EDITOR_IS_SHARED) { priv->accounts = itip_addresses_get (); - for (it = e_list_get_iterator((EList *)priv->accounts); - e_iterator_is_valid(it); - e_iterator_next(it)) { + for (it = e_list_get_iterator ((EList *)priv->accounts); + e_iterator_is_valid (it); + e_iterator_next (it)) { gchar *full = NULL; - a = (EAccount *)e_iterator_get(it); + a = (EAccount *)e_iterator_get (it); /* skip disabled accounts */ if (!a->enabled) @@ -1182,10 +1182,10 @@ memo_page_construct (MemoPage *mpage) full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); - priv->address_strings = g_list_append(priv->address_strings, full); + priv->address_strings = g_list_append (priv->address_strings, full); } - g_object_unref(it); + g_object_unref (it); if (priv->address_strings) { GList *l; diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index c5944af194..555ca073c8 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -270,7 +270,7 @@ preview_recur (RecurrencePage *rpage) tag_calendar_by_comp (E_CALENDAR (priv->preview_calendar), comp, client, zone, TRUE, FALSE); - g_object_unref(comp); + g_object_unref (comp); } static GObject * diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index 823bd4be52..0f9a6fba8e 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -43,12 +43,12 @@ GtkResponseType save_component_dialog (GtkWindow *parent, ECalComponent *comp) { - ECalComponentVType vtype = e_cal_component_get_vtype(comp); + ECalComponentVType vtype = e_cal_component_get_vtype (comp); CompEditorFlags flags; switch (vtype) { case E_CAL_COMPONENT_EVENT: - flags = comp_editor_get_flags (COMP_EDITOR(parent)); + flags = comp_editor_get_flags (COMP_EDITOR (parent)); if (flags & COMP_EDITOR_MEETING) return e_alert_run_dialog_for_args (parent, "calendar:prompt-save-meeting", NULL); else diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 35ec225c19..ec63458d81 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -365,7 +365,7 @@ task_details_page_fill_component (CompEditorPage *page, /* COMPLETED today or before */ icaltoday = icaltime_current_time_with_zone (zone); icaltimezone_convert_time (&icaltoday, zone, - icaltimezone_get_utc_timezone()); + icaltimezone_get_utc_timezone ()); if (icaltime_compare_date_only (icalcomplete, icaltoday) > 0) { comp_editor_page_display_validation_error ( @@ -498,7 +498,7 @@ complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete) { CompEditorPageDates dates = {NULL, NULL, NULL, NULL}; icaltimezone *zone; - struct icaltimetype completed_tt = icaltime_null_time(); + struct icaltimetype completed_tt = icaltime_null_time (); /* Get the current time in UTC. */ zone = icaltimezone_get_utc_timezone (); diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 5a9849db8e..476fb060d4 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -335,7 +335,7 @@ task_editor_init (TaskEditor *te) G_CALLBACK (gtk_widget_hide), NULL); g_signal_connect ( te->priv->task_details_window, "delete-event", - G_CALLBACK(gtk_widget_hide), NULL); + G_CALLBACK (gtk_widget_hide), NULL); te->priv->task_details_page = task_details_page_new (editor); content_area = gtk_dialog_get_content_area ( @@ -434,18 +434,18 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp) EIterator *it; accounts = itip_addresses_get (); - for (it = e_list_get_iterator((EList *)accounts); - e_iterator_is_valid(it); - e_iterator_next(it)) { + for (it = e_list_get_iterator ((EList *)accounts); + e_iterator_is_valid (it); + e_iterator_next (it)) { EMeetingAttendee *ia; - account = (EAccount*)e_iterator_get(it); + account = (EAccount*)e_iterator_get (it); ia = e_meeting_store_find_attendee (priv->model, account->id->address, &row); if (ia != NULL) e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_STATUS); } - g_object_unref(it); + g_object_unref (it); } else if (e_cal_get_organizer_must_attend (client)) { EMeetingAttendee *ia; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 85c6bb15b8..7777f23dd0 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -483,8 +483,8 @@ get_current_account (TaskPage *page) if (!str) return NULL; - for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) { - EAccount *a = (EAccount *)e_iterator_get(it); + for (it = e_list_get_iterator ((EList *)priv->accounts); e_iterator_is_valid (it); e_iterator_next (it)) { + EAccount *a = (EAccount *)e_iterator_get (it); gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); if (!g_ascii_strcasecmp (full, str)) { @@ -1184,7 +1184,7 @@ remove_clicked_cb (GtkButton *btn, TaskPage *page) for (tmp = paths; tmp; tmp=tmp->next) { path = tmp->data; - gtk_tree_model_get_iter (GTK_TREE_MODEL(priv->model), &iter, path); + gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path); gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1); ia = e_meeting_store_find_attendee (priv->model, address, NULL); @@ -1357,7 +1357,7 @@ task_page_set_info_string (TaskPage *tpage, const gchar *icon, const gchar *msg) priv = tpage->priv; gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON); - gtk_label_set_markup (GTK_LABEL(priv->info_string), msg); + gtk_label_set_markup (GTK_LABEL (priv->info_string), msg); if (msg && icon) gtk_widget_show (priv->info_hbox); @@ -1489,8 +1489,8 @@ date_changed_cb (EDateEdit *dedit, CompEditorPageDates dates; gboolean date_set, time_set; ECalComponentDateTime start_dt, due_dt; - struct icaltimetype start_tt = icaltime_null_time(); - struct icaltimetype due_tt = icaltime_null_time(); + struct icaltimetype start_tt = icaltime_null_time (); + struct icaltimetype due_tt = icaltime_null_time (); if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (tpage))) return; @@ -1624,8 +1624,8 @@ static void times_updated (TaskPage *tpage, gboolean adjust_end_time) { TaskPagePrivate *priv; - struct icaltimetype start_tt = icaltime_null_time(); - struct icaltimetype end_tt = icaltime_null_time(); + struct icaltimetype start_tt = icaltime_null_time (); + struct icaltimetype end_tt = icaltime_null_time (); gboolean date_set; gboolean set_start_date = FALSE, set_end_date = FALSE, adjust_by_hour; icaltimezone *zone; @@ -1756,7 +1756,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage) if (client) { gchar *backend_addr = NULL; - e_cal_get_cal_address(client, &backend_addr, NULL); + e_cal_get_cal_address (client, &backend_addr, NULL); if (priv->is_assignment) task_page_select_organizer (tpage, backend_addr); @@ -1984,7 +1984,7 @@ task_page_select_organizer (TaskPage *tpage, const gchar *backend_address) editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tpage)); client = comp_editor_get_client (editor); - def_account = itip_addresses_get_default(); + def_account = itip_addresses_get_default (); if (def_account && def_account->enabled) def_address = g_strdup_printf("%s <%s>", def_account->id->name, def_account->id->address); @@ -2061,12 +2061,12 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client) } priv->accounts = itip_addresses_get (); - for (it = e_list_get_iterator((EList *)priv->accounts); - e_iterator_is_valid(it); - e_iterator_next(it)) { + for (it = e_list_get_iterator ((EList *)priv->accounts); + e_iterator_is_valid (it); + e_iterator_next (it)) { gchar *full = NULL; - a = (EAccount *)e_iterator_get(it); + a = (EAccount *)e_iterator_get (it); /* skip disabled accounts */ if (!a->enabled) @@ -2074,10 +2074,10 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client) full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); - priv->address_strings = g_list_append(priv->address_strings, full); + priv->address_strings = g_list_append (priv->address_strings, full); } - g_object_unref(it); + g_object_unref (it); if (priv->address_strings) { GList *l; diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h index 273c316879..0be9b8538b 100644 --- a/calendar/gui/dialogs/task-page.h +++ b/calendar/gui/dialogs/task-page.h @@ -80,7 +80,7 @@ void task_page_show_options (TaskPage *page); void task_page_hide_options (TaskPage *page); void task_page_set_assignment (TaskPage *page, gboolean set); -void task_page_send_options_clicked_cb(TaskPage *tpage); +void task_page_send_options_clicked_cb (TaskPage *tpage); void task_page_set_view_role (TaskPage *page, gboolean state); void task_page_set_view_status (TaskPage *page, -- cgit v1.2.3