diff options
Diffstat (limited to 'calendar/gui/dialogs')
30 files changed, 1150 insertions, 1150 deletions
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 342f8be472..7267c29380 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -71,7 +71,7 @@ typedef struct { /* The client */ ECal *ecal; - + /* Toplevel */ GtkWidget *toplevel; @@ -89,7 +89,7 @@ typedef struct { GtkWidget *repeat_unit; GtkWidget *option_notebook; - + /* Display alarm widgets */ GtkWidget *dalarm_group; GtkWidget *dalarm_message; @@ -212,7 +212,7 @@ alarm_to_dialog (Dialog *dialog) gboolean repeat; ECalComponentAlarmAction action; char *email; - int i; + int i; /* Clean the page */ clear_widgets (dialog); @@ -232,7 +232,7 @@ alarm_to_dialog (Dialog *dialog) && e_cal_get_alarm_email_address (dialog->ecal, &email, NULL)) { ECalComponentAttendee *a; GSList attendee_list; - + a = g_new0 (ECalComponentAttendee, 1); a->value = email; attendee_list.data = a; @@ -429,7 +429,7 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) icalcomponent *icalcomp; icalproperty *icalprop; GList *l; - + /* 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); @@ -440,7 +440,7 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) ECalComponentAttendee *a; dest = l->data; - + a = g_new0 (ECalComponentAttendee, 1); a->value = e_destination_get_email (dest); a->cn = e_destination_get_name (dest); @@ -455,7 +455,7 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->malarm_message))) return; - + /* Description */ text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description)); gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start); @@ -574,11 +574,11 @@ palarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm) description.value = str; description.altrep = NULL; - + e_cal_component_alarm_set_description (alarm, &description); g_free (str); - + /* 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); @@ -621,7 +621,7 @@ populate_widgets_from_alarm (Dialog *dialog) e_dialog_option_menu_set (dialog->time, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START, time_map); break; - case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END: + case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END: e_dialog_option_menu_set (dialog->time, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END, time_map); break; default: @@ -790,7 +790,7 @@ get_widgets (Dialog *dialog) dialog->malarm_addressbook = GW ("malarm-addressbook"); dialog->malarm_message = GW ("malarm-message"); dialog->malarm_description = GW ("malarm-description"); - + dialog->palarm_group = GW ("palarm-group"); dialog->palarm_program = GW ("palarm-program"); dialog->palarm_args = GW ("palarm-args"); @@ -821,7 +821,7 @@ get_widgets (Dialog *dialog) && dialog->malarm_description && dialog->palarm_group && dialog->palarm_program - && dialog->palarm_args); + && dialog->palarm_args); } #if 0 @@ -910,7 +910,7 @@ check_custom_sound (Dialog *dialog) { char *str, *dir; gboolean sens; - + str = gtk_file_chooser_get_filename ( GTK_FILE_CHOOSER (dialog->aalarm_file_chooser)); @@ -943,7 +943,7 @@ static void aalarm_attach_changed_cb (GtkWidget *widget, gpointer data) { Dialog *dialog = data; - + check_custom_sound (dialog); } @@ -954,7 +954,7 @@ check_custom_message (Dialog *dialog) GtkTextBuffer *text_buffer; GtkTextIter text_iter_start, text_iter_end; gboolean sens; - + text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description)); gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start); gtk_text_buffer_get_end_iter (text_buffer, &text_iter_end); @@ -982,7 +982,7 @@ static void dalarm_description_changed_cb (GtkWidget *widget, gpointer data) { Dialog *dialog = data; - + check_custom_message (dialog); } @@ -991,7 +991,7 @@ check_custom_program (Dialog *dialog) { char *str; gboolean sens; - + str = e_dialog_editable_get (dialog->palarm_program); sens = str && *str; @@ -1002,7 +1002,7 @@ static void palarm_program_changed_cb (GtkWidget *widget, gpointer data) { Dialog *dialog = data; - + check_custom_program (dialog); } @@ -1037,7 +1037,7 @@ malarm_addresses_changed_cb (GtkWidget *editable, gpointer data) { Dialog *dialog = data; - + check_custom_email (dialog); } @@ -1057,7 +1057,7 @@ static void malarm_description_changed_cb (GtkWidget *widget, gpointer data) { Dialog *dialog = data; - + check_custom_email (dialog); } @@ -1068,7 +1068,7 @@ action_selection_done_cb (GtkMenuShell *menu_shell, gpointer data) char *dir; ECalComponentAlarmAction action; int page = 0, i; - + action = e_dialog_option_menu_get (dialog->action, action_map); for (i = 0; action_map[i] != -1 ; i++) { if (action == action_map[i]) { @@ -1076,11 +1076,11 @@ action_selection_done_cb (GtkMenuShell *menu_shell, gpointer data) break; } } - + gtk_notebook_set_current_page ( GTK_NOTEBOOK (dialog->option_notebook), page); - switch (action) { + switch (action) { case E_CAL_COMPONENT_ALARM_AUDIO: dir = calendar_config_get_dir_path (); if ( dir && *dir ) @@ -1114,7 +1114,7 @@ init_widgets (Dialog *dialog) { GtkWidget *menu; GtkTextBuffer *text_buffer; - + menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dialog->action)); g_signal_connect (menu, "selection_done", G_CALLBACK (action_selection_done_cb), @@ -1158,12 +1158,12 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) int response_id; GList *icon_list; char *gladefile; - + g_return_val_if_fail (alarm != NULL, FALSE); dialog.alarm = alarm; dialog.ecal = ecal; - + gladefile = g_build_filename (EVOLUTION_GLADEDIR, "alarm-dialog.glade", NULL); @@ -1201,7 +1201,7 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel), GTK_WINDOW (parent)); - + response_id = gtk_dialog_run (GTK_DIALOG (dialog.toplevel)); if (response_id == GTK_RESPONSE_OK) diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index de59361519..4b2be10d48 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -59,7 +59,7 @@ typedef struct { /* The list store */ EAlarmList *list_store; - + /* Toplevel */ GtkWidget *toplevel; @@ -68,7 +68,7 @@ typedef struct { GtkWidget *edit; GtkWidget *delete; GtkWidget *box; - + } Dialog; /* Gets the widgets from the XML file and returns TRUE if they are all available. */ @@ -83,7 +83,7 @@ get_widgets (Dialog *dialog) dialog->box = GW ("vbox53"); dialog->list = GW ("list"); - dialog->add = GW ("add"); + dialog->add = GW ("add"); dialog->edit = GW ("edit"); dialog->delete = GW ("delete"); @@ -130,7 +130,7 @@ add_clicked_cb (GtkButton *button, gpointer data) GtkTreeIter iter; icalcomponent *icalcomp; icalproperty *icalprop; - + view = GTK_TREE_VIEW (dialog->list); alarm = e_cal_component_alarm_new (); @@ -139,7 +139,7 @@ add_clicked_cb (GtkButton *button, gpointer data) icalprop = icalproperty_new_x ("1"); icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION"); icalcomponent_add_property (icalcomp, icalprop); - + if (alarm_dialog_run (dialog->toplevel, dialog->ecal, alarm)) { e_alarm_list_append (dialog->list_store, &iter, alarm); gtk_tree_selection_select_iter (gtk_tree_view_get_selection (view), &iter); @@ -271,9 +271,9 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store) int response_id; GList *icon_list; char *gladefile; - + dialog.ecal = ecal; - dialog.list_store = list_store; + dialog.list_store = list_store; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "alarm-list-dialog.glade", @@ -294,7 +294,7 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store) init_widgets (&dialog); sensitize_buttons (&dialog); - + gtk_widget_ensure_style (dialog.toplevel); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12); @@ -323,10 +323,10 @@ alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store) { Dialog *dialog; char *gladefile; - + dialog = (Dialog *)g_new (Dialog, 1); dialog->ecal = ecal; - dialog->list_store = list_store; + dialog->list_store = list_store; gladefile = g_build_filename (EVOLUTION_GLADEDIR, "alarm-list-dialog.glade", @@ -347,7 +347,7 @@ alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store) init_widgets (dialog); sensitize_buttons (dialog); - + g_object_unref (dialog->xml); /* Free the other stuff when the parent really gets destroyed. */ diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c index aa57f95dc7..c8f5e89057 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.c +++ b/calendar/gui/dialogs/cal-attachment-select-file.c @@ -58,9 +58,9 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho GtkWidget *showinline = NULL; char *path; GList *icon_list; - + path = g_object_get_data ((GObject *) editor, "attach_path"); - + if (flags & SELECTOR_MODE_SAVE) selection = gtk_file_chooser_dialog_new (title, NULL, @@ -75,49 +75,49 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL); - + gtk_dialog_set_default_response (GTK_DIALOG (selection), GTK_RESPONSE_OK); gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (selection), FALSE); - + if ((flags & SELECTOR_MODE_SAVE) == 0) gtk_file_chooser_set_select_multiple ((GtkFileChooser *) selection, (flags & SELECTOR_MODE_MULTI)); - + /* restore last path used */ if (!path) gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), g_get_home_dir ()); else gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (selection), path); - + if (showinline_p) { showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment")); gtk_widget_show (showinline); gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (selection), showinline); } - + gtk_window_set_transient_for ((GtkWindow *) selection, (GtkWindow *) editor); gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor"); gtk_window_set_modal ((GtkWindow *) selection, TRUE); - + icon_list = e_icon_factory_get_icon_list ("mail-message-new"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); g_list_free (icon_list); } - + if (gtk_dialog_run ((GtkDialog *) selection) == GTK_RESPONSE_OK) { if (showinline_p) *showinline_p = gtk_toggle_button_get_active ((GtkToggleButton *) showinline); - + path = g_path_get_dirname (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection))); - + g_object_set_data_full ((GObject *) editor, "attach_path", g_strdup_printf ("%s/", path), g_free); g_free (path); } else { gtk_widget_destroy (selection); selection = NULL; } - + return selection; } @@ -139,7 +139,7 @@ comp_editor_select_file (CompEditor *editor, const char *title, gboolean save_mo guint32 flags = save_mode ? SELECTOR_MODE_SAVE : SELECTOR_MODE_MULTI; GtkWidget *selection; char *name = NULL; - + selection = run_selector (editor, title, flags, NULL); if (selection) { name = g_strdup (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection))); @@ -154,15 +154,15 @@ comp_editor_select_file_attachments (CompEditor *editor, gboolean *showinline_p) { GtkWidget *selection; GPtrArray *list = NULL; - + selection = run_selector (editor, _("Attach file(s)"), SELECTOR_MODE_MULTI, showinline_p); - + if (selection) { GSList *l, *n; - + if ((l = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (selection)))) { list = g_ptr_array_new (); - + while (l) { n = l->next; g_ptr_array_add (list, l->data); @@ -170,10 +170,10 @@ comp_editor_select_file_attachments (CompEditor *editor, gboolean *showinline_p) l = n; } } - + gtk_widget_destroy (selection); } - + return list; } diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index afea9a8df2..a916359b2b 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -124,11 +124,11 @@ timezone_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (prefs->timezone)); icalcomp = icaltimezone_get_component (zone); - if (!(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT))) + if (!(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT))) gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, FALSE); - else + else gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, TRUE); - + calendar_config_set_timezone (icaltimezone_get_location (zone)); } @@ -334,7 +334,7 @@ alarms_selection_changed (ESourceSelector *selector, CalendarPrefsDialog *prefs) alarm = e_source_get_property (source, "alarm"); if (alarm && !g_ascii_strcasecmp (alarm, "never")) continue; - + g_message ("Unsetting for %s", e_source_peek_name (source)); e_source_set_property (source, "alarm", "false"); } @@ -356,7 +356,7 @@ alarms_selection_changed (ESourceSelector *selector, CalendarPrefsDialog *prefs) e_source_selector_free_selection (selection); /* FIXME show an error if this fails? */ - e_source_list_sync (source_list, NULL); + e_source_list_sync (source_list, NULL); } static void @@ -406,7 +406,7 @@ setup_changes (CalendarPrefsDialog *prefs) g_signal_connect (G_OBJECT (prefs->default_reminder_units), "changed", G_CALLBACK (default_reminder_units_changed), prefs); g_signal_connect (G_OBJECT (prefs->alarm_list_widget), "selection_changed", G_CALLBACK (alarms_selection_changed), prefs); - + g_signal_connect (G_OBJECT (prefs->template_url), "changed", G_CALLBACK (template_url_changed), prefs); } @@ -506,14 +506,14 @@ show_config (CalendarPrefsDialog *prefs) g_free (location); icalcomp = icaltimezone_get_component (zone); - if (!(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT))) + if (!(dl_comp = icalcomponent_get_first_component (icalcomp, ICAL_XDAYLIGHT_COMPONENT))) gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, FALSE); - else + else gtk_widget_set_sensitive ((GtkWidget *) prefs->daylight_saving, TRUE); - + set = calendar_config_get_daylight_saving (); gtk_toggle_button_set_active ((GtkToggleButton *) prefs->daylight_saving, set); - + /* Working Days. */ working_days = calendar_config_get_working_days (); mask = 1 << 0; @@ -665,7 +665,7 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs) /* Alarms tab */ prefs->scrolled_window = glade_xml_get_widget (gui, "calendar-source-scrolled-window"); - + /* Free/Busy tab */ prefs->template_url = glade_xml_get_widget (gui, "template_url"); target = e_cal_config_target_new_prefs (ec, prefs->gconf); diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h index d6f84aae4d..d0df6e4a12 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.h +++ b/calendar/gui/dialogs/cal-prefs-dialog.h @@ -1,14 +1,14 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Author : +/* + * Author : * David Trowbridge <trowbrds cs colorado edu> * Damon Chaplin <damon@ximian.com> * * Copyright (C) 2005 Novell, Inc. (www.novell.com) * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index a7b2e15b80..3f6bcf4e45 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -243,15 +243,15 @@ eccp_get_source_name (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, return entry; } -static void +static void offline_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog) { - + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) e_source_set_property (sdialog->source, "offline_sync", "1"); - else - e_source_set_property (sdialog->source, "offline_sync", "0"); - + else + e_source_set_property (sdialog->source, "offline_sync", "0"); + } static GtkWidget * @@ -268,9 +268,9 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, else { row = ((GtkTable*)parent)->nrows; - if (sdialog->source_type == E_CAL_SOURCE_TYPE_EVENT) + if (sdialog->source_type == E_CAL_SOURCE_TYPE_EVENT) offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y calendar contents locally for offline operation")); - else if (sdialog->source_type == E_CAL_SOURCE_TYPE_TODO) + else if (sdialog->source_type == E_CAL_SOURCE_TYPE_TODO) offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y task list contents locally for offline operation")); else if(sdialog->source_type == E_CAL_SOURCE_TYPE_JOURNAL) offline_setting = gtk_check_button_new_with_mnemonic (_("Cop_y memo list contents locally for offline operation")); @@ -280,7 +280,7 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, gtk_table_attach (GTK_TABLE (parent), offline_setting, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); } - + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (offline_setting), (offline_sync && g_str_equal (offline_sync, "1")) ? TRUE : FALSE); if (is_local) gtk_widget_hide (offline_setting); @@ -397,7 +397,7 @@ static ECalConfigItem ecmp_items[] = { { 0 }, }; -/** +/** * cs_load_sources: * @sdialog: dialog where to load sources list * @conf_key: configuration key where to get sources' list @@ -463,7 +463,7 @@ calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourc e_source_set_absolute_uri (sdialog->source, NULL); e_source_set_group (sdialog->source, sdialog->source_group); - sdialog->source_type = E_CAL_SOURCE_TYPE_EVENT; + sdialog->source_type = E_CAL_SOURCE_TYPE_EVENT; sdialog->config = ec = e_cal_config_new (E_CONFIG_BOOK, "org.gnome.evolution.calendar.calendarProperties"); for (i = 0; eccp_items[i].path; i++) items = g_slist_prepend (items, &eccp_items[i]); @@ -478,7 +478,7 @@ calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourc sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("Calendar Properties")); else sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("New Calendar")); - + /* forces initial validation */ if (!sdialog->original_source) e_config_target_changed ((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE); diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index ffecf671c8..93dfc1d4b1 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -33,7 +33,7 @@ /* is_past_event: - * + * * returns TRUE if @comp is in the past, FALSE otherwise. * Comparision is based only on date part, time part is ignored. */ @@ -56,10 +56,10 @@ is_past_event (ECalComponent *comp) /** * cancel_component_dialog: - * + * * Pops up a dialog box asking the user whether he wants to send a * cancel and delete an iTip/iMip message - * + * * Return value: TRUE if the user clicked Yes, FALSE otherwise. **/ gboolean @@ -67,12 +67,12 @@ cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, g { ECalComponentVType vtype; const char *id; - + if (deleting && e_cal_get_save_schedules (client)) return TRUE; - + vtype = e_cal_component_get_vtype (comp); - + switch (vtype) { case E_CAL_COMPONENT_EVENT: if (is_past_event (comp)) { @@ -103,7 +103,7 @@ cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, g g_message (G_STRLOC ": Cannot handle object of type %d", vtype); return FALSE; } - + if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES) return TRUE; else diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index 6afae1a6b3..bfc89604e3 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -37,10 +37,10 @@ * @comp: A calendar component * @deleted: Whether the object is being deleted or updated * @changed: Whether or not the user has made changes - * + * * Pops up a dialog box asking the user whether changes made (if any) * should be thrown away because the item has been updated elsewhere - * + * * Return value: TRUE if the user clicked Yes, FALSE otherwise. **/ gboolean @@ -51,7 +51,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet char *str; gint response; GList *icon_list; - + vtype = e_cal_component_get_vtype (comp); if (deleted) { @@ -76,7 +76,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet if (changed) str = g_strdup_printf (_("%s You have made changes. Forget those changes and close the editor?"), str); else - str = g_strdup_printf (_("%s You have made no changes, close the editor?"), str); + str = g_strdup_printf (_("%s You have made no changes, close the editor?"), str); } else { switch (vtype) { @@ -100,20 +100,20 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet if (changed) str = g_strdup_printf (_("%s You have made changes. Forget those changes and update the editor?"), str); else - str = g_strdup_printf (_("%s You have made no changes, update the editor?"), str); + str = g_strdup_printf (_("%s You have made no changes, update the editor?"), str); } - + dialog = gtk_message_dialog_new (parent, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, str); - + icon_list = e_icon_factory_get_icon_list ("stock_calendar"); if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); g_list_free (icon_list); } - + response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c index 897764dfa8..174f7eb50d 100644 --- a/calendar/gui/dialogs/comp-editor-page.c +++ b/calendar/gui/dialogs/comp-editor-page.c @@ -58,10 +58,10 @@ static guint comp_editor_page_signals[LAST_SIGNAL]; /** * comp_editor_page_get_type: - * + * * Registers the #CompEditorPage class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the #CompEditorPage class. **/ GtkType @@ -143,23 +143,23 @@ comp_editor_page_class_init (CompEditorPageClass *class) NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); - comp_editor_page_signals[FOCUS_IN] = + comp_editor_page_signals[FOCUS_IN] = g_signal_new ("focus_in", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (CompEditorPageClass, focus_in), NULL, NULL, g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); - comp_editor_page_signals[FOCUS_OUT] = + G_TYPE_NONE, 1, G_TYPE_POINTER); + comp_editor_page_signals[FOCUS_OUT] = g_signal_new ("focus_out", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (CompEditorPageClass, focus_out), NULL, NULL, g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, 1, G_TYPE_POINTER); - + G_TYPE_NONE, 1, G_TYPE_POINTER); + class->changed = NULL; class->summary_changed = NULL; class->dates_changed = NULL; @@ -213,9 +213,9 @@ comp_editor_page_destroy (GtkObject *object) /** * comp_editor_page_get_widget: * @page: An editor page. - * + * * Queries the main widget of an editor page. - * + * * Return value: The widget that is the page's upper container. It should * normally be inserted in a notebook widget. **/ @@ -232,7 +232,7 @@ comp_editor_page_get_widget (CompEditorPage *page) /** * comp_editor_page_focus_main_widget: * @page: An editor page. - * + * * Makes an editor page focus its main widget. This is used by the component * editor when it first pops up so that it can focus the main widget in the * first page. @@ -251,7 +251,7 @@ comp_editor_page_focus_main_widget (CompEditorPage *page) * comp_editor_page_fill_widgets: * @page: An editor page. * @comp: A calendar component. - * + * * Fills the widgets of an editor page with the data from a calendar component. **/ gboolean @@ -268,7 +268,7 @@ comp_editor_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) * comp_editor_page_fill_component: * @page: An editor page. * @comp: A calendar component. - * + * * Takes the data from the widgets of an editor page and sets it on a calendar * component, replacing the contents of the properties that the editor page * knows how to manipulate. @@ -338,7 +338,7 @@ comp_editor_page_set_e_cal (CompEditorPage *page, ECal *client) * comp_editor_page_set_summary: * @page: An editor page * @summary: The text of the new summary value - * + * * Sets the summary value for this group of widgets **/ void @@ -373,7 +373,7 @@ comp_editor_page_unset_focused_widget (CompEditorPage *page, GtkWidget *widget) * @page: An editor page * @widget: The widget that has the current focus **/ -void +void comp_editor_page_set_focused_widget (CompEditorPage *page, GtkWidget *widget) { g_return_if_fail (page!= NULL); @@ -388,7 +388,7 @@ comp_editor_page_set_focused_widget (CompEditorPage *page, GtkWidget *widget) * comp_editor_page_set_dates: * @page: An editor page * @dates: A collection of various dates in time_t format - * + * * Sets the date values for this group of widgets **/ void @@ -404,7 +404,7 @@ comp_editor_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates) /** * comp_editor_page_notify_changed: * @page: An editor page. - * + * * Makes an editor page emit the "changed" signal. This is meant to be * used only by page implementations. **/ @@ -419,9 +419,9 @@ comp_editor_page_notify_changed (CompEditorPage *page) /** * comp_editor_page_notify_needs_send: - * @page: - * - * + * @page: + * + * **/ void comp_editor_page_notify_needs_send (CompEditorPage *page) @@ -429,13 +429,13 @@ comp_editor_page_notify_needs_send (CompEditorPage *page) g_return_if_fail (page != NULL); g_return_if_fail (IS_COMP_EDITOR_PAGE (page)); - gtk_signal_emit (GTK_OBJECT (page), comp_editor_page_signals[NEEDS_SEND]); + gtk_signal_emit (GTK_OBJECT (page), comp_editor_page_signals[NEEDS_SEND]); } /** * comp_editor_page_notify_summary_changed: * @page: An editor page. - * + * * Makes an editor page emit the "summary_changed" signal. This is meant to be * used only by page implementations. **/ @@ -446,7 +446,7 @@ comp_editor_page_notify_summary_changed (CompEditorPage *page, g_return_if_fail (page != NULL); g_return_if_fail (IS_COMP_EDITOR_PAGE (page)); - + gtk_signal_emit (GTK_OBJECT (page), comp_editor_page_signals[SUMMARY_CHANGED], summary); @@ -455,7 +455,7 @@ comp_editor_page_notify_summary_changed (CompEditorPage *page, /** * comp_editor_page_notify_dates_changed: * @page: An editor page. - * + * * Makes an editor page emit the "dates_changed" signal. This is meant to be * used only by page implementations. **/ @@ -474,7 +474,7 @@ comp_editor_page_notify_dates_changed (CompEditorPage *page, /** * comp_editor_page_notify_client_changed: * @page: An editor page. - * + * * Makes an editor page emit the "client_changed" signal. This is meant to be * used only by page implementations. **/ diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 8aa7bbd734..dabf01745e 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -43,7 +43,7 @@ * comp_editor_dates: * @dates: A structure to be filled out with dates of a component * @comp: The component to extract the dates from - * + * * Extracts the dates from the calendar component into the * CompEditorPageDates structure. Call comp_editor_free_dates() to free the * results. @@ -57,7 +57,7 @@ comp_editor_dates (CompEditorPageDates *dates, ECalComponent *comp) dates->end = NULL; dates->due = NULL; dates->complete = NULL; - + /* Note that the ECalComponentDateTime's returned contain allocated icaltimetype and tzid values, so we just take over ownership of those. */ @@ -119,7 +119,7 @@ write_label_piece (struct icaltimetype *tt, char *buffer, int size, struct tm tmp_tm = { 0 }; struct icaltimetype tt_copy = *tt; int len; - + /* FIXME: May want to convert the time to an appropriate zone. */ if (stext != NULL) @@ -145,7 +145,7 @@ write_label_piece (struct icaltimetype *tt, char *buffer, int size, len = strlen (buffer); e_time_format_date_and_time (&tmp_tm, - calendar_config_get_24_hour_format (), + calendar_config_get_24_hour_format (), !tt_copy.is_date, FALSE, &buffer[len], size - len); if (etext != NULL) @@ -156,7 +156,7 @@ write_label_piece (struct icaltimetype *tt, char *buffer, int size, * comp_editor_date_label: * @dates: The dates to use in constructing a label * @label: The label whose text is to be set - * + * * Set the text of a label based on the dates available and the user's * formatting preferences **/ @@ -192,7 +192,7 @@ comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label) else write_label_piece (dates->complete, buffer, 1024, _("Completed "), NULL, NULL); } - + if (due_set && dates->complete == NULL) { if (start_set) write_label_piece (dates->due->value, buffer, 1024, _(" (Due "), ")", NULL); @@ -207,7 +207,7 @@ static void date_edit_destroy_cb (EDateEdit *date_edit, gpointer data) { EDateEditConfig *config = data; - + g_object_unref (config); } @@ -218,9 +218,9 @@ date_edit_destroy_cb (EDateEdit *date_edit, gpointer data) * @make_time_insensitive: Whether the time field is made insensitive rather * than hiding it. This is useful if you want to preserve the layout of the * widgets. - * + * * Creates a new #EDateEdit widget, configured using the calendar's preferences. - * + * * Return value: A newly-created #EDateEdit widget. **/ GtkWidget * @@ -229,7 +229,7 @@ comp_editor_new_date_edit (gboolean show_date, gboolean show_time, { EDateEdit *dedit; EDateEditConfig *config; - + dedit = E_DATE_EDIT (e_date_edit_new ()); e_date_edit_set_show_date (dedit, show_date); @@ -239,10 +239,10 @@ comp_editor_new_date_edit (gboolean show_date, gboolean show_time, #else e_date_edit_set_make_time_insensitive (dedit, FALSE); #endif - + config = e_date_edit_config_new (dedit); g_signal_connect (G_OBJECT (dedit), "destroy", G_CALLBACK (date_edit_destroy_cb), config); - + return GTK_WIDGET (dedit); } @@ -280,10 +280,10 @@ comp_editor_get_current_time (GtkObject *object, gpointer data) /** * comp_editor_strip_categories: * @categories: A string of category names entered by the user. - * + * * Takes a string of the form "categ, categ, categ, ..." and removes the * whitespace between categories to result in "categ,categ,categ,..." - * + * * Return value: The category names stripped of surrounding whitespace * and separated with commas. **/ @@ -329,7 +329,7 @@ comp_editor_strip_categories (const char *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 e2ca1b5730..2b2b797775 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -81,7 +81,7 @@ struct _CompEditorPrivate { /* Client to use */ ECal *client; - + /* Source client (where comp lives currently) */ ECal *source_client; @@ -98,7 +98,7 @@ struct _CompEditorPrivate { GtkNotebook *notebook; /* Focussed Widget*/ - GtkWidget *focused_entry; + GtkWidget *focused_entry; /* Attachment handling */ GtkWidget *attachment_bar; @@ -109,20 +109,20 @@ struct _CompEditorPrivate { GtkWidget *attachment_expander_num; guint32 attachment_bar_visible : 1; - - /* TODO use this flags for setting all the boolean variables + + /* TODO use this flags for setting all the boolean variables below */ CompEditorFlags flags; - + gboolean changed; gboolean needs_send; CalObjModType mod; - + gboolean existing_org; gboolean user_org; gboolean is_group_item; - + gboolean warned; char *help_section; @@ -212,12 +212,12 @@ attach_message(CompEditor *editor, CamelMimeMessage *msg) g_free(desc); } else camel_mime_part_set_description(mime_part, _("Attached message")); - + i = e_attachment_bar_get_num_attachments (E_ATTACHMENT_BAR (editor->priv->attachment_bar)); i++; filename = g_strdup_printf ("email%d",i); camel_mime_part_set_filename (mime_part, filename); - + camel_medium_set_content_object((CamelMedium *)mime_part, (CamelDataWrapper *)msg); camel_mime_part_set_content_type(mime_part, "message/rfc822"); e_attachment_bar_attach_mime_part(E_ATTACHMENT_BAR(editor->priv->attachment_bar), mime_part); @@ -259,7 +259,7 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele stream = camel_stream_mem_new (); camel_stream_write (stream, (char *)selection->data, selection->length); camel_stream_reset (stream); - + msg = camel_mime_message_new (); if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg, stream) != -1) { attach_message(editor, msg); @@ -276,7 +276,7 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele tmp = g_strndup ((char *)selection->data, selection->length); urls = g_strsplit (tmp, "\n", 0); g_free (tmp); - + for (i = 0; urls[i] != NULL; i++) { str = g_strstrip (urls[i]); if (urls[i][0] == '#') { @@ -309,7 +309,7 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele g_free (str); } } - + g_free (urls); success = TRUE; break; @@ -317,15 +317,15 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele case DND_TYPE_TEXT_CALENDAR: content_type = gdk_atom_name (selection->type); d(printf ("dropping a %s\n", content_type)); - + mime_part = camel_mime_part_new (); camel_mime_part_set_content (mime_part, (char *)selection->data, selection->length, content_type); camel_mime_part_set_disposition (mime_part, "inline"); - + e_attachment_bar_attach_mime_part (E_ATTACHMENT_BAR (editor->priv->attachment_bar), mime_part); - + camel_object_unref (mime_part); g_free (content_type); @@ -393,7 +393,7 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele desc = g_strdup_printf(ngettext("Attached message", "%d attached messages", uids->len), uids->len); camel_mime_part_set_description(mime_part, desc); g_free(desc); - + num = e_attachment_bar_get_num_attachments (E_ATTACHMENT_BAR (editor->priv->attachment_bar)); num++; filename = g_strdup_printf ("email%d", num); @@ -591,23 +591,23 @@ listen_for_changes (CompEditor *editor) G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); - + g_object_unref (priv->view); priv->view = NULL; } - + /* Listen for changes */ if (priv->comp) e_cal_component_get_uid (priv->comp, &uid); if (uid) { char *query; - + query = g_strdup_printf ("(uid? \"%s\")", uid); e_cal_get_query (priv->source_client, query, &priv->view, NULL); g_free (query); } - + if (priv->view) { g_signal_connect (priv->view, "objects_modified", G_CALLBACK (obj_modified_cb), editor); @@ -654,9 +654,9 @@ get_attachment_list (CompEditor *editor) char *attach_file_url; char *safe_fname, *utf8_safe_fname; char *filename; - + wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (p->data)); - + /* Extract the content from the stream and write it down * as a mime part file into the directory denoting the * calendar source */ @@ -682,7 +682,7 @@ get_attachment_list (CompEditor *editor) g_free (filename); continue; } - + if (camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) stream) == -1) { g_free (attach_file_url); camel_stream_close (stream); @@ -747,7 +747,7 @@ save_comp (CompEditor *editor) /* retrieve all timezones */ comp_editor_page_fill_timezones (l->data, timezones); } - + /* If we are not the organizer, we don't update the sequence number */ if (!e_cal_component_has_organizer (clone) || itip_organizer_is_user (clone, priv->client) || itip_sentby_is_user (clone)) e_cal_component_commit_sequence (clone); @@ -762,11 +762,11 @@ save_comp (CompEditor *editor) /* send timezones */ g_hash_table_foreach (timezones, (GHFunc) send_timezone, editor); g_hash_table_destroy (timezones); - + /* Attachments*/ - + e_cal_component_set_attachment_list (priv->comp, - get_attachment_list (editor)); + get_attachment_list (editor)); icalcomp = e_cal_component_get_icalcomponent (priv->comp); /* send the component to the server */ if (!cal_comp_is_on_server (priv->comp, priv->client)) { @@ -812,7 +812,7 @@ save_comp (CompEditor *editor) if (delay_set) return TRUE; } - + if (!result) { GtkWidget *dialog; @@ -835,7 +835,7 @@ save_comp (CompEditor *editor) e_cal_get_source (priv->source_client)) && cal_comp_is_on_server (priv->comp, priv->source_client)) { /* Comp found a new home. Remove it from old one. */ - + if (e_cal_component_is_instance (priv->comp) || e_cal_component_has_recurrences (priv->comp)) e_cal_remove_object_with_mod (priv->source_client, orig_uid, NULL, CALOBJ_MOD_ALL, NULL); @@ -846,7 +846,7 @@ save_comp (CompEditor *editor) * again this session. */ g_object_unref (priv->source_client); priv->source_client = g_object_ref (priv->client); - + listen_for_changes (editor); } @@ -864,19 +864,19 @@ save_comp_with_send (CompEditor *editor) gboolean delegate; priv = editor->priv; - + send = priv->changed && priv->needs_send; delegate = priv->flags & COMP_EDITOR_DELEGATE; - + if (delegate) { icalcomponent *icalcomp = e_cal_component_get_icalcomponent (priv->comp); icalproperty *icalprop; - + icalprop = icalproperty_new_x ("1"); icalproperty_set_x_name (icalprop, "X-EVOLUTION-DELEGATED"); icalcomponent_add_property (icalcomp, icalprop); } - + if (!save_comp (editor)) return FALSE; @@ -889,7 +889,7 @@ save_comp_with_send (CompEditor *editor) } else { if (!comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST)) return FALSE; - + if (delegate) return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REPLY); } @@ -933,7 +933,7 @@ prompt_and_save_changes (CompEditor *editor, gboolean send) if (e_cal_component_is_instance (priv->comp)) if (!recur_component_dialog (priv->client, priv->comp, &priv->mod, GTK_WINDOW (editor), FALSE)) return FALSE; - + if (send && save_comp_with_send (editor)) return TRUE; else if (!send && save_comp (editor)) @@ -954,7 +954,7 @@ delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data) CompEditor *editor = COMP_EDITOR (data); commit_all_fields (editor); - + if (prompt_and_save_changes (editor, TRUE)) close_dialog (editor); @@ -966,7 +966,7 @@ attachment_bar_changed_cb (EAttachmentBar *bar, void *data) { CompEditor *editor = COMP_EDITOR (data); - + guint attachment_num = e_attachment_bar_get_num_attachments ( E_ATTACHMENT_BAR (editor->priv->attachment_bar)); if (attachment_num) { @@ -979,37 +979,37 @@ attachment_bar_changed_cb (EAttachmentBar *bar, gtk_widget_show (editor->priv->attachment_expander_icon); e_expander_set_expanded(E_EXPANDER(editor->priv->attachment_expander),TRUE); - + } else { gtk_label_set_text (GTK_LABEL (editor->priv->attachment_expander_num), ""); gtk_widget_hide (editor->priv->attachment_expander_icon); e_expander_set_expanded(E_EXPANDER(editor->priv->attachment_expander),FALSE); } - - + + /* Mark the editor as changed so it prompts about unsaved changes on close */ comp_editor_set_changed (editor, TRUE); } -static void -attachment_expander_activate_cb (EExpander *expander, - void *data) -{ - CompEditor *editor = COMP_EDITOR (data); - gboolean show = e_expander_get_expanded (expander); - - /* Update the expander label */ - if (show) - gtk_label_set_text_with_mnemonic (GTK_LABEL (editor->priv->attachment_expander_label), - _("Hide Attachment _Bar")); - else - gtk_label_set_text_with_mnemonic (GTK_LABEL (editor->priv->attachment_expander_label), - _("Show Attachment _Bar")); +static void +attachment_expander_activate_cb (EExpander *expander, + void *data) +{ + CompEditor *editor = COMP_EDITOR (data); + gboolean show = e_expander_get_expanded (expander); + + /* Update the expander label */ + if (show) + gtk_label_set_text_with_mnemonic (GTK_LABEL (editor->priv->attachment_expander_label), + _("Hide Attachment _Bar")); + else + gtk_label_set_text_with_mnemonic (GTK_LABEL (editor->priv->attachment_expander_label), + _("Show Attachment _Bar")); } -static gboolean +static gboolean open_attachment (EAttachmentBar *bar, CompEditor *editor) { GnomeIconList *icon_list; @@ -1017,7 +1017,7 @@ open_attachment (EAttachmentBar *bar, CompEditor *editor) int num; char *attach_file_url; GError *error = NULL; - + if (E_IS_ATTACHMENT_BAR (bar)) { icon_list = GNOME_ICON_LIST (bar); p = gnome_icon_list_get_selection (icon_list); @@ -1028,7 +1028,7 @@ open_attachment (EAttachmentBar *bar, CompEditor *editor) char *filename = NULL; const char *local_store = e_cal_get_local_attachment_store (editor->priv->client); - e_cal_component_get_uid (editor->priv->comp, &comp_uid); + e_cal_component_get_uid (editor->priv->comp, &comp_uid); num = GPOINTER_TO_INT (p->data); list = e_attachment_bar_get_attachment (bar, num); attachment = list->data; @@ -1039,7 +1039,7 @@ open_attachment (EAttachmentBar *bar, CompEditor *editor) camel_mime_part_get_filename(attachment->body)); attach_file_url = g_build_path ("/", local_store, filename, NULL); - + /* launch the url now */ /* TODO should send GError and handle error conditions * here */ @@ -1050,14 +1050,14 @@ open_attachment (EAttachmentBar *bar, CompEditor *editor) g_free (filename); g_free (attach_file_url); } return TRUE; - } else + } else return FALSE; } -static gboolean +static gboolean attachment_bar_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, CompEditor *editor) { - if (E_IS_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) + if (E_IS_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) if (open_attachment (bar, editor)) return TRUE; return FALSE; @@ -1070,7 +1070,7 @@ cab_open(EPopup *ep, EPopupItem *item, void *data) { EAttachmentBar *bar = data; CompEditor *editor = COMP_EDITOR (gtk_widget_get_toplevel (GTK_WIDGET (bar))); - + if (!open_attachment (bar, editor)) g_message ("\n Open failed"); } @@ -1097,20 +1097,20 @@ cab_add(EPopup *ep, EPopupItem *item, void *data) if (!g_ascii_strcasecmp (url->protocol, "file")) e_attachment_bar_attach (bar, url->path, is_inline ? "inline" : "attachment"); - else + else e_attachment_bar_attach_remote_file (bar, file_list->pdata[i], is_inline ? "inline" : "attachment"); g_free (file_list->pdata[i]); camel_url_free (url); } - - g_ptr_array_free (file_list, TRUE); + + g_ptr_array_free (file_list, TRUE); } static void cab_properties(EPopup *ep, EPopupItem *item, void *data) { EAttachmentBar *bar = data; - + e_attachment_bar_edit_selected(bar); } @@ -1138,17 +1138,17 @@ cab_popup_position(GtkMenu *menu, int *x, int *y, gboolean *push_in, gpointer us GnomeIconList *icon_list = user_data; GList *selection; GnomeCanvasPixbuf *image; - + gdk_window_get_origin (((GtkWidget*) bar)->window, x, y); - + selection = gnome_icon_list_get_selection (icon_list); if (selection == NULL) return; - + image = gnome_icon_list_get_icon_pixbuf_item (icon_list, GPOINTER_TO_INT(selection->data)); if (image == NULL) return; - + /* Put menu to the center of icon. */ *x += (int)(image->item.x1 + image->item.x2) / 2; *y += (int)(image->item.y1 + image->item.y2) / 2; @@ -1197,7 +1197,7 @@ cab_popup(EAttachmentBar *bar, GdkEventButton *event, int id) /* GtkWidget methods. */ -static gboolean +static gboolean popup_menu_event (GtkWidget *widget) { cab_popup((EAttachmentBar *)widget, NULL, -1); @@ -1211,10 +1211,10 @@ button_press_event (GtkWidget *widget, GdkEventButton *event) EAttachmentBar *bar = (EAttachmentBar *)widget; GnomeIconList *icon_list = GNOME_ICON_LIST(widget); int icon_number = -1; - + if (event->button != 3) return FALSE; - + if (!gnome_icon_list_get_selection (icon_list)) { icon_number = gnome_icon_list_get_icon_at (icon_list, event->x, event->y); if (icon_number >= 0) { @@ -1224,7 +1224,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event) } cab_popup(bar, event, icon_number); - + return TRUE; } @@ -1236,7 +1236,7 @@ key_press_event(GtkWidget *widget, GdkEventKey *event) e_attachment_bar_remove_selected (bar); return TRUE; } - + return FALSE; } @@ -1245,13 +1245,13 @@ editor_key_press_event(GtkWidget *widget, GdkEventKey *event, CompEditor *editor { if (event->keyval == GDK_Escape) { commit_all_fields (editor); - + if (prompt_and_save_changes (editor, TRUE)) close_dialog (editor); return TRUE; } - + return FALSE; } /* Menu callbacks */ @@ -1270,23 +1270,23 @@ menu_file_save_cb (BonoboUIComponent *uic, if (e_attachment_bar_get_download_count (E_ATTACHMENT_BAR (editor->priv->attachment_bar)) ){ gboolean response = 1; /*FIXME: Cannot use mail functions from calendar!!!! */ -#if 0 +#if 0 ECalComponentVType vtype = e_cal_component_get_vtype(editor->priv->comp); if (vtype == E_CAL_COMPONENT_EVENT) - response = em_utils_prompt_user((GtkWindow *)widget, - NULL, - "calendar:ask-send-event-pending-download", + response = em_utils_prompt_user((GtkWindow *)widget, + NULL, + "calendar:ask-send-event-pending-download", NULL); else - response = em_utils_prompt_user((GtkWindow *)widget, - NULL, - "calendar:ask-send-task-pending-download", + response = em_utils_prompt_user((GtkWindow *)widget, + NULL, + "calendar:ask-send-task-pending-download", NULL); #endif - if (!response) + if (!response) return; - } + } if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) { e_error_run ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (editor)), "calendar:prompt-read-only-cal", NULL); @@ -1305,10 +1305,10 @@ menu_file_save_cb (BonoboUIComponent *uic, if (!correct) return; - if (!text.value) + if (!text.value) if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp)) return; - if (save_comp_with_send (editor)) + if (save_comp_with_send (editor)) close_dialog (editor); } @@ -1323,16 +1323,16 @@ menu_file_print_cb (BonoboUIComponent *uic, ECalComponent *comp; GList *l; icalcomponent *icalcomp = e_cal_component_get_icalcomponent (priv->comp); - + comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (icalcomp)); for (l = priv->pages; l != NULL; l = l->next) comp_editor_page_fill_component (l->data, comp); - + print_comp (comp, priv->client, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG); - g_object_unref (comp); + g_object_unref (comp); } static void @@ -1345,14 +1345,14 @@ menu_file_print_preview_cb (BonoboUIComponent *uic, ECalComponent *comp; GList *l; icalcomponent *icalcomp = e_cal_component_get_icalcomponent (priv->comp); - + comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (icalcomp)); for (l = priv->pages; l != NULL; l = l->next) - comp_editor_page_fill_component (l->data, comp); + comp_editor_page_fill_component (l->data, comp); print_comp (comp, priv->client, TRUE); - g_object_unref (comp); + g_object_unref (comp); } static void @@ -1361,7 +1361,7 @@ menu_file_close_cb (BonoboUIComponent *uic, const char *path) { CompEditor *editor = (CompEditor *) data; - + commit_all_fields (editor); if (prompt_and_save_changes (editor, TRUE)) @@ -1409,8 +1409,8 @@ menu_edit_selectall_cb (BonoboUIComponent *uic, if (GTK_IS_ENTRY (priv->focused_entry)) { gtk_editable_set_position (GTK_EDITABLE (priv->focused_entry), -1); gtk_editable_select_region (GTK_EDITABLE (priv->focused_entry), 0, -1); - } - if (GTK_IS_TEXT_VIEW (priv->focused_entry)) + } + if (GTK_IS_TEXT_VIEW (priv->focused_entry)) g_signal_emit_by_name (priv->focused_entry, "select-all", TRUE); } @@ -1421,7 +1421,7 @@ menu_edit_cut_cb (BonoboUIComponent *uic, { CompEditor *editor = data; CompEditorPrivate *priv = editor->priv; - + if (GTK_IS_ENTRY (priv->focused_entry)) gtk_editable_cut_clipboard (GTK_EDITABLE (priv->focused_entry)); if (GTK_IS_TEXT_VIEW (priv->focused_entry)) @@ -1454,13 +1454,13 @@ menu_insert_attachment_cb (BonoboUIComponent *uic, if (!g_ascii_strcasecmp (url->protocol, "file")) e_attachment_bar_attach (bar, url->path, is_inline ? "inline" : "attachment"); - else + else e_attachment_bar_attach_remote_file (bar, file_list->pdata[i], is_inline ? "inline" : "attachment"); g_free (file_list->pdata[i]); camel_url_free (url); } - - g_ptr_array_free (file_list, TRUE); + + g_ptr_array_free (file_list, TRUE); } static void @@ -1469,7 +1469,7 @@ menu_help_cb (BonoboUIComponent *uic, const char *path) { CompEditor *editor = (CompEditor *) data; - + comp_editor_show_help (editor); } @@ -1477,17 +1477,17 @@ static BonoboUIVerb verbs [] = { BONOBO_UI_VERB ("FileSave", menu_file_save_cb), BONOBO_UI_VERB ("CalendarPrint", menu_file_print_cb), - BONOBO_UI_VERB ("CalendarPrintPreview", menu_file_print_preview_cb), + BONOBO_UI_VERB ("CalendarPrintPreview", menu_file_print_preview_cb), BONOBO_UI_VERB ("FileClose", menu_file_close_cb), BONOBO_UI_VERB ("EditCopy", menu_edit_copy_cb), BONOBO_UI_VERB ("EditPaste", menu_edit_paste_cb), BONOBO_UI_VERB ("EditCut", menu_edit_cut_cb), - BONOBO_UI_VERB ("EditSelectAll", menu_edit_selectall_cb), + BONOBO_UI_VERB ("EditSelectAll", menu_edit_selectall_cb), BONOBO_UI_VERB ("InsertAttachments", menu_insert_attachment_cb), - + BONOBO_UI_VERB ("Help", menu_help_cb), - + BONOBO_UI_VERB_END }; @@ -1530,7 +1530,7 @@ setup_widgets (CompEditor *editor) gtk_notebook_set_show_tabs (priv->notebook, FALSE); g_signal_connect (editor, "delete_event", G_CALLBACK (delete_event_cb), editor); - g_signal_connect (editor, "key_press_event", G_CALLBACK (editor_key_press_event), editor); + g_signal_connect (editor, "key_press_event", G_CALLBACK (editor_key_press_event), editor); /*Attachments */ priv->attachment_scrolled_window = gtk_scrolled_window_new (NULL, NULL); @@ -1538,7 +1538,7 @@ setup_widgets (CompEditor *editor) GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->attachment_scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - + priv->attachment_bar = e_attachment_bar_new (NULL); g_signal_connect (priv->attachment_bar, "button_press_event", G_CALLBACK (button_press_event), NULL); @@ -1552,7 +1552,7 @@ setup_widgets (CompEditor *editor) g_signal_connect (priv->attachment_bar, "changed", G_CALLBACK (attachment_bar_changed_cb), editor); g_signal_connect (GNOME_ICON_LIST (priv->attachment_bar), "event", - G_CALLBACK (attachment_bar_icon_clicked_cb), editor); + G_CALLBACK (attachment_bar_icon_clicked_cb), editor); priv->attachment_expander_label = gtk_label_new_with_mnemonic (_("Show Attachment _Bar")); priv->attachment_expander_num = gtk_label_new (""); @@ -1560,12 +1560,12 @@ setup_widgets (CompEditor *editor) gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5); expander_hbox = gtk_hbox_new (FALSE, 0); - + attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf); gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5); gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1); - g_object_unref (attachment_pixbuf); + g_object_unref (attachment_pixbuf); gtk_box_pack_start (GTK_BOX (expander_hbox), priv->attachment_expander_label, TRUE, TRUE, 0); @@ -1584,8 +1584,8 @@ setup_widgets (CompEditor *editor) gtk_box_pack_start (GTK_BOX (vbox), priv->attachment_expander, FALSE, FALSE, GNOME_PAD_SMALL); gtk_widget_show (priv->attachment_expander); - e_expander_set_expanded (E_EXPANDER (priv->attachment_expander), FALSE); - g_signal_connect_after (priv->attachment_expander, "activate", + e_expander_set_expanded (E_EXPANDER (priv->attachment_expander), FALSE); + g_signal_connect_after (priv->attachment_expander, "activate", G_CALLBACK (attachment_expander_activate_cb), editor); } @@ -1617,7 +1617,7 @@ comp_editor_init (CompEditor *editor) editor->uic = bonobo_ui_component_new_default (); /* FIXME: handle bonobo exceptions */ bonobo_ui_component_set_container (editor->uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)), NULL); - + bonobo_ui_component_add_verb_list_with_data (editor->uic, verbs, editor); bonobo_ui_component_freeze (editor->uic, NULL); @@ -1678,7 +1678,7 @@ comp_editor_finalize (GObject *object) g_object_unref (priv->client); priv->client = NULL; } - + if (priv->source_client) { g_object_unref (priv->source_client); priv->source_client = NULL; @@ -1759,8 +1759,8 @@ close_dialog (CompEditor *editor) notification back when we are in an inconsistent state */ if (priv->view) g_signal_handlers_disconnect_matched (G_OBJECT (priv->view), - G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); - + G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); + gtk_widget_destroy (GTK_WIDGET (editor)); } @@ -1883,10 +1883,10 @@ comp_editor_get_changed (CompEditor *editor) return priv->changed; } -void +void comp_editor_set_flags (CompEditor *editor, CompEditorFlags flags) { - + CompEditorPrivate *priv; g_return_if_fail (editor != NULL); @@ -1898,10 +1898,10 @@ comp_editor_set_flags (CompEditor *editor, CompEditorFlags flags) } -CompEditorFlags +CompEditorFlags comp_editor_get_flags (CompEditor *editor) { - + CompEditorPrivate *priv; g_return_val_if_fail (editor != NULL, FALSE); @@ -1982,11 +1982,11 @@ static void page_unmapped_cb (GtkWidget *page_widget, * comp_editor_append_page: * @editor: A component editor * @page: A component editor page - * @label: Label of the page. Should be NULL if add is FALSE. + * @label: Label of the page. Should be NULL if add is FALSE. * @add: Add's the page into the notebook if TRUE * * Appends a page to the notebook if add is TRUE else - * just adds it to the list of pages. + * just adds it to the list of pages. **/ void comp_editor_append_page (CompEditor *editor, @@ -2029,7 +2029,7 @@ comp_editor_append_page (CompEditor *editor, is_first_page = (priv->pages == NULL); priv->pages = g_list_append (priv->pages, page); - + if (add) gtk_notebook_append_page (priv->notebook, page_widget, label_widget); @@ -2085,7 +2085,7 @@ comp_editor_remove_page (CompEditor *editor, CompEditorPage *page) page_num = gtk_notebook_page_num (priv->notebook, page_widget); if (page_num == -1) return; - + /* Disconnect all the signals added in append_page(). */ g_signal_handlers_disconnect_matched (page, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor); g_signal_handlers_disconnect_matched (page_widget, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, page); @@ -2240,7 +2240,7 @@ make_title_from_string (ECalComponent *comp, const char *str, gboolean is_group_ break; case E_CAL_COMPONENT_TODO: if (is_group_item) - type_string = _("Assigned Task - %s"); + type_string = _("Assigned Task - %s"); else type_string = _("Task - %s"); break; @@ -2345,7 +2345,7 @@ attachment_guess_mime_type (const char *file_name) return type; } -static void +static void set_attachment_list (CompEditor *editor, GSList *attach_list) { GSList *p = NULL; @@ -2355,10 +2355,10 @@ set_attachment_list (CompEditor *editor, GSList *attach_list) if (e_attachment_bar_get_num_attachments (E_ATTACHMENT_BAR (editor->priv->attachment_bar))) { /* To prevent repopulating the - * bar due to redraw functions in fill_widget. + * bar due to redraw functions in fill_widget. * Assumes it can be set only once. - */ - return; + */ + return; } for (p = attach_list; p != NULL; p = p->next) { @@ -2367,32 +2367,32 @@ set_attachment_list (CompEditor *editor, GSList *attach_list) CamelDataWrapper *wrapper; CamelStream *stream; struct stat statbuf; - char *mime_type, *file_name; + char *mime_type, *file_name; char *ptr; attach_filename = (char *) p->data; - /* should we assert if g_str_has_prefix (attach_filename, "file://")) + /* should we assert if g_str_has_prefix (attach_filename, "file://")) * here */ /* get url sans protocol and add it to the bar. - * how to set the filename properly */ + * how to set the filename properly */ file_name = g_filename_from_uri (attach_filename, NULL, NULL); if (!file_name) continue; - + if (g_stat (file_name, &statbuf) < 0) { g_warning ("Cannot attach file %s: %s", file_name, g_strerror (errno)); g_free (file_name); continue; } - + /* return if it's not a regular file */ if (!S_ISREG (statbuf.st_mode)) { g_warning ("Cannot attach file %s: not a regular file", file_name); g_free (file_name); return; } - + stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0); if (!stream) { g_warning ("Cannot attach file %s: %s", file_name, g_strerror (errno)); @@ -2407,7 +2407,7 @@ set_attachment_list (CompEditor *editor, GSList *attach_list) } else { wrapper = camel_data_wrapper_new (); } - + camel_data_wrapper_construct_from_stream (wrapper, stream); camel_data_wrapper_set_mime_type (wrapper, mime_type); g_free (mime_type); @@ -2418,18 +2418,18 @@ set_attachment_list (CompEditor *editor, GSList *attach_list) } camel_object_unref (stream); - + part = camel_mime_part_new (); camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper); camel_object_unref (wrapper); - + camel_mime_part_set_disposition (part, "attachment"); ptr = strstr (file_name, comp_uid); if (ptr) { ptr += strlen(comp_uid); if (*ptr++ == '-') - camel_mime_part_set_filename (part, ptr); + camel_mime_part_set_filename (part, ptr); } g_free (file_name); @@ -2437,7 +2437,7 @@ set_attachment_list (CompEditor *editor, GSList *attach_list) e_expander_set_expanded (E_EXPANDER (editor->priv->attachment_expander), TRUE); camel_object_unref (part); - } + } } static void @@ -2455,7 +2455,7 @@ fill_widgets (CompEditor *editor) set_attachment_list (editor, attachment_list); g_slist_foreach (attachment_list, (GFunc)g_free, NULL); g_slist_free (attachment_list); - } + } for (l = priv->pages; l != NULL; l = l->next) comp_editor_page_fill_widgets (l->data, priv->comp); @@ -2499,7 +2499,7 @@ real_edit_comp (CompEditor *editor, ECalComponent *comp) { CompEditorPrivate *priv; const char *uid; - + g_return_if_fail (editor != NULL); g_return_if_fail (IS_COMP_EDITOR (editor)); @@ -2512,11 +2512,11 @@ real_edit_comp (CompEditor *editor, ECalComponent *comp) if (comp) priv->comp = e_cal_component_clone (comp); - + priv->existing_org = e_cal_component_has_organizer (comp); priv->user_org = (itip_organizer_is_user (comp, priv->client) || itip_sentby_is_user (comp)); priv->warned = FALSE; - + set_title_from_comp (editor); set_icon_from_comp (editor); e_cal_component_get_uid (comp, &uid); @@ -2532,10 +2532,10 @@ real_edit_comp (CompEditor *editor, ECalComponent *comp) static void set_attendees_for_delegation (ECalComponent *comp, const char *address, ECalComponentItipMethod method) { - icalproperty *prop; + icalproperty *prop; icalparameter *param; icalcomponent *icalcomp; - + icalcomp = e_cal_component_get_icalcomponent (comp); for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY); @@ -2550,7 +2550,7 @@ set_attendees_for_delegation (ECalComponent *comp, const char *address, ECalComp ((delfrom && *delfrom) && g_str_equal (itip_strip_mailto (delfrom), address)))) { icalcomponent_remove_property (icalcomp, prop); - } + } } @@ -2565,8 +2565,8 @@ get_users_from_memo_comp (ECalComponent *comp, GList **users) char **emails, **iter; icalcomp = e_cal_component_get_icalcomponent (comp); - - for (icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); icalprop; + + for (icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); icalprop; icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY)) { if (g_str_equal (icalproperty_get_x_name (icalprop), "X-EVOLUTION-RECIPIENTS")) { break; @@ -2593,7 +2593,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method) ECalComponent *send_comp; char *address = NULL; GList *users = NULL; - + g_return_val_if_fail (editor != NULL, FALSE); g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE); @@ -2601,9 +2601,9 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method) send_comp = e_cal_component_clone (priv->comp); - if (e_cal_component_get_vtype (send_comp) == E_CAL_COMPONENT_JOURNAL) + if (e_cal_component_get_vtype (send_comp) == E_CAL_COMPONENT_JOURNAL) get_users_from_memo_comp (send_comp, &users); - + /* The user updates the delegated status to the Organizer, so remove all other attendees */ if ((priv->flags & COMP_EDITOR_DELEGATE)) { address = itip_get_comp_attendee (send_comp, priv->client); @@ -2611,7 +2611,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method) if (address) set_attendees_for_delegation (send_comp, address, method); } - + if (!e_cal_component_has_attachments (priv->comp)) { if (itip_send_comp (method, send_comp, priv->client, NULL, NULL, users)) { @@ -2624,7 +2624,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method) int num_attachments, i; GSList *attach_list = NULL; GSList *mime_attach_list; - + num_attachments = e_cal_component_get_num_attachments (send_comp); for (i = 0; i < num_attachments ; i++) { @@ -2645,7 +2645,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method) g_object_unref (send_comp); g_free (address); comp_editor_set_changed (editor, TRUE); - + return FALSE; } @@ -2689,7 +2689,7 @@ comp_editor_get_comp (CompEditor *editor) /** * comp_editor_get_current_comp - * + * * @param editor * @param correct Set this no non-NULL if you are interested to know if * all pages reported success when filling component. @@ -2771,12 +2771,12 @@ gboolean comp_editor_close (CompEditor *editor) { gboolean close; - + g_return_val_if_fail (editor != NULL, FALSE); g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE); commit_all_fields (editor); - + close = prompt_and_save_changes (editor, TRUE); if (close) close_dialog (editor); @@ -2790,7 +2790,7 @@ comp_editor_close (CompEditor *editor) * be freed by the caller. */ GSList * -comp_editor_get_mime_attach_list (CompEditor *editor) +comp_editor_get_mime_attach_list (CompEditor *editor) { struct CalMimeAttach *cal_mime_attach; GSList *attach_list = NULL, *l, *parts; @@ -2798,7 +2798,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor) /* TODO assert sanity of bar */ parts = e_attachment_bar_get_parts (E_ATTACHMENT_BAR (editor->priv->attachment_bar)); for (l = parts; l ; l = l->next) { - + CamelDataWrapper *wrapper; CamelStreamMem *mstream; unsigned char *buffer = NULL; @@ -2807,10 +2807,10 @@ comp_editor_get_mime_attach_list (CompEditor *editor) cal_mime_attach = g_malloc0 (sizeof (struct CalMimeAttach)); wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (l->data)); mstream = (CamelStreamMem *) camel_stream_mem_new (); - + camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream); buffer = g_memdup (mstream->buffer->data, mstream->buffer->len); - + cal_mime_attach->encoded_data = (char *)buffer; cal_mime_attach->length = mstream->buffer->len; cal_mime_attach->filename = g_strdup (camel_mime_part_get_filename @@ -2820,15 +2820,15 @@ comp_editor_get_mime_attach_list (CompEditor *editor) desc = _("attachment"); cal_mime_attach->description = g_strdup (desc); cal_mime_attach->content_type = g_strdup (camel_data_wrapper_get_mime_type (wrapper)); - + disp = camel_mime_part_get_disposition ((CamelMimePart *)l->data); - if (disp && !g_ascii_strcasecmp(disp, "inline")) + if (disp && !g_ascii_strcasecmp(disp, "inline")) cal_mime_attach->disposition = TRUE; - + attach_list = g_slist_append (attach_list, cal_mime_attach); camel_object_unref (mstream); - + } g_slist_free (parts); @@ -2864,7 +2864,7 @@ comp_editor_focus (CompEditor *editor) /** * comp_editor_notify_client_changed: * @editor: A component editor. - * + * * Makes an editor emit the "client_changed" signal. **/ void @@ -2880,7 +2880,7 @@ comp_editor_notify_client_changed (CompEditor *editor, ECal *client) priv = editor->priv; priv->changed = TRUE; - + g_object_unref (priv->client); priv->client = client; @@ -2909,7 +2909,7 @@ page_changed_cb (GtkObject *obj, gpointer data) _("Changes made to this item may be discarded if an update arrives")); priv->warned = TRUE; } - + } static void @@ -2921,7 +2921,7 @@ needs_send_cb (GtkObject *obj, gpointer data) } /* Focus out widget callback */ -static void +static void page_focus_out_widget_cb (GtkObject *obj, GtkWidget *widget, gpointer data) { CompEditor *editor = COMP_EDITOR (data); @@ -2936,7 +2936,7 @@ page_focus_out_widget_cb (GtkObject *obj, GtkWidget *widget, gpointer data) static void page_focus_in_widget_cb (GtkObject *obj, GtkWidget *widget, gpointer data) { - + CompEditor *editor = COMP_EDITOR (data); CompEditorPrivate *priv; @@ -3016,7 +3016,7 @@ obj_modified_cb (ECal *client, GList *objects, gpointer data) _("Unable to use current version!")); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - + icalcomponent_free (icalcomp); } diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index e761061939..7243808386 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -107,7 +107,7 @@ gboolean comp_editor_save_comp (CompEditor *editor, void comp_editor_delete_comp (CompEditor *editor); gboolean comp_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method); -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_focus (CompEditor *editor); diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index 2644f18c13..8446608222 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -47,11 +47,11 @@ * the component instead. * @widget: A widget to use as a basis for conversion from UTF8 into font * encoding. - * + * * Pops up a dialog box asking the user whether he wants to delete a number of * calendar components. The dialog will not appear, however, if the * configuration option for confirmation is turned off. - * + * * Return value: TRUE if the user clicked Yes, FALSE otherwise. If the * configuration option for confirmation is turned off, this function will * unconditionally return TRUE. @@ -65,7 +65,7 @@ delete_component_dialog (ECalComponent *comp, const char *id; char *arg0 = NULL; int response; - + if (comp) { g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE); g_return_val_if_fail (n_comps == 1, FALSE); @@ -82,14 +82,14 @@ delete_component_dialog (ECalComponent *comp, if (comp) { ECalComponentText summary; - + vtype = e_cal_component_get_vtype (comp); - + if (!consider_as_untitled) { e_cal_component_get_summary (comp, &summary); arg0 = g_strdup (summary.value); } - + switch (vtype) { case E_CAL_COMPONENT_EVENT: if (arg0) @@ -146,14 +146,14 @@ delete_component_dialog (ECalComponent *comp, vtype); return FALSE; } - + if (n_comps > 1) arg0 = g_strdup_printf ("%d", n_comps); } - + response = e_error_run ((GtkWindow *) gtk_widget_get_toplevel (widget), id, arg0, NULL); g_free (arg0); - + return response == GTK_RESPONSE_YES; } @@ -167,7 +167,7 @@ cb_toggled_cb (GtkWidget *toggle, gpointer data) gtk_widget_set_sensitive (entry, active); } -gboolean +gboolean prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *parent) { char *message = NULL; @@ -175,7 +175,7 @@ prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *pare GtkMessageDialog *dialog = NULL; GtkWidget *cb, *label, *entry, *vbox, *sw, *frame; gboolean ret_val = FALSE; - + type = e_cal_component_get_vtype (comp); switch (type) { @@ -193,13 +193,13 @@ prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *pare return FALSE; } - dialog = (GtkMessageDialog *) gtk_message_dialog_new_with_markup - ((GtkWindow *) gtk_widget_get_toplevel (parent), GTK_DIALOG_MODAL, + dialog = (GtkMessageDialog *) gtk_message_dialog_new_with_markup + ((GtkWindow *) gtk_widget_get_toplevel (parent), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "<b>%s</b>", message); g_free (message); gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); - + gtk_box_set_spacing ((GtkBox *) (GTK_DIALOG (dialog)->vbox), 12); vbox = GTK_WIDGET (GTK_DIALOG (dialog)->vbox); @@ -207,7 +207,7 @@ prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *pare gtk_container_add (GTK_CONTAINER (vbox), cb); label = gtk_label_new_with_mnemonic ("_Retract comment"); - + frame = gtk_frame_new (NULL); gtk_frame_set_label_widget ((GtkFrame *) frame, label); gtk_frame_set_label_align ((GtkFrame *) frame, 0, 0); @@ -216,7 +216,7 @@ prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *pare sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy ((GtkScrolledWindow *)sw, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - + entry = gtk_text_view_new (); gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)sw, entry); gtk_label_set_mnemonic_widget ((GtkLabel *)label, entry); @@ -237,7 +237,7 @@ prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *pare gtk_text_buffer_get_start_iter (text_buffer, &text_iter_start); gtk_text_buffer_get_end_iter (text_buffer, &text_iter_end); - *retract_text = gtk_text_buffer_get_text (text_buffer, &text_iter_start, + *retract_text = gtk_text_buffer_get_text (text_buffer, &text_iter_start, &text_iter_end, FALSE); } } diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index a3bcfb76ee..d8f4df3cfc 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -33,9 +33,9 @@ /** * delete_error_dialog: - * + * * Shows any applicable error messages as the result of deleting and object - * + * **/ void delete_error_dialog (GError *error, ECalComponentVType vtype) @@ -43,10 +43,10 @@ delete_error_dialog (GError *error, ECalComponentVType vtype) GList *icon_list = NULL; GtkWidget *dialog; const char *str; - + if (!error) return; - + switch (error->code) { case E_CALENDAR_STATUS_CORBA_EXCEPTION: switch (vtype) { @@ -98,11 +98,11 @@ delete_error_dialog (GError *error, ECalComponentVType vtype) break; case E_CALENDAR_STATUS_OK: case E_CALENDAR_STATUS_OBJECT_NOT_FOUND: - default: + default: /* If not found, we don't care - its gone anyhow */ return; } - + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, str); @@ -110,13 +110,13 @@ delete_error_dialog (GError *error, ECalComponentVType vtype) icon_list = e_icon_factory_get_icon_list ("stock_calendar"); else if (vtype == E_CAL_COMPONENT_TODO) icon_list = e_icon_factory_get_icon_list ("stock_todo"); - + if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); g_list_free (icon_list); } - + gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 0340194b22..8f2fbb4ed7 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -49,7 +49,7 @@ struct _EDelegateDialogPrivate { GtkWidget *addressbook; ENameSelector *name_selector; - GtkWidget *entry; + GtkWidget *entry; }; static const char *section_name = "Delegate To"; @@ -167,7 +167,7 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char e_name_selector_model_peek_section (name_selector_model, section_name, NULL, &destination_store); e_destination_store_append_destination (destination_store, dest); g_object_unref (dest); - + g_signal_connect((priv->addressbook), "clicked", G_CALLBACK (addressbook_clicked_cb), edd); @@ -193,7 +193,7 @@ get_widgets (EDelegateDialog *edd) priv->app = GW ("delegate-dialog"); priv->hbox = GW ("delegate-hbox"); - priv->addressbook = GW ("addressbook"); + priv->addressbook = GW ("addressbook"); return (priv->app && priv->hbox @@ -206,7 +206,7 @@ addressbook_clicked_cb (GtkWidget *widget, gpointer data) EDelegateDialog *edd = data; EDelegateDialogPrivate *priv; ENameSelectorDialog *name_selector_dialog; - + priv = edd->priv; name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector); @@ -251,7 +251,7 @@ e_delegate_dialog_get_delegate (EDelegateDialog *edd) EDestinationStore *destination_store; GList *destinations; EDestination *destination; - + g_return_val_if_fail (edd != NULL, NULL); g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL); @@ -269,7 +269,7 @@ e_delegate_dialog_get_delegate (EDelegateDialog *edd) g_free (priv->address); priv->address = g_strdup (e_destination_get_email (destination)); } - + g_list_free (destinations); return g_strdup (priv->address); } @@ -283,7 +283,7 @@ e_delegate_dialog_get_delegate_name (EDelegateDialog *edd) EDestinationStore *destination_store; GList *destinations; EDestination *destination; - + g_return_val_if_fail (edd != NULL, NULL); g_return_val_if_fail (E_IS_DELEGATE_DIALOG (edd), NULL); @@ -301,7 +301,7 @@ e_delegate_dialog_get_delegate_name (EDelegateDialog *edd) g_free (priv->name); priv->name = g_strdup (e_destination_get_name (destination)); } - + g_list_free (destinations); return g_strdup (priv->name); } diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c index 01fe01529e..2d776c1df6 100644 --- a/calendar/gui/dialogs/e-send-options-utils.c +++ b/calendar/gui/dialogs/e-send-options-utils.c @@ -23,8 +23,8 @@ #include <glib.h> #include <string.h> -void -e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char * type) +void +e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char * type) { ESendOptionsGeneral *gopts = NULL; ESendOptionsStatusTracking *sopts; @@ -32,20 +32,20 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, ESourceList *source_list; const char *uid; const char *value; - + gopts = sod->data->gopts; sopts = sod->data->sopts; - + if (!strcmp (type, "calendar")) source_list = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); - else + else source_list = e_source_list_new_for_gconf (gconf, "/apps/evolution/tasks/sources"); - + uid = e_source_peek_uid (source); source = e_source_list_peek_source_by_uid (source_list, uid); /* priority */ - value = e_source_get_property (source, "priority"); + value = e_source_get_property (source, "priority"); if (value) { if (!strcmp (value, "high")) gopts->priority = E_PRIORITY_HIGH; @@ -57,20 +57,20 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, gopts->priority = E_PRIORITY_UNDEFINED; } /* Reply requested */ - value = e_source_get_property (source, "reply-requested"); + value = e_source_get_property (source, "reply-requested"); if (value) { if (!strcmp (value, "none")) gopts->reply_enabled = FALSE; else if (!strcmp (value, "convinient")) { gopts->reply_enabled = TRUE; - gopts->reply_convenient = TRUE; + gopts->reply_convenient = TRUE; } else { gint i = atoi (value); gopts->reply_within = i; } } /* Delay delivery */ - value = e_source_get_property (source, "delay-delivery"); + value = e_source_get_property (source, "delay-delivery"); if (value) { if (!strcmp (value, "none")) gopts->delay_enabled = FALSE; @@ -78,9 +78,9 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, gopts->delay_enabled = TRUE; gopts->delay_until = icaltime_as_timet (icaltime_from_string (value)); } - } + } /* Expiration Date */ - value = e_source_get_property (source, "expiration"); + value = e_source_get_property (source, "expiration"); if (value) { if (!strcmp (value, "none")) gopts->expiration_enabled = FALSE; @@ -94,7 +94,7 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, } } /* status tracking */ - value = e_source_get_property (source, "status-tracking"); + value = e_source_get_property (source, "status-tracking"); if (value) { if (!strcmp (value, "none")) sopts->tracking_enabled = FALSE; @@ -110,44 +110,44 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, } /* Return Notifications */ - - value = e_source_get_property (source, "return-open"); + + value = e_source_get_property (source, "return-open"); if (value) { if (!strcmp (value, "none")) sopts->opened = E_RETURN_NOTIFY_NONE; - else + else sopts->opened = E_RETURN_NOTIFY_MAIL; } - - value = e_source_get_property (source, "return-accept"); + + value = e_source_get_property (source, "return-accept"); if (value) { if (!strcmp (value, "none")) sopts->accepted = E_RETURN_NOTIFY_NONE; - else + else sopts->accepted = E_RETURN_NOTIFY_MAIL; } - value = e_source_get_property (source, "return-decline"); + value = e_source_get_property (source, "return-decline"); if (value) { if (!strcmp (value, "none")) sopts->declined = E_RETURN_NOTIFY_NONE; - else + else sopts->declined = E_RETURN_NOTIFY_MAIL; } - - value = e_source_get_property (source, "return-complete"); + + value = e_source_get_property (source, "return-complete"); if (value) { if (!strcmp (value, "none")) sopts->completed = E_RETURN_NOTIFY_NONE; - else + else sopts->completed = E_RETURN_NOTIFY_MAIL; } g_object_unref (gconf); } -void -e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp) +void +e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp) { int i = 1; icalproperty *prop; @@ -164,19 +164,19 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp if (e_sendoptions_get_need_general_options (sod)) { prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", gopts->priority)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-PRIORITY"); - icalcomponent_add_property (icalcomp, prop); + icalcomponent_add_property (icalcomp, prop); if (gopts->reply_enabled) { - if (gopts->reply_convenient) - prop = icalproperty_new_x ("convenient"); - else + if (gopts->reply_convenient) + prop = icalproperty_new_x ("convenient"); + else prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", gopts->reply_within)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-REPLY"); icalcomponent_add_property (icalcomp, prop); } if (gopts->expiration_enabled && gopts->expire_after) { - prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", gopts->expire_after)); + prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", gopts->expire_after)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-EXPIRE"); icalcomponent_add_property (icalcomp, prop); } @@ -184,35 +184,35 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp if (gopts->delay_enabled) { struct icaltimetype temp; icaltimezone *zone = calendar_config_get_icaltimezone (); - temp = icaltime_from_timet_with_zone (gopts->delay_until, FALSE, zone); + temp = icaltime_from_timet_with_zone (gopts->delay_until, FALSE, zone); prop = icalproperty_new_x (icaltime_as_ical_string (temp)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-DELAY"); icalcomponent_add_property (icalcomp, prop); } } - - if (sopts->tracking_enabled) - prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", sopts->track_when)); + + if (sopts->tracking_enabled) + prop = icalproperty_new_x ((const char *) g_strdup_printf ( "%d", sopts->track_when)); else prop = icalproperty_new_x ("0"); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-TRACKINFO"); icalcomponent_add_property (icalcomp, prop); - - - prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->opened)); + + + prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->opened)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-OPENED"); icalcomponent_add_property (icalcomp, prop); - - prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->accepted)); + + prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->accepted)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-ACCEPTED"); icalcomponent_add_property (icalcomp, prop); - prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->declined)); + prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->declined)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-DECLINED"); icalcomponent_add_property (icalcomp, prop); - prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->completed)); + prop = icalproperty_new_x ((const char *) g_strdup_printf ("%d", sopts->completed)); icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-COMPLETED"); icalcomponent_add_property (icalcomp, prop); } diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h index a1a2b99842..560a37ea9d 100644 --- a/calendar/gui/dialogs/e-send-options-utils.h +++ b/calendar/gui/dialogs/e-send-options-utils.h @@ -26,6 +26,6 @@ #include <libecal/e-cal-component.h> #include <libedataserver/e-source-list.h> -void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char* type); +void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char* type); void e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp); #endif diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index eb86ea07b4..e5081f8a34 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -51,7 +51,7 @@ struct _EventEditorPrivate { EMeetingStore *model; gboolean is_meeting; gboolean meeting_shown; - gboolean updating; + gboolean updating; }; @@ -74,14 +74,14 @@ event_editor_class_init (EventEditorClass *klass) { GObjectClass *gobject_class; CompEditorClass *editor_class; - + gobject_class = (GObjectClass *) klass; editor_class = (CompEditorClass *) klass; editor_class->set_e_cal = event_editor_set_e_cal; editor_class->edit_comp = event_editor_edit_comp; editor_class->send_comp = event_editor_send_comp; - + gobject_class->finalize = event_editor_finalize; } @@ -114,11 +114,11 @@ menu_view_role_cb (BonoboUIComponent *component, gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - event_page_set_view_role (ee->priv->event_page, atoi(state)); - calendar_config_set_show_role (atoi(state)); + event_page_set_view_role (ee->priv->event_page, atoi(state)); + calendar_config_set_show_role (atoi(state)); } static void @@ -129,12 +129,12 @@ menu_view_status_cb (BonoboUIComponent *component, gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - + event_page_set_view_status (ee->priv->event_page, atoi(state)); - calendar_config_set_show_status (atoi(state)); + calendar_config_set_show_status (atoi(state)); } static void @@ -145,11 +145,11 @@ menu_view_type_cb (BonoboUIComponent *component, gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - event_page_set_view_type (ee->priv->event_page, atoi(state)); - calendar_config_set_show_type (atoi(state)); + event_page_set_view_type (ee->priv->event_page, atoi(state)); + calendar_config_set_show_type (atoi(state)); } static void @@ -160,11 +160,11 @@ menu_view_rsvp_cb (BonoboUIComponent *component, gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - event_page_set_view_rsvp (ee->priv->event_page, atoi(state)); - calendar_config_set_show_rsvp (atoi(state)); + event_page_set_view_rsvp (ee->priv->event_page, atoi(state)); + calendar_config_set_show_rsvp (atoi(state)); } static void @@ -187,11 +187,11 @@ menu_show_time_busy_cb (BonoboUIComponent *component, gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - event_page_set_show_time_busy (ee->priv->event_page, atoi(state)); + event_page_set_show_time_busy (ee->priv->event_page, atoi(state)); } static void @@ -202,10 +202,10 @@ menu_all_day_event_cb (BonoboUIComponent *component, gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - event_page_set_all_day_event (ee->priv->event_page, atoi(state)); + event_page_set_all_day_event (ee->priv->event_page, atoi(state)); } static void @@ -216,10 +216,10 @@ menu_show_time_zone_cb (BonoboUIComponent *component, gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - event_page_set_show_timezone (ee->priv->event_page, atoi(state)); + event_page_set_show_timezone (ee->priv->event_page, atoi(state)); calendar_config_set_show_timezone (atoi(state)); } @@ -231,11 +231,11 @@ menu_show_categories_cb (BonoboUIComponent *component, gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - event_page_set_show_categories (ee->priv->event_page, atoi(state)); + event_page_set_show_categories (ee->priv->event_page, atoi(state)); calendar_config_set_show_categories (atoi(state)); } @@ -251,7 +251,7 @@ menu_class_public_cb (BonoboUIComponent *ui_component, return; comp_editor_page_notify_changed (COMP_EDITOR_PAGE (ee->priv->event_page)); - + event_page_set_classification (ee->priv->event_page, E_CAL_COMPONENT_CLASS_PUBLIC); } @@ -265,7 +265,7 @@ menu_class_private_cb (BonoboUIComponent *ui_component, EventEditor *ee = (EventEditor *) user_data; if (state[0] == '0') return; - + comp_editor_page_notify_changed (COMP_EDITOR_PAGE (ee->priv->event_page)); event_page_set_classification (ee->priv->event_page, E_CAL_COMPONENT_CLASS_PRIVATE); @@ -295,7 +295,7 @@ menu_action_recurrence_cb (BonoboUIComponent *ui_component, gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - + gtk_widget_show (ee->priv->recur_window); } @@ -304,13 +304,13 @@ menu_action_freebusy_cb (BonoboUIComponent *ui_component, const char *path, Bonobo_UIComponent_EventType type, const char *state, - gpointer user_data) + gpointer user_data) { EventEditor *ee = (EventEditor *) user_data; - - if (!ee->priv->sched_window) + + if (!ee->priv->sched_window) create_schedule_page (ee); - else + else gtk_widget_show (ee->priv->sched_window); } @@ -329,7 +329,7 @@ menu_all_day_event_cmd (BonoboUIComponent *uic, void *data, const char *path) { - /* TODO + /* TODO EventEditor *ee = (EventEditor *) data; event_page_set_all_day_event (ee->priv->event_page, atoi(state));*/ @@ -340,10 +340,10 @@ menu_show_time_zone_cmd (BonoboUIComponent *uic, void *data, const char *path) { - /* TODO + /* TODO EventEditor *ee = (EventEditor *) data; - - event_page_set_show_timezone (ee->priv->event_page, atoi(state)); + + event_page_set_show_timezone (ee->priv->event_page, atoi(state)); calendar_config_set_show_timezone (atoi(state)); */ } @@ -353,7 +353,7 @@ menu_action_recurrence_cmd (BonoboUIComponent *uic, const char *path) { EventEditor *ee = (EventEditor *) data; - + gtk_widget_show (ee->priv->recur_window); } @@ -395,9 +395,9 @@ menu_action_freebusy_cmd (BonoboUIComponent *uic, { EventEditor *ee = (EventEditor *) data; - if (!ee->priv->sched_window) + if (!ee->priv->sched_window) create_schedule_page (ee); - else + else gtk_widget_show (ee->priv->sched_window); } @@ -407,18 +407,18 @@ menu_insert_send_options_cmd (BonoboUIComponent *uic, const char *path) { EventEditor *ee = (EventEditor *) data; - + event_page_sendoptions_clicked_cb (ee->priv->event_page); } static BonoboUIVerb verbs [] = { BONOBO_UI_VERB ("ActionAlarm", menu_action_alarm_cmd), BONOBO_UI_VERB ("ActionAllDayEvent", menu_all_day_event_cmd), - BONOBO_UI_VERB ("ViewTimeZone", menu_show_time_zone_cmd), + BONOBO_UI_VERB ("ViewTimeZone", menu_show_time_zone_cmd), BONOBO_UI_VERB ("ActionRecurrence", menu_action_recurrence_cmd), BONOBO_UI_VERB ("ActionFreeBusy", menu_action_freebusy_cmd), BONOBO_UI_VERB ("InsertSendOptions", menu_insert_send_options_cmd), - + BONOBO_UI_VERB_END }; @@ -433,14 +433,14 @@ static EPixmap pixmaps[] = { E_PIXMAP ("/Toolbar/ActionAlarm", "stock_alarm", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/ActionAllDayEvent", "stock_new-24h-appointment", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR), /* These two will have an absolute path to the png file filled * in at run-time, see event_editor_init(). */ E_PIXMAP ("/Toolbar/ActionFreeBusy", NULL, E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/commands/ActionFreeBusy", NULL, E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/ActionFreeBusy", NULL, E_ICON_SIZE_MENU), E_PIXMAP_END }; @@ -458,7 +458,7 @@ event_editor_init (EventEditor *ee) priv->model = E_MEETING_STORE (e_meeting_store_new ()); priv->meeting_shown = TRUE; - priv->updating = FALSE; + priv->updating = FALSE; priv->is_meeting = FALSE; bonobo_ui_component_freeze (editor->uic, NULL); @@ -486,7 +486,7 @@ event_editor_init (EventEditor *ee) bonobo_ui_component_add_listener ( editor->uic, "ViewStatus", menu_view_status_cb, editor); - + /* Show hide the type fields */ status = calendar_config_get_show_type (); bonobo_ui_component_set_prop ( @@ -517,15 +517,15 @@ event_editor_init (EventEditor *ee) bonobo_ui_component_add_listener ( editor->uic, "ActionAlarm", menu_action_alarm_cb, editor); - + bonobo_ui_component_add_listener ( - editor->uic, "ActionAllDayEvent", + editor->uic, "ActionAllDayEvent", menu_all_day_event_cb, editor); - + bonobo_ui_component_add_listener ( - editor->uic, "ActionShowTimeBusy", + editor->uic, "ActionShowTimeBusy", menu_show_time_busy_cb, editor); - + status = calendar_config_get_show_timezone (); bonobo_ui_component_set_prop ( editor->uic, "/commands/ViewTimeZone", @@ -556,10 +556,10 @@ event_editor_init (EventEditor *ee) menu_class_confidential_cb, editor); bonobo_ui_component_add_listener ( - editor->uic, "ActionRecurrence", + editor->uic, "ActionRecurrence", menu_action_recurrence_cb, editor); bonobo_ui_component_add_listener ( - editor->uic, "ActionFreeBusy", + editor->uic, "ActionFreeBusy", menu_action_freebusy_cb, editor); /* NOTE: Make sure the 6 and 7 below correspond to the correct @@ -571,14 +571,14 @@ event_editor_init (EventEditor *ee) } e_pixmaps_update (editor->uic, pixmaps); - bonobo_ui_component_thaw (editor->uic, NULL); + bonobo_ui_component_thaw (editor->uic, NULL); comp_editor_set_help_section (COMP_EDITOR (ee), "usage-calendar-apts"); } /* Handler for the delete event. It hides the window without destroying it. Connected to the recur dialog and Free busy dialog */ -static gboolean +static gboolean window_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) { gtk_widget_hide (widget); @@ -597,7 +597,7 @@ event_editor_construct (EventEditor *ee, ECal *client) priv->event_page = event_page_new (priv->model, client, COMP_EDITOR(ee)->uic); g_object_ref_sink (priv->event_page); - comp_editor_append_page (COMP_EDITOR (ee), + comp_editor_append_page (COMP_EDITOR (ee), COMP_EDITOR_PAGE (priv->event_page), _("Appoint_ment"), TRUE); g_signal_connect (G_OBJECT (priv->event_page), "client_changed", @@ -611,7 +611,7 @@ event_editor_construct (EventEditor *ee, ECal *client) g_signal_connect ((GtkWidget *) priv->recur_window, "delete-event", G_CALLBACK(window_delete_event), NULL); priv->recur_page = recurrence_page_new (); g_object_ref_sink (priv->recur_page); - gtk_container_add ((GtkContainer *) (GTK_DIALOG (priv->recur_window)->vbox), + gtk_container_add ((GtkContainer *) (GTK_DIALOG (priv->recur_window)->vbox), comp_editor_page_get_widget (COMP_EDITOR_PAGE (priv->recur_page))); gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window))); comp_editor_append_page (COMP_EDITOR (ee), COMP_EDITOR_PAGE (priv->recur_page), NULL, FALSE); @@ -621,9 +621,9 @@ event_editor_construct (EventEditor *ee, ECal *client) event_page_show_options (priv->event_page); comp_editor_set_group_item (COMP_EDITOR (ee), TRUE); - if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM))) + if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM))) bonobo_ui_component_set_prop (editor->uic, "/commands/ActionFreeBusy", "hidden", "1", NULL); - + event_page_set_meeting (priv->event_page, TRUE); priv->meeting_shown=TRUE; } else { @@ -649,14 +649,14 @@ event_editor_set_e_cal (CompEditor *editor, ECal *client) { EventEditor *ee; EventEditorPrivate *priv; - + ee = EVENT_EDITOR (editor); priv = ee->priv; e_meeting_store_set_e_cal (priv->model, client); - + if (COMP_EDITOR_CLASS (event_editor_parent_class)->set_e_cal) - COMP_EDITOR_CLASS (event_editor_parent_class)->set_e_cal (editor, client); + COMP_EDITOR_CLASS (event_editor_parent_class)->set_e_cal (editor, client); } static void @@ -669,10 +669,10 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp) ECalComponentDateTime dtstart, dtend; ECal *client; GSList *attendees = NULL; - + ee = EVENT_EDITOR (editor); priv = ee->priv; - + priv->updating = TRUE; delegate = (comp_editor_get_flags (COMP_EDITOR (editor)) & COMP_EDITOR_DELEGATE); @@ -694,26 +694,26 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp) /* Get meeting related stuff */ e_cal_component_get_organizer (comp, &organizer); e_cal_component_get_attendee_list (comp, &attendees); - + /* Set up the attendees */ if (attendees != NULL) { GSList *l; int row; char *user_email; - user_email = itip_get_comp_attendee (comp, client); - + user_email = itip_get_comp_attendee (comp, client); + if (!priv->meeting_shown) { bonobo_ui_component_set_prop (editor->uic, "/commands/ActionFreeBusy", "hidden", "0", NULL); } - + if (!(delegate && e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY))) { for (l = attendees; l != NULL; l = l->next) { ECalComponentAttendee *ca = l->data; EMeetingAttendee *ia; - + if (delegate && !g_str_equal (itip_strip_mailto (ca->value), user_email)) continue; - + ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_e_cal_component_attendee (ca)); /* If we aren't the organizer or the attendee is just delegated, don't allow editing */ @@ -751,10 +751,10 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp) e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE); } } - - event_page_set_meeting (priv->event_page, TRUE); + + event_page_set_meeting (priv->event_page, TRUE); priv->meeting_shown = TRUE; - } + } e_cal_component_free_attendee_list (attendees); comp_editor_set_needs_send (COMP_EDITOR (ee), priv->meeting_shown && (itip_organizer_is_user (comp, client) || itip_sentby_is_user (comp))); @@ -775,12 +775,12 @@ event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method) if (method == E_CAL_COMPONENT_METHOD_PUBLISH || method == E_CAL_COMPONENT_METHOD_CANCEL) goto parent; - + comp = event_page_get_cancel_comp (priv->event_page); if (comp != NULL) { ECal *client; gboolean result; - + client = e_meeting_store_get_e_cal (priv->model); result = itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp, client, NULL, NULL, NULL); @@ -788,7 +788,7 @@ event_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method) if (!result) return FALSE; - else + else return TRUE; } @@ -816,7 +816,7 @@ event_editor_finalize (GObject *object) g_object_unref (priv->event_page); priv->event_page = NULL; } - + if (priv->recur_page) { g_object_unref (priv->recur_page); priv->recur_page = NULL; @@ -864,13 +864,13 @@ show_meeting (EventEditor *ee) EventEditorPrivate *priv; CompEditor *editor = COMP_EDITOR (ee); CompEditorFlags flags = comp_editor_get_flags (editor); - + priv = ee->priv; event_page_set_meeting (priv->event_page, TRUE); if (!priv->meeting_shown) { bonobo_ui_component_set_prop (editor->uic, "/commands/ActionFreeBusy", "hidden", "0", NULL); - + priv->meeting_shown = TRUE; comp_editor_set_changed (COMP_EDITOR (ee), FALSE); diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index b9b354f017..a60b87c4c9 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -82,7 +82,7 @@ struct _EventPagePrivate { EAccountList *accounts; GList *address_strings; - EMeetingAttendee *ia; + EMeetingAttendee *ia; char *default_address; char *user_add; ECalComponent *comp; @@ -94,7 +94,7 @@ struct _EventPagePrivate { /* Lists of attendees */ GPtrArray *deleted_attendees; - + GtkWidget *start_time; GtkWidget *end_time; GtkWidget *end_time_selector; @@ -112,7 +112,7 @@ struct _EventPagePrivate { GtkWidget *description; ECalComponentClassification classification; - + gboolean show_time_as_busy; GtkWidget *alarm_dialog; @@ -124,7 +124,7 @@ struct _EventPagePrivate { GtkWidget *categories; GtkWidget *source_selector; - + /* Meeting related items */ GtkWidget *list_box; GtkWidget *organizer_table; @@ -147,14 +147,14 @@ struct _EventPagePrivate { gboolean updating; EAlarmList *alarm_list_store; - + gboolean sendoptions_shown; ESendOptionsDialog *sod; char *old_summary; CalUnits alarm_units; int alarm_interval; - + /* This is TRUE if both the start & end timezone are the same. If the start timezone is then changed, we updated the end timezone to the same value, since 99% of events start and end in one timezone. */ @@ -176,7 +176,7 @@ static gboolean event_page_fill_timezones (CompEditorPage *page, GHashTable *tim static void event_page_set_summary (CompEditorPage *page, const char *summary); static void event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates); static void notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt, struct icaltimetype *end_tt); -static gboolean check_start_before_end (struct icaltimetype *start_tt, icaltimezone *start_zone, +static gboolean check_start_before_end (struct icaltimetype *start_tt, icaltimezone *start_zone, struct icaltimetype *end_tt, icaltimezone *end_zone, gboolean adjust_end_time); static void set_attendees (ECalComponent *comp, const GPtrArray *attendees); static void hour_sel_changed ( GtkSpinButton *widget, EventPage *epage); @@ -258,14 +258,14 @@ event_page_init (EventPage *epage) priv->ia = NULL; priv->default_address = NULL; priv->invite = NULL; - + priv->model = NULL; priv->list_view = NULL; - + priv->updating = FALSE; - + priv->alarm_interval = -1; - + priv->sendoptions_shown = FALSE; priv->is_meeting = FALSE; priv->sync_timezones = FALSE; @@ -277,7 +277,7 @@ static void cleanup_attendees (GPtrArray *attendees) { int i; - + for (i = 0; i < attendees->len; i++) g_object_unref (g_ptr_array_index (attendees, i)); } @@ -295,7 +295,7 @@ event_page_finalize (GObject *object) epage = EVENT_PAGE (object); priv = epage->priv; - + for (l = priv->address_strings; l != NULL; l = l->next) g_free (l->data); g_list_free (priv->address_strings); @@ -305,7 +305,7 @@ event_page_finalize (GObject *object) cleanup_attendees (priv->deleted_attendees); g_ptr_array_free (priv->deleted_attendees, TRUE); - + if (priv->main) g_object_unref (priv->main); @@ -446,7 +446,7 @@ set_all_day (EventPage *epage, gboolean all_day) priv = epage->priv; set_all_day_event_menu (epage, all_day); - + /* TODO implement for in end time selector */ if (all_day) gtk_option_menu_set_history (GTK_OPTION_MENU (priv->end_time_selector), 1); @@ -476,7 +476,7 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD if (!e_cal_get_timezone (COMP_EDITOR_PAGE (epage)->client, start_date->tzid, &start_zone, NULL)) { g_warning ("Couldn't get timezone from server: %s", - start_date->tzid ? start_date->tzid : ""); + start_date->tzid ? start_date->tzid : ""); } } @@ -490,7 +490,7 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD *end_tt = *start_tt; icaltime_adjust (end_tt, 1, 0, 0, 0); } - + if (start_tt->is_date && end_tt->is_date) { all_day_event = TRUE; if (icaltime_compare_date_only (*end_tt, *start_tt) > 0) { @@ -527,23 +527,23 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD are the same. */ g_signal_handlers_block_matched (priv->start_timezone, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); g_signal_handlers_block_matched (priv->end_timezone, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); - + if (start_zone) 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))) homezone = FALSE; - + event_page_set_show_timezone (epage, (calendar_config_get_show_timezone()|| !homezone) & !all_day_event); - + /*unblock the endtimezone widget*/ g_signal_handlers_unblock_matched (priv->end_timezone, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); g_signal_handlers_unblock_matched (priv->start_timezone, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); - priv->sync_timezones = TRUE; + priv->sync_timezones = TRUE; - update_end_time_selector (epage); + update_end_time_selector (epage); } /* Fills the widgets with default values */ @@ -582,13 +582,13 @@ clear_widgets (EventPage *epage) /* Alarm */ e_dialog_option_menu_set (priv->alarm_time, ALARM_NONE, alarm_map); - + /* Categories */ e_dialog_editable_set (priv->categories, NULL); } static gboolean -is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type) +is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type) { ECalComponentAlarmTrigger trigger; ECalComponentAlarmRepeat repeat; @@ -598,7 +598,7 @@ is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, icalproperty *icalprop; icalattach *attach; gboolean needs_desc = FALSE; - + e_cal_component_alarm_get_action (ca, &action); if (action != E_CAL_COMPONENT_ALARM_DISPLAY) return TRUE; @@ -619,7 +619,7 @@ is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, icalprop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY); } - if (!needs_desc) { + if (!needs_desc) { e_cal_component_alarm_get_description (ca, &desc); if (!desc.value || !old_summary || strcmp (desc.value, old_summary)) return TRUE; @@ -628,14 +628,14 @@ is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, e_cal_component_alarm_get_repeat (ca, &repeat); if (repeat.repetitions != 0) return TRUE; - + if (e_cal_component_alarm_has_attendees (ca)) return TRUE; - + e_cal_component_alarm_get_trigger (ca, &trigger); if (trigger.type != E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START) return TRUE; - + if (trigger.u.rel_duration.is_neg != 1) return TRUE; @@ -652,7 +652,7 @@ is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, *alarm_type = ALARM_1_DAY; return FALSE; } - + if (trigger.u.rel_duration.days == 0 && trigger.u.rel_duration.hours == 1 && trigger.u.rel_duration.minutes == 0) { @@ -660,47 +660,47 @@ is_custom_alarm (ECalComponentAlarm *ca, char *old_summary, CalUnits user_units, *alarm_type = ALARM_1_HOUR; return FALSE; } - + if (trigger.u.rel_duration.days == 0 && trigger.u.rel_duration.hours == 0 && trigger.u.rel_duration.minutes == 15) { if (alarm_type) - *alarm_type = ALARM_15_MINUTES; + *alarm_type = ALARM_15_MINUTES; return FALSE; } if (user_interval != -1) { switch (user_units) { - case CAL_DAYS: + case CAL_DAYS: if (trigger.u.rel_duration.days == user_interval && trigger.u.rel_duration.hours == 0 && trigger.u.rel_duration.minutes == 0) { if (alarm_type) - *alarm_type = ALARM_USER_TIME; + *alarm_type = ALARM_USER_TIME; return FALSE; } break; - + case CAL_HOURS: if (trigger.u.rel_duration.days == 0 && trigger.u.rel_duration.hours == user_interval && trigger.u.rel_duration.minutes == 0) { if (alarm_type) - *alarm_type = ALARM_USER_TIME; + *alarm_type = ALARM_USER_TIME; return FALSE; } break; - + case CAL_MINUTES: if (trigger.u.rel_duration.days == 0 && trigger.u.rel_duration.hours == 0 && trigger.u.rel_duration.minutes == user_interval) { if (alarm_type) - *alarm_type = ALARM_USER_TIME; + *alarm_type = ALARM_USER_TIME; return FALSE; } break; - } + } } return TRUE; @@ -711,7 +711,7 @@ is_custom_alarm_uid_list (ECalComponent *comp, GList *alarms, char *old_summary, { ECalComponentAlarm *ca; gboolean result; - + if (g_list_length (alarms) > 1) return TRUE; @@ -723,13 +723,13 @@ is_custom_alarm_uid_list (ECalComponent *comp, GList *alarms, char *old_summary, } static gboolean -is_custom_alarm_store (EAlarmList *alarm_list_store, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type) +is_custom_alarm_store (EAlarmList *alarm_list_store, char *old_summary, CalUnits user_units, int user_interval, int *alarm_type) { const ECalComponentAlarm *alarm; GtkTreeModel *model; GtkTreeIter iter; gboolean valid_iter; - + model = GTK_TREE_MODEL (alarm_list_store); valid_iter = gtk_tree_model_get_iter_first (model, &iter); @@ -743,7 +743,7 @@ is_custom_alarm_store (EAlarmList *alarm_list_store, char *old_summary, CalUnit valid_iter = gtk_tree_model_iter_next (model, &iter); if (valid_iter) return TRUE; - + return FALSE; } @@ -779,7 +779,7 @@ event_page_set_view_rsvp (EventPage *epage, gboolean state) e_meeting_list_view_column_set_visible (priv->list_view, "RSVP", state); } -void +void event_page_set_classification (EventPage *epage, ECalComponentClassification class) { epage->priv->classification = class; @@ -790,7 +790,7 @@ create_image_event_box (const char *image_text, const char *tip_text) { GtkWidget *image, *box; GtkTooltips *tip; - + box = gtk_event_box_new (); tip = gtk_tooltips_new (); image = e_icon_factory_get_image (image_text, E_ICON_SIZE_MENU); @@ -799,7 +799,7 @@ create_image_event_box (const char *image_text, const char *tip_text) gtk_widget_show_all (box); gtk_tooltips_set_tip (tip, box, tip_text, NULL); - return box; + return box; } static void @@ -807,36 +807,36 @@ sensitize_widgets (EventPage *epage) { gboolean read_only, custom, alarm, sens = TRUE, sensitize; EventPagePrivate *priv; - gboolean delegate; - + gboolean delegate; + priv = epage->priv; if (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_MEETING) sens = COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_USER_ORG; if (!e_cal_is_read_only (COMP_EDITOR_PAGE (epage)->client, &read_only, NULL)) read_only = TRUE; - + delegate = COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE; - + sensitize = !read_only && sens; alarm = e_dialog_option_menu_get (priv->alarm_time, alarm_map) != ALARM_NONE; - custom = is_custom_alarm_store (priv->alarm_list_store, priv->old_summary, priv->alarm_units, priv->alarm_interval, NULL) || + custom = is_custom_alarm_store (priv->alarm_list_store, priv->old_summary, priv->alarm_units, priv->alarm_interval, NULL) || e_dialog_option_menu_get (priv->alarm_time, alarm_map) == ALARM_CUSTOM ? TRUE:FALSE; if (alarm && !priv->alarm_icon) { priv->alarm_icon = create_image_event_box ("stock_bell", _("This event has alarms")); gtk_box_pack_start ((GtkBox *)priv->status_icons, priv->alarm_icon, FALSE, FALSE, 6); } - - /* The list of organizers is set to be non-editable. Otherwise any - * change in the displayed list causes an 'Account not found' error. + + /* The list of organizers is set to be non-editable. Otherwise any + * change in the displayed list causes an 'Account not found' error. */ gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (priv->organizer)->entry), FALSE); gtk_editable_set_editable (GTK_EDITABLE (priv->summary), !read_only); gtk_editable_set_editable (GTK_EDITABLE (priv->location), sensitize); - gtk_widget_set_sensitive (priv->alarm_box, custom); + gtk_widget_set_sensitive (priv->alarm_box, custom); gtk_widget_set_sensitive (priv->start_time, sensitize); gtk_widget_set_sensitive (priv->start_timezone, sensitize); gtk_widget_set_sensitive (priv->end_time, sensitize); @@ -848,9 +848,9 @@ sensitize_widgets (EventPage *epage) if ( (COMP_EDITOR_PAGE(epage)->flags) & COMP_EDITOR_PAGE_NEW_ITEM ) { if (priv->all_day_event) gtk_option_menu_set_history (GTK_OPTION_MENU (priv->end_time_selector), 1); - else + else gtk_option_menu_set_history (GTK_OPTION_MENU (priv->end_time_selector), 0); - } else + } else gtk_option_menu_set_history (GTK_OPTION_MENU (priv->end_time_selector), 1); gtk_widget_set_sensitive (priv->hour_selector, sensitize); @@ -868,7 +868,7 @@ sensitize_widgets (EventPage *epage) e_meeting_list_view_set_editable (priv->list_view, (!read_only && sens) || delegate); gtk_widget_set_sensitive (priv->remove, (!read_only && sens) || delegate); gtk_widget_set_sensitive (priv->invite, (!read_only && sens) || delegate); - gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only); + gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only); bonobo_ui_component_set_prop (priv->uic, "/commands/InsertAttachments", "sensitive", sensitize ? "1" : "0" , NULL); @@ -905,9 +905,9 @@ sensitize_widgets (EventPage *epage) gtk_widget_show (priv->list_box); gtk_widget_show (priv->attendee_box); gtk_widget_show (priv->organizer); - gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); + gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); } - + } void @@ -928,7 +928,7 @@ event_page_show_options (EventPage *page) page->priv->sendoptions_shown = TRUE; } -void +void event_page_set_meeting (EventPage *page, gboolean set) { g_return_if_fail (IS_EVENT_PAGE (page)); @@ -937,7 +937,7 @@ event_page_set_meeting (EventPage *page, gboolean set) sensitize_widgets (page); } -void +void event_page_set_delegate (EventPage *page, gboolean set) { g_return_if_fail (IS_EVENT_PAGE (page)); @@ -950,17 +950,17 @@ event_page_set_delegate (EventPage *page, gboolean set) static EAccount * get_current_account (EventPage *epage) -{ +{ EventPagePrivate *priv; EIterator *it; const char *str; - + priv = epage->priv; str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry)); 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); char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); @@ -971,12 +971,12 @@ get_current_account (EventPage *epage) return a; } - + g_free (full); } g_object_unref (it); - - return NULL; + + return NULL; } /* fill_widgets handler for the event page */ @@ -994,7 +994,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) gchar *backend_addr = NULL; GSList *l; gboolean validated = TRUE; - + g_return_val_if_fail (page->client != NULL, FALSE); epage = EVENT_PAGE (page); @@ -1005,15 +1005,15 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) /* Don't send off changes during this time */ priv->updating = TRUE; - + /* Clean out old data */ if (priv->comp != NULL) g_object_unref (priv->comp); priv->comp = NULL; - + cleanup_attendees (priv->deleted_attendees); g_ptr_array_set_size (priv->deleted_attendees, 0); - + /* Clean the page */ clear_widgets (epage); @@ -1021,18 +1021,18 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) /* Component for cancellation */ priv->comp = e_cal_component_clone (comp); - + e_cal_component_get_summary (comp, &text); e_dialog_editable_set (priv->summary, text.value); priv->old_summary = g_strdup (text.value); - + e_cal_component_get_location (comp, &location); e_dialog_editable_set (priv->location, location); e_cal_component_get_description_list (comp, &l); if (l && l->data) { ECalComponentText *dtext; - + dtext = l->data; gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), dtext->value ? dtext->value : "", -1); @@ -1043,9 +1043,9 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) set_subscriber_info_string (epage, backend_addr); if (priv->is_meeting) { - ECalComponentOrganizer organizer; + ECalComponentOrganizer organizer; - priv->user_add = itip_get_comp_attendee (comp, COMP_EDITOR_PAGE (epage)->client); + priv->user_add = itip_get_comp_attendee (comp, COMP_EDITOR_PAGE (epage)->client); /* Organizer strings */ event_page_select_organizer (epage, backend_addr); @@ -1057,7 +1057,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) const gchar *strip = itip_strip_mailto (organizer.value); gchar *string; GList *list = NULL; - + if (itip_organizer_is_user (comp, page->client) || itip_sentby_is_user (comp)) { if (e_cal_get_static_capability ( page->client, @@ -1105,7 +1105,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) if (!(backend_addr && *backend_addr) || !g_ascii_strcasecmp (backend_addr, a->id->address)) { e_meeting_attendee_set_address (priv->ia, g_strdup_printf ("MAILTO:%s", a->id->address)); e_meeting_attendee_set_cn (priv->ia, g_strdup (a->id->name)); - } else { + } else { e_meeting_attendee_set_address (priv->ia, g_strdup_printf ("MAILTO:%s", backend_addr)); e_meeting_attendee_set_sentby (priv->ia, g_strdup_printf ("MAILTO:%s", a->id->address)); } @@ -1120,7 +1120,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) } } - if (backend_addr) + if (backend_addr) g_free (backend_addr); /* Start and end times */ @@ -1134,7 +1134,7 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) validated = FALSE; } else update_time (epage, &start_date, &end_date); - + e_cal_component_free_datetime (&start_date); e_cal_component_free_datetime (&end_date); @@ -1175,22 +1175,22 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) /* Alarms */ g_signal_handlers_block_matched (priv->alarm_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); g_signal_handlers_block_matched (priv->alarm_list_store, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); - + if (e_cal_component_has_alarms (comp)) { GList *alarms, *list; int alarm_type; - + alarms = e_cal_component_get_alarm_uids (comp); if (!is_custom_alarm_uid_list (comp, alarms, priv->old_summary, priv->alarm_units, priv->alarm_interval, &alarm_type)) e_dialog_option_menu_set (priv->alarm_time, alarm_type, alarm_map); - else + else e_dialog_option_menu_set (priv->alarm_time, ALARM_CUSTOM, alarm_map); - + for (list = alarms; list != NULL; list = list->next) { ECalComponentAlarm *ca; - + ca = e_cal_component_get_alarm (comp, list->data); - e_alarm_list_append (priv->alarm_list_store, NULL, ca); + e_alarm_list_append (priv->alarm_list_store, NULL, ca); e_cal_component_alarm_free (ca); } @@ -1204,14 +1204,14 @@ event_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) /* Categories */ e_cal_component_get_categories (comp, &categories); e_dialog_editable_set (priv->categories, categories); - + /* Source */ e_source_combo_box_set_active ( E_SOURCE_COMBO_BOX (priv->source_selector), e_cal_get_source (page->client)); e_cal_component_get_uid (comp, &uid); - if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) + if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) && !(COMP_EDITOR_PAGE (epage)->flags && COMP_EDITOR_PAGE_NEW_ITEM)) { event_page_hide_options (epage); } @@ -1377,7 +1377,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) e_cal_component_set_transparency (comp, busy ? E_CAL_COMPONENT_TRANSP_OPAQUE : E_CAL_COMPONENT_TRANSP_TRANSPARENT); /* send options */ - if (priv->sendoptions_shown && priv->sod) + if (priv->sendoptions_shown && priv->sod) e_sendoptions_utils_fill_component (priv->sod, comp); /* Alarm */ @@ -1389,19 +1389,19 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) gboolean valid_iter; model = GTK_TREE_MODEL (priv->alarm_list_store); - + for (valid_iter = gtk_tree_model_get_iter_first (model, &iter); valid_iter; valid_iter = gtk_tree_model_iter_next (model, &iter)) { ECalComponentAlarm *alarm, *alarm_copy; icalcomponent *icalcomp; icalproperty *icalprop; - + alarm = (ECalComponentAlarm *) e_alarm_list_get_alarm (priv->alarm_list_store, &iter); if (!alarm) { g_warning ("alarm is NULL\n"); continue; } - + /* We set the description of the alarm if it's got * the X-EVOLUTION-NEEDS-DESCRIPTION property. */ @@ -1438,51 +1438,51 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) int alarm_type; ca = e_cal_component_alarm_new (); - + e_cal_component_get_summary (comp, &summary); - + if (summary.value) e_cal_component_alarm_set_description (ca, &summary); - + e_cal_component_alarm_set_action (ca, E_CAL_COMPONENT_ALARM_DISPLAY); memset (&trigger, 0, sizeof (ECalComponentAlarmTrigger)); - trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START; + trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START; trigger.u.rel_duration.is_neg = 1; - + alarm_type = e_dialog_option_menu_get (priv->alarm_time, alarm_map); switch (alarm_type) { case ALARM_15_MINUTES: trigger.u.rel_duration.minutes = 15; break; - + case ALARM_1_HOUR: trigger.u.rel_duration.hours = 1; break; - + case ALARM_1_DAY: trigger.u.rel_duration.days = 1; break; case ALARM_USER_TIME: switch (calendar_config_get_default_reminder_units ()) { - case CAL_DAYS: + case CAL_DAYS: trigger.u.rel_duration.days = priv->alarm_interval; break; - + case CAL_HOURS: trigger.u.rel_duration.hours = priv->alarm_interval; break; - + case CAL_MINUTES: trigger.u.rel_duration.minutes = priv->alarm_interval; break; } break; - + default: break; - } + } e_cal_component_alarm_set_trigger (ca, trigger); e_cal_component_add_alarm (comp, ca); @@ -1495,9 +1495,9 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) if (!priv->existing) { EAccount *a; gchar *backend_addr = NULL, *org_addr = NULL, *sentby = NULL; - + e_cal_get_cal_address (priv->client, &backend_addr, NULL); - + /* Find the identity for the organizer or sentby field */ a = get_current_account (epage); @@ -1505,14 +1505,14 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) if (a == NULL) { e_notice (page, GTK_MESSAGE_ERROR, _("The organizer selected no longer has an account.")); - return FALSE; + return FALSE; } if (a->id->address == NULL || strlen (a->id->address) == 0) { e_notice (page, GTK_MESSAGE_ERROR, _("An organizer is required.")); return FALSE; - } + } if (!(backend_addr && *backend_addr) || !g_ascii_strcasecmp (backend_addr, a->id->address)) { org_addr = g_strdup_printf ("MAILTO:%s", a->id->address); @@ -1569,7 +1569,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp) } e_cal_component_set_attendee_list (comp, attendee_list); e_cal_component_free_attendee_list (attendee_list); - } else + } else set_attendees (comp, e_meeting_store_get_attendees (priv->model)); } @@ -1613,7 +1613,7 @@ event_page_set_summary (CompEditorPage *page, const char *summary) static void event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates) -{ +{ update_time (EVENT_PAGE (page), dates->start, dates->end); } @@ -1665,7 +1665,7 @@ void update_end_time_selector (EventPage *epage) e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time), &end_tt.hour, &end_tt.minute); - + end_timet = icaltime_as_timet (end_tt); start_timet = icaltime_as_timet (start_tt); @@ -1726,7 +1726,7 @@ edit_clicked_cb (GtkButton *btn, EventPage *epage) GtkTreePath *path = NULL; GtkTreeViewColumn *focus_col; gint row = 0; - + priv = epage->priv; gtk_tree_view_get_cursor (GTK_TREE_VIEW (priv->list_view), &path, NULL); @@ -1754,16 +1754,16 @@ add_clicked_cb (GtkButton *btn, EventPage *epage) } static gboolean -existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) +existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) { GSList *attendees, *l; const gchar *ia_address; const gchar *ia_sentby = NULL; - + ia_address = itip_strip_mailto (e_meeting_attendee_get_address (ia)); if (!ia_address) return FALSE; - + if (e_meeting_attendee_is_set_sentby (ia)) ia_sentby = itip_strip_mailto (e_meeting_attendee_get_sentby (ia)); @@ -1773,7 +1773,7 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) ECalComponentAttendee *attendee = l->data; const char *address; const char *sentby = NULL; - + address = itip_strip_mailto (attendee->value); if (attendee->sentby) sentby = itip_strip_mailto (attendee->sentby); @@ -1783,19 +1783,19 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) return TRUE; } } - + e_cal_component_free_attendee_list (attendees); - + return FALSE; } static void -remove_attendee (EventPage *epage, EMeetingAttendee *ia) +remove_attendee (EventPage *epage, EMeetingAttendee *ia) { EventPagePrivate *priv; int pos = 0; gboolean delegate = (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE); - + priv = epage->priv; /* If the user deletes the organizer attendee explicitly, @@ -1803,22 +1803,22 @@ remove_attendee (EventPage *epage, EMeetingAttendee *ia) if (ia == priv->ia) { g_object_unref (priv->ia); priv->ia = NULL; - } - + } + /* If this was a delegatee, no longer delegate */ if (e_meeting_attendee_is_set_delfrom (ia)) { EMeetingAttendee *ib; - + ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delfrom (ia), &pos); if (ib != NULL) { e_meeting_attendee_set_delto (ib, NULL); - - if (!delegate) + + if (!delegate) e_meeting_attendee_set_edit_level (ib, E_MEETING_ATTENDEE_EDIT_FULL); - } + } } - - /* Handle deleting all attendees in the delegation chain */ + + /* Handle deleting all attendees in the delegation chain */ while (ia != NULL) { EMeetingAttendee *ib = NULL; @@ -1826,16 +1826,16 @@ remove_attendee (EventPage *epage, EMeetingAttendee *ia) g_object_ref (ia); g_ptr_array_add (priv->deleted_attendees, ia); } - + if (e_meeting_attendee_get_delto (ia) != NULL) ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delto (ia), NULL); - + e_meeting_list_view_remove_attendee_from_name_selector (priv->list_view, ia); e_meeting_store_remove_attendee (priv->model, ia); ia = ib; } - + sensitize_widgets (epage); } @@ -1851,7 +1851,7 @@ remove_clicked_cb (GtkButton *btn, EventPage *epage) GtkTreeModel *model = NULL; gboolean valid_iter; char *address; - + priv = epage->priv; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view)); @@ -1861,10 +1861,10 @@ remove_clicked_cb (GtkButton *btn, EventPage *epage) return; } paths = g_list_reverse (paths); - + 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 (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1); @@ -1874,35 +1874,35 @@ remove_clicked_cb (GtkButton *btn, EventPage *epage) g_warning ("Cannot delete attendee\n"); continue; } else if (e_meeting_attendee_get_edit_level (ia) != E_MEETING_ATTENDEE_EDIT_FULL) { - g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia)); + g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia)); continue; } - + remove_attendee (epage, ia); } - + /* Select closest item after removal */ valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path); if (!valid_iter) { gtk_tree_path_prev (path); valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path); } - + if (valid_iter) { gtk_tree_selection_unselect_all (selection); gtk_tree_selection_select_iter (selection, &iter); } - + g_list_foreach (paths, (GFunc) gtk_tree_path_free, NULL); g_list_free (paths); } static void -invite_cb (GtkWidget *widget, gpointer data) +invite_cb (GtkWidget *widget, gpointer data) { EventPage *page; EventPagePrivate *priv; - + page = EVENT_PAGE (data); priv = page->priv; @@ -1912,7 +1912,7 @@ invite_cb (GtkWidget *widget, gpointer data) static void attendee_added_cb (EMeetingListView *emlv, EMeetingAttendee *ia, gpointer user_data) { - EventPage *epage = EVENT_PAGE (user_data); + EventPage *epage = EVENT_PAGE (user_data); EventPagePrivate *priv; gboolean delegate = (COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE); @@ -1922,15 +1922,15 @@ attendee_added_cb (EMeetingListView *emlv, EMeetingAttendee *ia, gpointer user_d if (existing_attendee (ia, priv->comp)) e_meeting_store_remove_attendee (priv->model, ia); else { - if (!e_cal_get_static_capability (COMP_EDITOR_PAGE(epage)->client, + if (!e_cal_get_static_capability (COMP_EDITOR_PAGE(epage)->client, CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) { const char *delegator_id = e_meeting_attendee_get_delfrom (ia); EMeetingAttendee *delegator; delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL); - e_meeting_attendee_set_delto (delegator, + e_meeting_attendee_set_delto (delegator, g_strdup (e_meeting_attendee_get_address (ia))); - + e_meeting_attendee_set_delfrom (ia, g_strdup_printf ("MAILTO:%s", delegator_id)); gtk_widget_set_sensitive (priv->invite, FALSE); gtk_widget_set_sensitive (priv->add, FALSE); @@ -1954,7 +1954,7 @@ static void popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data) { EventPage *epage = data; - + remove_clicked_cb (NULL, epage); } @@ -1967,7 +1967,7 @@ enum { static EPopupItem context_menu_items[] = { { E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, - { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, + { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, }; static void @@ -2000,7 +2000,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage) GtkTreeSelection *selection; if (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, &priv->row); g_free (address); @@ -2009,7 +2009,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage) selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view)); gtk_tree_selection_unselect_all (selection); gtk_tree_selection_select_path (selection, path); - + if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL) disable_mask &= ~ATTENDEE_CAN_DELETE; } @@ -2025,7 +2025,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage) for (i=0;i<sizeof(context_menu_items)/sizeof(context_menu_items[0]);i++) menus = g_slist_prepend(menus, &context_menu_items[i]); - + e_popup_add_items((EPopup *)ep, menus, NULL, context_popup_free, epage); menu = e_popup_create_menu_once((EPopup *)ep, NULL, disable_mask); gtk_menu_popup (menu, NULL, NULL, NULL, NULL, event->button, event->time); @@ -2035,9 +2035,9 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage) static gboolean list_view_event (EMeetingListView *list_view, GdkEvent *event, EventPage *epage) { - + EventPagePrivate *priv= epage->priv; - + if (event->type == GDK_2BUTTON_PRESS && COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_USER_ORG) { EMeetingAttendee *attendee; @@ -2051,7 +2051,7 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, EventPage *epage) return TRUE; } - return FALSE; + return FALSE; } @@ -2059,7 +2059,7 @@ static gboolean list_key_press (EMeetingListView *list_view, GdkEventKey *event, EventPage *epage) { if (event->keyval == GDK_Delete) { - + remove_clicked_cb (NULL, epage); return TRUE; @@ -2104,14 +2104,14 @@ event_page_set_all_day_event (EventPage *epage, gboolean all_day) /* TODO implement the for portion in end time selector */ gtk_widget_set_sensitive (priv->end_time_selector, !all_day); - if (all_day) + if (all_day) gtk_option_menu_set_history (GTK_OPTION_MENU (priv->end_time_selector), 1); - else + else gtk_option_menu_set_history (GTK_OPTION_MENU (priv->end_time_selector), 0); - + if (all_day) { bonobo_ui_component_set_prop (epage->priv->uic, "/commands/ViewTimeZone", "sensitive", "0", NULL); - + /* Round down to the start of the day. */ start_tt.hour = 0; start_tt.minute = 0; @@ -2129,7 +2129,7 @@ event_page_set_all_day_event (EventPage *epage, gboolean all_day) icaltimezone *start_zone; bonobo_ui_component_set_prop (epage->priv->uic, "/commands/ViewTimeZone", "sensitive", "1", NULL); - + if (end_tt.year == start_tt.year && end_tt.month == start_tt.month && end_tt.day == start_tt.day) { @@ -2155,7 +2155,7 @@ event_page_set_all_day_event (EventPage *epage, gboolean all_day) &end_tt, start_zone, TRUE); } - + event_page_set_show_timezone (epage, calendar_config_get_show_timezone() & !all_day); g_signal_handlers_block_matched (priv->start_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); g_signal_handlers_block_matched (priv->end_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); @@ -2196,17 +2196,17 @@ event_page_show_alarm (EventPage *epage) gtk_widget_show (epage->priv->alarm_dialog); } -void +void event_page_set_show_timezone (EventPage *epage, gboolean state) { if (state) { gtk_widget_show_all (epage->priv->start_timezone); - gtk_widget_show (epage->priv->timezone_label); + gtk_widget_show (epage->priv->timezone_label); } else { gtk_widget_hide (epage->priv->start_timezone); gtk_widget_hide (epage->priv->timezone_label); } - + } void @@ -2214,7 +2214,7 @@ event_page_set_show_categories (EventPage *epage, gboolean state) { if (state) { gtk_widget_show (epage->priv->categories_btn); - gtk_widget_show (epage->priv->categories); + gtk_widget_show (epage->priv->categories); } else { gtk_widget_hide (epage->priv->categories_btn); gtk_widget_hide (epage->priv->categories); @@ -2222,7 +2222,7 @@ event_page_set_show_categories (EventPage *epage, gboolean state) } /*If the msg has some value set, the icon should always be set */ -void +void event_page_set_info_string (EventPage *epage, const gchar *icon, const gchar *msg) { EventPagePrivate *priv; @@ -2232,10 +2232,10 @@ event_page_set_info_string (EventPage *epage, const gchar *icon, const gchar *ms gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON); gtk_label_set_text (GTK_LABEL(priv->info_string), msg); - if (msg && icon) - gtk_widget_show (priv->info_hbox); - else - gtk_widget_hide (priv->info_hbox); + if (msg && icon) + gtk_widget_show (priv->info_hbox); + else + gtk_widget_hide (priv->info_hbox); } /* Gets the widgets from the XML file and returns if they are all available. */ @@ -2285,7 +2285,7 @@ get_widgets (EventPage *epage) g_object_ref (priv->main); gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main); - priv->categories = GW ("categories"); + priv->categories = GW ("categories"); priv->categories_btn = GW ("categories-button"); priv->organizer = GW ("organizer"); priv->summary = GW ("summary"); @@ -2302,30 +2302,30 @@ get_widgets (EventPage *epage) priv->remove = GW ("remove-attendee"); priv->edit = GW ("edit-attendee"); priv->list_box = GW ("list-box"); - + priv->calendar_label = GW ("calendar-label"); priv->attendee_box = GW ("attendee-box"); priv->org_cal_label = GW ("org-cal-label"); priv->list_view = e_meeting_list_view_new (priv->model); - + sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN); gtk_widget_show (sw); gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->list_view)); gtk_box_pack_start (GTK_BOX (priv->list_box), sw, TRUE, TRUE, 0); - + /* Glade's visibility flag doesn't seem to work for custom widgets */ priv->start_time = GW ("start-time"); gtk_widget_show (priv->start_time); - + priv->time_hour = GW ("time-hour"); priv->hour_selector = GW ("hour_selector"); priv->minute_selector = GW ("minute_selector"); priv->end_time_selector = GW ("end-time-selector"); - + priv->end_time = GW ("end-time"); gtk_widget_show_all (priv->time_hour); gtk_widget_hide (priv->end_time); @@ -2374,13 +2374,13 @@ summary_changed_cb (GtkEditable *editable, gpointer data) EventPage *epage; EventPagePrivate *priv; gchar *summary; - + epage = EVENT_PAGE (data); priv = epage->priv; - + if (priv->updating) return; - + summary = e_dialog_editable_get (GTK_WIDGET (editable)); comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (epage), summary); @@ -2401,7 +2401,7 @@ notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt, gboolean all_day_event; icaltimezone *start_zone = NULL; priv = epage->priv; - + all_day_event = priv->all_day_event; start_dt.value = start_tt; @@ -2485,7 +2485,7 @@ times_updated (EventPage *epage, gboolean adjust_end_time) gboolean date_set, all_day_event; gboolean set_start_date = FALSE, set_end_date = FALSE; icaltimezone *start_zone; - + priv = epage->priv; if (priv->updating) @@ -2575,7 +2575,7 @@ static void start_date_changed_cb (GtkWidget *dedit, gpointer data) { EventPage *epage; - + epage = EVENT_PAGE (data); hour_minute_changed (epage); @@ -2590,7 +2590,7 @@ static void end_date_changed_cb (GtkWidget *dedit, gpointer data) { EventPage *epage; - + epage = EVENT_PAGE (data); times_updated (epage, FALSE); @@ -2654,9 +2654,9 @@ event_page_sendoptions_clicked_cb (EventPage *epage) E_SOURCE_COMBO_BOX (priv->source_selector)); e_sendoptions_utils_set_default_data (priv->sod, source, "calendar"); priv->sod->data->initialized = TRUE; - } + } - if (e_cal_get_static_capability (COMP_EDITOR_PAGE (epage)->client, + if (e_cal_get_static_capability (COMP_EDITOR_PAGE (epage)->client, CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) { e_sendoptions_set_need_general_options (priv->sod, FALSE); } @@ -2671,10 +2671,10 @@ field_changed_cb (GtkWidget *widget, gpointer data) { EventPage *epage; EventPagePrivate *priv; - + epage = EVENT_PAGE (data); priv = epage->priv; - + if (!priv->updating) comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage)); } @@ -2693,7 +2693,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage) client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT); if (client) { icaltimezone *zone; - + zone = calendar_config_get_icaltimezone (); e_cal_set_default_timezone (client, zone, NULL); } @@ -2727,7 +2727,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage) gchar *backend_addr = NULL; e_cal_get_cal_address(client, &backend_addr, NULL); - + if (priv->is_meeting) event_page_select_organizer (epage, backend_addr); @@ -2747,13 +2747,13 @@ set_subscriber_info_string (EventPage *epage, const char *backend_address) { ECal *client = COMP_EDITOR_PAGE (epage)->client; ESource *source; - + source = e_cal_get_source (client); - + if (e_source_get_property (source, "subscriber")) - /* Translators: This string is used when we are creating an Event + /* Translators: This string is used when we are creating an Event (meeting or appointment) on behalf of some other user */ - event_page_set_info_string (epage, GTK_STOCK_DIALOG_INFO, + event_page_set_info_string (epage, GTK_STOCK_DIALOG_INFO, g_strdup_printf(_("You are acting on behalf of %s"), backend_address)); else event_page_set_info_string (epage, NULL, NULL); @@ -2764,7 +2764,7 @@ alarm_changed_cb (GtkWidget *widget, gpointer data) { EventPage *epage; EventPagePrivate *priv; - + epage = EVENT_PAGE (data); priv = epage->priv; @@ -2774,43 +2774,43 @@ alarm_changed_cb (GtkWidget *widget, gpointer data) icalcomponent *icalcomp; icalproperty *icalprop; int alarm_type; - - ca = e_cal_component_alarm_new (); - + + ca = e_cal_component_alarm_new (); + e_cal_component_alarm_set_action (ca, E_CAL_COMPONENT_ALARM_DISPLAY); memset (&trigger, 0, sizeof (ECalComponentAlarmTrigger)); - trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START; + trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START; trigger.u.rel_duration.is_neg = 1; - + alarm_type = e_dialog_option_menu_get (priv->alarm_time, alarm_map); switch (alarm_type) { case ALARM_15_MINUTES: e_alarm_list_clear (priv->alarm_list_store); trigger.u.rel_duration.minutes = 15; break; - + case ALARM_1_HOUR: e_alarm_list_clear (priv->alarm_list_store); trigger.u.rel_duration.hours = 1; break; - + case ALARM_1_DAY: - e_alarm_list_clear (priv->alarm_list_store); + e_alarm_list_clear (priv->alarm_list_store); trigger.u.rel_duration.days = 1; break; case ALARM_USER_TIME: - e_alarm_list_clear (priv->alarm_list_store); + e_alarm_list_clear (priv->alarm_list_store); switch (calendar_config_get_default_reminder_units ()) { - case CAL_DAYS: + case CAL_DAYS: trigger.u.rel_duration.days = priv->alarm_interval; break; - + case CAL_HOURS: trigger.u.rel_duration.hours = priv->alarm_interval; break; - + case CAL_MINUTES: trigger.u.rel_duration.minutes = priv->alarm_interval; break; @@ -2818,14 +2818,14 @@ alarm_changed_cb (GtkWidget *widget, gpointer data) break; case ALARM_CUSTOM: gtk_widget_set_sensitive (priv->alarm_box, TRUE); - + default: break; } - + if (alarm_type != ALARM_CUSTOM) { e_cal_component_alarm_set_trigger (ca, trigger); - + icalcomp = e_cal_component_alarm_get_icalcomponent (ca); icalprop = icalproperty_new_x ("1"); icalproperty_set_x_name (icalprop, "X-EVOLUTION-NEEDS-DESCRIPTION"); @@ -2843,24 +2843,24 @@ alarm_changed_cb (GtkWidget *widget, gpointer data) gtk_container_remove (GTK_CONTAINER (priv->status_icons), priv->alarm_icon); priv->alarm_icon = NULL; } - } - - sensitize_widgets (epage); + } + + sensitize_widgets (epage); } -static void +static void alarm_store_inserted_cb (EAlarmList *alarm_list_store, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { field_changed_cb (NULL, data); } -static void +static void alarm_store_deleted_cb (EAlarmList *alarm_list_store, GtkTreePath *path, gpointer data) { field_changed_cb (NULL, data); } -static void +static void alarm_store_changed_cb (EAlarmList *alarm_list_store, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { field_changed_cb (NULL, data); @@ -2877,18 +2877,18 @@ alarm_custom_clicked_cb (GtkWidget *widget, gpointer data) GtkTreeIter iter; gboolean valid_iter; GtkWidget *toplevel; - + epage = EVENT_PAGE (data); priv = epage->priv; /* Make a copy of the list store in case the user cancels */ temp_list_store = e_alarm_list_new (); model = GTK_TREE_MODEL (priv->alarm_list_store); - + for (valid_iter = gtk_tree_model_get_iter_first (model, &iter); valid_iter; valid_iter = gtk_tree_model_iter_next (model, &iter)) { ECalComponentAlarm *alarm; - + alarm = (ECalComponentAlarm *) e_alarm_list_get_alarm (priv->alarm_list_store, &iter); if (alarm == NULL) { g_warning ("alarm is NULL\n"); @@ -2896,18 +2896,18 @@ alarm_custom_clicked_cb (GtkWidget *widget, gpointer data) } e_alarm_list_append (temp_list_store, NULL, alarm); - } - + } + toplevel = gtk_widget_get_toplevel (priv->main); if (alarm_list_dialog_run (toplevel, COMP_EDITOR_PAGE (epage)->client, temp_list_store)) { g_object_unref (priv->alarm_list_store); priv->alarm_list_store = temp_list_store; - comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage)); + comp_editor_page_notify_changed (COMP_EDITOR_PAGE (epage)); } else { g_object_unref (temp_list_store); - } - + } + /* If the user erases everything, uncheck the alarm toggle */ valid_iter = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->alarm_list_store), &iter); @@ -2925,7 +2925,7 @@ init_widgets (EventPage *epage) char *menu_label = NULL; GtkTreeSelection *selection; GtkWidget *cus_item, *menu; - + priv = epage->priv; /* Make sure the EDateEdit widgets use our timezones to get the @@ -2967,7 +2967,7 @@ init_widgets (EventPage *epage) /* Categories */ g_signal_connect((priv->categories_btn), "clicked", G_CALLBACK (categories_clicked_cb), epage); - + /* Source selector */ g_signal_connect((priv->source_selector), "changed", G_CALLBACK (source_changed_cb), epage); @@ -2984,19 +2984,19 @@ init_widgets (EventPage *epage) g_signal_connect((priv->start_timezone), "changed", G_CALLBACK (start_timezone_changed_cb), epage); - e_meeting_list_view_column_set_visible (priv->list_view, "Attendee ", + e_meeting_list_view_column_set_visible (priv->list_view, "Attendee ", TRUE); e_meeting_list_view_column_set_visible (priv->list_view, "Role", calendar_config_get_show_role()); e_meeting_list_view_column_set_visible (priv->list_view, "RSVP", calendar_config_get_show_rsvp()); e_meeting_list_view_column_set_visible (priv->list_view, "Status", calendar_config_get_show_status()); e_meeting_list_view_column_set_visible (priv->list_view, "Type", calendar_config_get_show_type()); - + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); g_signal_connect (G_OBJECT (priv->list_view), "button_press_event", G_CALLBACK (button_press_event), epage); g_signal_connect (G_OBJECT (priv->list_view), "event", G_CALLBACK (list_view_event), epage); - g_signal_connect (priv->list_view, "key_press_event", G_CALLBACK (list_key_press), epage); + g_signal_connect (priv->list_view, "key_press_event", G_CALLBACK (list_key_press), epage); /* Add attendee button */ g_signal_connect (priv->add, "clicked", G_CALLBACK (add_clicked_cb), epage); @@ -3008,7 +3008,7 @@ init_widgets (EventPage *epage) g_signal_connect (priv->edit, "clicked", G_CALLBACK (edit_clicked_cb), epage); /* Contacts button */ - g_signal_connect(priv->invite, "clicked", G_CALLBACK (invite_cb), epage); + g_signal_connect(priv->invite, "clicked", G_CALLBACK (invite_cb), epage); /* Alarm dialog */ g_signal_connect (GTK_DIALOG (priv->alarm_dialog), "response", G_CALLBACK (gtk_widget_hide), priv->alarm_dialog); @@ -3020,7 +3020,7 @@ init_widgets (EventPage *epage) gtk_window_set_modal (GTK_WINDOW (priv->alarm_dialog), TRUE); /* Meeting List View */ - g_signal_connect (priv->list_view, "attendee_added", G_CALLBACK (attendee_added_cb), epage); + g_signal_connect (priv->list_view, "attendee_added", G_CALLBACK (attendee_added_cb), epage); gtk_widget_show (GTK_WIDGET (priv->list_view)); @@ -3031,7 +3031,7 @@ init_widgets (EventPage *epage) } else { gtk_widget_show (priv->categories_btn); gtk_widget_show (priv->categories); - } + } /* End time selector */ gtk_option_menu_set_history (GTK_OPTION_MENU (priv->end_time_selector), 1); @@ -3049,24 +3049,24 @@ init_widgets (EventPage *epage) priv->alarm_units = calendar_config_get_default_reminder_units (); priv->alarm_interval = calendar_config_get_default_reminder_interval (); - menu_label = ""; + menu_label = ""; switch (priv->alarm_units) { case CAL_DAYS: if (priv->alarm_interval != 1) { menu_label = g_strdup_printf (ngettext("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval); - } + } break; - + case CAL_HOURS: if (priv->alarm_interval != 1) { menu_label = g_strdup_printf (ngettext("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval); - } + } break; - + case CAL_MINUTES: if (priv->alarm_interval != 15) { menu_label = g_strdup_printf (ngettext("%d minute before appointment", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval); - } + } break; } @@ -3076,23 +3076,23 @@ init_widgets (EventPage *epage) } menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time)); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), cus_item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), cus_item); cus_item = gtk_menu_item_new_with_label (_("Customize")); gtk_widget_show (cus_item); menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time)); gtk_menu_shell_append (GTK_MENU_SHELL (menu), cus_item); - + cus_item = gtk_menu_item_new_with_label (_("None")); gtk_widget_show (cus_item); menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->alarm_time)); gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), cus_item); - + g_signal_connect (priv->alarm_time, "changed", G_CALLBACK (field_changed_cb), epage); g_signal_connect (priv->alarm_time, "changed", G_CALLBACK (alarm_changed_cb), epage); - + /* Belongs to priv->description */ g_signal_connect((text_buffer), "changed", G_CALLBACK (field_changed_cb), epage); @@ -3180,9 +3180,9 @@ event_page_select_organizer (EventPage *epage, const char *backend_address) /** * event_page_construct: * @epage: An event page. - * + * * Constructs an event page by loading its Glade data. - * + * * Return value: The same object as @epage, or NULL if the widgets could not be * created. **/ @@ -3206,13 +3206,13 @@ event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client) g_free (gladefile); if (!priv->xml) { - g_message ("event_page_construct(): " + g_message ("event_page_construct(): " "Could not load the Glade XML file!"); return NULL; } if (!get_widgets (epage)) { - g_message ("event_page_construct(): " + g_message ("event_page_construct(): " "Could not find all widgets in the XML file!"); return NULL; } @@ -3222,10 +3222,10 @@ event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client) e_iterator_is_valid(it); e_iterator_next(it)) { gchar *full = NULL; - + a = (EAccount *)e_iterator_get(it); - + /* skip disabled accounts */ if (!a->enabled) continue; @@ -3234,7 +3234,7 @@ event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client) priv->address_strings = g_list_append(priv->address_strings, full); } - + g_object_unref(it); if (priv->address_strings) @@ -3243,7 +3243,7 @@ event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client) g_warning ("No potential organizers!"); if (!init_widgets (epage)) { - g_message ("event_page_construct(): " + g_message ("event_page_construct(): " "Could not initialize the widgets!"); return NULL; } @@ -3253,9 +3253,9 @@ event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client) /** * event_page_new: - * + * * Creates a new event page. - * + * * Return value: A newly-created event page, or NULL if the page could * not be created. **/ @@ -3329,22 +3329,22 @@ set_attendees (ECalComponent *comp, const GPtrArray *attendees) { GSList *comp_attendees = NULL, *l; int i; - + for (i = 0; i < attendees->len; i++) { EMeetingAttendee *ia = g_ptr_array_index (attendees, i); ECalComponentAttendee *ca; - + ca = e_meeting_attendee_as_e_cal_component_attendee (ia); - + comp_attendees = g_slist_prepend (comp_attendees, ca); - + } comp_attendees = g_slist_reverse (comp_attendees); - + e_cal_component_set_attendee_list (comp, comp_attendees); for (l = comp_attendees; l != NULL; l = l->next) - g_free (l->data); + g_free (l->data); g_slist_free (comp_attendees); } @@ -3360,9 +3360,9 @@ event_page_get_cancel_comp (EventPage *page) if (priv->deleted_attendees->len == 0) return NULL; - + set_attendees (priv->comp, priv->deleted_attendees); - + return e_cal_component_clone (priv->comp); } diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c index b6a7de8cf1..1c5b28c512 100644 --- a/calendar/gui/dialogs/memo-editor.c +++ b/calendar/gui/dialogs/memo-editor.c @@ -41,8 +41,8 @@ struct _MemoEditorPrivate { MemoPage *memo_page; - - gboolean updating; + + gboolean updating; }; static void memo_editor_set_e_cal (CompEditor *editor, ECal *client); @@ -99,11 +99,11 @@ menu_show_categories_cb (BonoboUIComponent *component, gpointer user_data) { MemoEditor *me = (MemoEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - memo_page_set_show_categories (me->priv->memo_page, atoi(state)); + memo_page_set_show_categories (me->priv->memo_page, atoi(state)); calendar_config_set_show_categories (atoi(state)); } @@ -133,7 +133,7 @@ menu_class_private_cb (BonoboUIComponent *ui_component, MemoEditor *me = (MemoEditor *) user_data; if (state[0] == '0') return; - + comp_editor_page_notify_changed (COMP_EDITOR_PAGE (me->priv->memo_page)); memo_page_set_classification (me->priv->memo_page, E_CAL_COMPONENT_CLASS_PRIVATE); } @@ -161,11 +161,11 @@ memo_editor_init (MemoEditor *me) CompEditor *editor = COMP_EDITOR(me); gboolean status; char *xmlfile; - + priv = g_new0 (MemoEditorPrivate, 1); me->priv = priv; - priv->updating = FALSE; + priv->updating = FALSE; bonobo_ui_component_freeze (editor->uic, NULL); @@ -174,7 +174,7 @@ memo_editor_init (MemoEditor *me) xmlfile, "evolution-memo-editor", NULL); g_free (xmlfile); - + status = calendar_config_get_show_categories (); bonobo_ui_component_set_prop ( editor->uic, "/commands/ViewCategories", @@ -196,7 +196,7 @@ memo_editor_init (MemoEditor *me) editor->uic, "ActionClassConfidential", menu_class_confidential_cb, editor); - bonobo_ui_component_thaw (editor->uic, NULL); + bonobo_ui_component_thaw (editor->uic, NULL); /* TODO add help stuff */ /* comp_editor_set_help_section (COMP_EDITOR (me), "usage-calendar-memo"); */ @@ -209,12 +209,12 @@ memo_editor_construct (MemoEditor *me, ECal *client) CompEditor *editor = COMP_EDITOR (me); gboolean read_only = FALSE; guint32 flags = comp_editor_get_flags (editor); - + priv = me->priv; priv->memo_page = memo_page_new (editor->uic, flags); g_object_ref_sink (priv->memo_page); - comp_editor_append_page (COMP_EDITOR (me), + comp_editor_append_page (COMP_EDITOR (me), COMP_EDITOR_PAGE (priv->memo_page), _("Memo"), TRUE); g_signal_connect (G_OBJECT (priv->memo_page), "client_changed", @@ -222,11 +222,11 @@ memo_editor_construct (MemoEditor *me, ECal *client) if (!e_cal_is_read_only (client, &read_only, NULL)) read_only = TRUE; - + bonobo_ui_component_set_prop (editor->uic, "/Toolbar/ecal3", "hidden", "1", NULL); comp_editor_set_e_cal (COMP_EDITOR (me), client); - - + + init_widgets (me); @@ -273,7 +273,7 @@ memo_editor_finalize (GObject *object) g_object_unref (priv->memo_page); priv->memo_page = NULL; } - + g_free (priv); if (G_OBJECT_CLASS (memo_editor_parent_class)->finalize) diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c index 6255b7aef6..d89e7a4049 100644 --- a/calendar/gui/dialogs/memo-page.c +++ b/calendar/gui/dialogs/memo-page.c @@ -83,7 +83,7 @@ struct _MemoPagePrivate { GtkWidget *to_button; GtkWidget *to_hbox; GtkWidget *to_entry; - + /* Summary */ GtkWidget *summary_label; GtkWidget *summary_entry; @@ -91,7 +91,7 @@ struct _MemoPagePrivate { /* Start date */ GtkWidget *start_label; GtkWidget *start_date; - + GtkWidget *categories_btn; GtkWidget *categories; @@ -129,10 +129,10 @@ G_DEFINE_TYPE (MemoPage, memo_page, TYPE_COMP_EDITOR_PAGE) /** * memo_page_get_type: - * + * * Registers the #TaskPage class if necessary, and returns the type ID * associated to it. - * + * * Return value: The type ID of the #TaskPage class. **/ @@ -150,7 +150,7 @@ memo_page_class_init (MemoPageClass *klass) editor_page_class->focus_main_widget = memo_page_focus_main_widget; editor_page_class->fill_widgets = memo_page_fill_widgets; editor_page_class->fill_component = memo_page_fill_component; - + object_class->finalize = memo_page_finalize; } @@ -194,7 +194,7 @@ memo_page_finalize (GObject *object) mpage = MEMO_PAGE (object); priv = mpage->priv; - + for (l = priv->address_strings; l != NULL; l = l->next) g_free (l->data); g_list_free (priv->address_strings); @@ -286,7 +286,7 @@ clear_widgets (MemoPage *mpage) e_dialog_editable_set (priv->categories, NULL); } -void +void memo_page_set_classification (MemoPage *page, ECalComponentClassification class) { page->priv->classification = class; @@ -297,32 +297,32 @@ sensitize_widgets (MemoPage *mpage) { gboolean read_only, sens = FALSE, sensitize; MemoPagePrivate *priv; - + priv = mpage->priv; if (!e_cal_is_read_only (COMP_EDITOR_PAGE (mpage)->client, &read_only, NULL)) read_only = TRUE; - + if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_IS_SHARED) sens = COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_PAGE_USER_ORG; else sens = TRUE; sensitize = (!read_only && sens); - + priv = mpage->priv; - /* The list of organizers is set to be non-editable. Otherwise any - * change in the displayed list causes an 'Account not found' error. + /* The list of organizers is set to be non-editable. Otherwise any + * change in the displayed list causes an 'Account not found' error. */ gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (priv->org_combo)->entry), FALSE); - + gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->memo_content), sensitize); gtk_widget_set_sensitive (priv->start_date, sensitize); gtk_widget_set_sensitive (priv->categories_btn, !read_only); gtk_editable_set_editable (GTK_EDITABLE (priv->categories), !read_only); gtk_editable_set_editable (GTK_EDITABLE (priv->summary_entry), sensitize); - + if (COMP_EDITOR_PAGE (mpage)->flags & COMP_EDITOR_IS_SHARED) { if (priv->to_entry) { gtk_editable_set_editable (GTK_EDITABLE (priv->to_entry), !read_only); @@ -357,18 +357,18 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) priv = mpage->priv; priv->updating = TRUE; - + /* Clean the screen */ clear_widgets (mpage); /* Summary */ e_cal_component_get_summary (comp, &text); e_dialog_editable_set (priv->summary_entry, text.value); - + e_cal_component_get_description_list (comp, &l); if (l && l->data) { ECalComponentText *dtext; - + dtext = l->data; gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->memo_content)), dtext->value ? dtext->value : "", -1); @@ -398,7 +398,7 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) break; } case E_CAL_COMPONENT_CLASS_PRIVATE: - { + { cl = E_CAL_COMPONENT_CLASS_PRIVATE; break; } @@ -446,7 +446,7 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) } } - if (backend_addr) + if (backend_addr) g_free (backend_addr); /* Source */ @@ -461,7 +461,7 @@ memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) return TRUE; } -static gboolean +static gboolean fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) { EDestinationStore *destination_store; @@ -504,16 +504,16 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) break; } } - + if (book) { GList *contacts = NULL; EContact *n_con = NULL; char *qu; EBookQuery *query; - qu = g_strdup_printf ("(is \"full_name\" \"%s\")", + qu = g_strdup_printf ("(is \"full_name\" \"%s\")", (char *) e_contact_get (contact, E_CONTACT_FULL_NAME)); - query = e_book_query_from_string (qu); + query = e_book_query_from_string (qu); if (!e_book_get_contacts (book, query, &contacts, NULL)) { g_warning ("Could not get contact from the book \n"); @@ -524,7 +524,7 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) e_destination_set_contact (des, n_con, 0); list_dests = e_destination_list_get_dests (des); - g_list_foreach (contacts, (GFunc) g_object_unref, NULL); + g_list_foreach (contacts, (GFunc) g_object_unref, NULL); g_list_free (contacts); } @@ -538,22 +538,22 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) card_dest.data = destination; list_dests = &card_dest; } - } - + } + for (l = list_dests; l; l = l->next) { EDestination *dest = l->data; const char *name, *attendee = NULL; - + name = e_destination_get_name (dest); /* If we couldn't get the attendee prior, get the email address as the default */ if (attendee == NULL || *attendee == '\0') { attendee = e_destination_get_email (dest); } - + if (attendee == NULL || *attendee == '\0') continue; - + if (!str) { str = g_string_new (NULL); g_string_prepend (str, attendee); @@ -571,7 +571,7 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) icalprop = icalproperty_new_x (str->str); icalproperty_set_x_name (icalprop, "X-EVOLUTION-RECIPIENTS"); icalcomponent_add_property (icalcomp, icalprop); - + g_string_free (str, FALSE); return TRUE; } else @@ -580,17 +580,17 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp) static EAccount * get_current_account (MemoPage *page) -{ +{ MemoPagePrivate *priv; EIterator *it; const char *str; - + priv = page->priv; str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->org_combo)->entry)); 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); char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); @@ -601,12 +601,12 @@ get_current_account (MemoPage *page) return a; } - + g_free (full); } g_object_unref (it); - - return NULL; + + return NULL; } /* fill_component handler for the memo page */ @@ -686,7 +686,7 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) l.next = NULL; e_cal_component_set_description_list (comp, &l); - + g_free(txt); } @@ -708,7 +708,7 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) &start_tt.month, &start_tt.day)) e_cal_component_set_dtstart (comp, &start_date); - else + else e_cal_component_set_dtstart (comp, NULL); /* Classification. */ @@ -730,7 +730,7 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) EAccount *a; gchar *backend_addr = NULL, *org_addr = NULL, *sentby = NULL; - + e_cal_get_cal_address (page->client, &backend_addr, NULL); /* Find the identity for the organizer or sentby field */ @@ -740,14 +740,14 @@ memo_page_fill_component (CompEditorPage *page, ECalComponent *comp) if (a == NULL) { e_notice (page, GTK_MESSAGE_ERROR, _("The organizer selected no longer has an account.")); - return FALSE; + return FALSE; } if (a->id->address == NULL || strlen (a->id->address) == 0) { e_notice (page, GTK_MESSAGE_ERROR, _("An organizer is required.")); return FALSE; - } + } if (!(backend_addr && *backend_addr) || !g_ascii_strcasecmp (backend_addr, a->id->address)) { org_addr = g_strdup_printf ("MAILTO:%s", a->id->address); @@ -778,7 +778,7 @@ memo_page_set_show_categories (MemoPage *page, gboolean state) { if (state) { gtk_widget_show (page->priv->categories_btn); - gtk_widget_show (page->priv->categories); + gtk_widget_show (page->priv->categories); } else { gtk_widget_hide (page->priv->categories_btn); gtk_widget_hide (page->priv->categories); @@ -786,7 +786,7 @@ memo_page_set_show_categories (MemoPage *page, gboolean state) } /*If the msg has some value set, the icon should always be set */ -void +void memo_page_set_info_string (MemoPage *mpage, const gchar *icon, const gchar *msg) { MemoPagePrivate *priv; @@ -797,9 +797,9 @@ memo_page_set_info_string (MemoPage *mpage, const gchar *icon, const gchar *msg) gtk_label_set_text (GTK_LABEL(priv->info_string), msg); if (msg && icon) - gtk_widget_show (priv->info_hbox); + gtk_widget_show (priv->info_hbox); else - gtk_widget_hide (priv->info_hbox); + gtk_widget_hide (priv->info_hbox); } /* Gets the widgets from the XML file and returns if they are all available. */ @@ -837,7 +837,7 @@ get_widgets (MemoPage *mpage) priv->org_label = GW ("org-label"); priv->org_combo = GW ("org-combo"); - + priv->to_button = GW ("to-button"); priv->to_hbox = GW ("to-hbox"); @@ -846,7 +846,7 @@ get_widgets (MemoPage *mpage) priv->start_label = GW ("start-label"); priv->start_date = GW ("start-date"); - + priv->memo_content = GW ("memo_content"); priv->categories_btn = GW ("categories-button"); @@ -885,10 +885,10 @@ field_changed_cb (GtkWidget *widget, gpointer data) { MemoPage *mpage; MemoPagePrivate *priv; - + mpage = MEMO_PAGE (data); priv = mpage->priv; - + if (!priv->updating) comp_editor_page_notify_changed (COMP_EDITOR_PAGE (mpage)); } @@ -948,13 +948,13 @@ set_subscriber_info_string (MemoPage *mpage, const char *backend_address) { ECal *client = COMP_EDITOR_PAGE (mpage)->client; ESource *source; - + source = e_cal_get_source (client); - + if (e_source_get_property (source, "subscriber")) - /* Translators: This string is used when we are creating a Memo + /* Translators: This string is used when we are creating a Memo on behalf of some other user */ - memo_page_set_info_string (mpage, GTK_STOCK_DIALOG_INFO, + memo_page_set_info_string (mpage, GTK_STOCK_DIALOG_INFO, g_strdup_printf(_("You are acting on behalf of %s"), backend_address)); else memo_page_set_info_string (mpage, NULL, NULL); @@ -991,13 +991,13 @@ summary_changed_cb (GtkEditable *editable, gpointer data) MemoPage *mpage; MemoPagePrivate *priv; gchar *summary; - + mpage = MEMO_PAGE (data); priv = mpage->priv; - + if (priv->updating) return; - + summary = e_dialog_editable_get (GTK_WIDGET (editable)); comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (mpage), summary); @@ -1005,12 +1005,12 @@ summary_changed_cb (GtkEditable *editable, gpointer data) } static void -to_button_clicked_cb (GtkButton *button, gpointer data) +to_button_clicked_cb (GtkButton *button, gpointer data) { MemoPage *page = data; MemoPagePrivate *priv = page->priv; ENameSelectorDialog *name_selector_dialog; - + name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector); gtk_widget_show (GTK_WIDGET (name_selector_dialog)); } @@ -1058,7 +1058,7 @@ init_widgets (MemoPage *mpage) /* Source selector */ g_signal_connect((priv->source_selector), "changed", G_CALLBACK (source_changed_cb), mpage); - + /* Connect the default signal handler to use to make sure the "changed" field gets set whenever a field is changed. */ @@ -1068,13 +1068,13 @@ init_widgets (MemoPage *mpage) g_signal_connect((priv->categories), "changed", G_CALLBACK (field_changed_cb), mpage); - + g_signal_connect((priv->summary_entry), "changed", G_CALLBACK (field_changed_cb), mpage); - + g_signal_connect((priv->source_selector), "changed", G_CALLBACK (field_changed_cb), mpage); - + g_signal_connect((priv->start_date), "changed", G_CALLBACK (field_changed_cb), mpage); @@ -1082,13 +1082,13 @@ init_widgets (MemoPage *mpage) ENameSelectorDialog *name_selector_dialog; name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector); - + g_signal_connect (name_selector_dialog, "response", G_CALLBACK (response_cb), mpage); g_signal_connect ((priv->to_button), "clicked", G_CALLBACK (to_button_clicked_cb), mpage); g_signal_connect ((priv->to_entry), "changed", G_CALLBACK (field_changed_cb), mpage); } - + memo_page_set_show_categories (mpage, calendar_config_get_show_categories()); return TRUE; @@ -1099,7 +1099,7 @@ get_to_entry (ENameSelector *name_selector) { ENameSelectorModel *name_selector_model; ENameSelectorEntry *name_selector_entry; - + name_selector_model = e_name_selector_peek_model (name_selector); e_name_selector_model_add_section (name_selector_model, "To", _("To"), NULL); name_selector_entry = (ENameSelectorEntry *)e_name_selector_peek_section_list (name_selector, "To"); @@ -1128,9 +1128,9 @@ memo_page_select_organizer (MemoPage *mpage, const char *backend_address) if (source) user_addr = e_source_get_property (source, "subscriber"); - if (user_addr) + if (user_addr) subscribed_cal = TRUE; - else + else user_addr = backend_address; priv->default_address = NULL; @@ -1156,9 +1156,9 @@ memo_page_select_organizer (MemoPage *mpage, const char *backend_address) /** * memo_page_construct: * @mpage: An memo page. - * + * * Constructs an memo page by loading its Glade data. - * + * * Return value: The same object as @mpage, or NULL if the widgets could not be * created. **/ @@ -1213,7 +1213,7 @@ memo_page_construct (MemoPage *mpage) gtk_widget_show (priv->org_label); gtk_widget_show (priv->org_combo); - + if (flags & COMP_EDITOR_PAGE_NEW_ITEM) { priv->name_selector = e_name_selector_new (); priv->to_entry = get_to_entry (priv->name_selector); @@ -1225,7 +1225,7 @@ memo_page_construct (MemoPage *mpage) } if (!init_widgets (mpage)) { - g_message ("memo_page_construct(): " + g_message ("memo_page_construct(): " "Could not initialize the widgets!"); return NULL; } @@ -1235,9 +1235,9 @@ memo_page_construct (MemoPage *mpage) /** * memo_page_new: - * + * * Creates a new memo page. - * + * * Return value: A newly-created task page, or NULL if the page could * not be created. **/ diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c index 4f11f9536d..ecf1436abc 100644 --- a/calendar/gui/dialogs/recur-comp.c +++ b/calendar/gui/dialogs/recur-comp.c @@ -41,16 +41,16 @@ recur_component_dialog (ECal *client, GtkWidget *placeholder, *vbox; ECalComponentVType vtype; gboolean ret; - + g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE); vtype = e_cal_component_get_vtype (comp); - + switch (vtype) { case E_CAL_COMPONENT_EVENT: if (!delegated) str = g_strdup_printf (_("You are modifying a recurring event. What would you like to modify?")); - else + else str = g_strdup_printf (_("You are delegating a recurring event. What would you like to delegate?")); break; diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 93a9fd05ba..c86137a5a5 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -148,7 +148,7 @@ struct _RecurrencePagePrivate { GtkWidget *recurs; gboolean custom; - + GtkWidget *params; GtkWidget *interval_value; GtkWidget *interval_unit; @@ -170,7 +170,7 @@ struct _RecurrencePagePrivate { GtkWidget *month_num_menu; enum month_num_options month_num; - + /* For ending date, created by hand */ GtkWidget *ending_date_edit; struct icaltimetype ending_date_tt; @@ -193,7 +193,7 @@ struct _RecurrencePagePrivate { /* For the recurrence preview, the actual widget */ GtkWidget *preview_calendar; EMiniCalendarConfig *preview_calendar_config; - + gboolean updating; }; @@ -354,7 +354,7 @@ clear_widgets (RecurrencePage *rpage) priv = rpage->priv; priv->custom = FALSE; - + priv->weekday_day_mask = 0; priv->month_index = 1; @@ -382,7 +382,7 @@ clear_widgets (RecurrencePage *rpage) menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->ending_menu)); g_signal_handlers_block_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage); - e_dialog_option_menu_set (priv->ending_menu, + e_dialog_option_menu_set (priv->ending_menu, ENDING_FOR, ending_types_map); g_signal_handlers_unblock_matched (menu, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, rpage); @@ -476,12 +476,12 @@ sensitize_recur_widgets (RecurrencePage *rpage) GtkWidget *label; priv = rpage->priv; - + if (COMP_EDITOR_PAGE (rpage)->flags & COMP_EDITOR_PAGE_MEETING) sens = COMP_EDITOR_PAGE (rpage)->flags & COMP_EDITOR_PAGE_USER_ORG; recurs = e_dialog_toggle_get (priv->recurs); - + /* We can't preview that well for instances right now */ if (e_cal_component_is_instance (priv->comp)) gtk_widget_set_sensitive (priv->preview_calendar, FALSE); @@ -524,13 +524,13 @@ sensitize_buttons (RecurrencePage *rpage) priv = rpage->priv; if (COMP_EDITOR_PAGE (rpage)->flags & COMP_EDITOR_PAGE_MEETING) sensitize = COMP_EDITOR_PAGE (rpage)->flags & COMP_EDITOR_PAGE_USER_ORG; - + selected_rows = gtk_tree_selection_count_selected_rows ( gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->exception_list))); if (!e_cal_is_read_only (COMP_EDITOR_PAGE (rpage)->client, &read_only, NULL)) read_only = TRUE; - + if (!read_only) { e_cal_component_get_uid (priv->comp, &uid); @@ -646,7 +646,7 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp) case ICAL_MONTHLY_RECURRENCE: { enum month_num_options month_num; enum month_day_options month_day; - + g_return_if_fail (GTK_BIN (priv->special)->child != NULL); g_return_if_fail (priv->month_day_menu != NULL); g_return_if_fail (GTK_IS_OPTION_MENU (priv->month_day_menu)); @@ -662,7 +662,7 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp) month_num = -1; else month_num++; - + switch (month_day) { case MONTH_DAY_NTH: if (month_num == -1) @@ -786,7 +786,7 @@ fill_component (RecurrencePage *rpage, ECalComponent *comp) model = GTK_TREE_MODEL (priv->exception_list_store); recurs = e_dialog_toggle_get (priv->recurs); - + if (recurs && priv->custom) { /* We just keep whatever the component has currently */ } else if (recurs) { @@ -844,7 +844,7 @@ preview_recur (RecurrencePage *rpage) ECalComponentDateTime cdt; GSList *l; icaltimezone *zone = NULL; - + priv = rpage->priv; /* If our component has not been set yet through ::fill_widgets(), we @@ -955,7 +955,7 @@ month_num_submenu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data) { GtkWidget *item; int month_index; - + item = gtk_menu_get_active (GTK_MENU (menu_shell)); item = gtk_menu_get_active (GTK_MENU (gtk_menu_item_get_submenu (GTK_MENU_ITEM (item)))); @@ -969,14 +969,14 @@ make_recur_month_num_submenu (const char *title, int start, int end) { GtkWidget *submenu, *item; int i; - + submenu = gtk_menu_new (); for (i = start; i < end; i++) { item = gtk_menu_item_new_with_label (_(e_cal_recur_nth[i])); gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item); gtk_object_set_user_data (GTK_OBJECT (item), GINT_TO_POINTER (i + 1)); gtk_widget_show (item); - } + } item = gtk_menu_item_new_with_label (_(title)); gtk_widget_show (item); @@ -990,28 +990,28 @@ make_recur_month_num_menu (int month_index) { static const char *options[] = { /* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] [Monday] [forever]' - * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or + * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or * the name of a week day (like 'Monday' or 'Friday') always follow. */ N_("first"), /* TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute") * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] [forever]' - * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or + * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or * the name of a week day (like 'Monday' or 'Friday') always follow. */ N_("second"), /* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] [Monday] [forever]' - * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or + * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or * the name of a week day (like 'Monday' or 'Friday') always follow. */ N_("third"), /* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] [Monday] [forever]' - * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or + * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or * the name of a week day (like 'Monday' or 'Friday') always follow. */ N_("fourth"), /* TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]' - * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or + * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or * the name of a week day (like 'Monday' or 'Friday') always follow. */ N_("last") @@ -1044,20 +1044,20 @@ make_recur_month_num_menu (int month_index) gtk_menu_shell_append(GTK_MENU_SHELL(menu), submenu_item); gtk_widget_show (submenu_item); - /* TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of - * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) + /* TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of + * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]). */ item = make_recur_month_num_submenu (_("1st to 10th"), 0, 10); gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item); - /* TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of - * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) + /* TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of + * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]). */ item = make_recur_month_num_submenu (_("11th to 20th"), 10, 20); gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item); - /* TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of - * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) + /* TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the exact day of + * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s) * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]). */ item = make_recur_month_num_submenu (_("21st to 31st"), 20, 31); @@ -1081,7 +1081,7 @@ make_recur_month_menu (void) { static const char *options[] = { /* For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]' - (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or + (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or the name of a week day (like 'Monday' or 'Friday') always follow. */ N_("day"), N_("Monday"), @@ -1144,7 +1144,7 @@ month_num_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data) e_dialog_option_menu_set (priv->month_num_menu, 0, month_num_options_map); e_dialog_option_menu_set (priv->month_num_menu, month_num, month_num_options_map); } - + if (month_num == MONTH_NUM_DAY && month_day != MONTH_DAY_NTH) e_dialog_option_menu_set (priv->month_day_menu, MONTH_DAY_NTH, @@ -1171,7 +1171,7 @@ month_day_menu_selection_done_cb (GtkMenuShell *menu_shell, gpointer data) rpage = RECURRENCE_PAGE (data); priv = rpage->priv; - + month_num = e_dialog_option_menu_get (priv->month_num_menu, month_num_options_map); month_day = e_dialog_option_menu_get (priv->month_day_menu, @@ -1220,7 +1220,7 @@ make_monthly_special (RecurrencePage *rpage) hbox = gtk_hbox_new (FALSE, 2); gtk_container_add (GTK_CONTAINER (priv->special), hbox); - /* TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]' + /* TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]' * (dropdown menu options are in [square brackets])." */ label = gtk_label_new (_("on the")); @@ -1359,11 +1359,11 @@ make_ending_until_special (RecurrencePage *rpage) gtk_widget_show_all (GTK_WIDGET (de)); /* Set the value */ - + if (COMP_EDITOR_PAGE (rpage)->flags & COMP_EDITOR_PAGE_NEW_ITEM) { e_cal_component_get_dtstart (priv->comp, &dt_start); /* Setting the default until time to 2 weeks */ - icaltime_adjust (dt_start.value, 14, 0, 0, 0); + icaltime_adjust (dt_start.value, 14, 0, 0, 0); e_date_edit_set_date (de, dt_start.value->year, dt_start.value->month, dt_start.value->day); e_cal_component_free_datetime (&dt_start); } else { @@ -1502,7 +1502,7 @@ fill_ending_date (RecurrencePage *rpage, struct icalrecurrencetype *r) ECal *client = COMP_EDITOR_PAGE (rpage)->client; ECalComponentDateTime dt; icaltimezone *from_zone, *to_zone; - + e_cal_component_get_dtstart (priv->comp, &dt); if (dt.value->is_date) @@ -1566,7 +1566,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) rpage = RECURRENCE_PAGE (page); priv = rpage->priv; - /* Keep a copy of the component so that we can expand the recurrence + /* Keep a copy of the component so that we can expand the recurrence * set for the preview. */ @@ -1577,7 +1577,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) if (!e_cal_component_has_organizer (comp)) page->flags |= COMP_EDITOR_PAGE_USER_ORG; - + /* Don't send off changes during this time */ priv->updating = TRUE; @@ -1763,7 +1763,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) if (nth == -1) { ECalComponentDateTime dt; - + e_cal_component_get_dtstart (comp, &dt); priv->month_index = dt.value->day; priv->month_num = MONTH_NUM_LAST; @@ -1772,7 +1772,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) priv->month_num = MONTH_NUM_DAY; } priv->month_day = MONTH_DAY_NTH; - + } else if (n_by_day == 1) { enum icalrecurrencetype_weekday weekday; int pos; @@ -1828,7 +1828,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) if (pos == -1) priv->month_num = MONTH_NUM_LAST; - else + else priv->month_num = pos - 1; priv->month_day = month_day; } else @@ -1936,7 +1936,7 @@ recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates) dt.tzid = dates->start->tzid; e_cal_component_set_dtstart (priv->comp, &dt); } - + if (dates->end) { icaltime = *dates->end->value; dt.tzid = dates->end->tzid; @@ -1948,7 +1948,7 @@ recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates) if (mask != priv->weekday_blocked_day_mask) { priv->weekday_day_mask = priv->weekday_day_mask | mask; priv->weekday_blocked_day_mask = mask; - + if (priv->weekday_picker != NULL) { weekday_picker_set_days (WEEKDAY_PICKER (priv->weekday_picker), priv->weekday_day_mask); @@ -1972,7 +1972,7 @@ recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates) g_date_free (start); g_date_free (end); } - + /* Make sure the preview gets updated. */ preview_recur (rpage); } @@ -2005,26 +2005,26 @@ get_widgets (RecurrencePage *rpage) g_object_ref (priv->main); gtk_container_remove (GTK_CONTAINER (priv->main->parent), priv->main); - + priv->recurs = GW ("recurs"); priv->params = GW ("params"); - + priv->interval_value = GW ("interval-value"); priv->interval_unit = GW ("interval-unit"); priv->special = GW ("special"); priv->ending_menu = GW ("ending-menu"); priv->ending_special = GW ("ending-special"); priv->custom_warning_bin = GW ("custom-warning-bin"); - + priv->exception_list = GW ("exception-list"); priv->exception_add = GW ("exception-add"); priv->exception_modify = GW ("exception-modify"); priv->exception_delete = GW ("exception-delete"); - + priv->preview_bin = GW ("preview-bin"); #undef GW - + return (priv->recurs && priv->params && priv->interval_value @@ -2077,7 +2077,7 @@ type_toggled_cb (GtkToggleButton *toggle, gpointer data) if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->recurs)) || read_only) gtk_widget_set_sensitive (priv->exception_add, FALSE); - else + else gtk_widget_set_sensitive (priv->exception_add, TRUE); } @@ -2127,7 +2127,7 @@ create_exception_dialog (RecurrencePage *rpage, const char *title, GtkWidget **d { RecurrencePagePrivate *priv; GtkWidget *dialog, *toplevel; - + priv = rpage->priv; toplevel = gtk_widget_get_toplevel (priv->main); @@ -2140,7 +2140,7 @@ create_exception_dialog (RecurrencePage *rpage, const char *title, GtkWidget **d *date_edit = comp_editor_new_date_edit (TRUE, FALSE, TRUE); gtk_widget_show (*date_edit); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), *date_edit, FALSE, TRUE, 6); - + return dialog; } @@ -2151,33 +2151,33 @@ exception_add_cb (GtkWidget *widget, gpointer data) RecurrencePage *rpage; GtkWidget *dialog, *date_edit; gboolean date_set; - + rpage = RECURRENCE_PAGE (data); dialog = create_exception_dialog (rpage, _("Add exception"), &date_edit); - + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { ECalComponentDateTime dt; struct icaltimetype icaltime = icaltime_null_time (); field_changed (rpage); - + dt.value = &icaltime; - + /* We use DATE values for exceptions, so we don't need a TZID. */ dt.tzid = NULL; icaltime.is_date = 1; - + date_set = e_date_edit_get_date (E_DATE_EDIT (date_edit), &icaltime.year, &icaltime.month, &icaltime.day); g_return_if_fail (date_set); - + append_exception (rpage, &dt); preview_recur (rpage); } - + gtk_widget_destroy (dialog); } @@ -2202,34 +2202,34 @@ exception_modify_cb (GtkWidget *widget, gpointer data) } current_dt = e_date_time_list_get_date_time (priv->exception_list_store, &iter); - + dialog = create_exception_dialog (rpage, _("Modify exception"), &date_edit); - e_date_edit_set_date (E_DATE_EDIT (date_edit), + e_date_edit_set_date (E_DATE_EDIT (date_edit), current_dt->value->year, current_dt->value->month, current_dt->value->day); - + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { ECalComponentDateTime dt; struct icaltimetype icaltime = icaltime_null_time (); struct icaltimetype *tt; field_changed (rpage); - + dt.value = &icaltime; tt = dt.value; - e_date_edit_get_date (E_DATE_EDIT (date_edit), + e_date_edit_get_date (E_DATE_EDIT (date_edit), &tt->year, &tt->month, &tt->day); tt->hour = 0; tt->minute = 0; tt->second = 0; tt->is_date = 1; - + /* No TZID, since we are using a DATE value now. */ dt.tzid = NULL; - + e_date_time_list_set_date_time (priv->exception_list_store, &iter, &dt); preview_recur (rpage); } - + gtk_widget_destroy (dialog); } @@ -2303,7 +2303,7 @@ field_changed (RecurrencePage *rpage) RecurrencePagePrivate *priv; priv = rpage->priv; - + if (!priv->updating) comp_editor_page_notify_changed (COMP_EDITOR_PAGE (rpage)); } @@ -2349,13 +2349,13 @@ init_widgets (RecurrencePage *rpage) rpage); /* Recurrence units */ - + g_signal_connect(GTK_OPTION_MENU (priv->interval_unit), "changed", G_CALLBACK (interval_selection_done_cb), rpage); /* Recurrence ending */ - + g_signal_connect(GTK_OPTION_MENU (priv->ending_menu), "changed", G_CALLBACK (ending_selection_done_cb), rpage); diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c index 08736ff7b1..7ea90d5a7b 100644 --- a/calendar/gui/dialogs/save-comp.c +++ b/calendar/gui/dialogs/save-comp.c @@ -30,11 +30,11 @@ /** * save_component_dialog: * @parent: Window to use as the transient dialog's parent. - * @comp: Pointer to the EcalComponent + * @comp: Pointer to the EcalComponent * * Pops up a dialog box asking the user whether he wants to save changes for * a calendar component. - * + * * Return value: the response_id of the button selected. **/ diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index e7e4e0ad31..36afc0ba7a 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -46,7 +46,7 @@ /* Private part of the SchedulePage structure */ -struct _SchedulePagePrivate { +struct _SchedulePagePrivate { /* Glade XML data */ GladeXML *xml; @@ -55,10 +55,10 @@ struct _SchedulePagePrivate { /* Model */ EMeetingStore *model; - + /* Selector */ EMeetingTimeSelector *sel; - + /* The timezone we use. Note that we use the same timezone for the start and end date. We convert the end date if it is passed in in another timezone. */ @@ -125,7 +125,7 @@ schedule_page_finalize (GObject *object) { SchedulePage *spage; SchedulePagePrivate *priv; - + g_return_if_fail (object != NULL); g_return_if_fail (IS_SCHEDULE_PAGE (object)); @@ -199,7 +199,7 @@ client_changed_cb (CompEditorPage *page, ECal *client, gpointer user_data) /* Set date/time */ static void -update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalComponentDateTime *end_date) +update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalComponentDateTime *end_date) { SchedulePagePrivate *priv; struct icaltimetype start_tt, end_tt; @@ -228,7 +228,7 @@ update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalCompone /* FIXME: Handle error better. */ g_warning ("Couldn't get timezone from server: %s", end_date->tzid ? end_date->tzid : ""); - } + } } start_tt = *start_date->value; @@ -237,15 +237,15 @@ update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalCompone icaltime_adjust (&end_tt, 1, 0, 0, 0); } else { end_tt = *end_date->value; - } - + } + /* If the end zone is not the same as the start zone, we convert it. */ priv->zone = start_zone; if (start_zone != end_zone) { icaltimezone_convert_time (&end_tt, end_zone, start_zone); } e_meeting_store_set_zone (priv->model, priv->zone); - + all_day = (start_tt.is_date && end_tt.is_date) ? TRUE : FALSE; /* For All Day Events, if DTEND is after DTSTART, we subtract 1 day @@ -268,7 +268,7 @@ update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalCompone } - + /* Fills the widgets with default values */ static void clear_widgets (SchedulePage *spage) @@ -301,10 +301,10 @@ schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) validated = FALSE; else update_time (spage, &start_date, &end_date); - + e_cal_component_free_datetime (&start_date); e_cal_component_free_datetime (&end_date); - + priv->updating = FALSE; sensitize_widgets (spage); @@ -324,12 +324,12 @@ schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates) { SchedulePage *spage; SchedulePagePrivate *priv; - + spage = SCHEDULE_PAGE (page); priv = spage->priv; priv->updating = TRUE; - + update_time (spage, dates->start, dates->end); priv->updating = FALSE; @@ -370,7 +370,7 @@ get_widgets (SchedulePage *spage) } static gboolean -init_widgets (SchedulePage *spage) +init_widgets (SchedulePage *spage) { SchedulePagePrivate *priv; @@ -398,20 +398,20 @@ schedule_page_set_meeting_time (SchedulePage *spage, icaltimetype *start_tt, ica } } - e_meeting_time_selector_set_meeting_time (priv->sel, start_tt->year, start_tt->month, start_tt->day, + e_meeting_time_selector_set_meeting_time (priv->sel, start_tt->year, start_tt->month, start_tt->day, start_tt->hour, start_tt->minute, end_tt->year, end_tt->month, end_tt->day, end_tt->hour, end_tt->minute); e_meeting_time_selector_set_all_day (priv->sel, all_day); - + } /** * schedule_page_construct: * @spage: An schedule page. - * + * * Constructs an schedule page by loading its Glade data. - * - * Return value: The same object as @spage, or NULL if the widgets could not + * + * Return value: The same object as @spage, or NULL if the widgets could not * be created. **/ SchedulePage * @@ -419,7 +419,7 @@ schedule_page_construct (SchedulePage *spage, EMeetingStore *ems) { SchedulePagePrivate *priv; char *gladefile; - + priv = spage->priv; gladefile = g_build_filename (EVOLUTION_GLADEDIR, @@ -443,7 +443,7 @@ schedule_page_construct (SchedulePage *spage, EMeetingStore *ems) /* Model */ g_object_ref (ems); priv->model = ems; - + /* Selector */ priv->sel = E_MEETING_TIME_SELECTOR (e_meeting_time_selector_new (ems)); gtk_widget_set_size_request ((GtkWidget *) priv->sel, -1, 400); @@ -456,7 +456,7 @@ schedule_page_construct (SchedulePage *spage, EMeetingStore *ems) gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->sel), TRUE, TRUE, 6); if (!init_widgets (spage)) { - g_message ("schedule_page_construct(): " + g_message ("schedule_page_construct(): " "Could not initialize the widgets!"); return NULL; } @@ -468,9 +468,9 @@ schedule_page_construct (SchedulePage *spage, EMeetingStore *ems) /** * schedule_page_new: - * + * * Creates a new schedule page. - * + * * Return value: A newly-created schedule page, or NULL if the page could * not be created. **/ @@ -492,12 +492,12 @@ void schedule_page_update_free_busy (SchedulePage *spage) { SchedulePagePrivate *priv; - + g_return_if_fail (spage != NULL); g_return_if_fail (IS_SCHEDULE_PAGE (spage)); - + priv = spage->priv; - + e_meeting_time_selector_refresh_free_busy (priv->sel, 0, TRUE); } @@ -508,7 +508,7 @@ schedule_page_set_name_selector (SchedulePage *spage, ENameSelector *name_select g_return_if_fail (spage != NULL); g_return_if_fail (IS_SCHEDULE_PAGE (spage)); - + priv = spage->priv; e_meeting_list_view_set_name_selector (priv->sel->list_view, name_selector); @@ -523,12 +523,12 @@ times_changed_cb (GtkWidget *widget, gpointer data) ECalComponentDateTime start_dt, end_dt; struct icaltimetype start_tt = icaltime_null_time (); struct icaltimetype end_tt = icaltime_null_time (); - + priv = spage->priv; if (priv->updating) return; - + e_date_edit_get_date (E_DATE_EDIT (priv->sel->start_date_edit), &start_tt.year, &start_tt.month, @@ -562,7 +562,7 @@ times_changed_cb (GtkWidget *widget, gpointer data) } dates.start = &start_dt; - dates.end = &end_dt; + dates.end = &end_dt; dates.due = NULL; dates.complete = NULL; diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index db15963717..7fef786e0f 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -64,13 +64,13 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type) icon_list = e_icon_factory_get_icon_list ("stock_todo"); else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) icon_list = e_icon_factory_get_icon_list ("stock_journal"); - + if (icon_list) { gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list); g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); g_list_free (icon_list); } - + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { selected_source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog)); if (selected_source) { diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c index 4be26333a4..0db1be872a 100644 --- a/calendar/gui/dialogs/send-comp.c +++ b/calendar/gui/dialogs/send-comp.c @@ -30,10 +30,10 @@ /** * send_component_dialog: - * + * * Pops up a dialog box asking the user whether he wants to send a * iTip/iMip message - * + * * Return value: TRUE if the user clicked Yes, FALSE otherwise. **/ gboolean @@ -41,10 +41,10 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo { ECalComponentVType vtype; const char *id; - + if (e_cal_get_save_schedules (client)) return FALSE; - + vtype = e_cal_component_get_vtype (comp); switch (vtype) { @@ -68,7 +68,7 @@ send_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, gbo "Cannot handle object of type %d", vtype); return FALSE; } - + if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES) return TRUE; else @@ -80,7 +80,7 @@ send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *c { ECalComponentVType vtype; const char *id; - + vtype = e_cal_component_get_vtype (comp); switch (vtype) { @@ -100,7 +100,7 @@ send_component_prompt_subject (GtkWindow *parent, ECal *client, ECalComponent *c "Cannot handle object of type %d", vtype); return FALSE; } - + if (e_error_run (parent, id, NULL) == GTK_RESPONSE_YES) return TRUE; else diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 572e2909d2..b9d5ace108 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -133,7 +133,7 @@ task_details_page_init (TaskDetailsPage *tdpage) priv->status = NULL; priv->priority = NULL; priv->percent_complete = NULL; - + priv->date_completed_label = NULL; priv->completed_date = NULL; @@ -264,12 +264,12 @@ sensitize_widgets (TaskDetailsPage *tdpage) { gboolean read_only; TaskDetailsPagePrivate *priv; - + priv = tdpage->priv; if (!e_cal_is_read_only (COMP_EDITOR_PAGE (tdpage)->client, &read_only, NULL)) read_only = TRUE; - + gtk_widget_set_sensitive (priv->status, !read_only); gtk_widget_set_sensitive (priv->priority, !read_only); gtk_widget_set_sensitive (priv->percent_complete, !read_only); @@ -294,10 +294,10 @@ task_details_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) priv = tdpage->priv; priv->updating = TRUE; - + /* Clean the screen */ clear_widgets (tdpage); - + /* Percent Complete. */ e_cal_component_get_percent (comp, &percent); if (percent) { @@ -361,7 +361,7 @@ task_details_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) /* URL */ e_cal_component_get_url (comp, &url); e_dialog_editable_set (priv->url, url); - + priv->updating = FALSE; sensitize_widgets (tdpage); @@ -382,7 +382,7 @@ task_details_page_fill_component (CompEditorPage *page, ECalComponent *comp) char *url; gboolean date_set; icaltimezone *zone = calendar_config_get_icaltimezone (); - + tdpage = TASK_DETAILS_PAGE (page); priv = tdpage->priv; @@ -426,7 +426,7 @@ task_details_page_fill_component (CompEditorPage *page, ECalComponent *comp) icaltimezone_convert_time (&icaltoday, zone, icaltimezone_get_utc_timezone()); - if (icaltime_compare_date_only (icalcomplete, icaltoday) > 0) { + if (icaltime_compare_date_only (icalcomplete, icaltoday) > 0) { comp_editor_page_display_validation_error (page, _("Completed date is wrong"), priv->completed_date); return FALSE; } @@ -513,7 +513,7 @@ get_widgets (TaskDetailsPage *tdpage) gtk_widget_show (priv->url_entry); priv->url = e_url_entry_get_entry (E_URL_ENTRY (priv->url_entry)); atk_object_set_name (gtk_widget_get_accessible (priv->url), _("Web Page")); - + #undef GW return (priv->status @@ -540,10 +540,10 @@ complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete) dates.start = NULL; dates.end = NULL; - dates.due = NULL; + dates.due = NULL; if (complete) dates.complete = &completed_tt; - + /* Notify upstream */ comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tdpage), &dates); @@ -593,7 +593,7 @@ date_changed_cb (EDateEdit *dedit, gpointer data) } e_dialog_spin_set (priv->percent_complete, 100); } - + priv->updating = FALSE; /* Notify upstream */ @@ -607,7 +607,7 @@ status_changed (GtkMenu *menu, TaskDetailsPage *tdpage) TaskDetailsPagePrivate *priv; icalproperty_status status; time_t ctime = -1; - + priv = tdpage->priv; if (priv->updating) @@ -647,12 +647,12 @@ percent_complete_changed (GtkAdjustment *adj, TaskDetailsPage *tdpage) icalproperty_status status; gboolean complete; time_t ctime = -1; - + priv = tdpage->priv; if (priv->updating) return; - + priv->updating = TRUE; percent = e_dialog_spin_get_int (priv->percent_complete); @@ -684,7 +684,7 @@ field_changed_cb (GtkWidget *widget, gpointer data) { TaskDetailsPage *tdpage; TaskDetailsPagePrivate *priv; - + tdpage = TASK_DETAILS_PAGE (data); priv = tdpage->priv; @@ -748,10 +748,10 @@ client_changed_cb (CompEditorPage *page, ECal *client, gpointer user_data) /** * task_details_page_construct: * @tdpage: An task details page. - * + * * Constructs an task page by loading its Glade data. - * - * Return value: The same object as @tdpage, or NULL if the widgets could not + * + * Return value: The same object as @tdpage, or NULL if the widgets could not * be created. **/ TaskDetailsPage * @@ -790,9 +790,9 @@ task_details_page_construct (TaskDetailsPage *tdpage) /** * task_details_page_new: - * + * * Creates a new task details page. - * + * * Return value: A newly-created task details page, or NULL if the page could * not be created. **/ diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 84512eaba1..8c9ee465e6 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -44,13 +44,13 @@ struct _TaskEditorPrivate { TaskPage *task_page; TaskDetailsPage *task_details_page; - + GtkWidget *task_details_window; EMeetingStore *model; - + gboolean assignment_shown; gboolean is_assigned; - gboolean updating; + gboolean updating; }; @@ -111,11 +111,11 @@ menu_view_role_cb (BonoboUIComponent *component, gpointer user_data) { TaskEditor *te = (TaskEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - task_page_set_view_role (te->priv->task_page, atoi(state)); - calendar_config_set_show_role (atoi(state)); + task_page_set_view_role (te->priv->task_page, atoi(state)); + calendar_config_set_show_role (atoi(state)); } static void @@ -126,12 +126,12 @@ menu_view_status_cb (BonoboUIComponent *component, gpointer user_data) { TaskEditor *te = (TaskEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - + task_page_set_view_status (te->priv->task_page, atoi(state)); - calendar_config_set_show_status (atoi(state)); + calendar_config_set_show_status (atoi(state)); } static void @@ -142,11 +142,11 @@ menu_view_type_cb (BonoboUIComponent *component, gpointer user_data) { TaskEditor *te = (TaskEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - task_page_set_view_type (te->priv->task_page, atoi(state)); - calendar_config_set_show_type (atoi(state)); + task_page_set_view_type (te->priv->task_page, atoi(state)); + calendar_config_set_show_type (atoi(state)); } static void @@ -157,11 +157,11 @@ menu_view_rsvp_cb (BonoboUIComponent *component, gpointer user_data) { TaskEditor *te = (TaskEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - task_page_set_view_rsvp (te->priv->task_page, atoi(state)); - calendar_config_set_show_rsvp (atoi(state)); + task_page_set_view_rsvp (te->priv->task_page, atoi(state)); + calendar_config_set_show_rsvp (atoi(state)); } static void @@ -172,10 +172,10 @@ menu_show_time_zone_cb (BonoboUIComponent *component, gpointer user_data) { TaskEditor *te = (TaskEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - task_page_set_show_timezone (te->priv->task_page, atoi(state)); + task_page_set_show_timezone (te->priv->task_page, atoi(state)); calendar_config_set_show_timezone (atoi(state)); } @@ -187,11 +187,11 @@ menu_show_categories_cb (BonoboUIComponent *component, gpointer user_data) { TaskEditor *te = (TaskEditor *) user_data; - + if (type != Bonobo_UIComponent_STATE_CHANGED) return; - task_page_set_show_categories (te->priv->task_page, atoi(state)); + task_page_set_show_categories (te->priv->task_page, atoi(state)); calendar_config_set_show_categories (atoi(state)); } @@ -221,7 +221,7 @@ menu_class_private_cb (BonoboUIComponent *ui_component, TaskEditor *te = (TaskEditor *) user_data; if (state[0] == '0') return; - + comp_editor_page_notify_changed (COMP_EDITOR_PAGE (te->priv->task_page)); task_page_set_classification (te->priv->task_page, E_CAL_COMPONENT_CLASS_PRIVATE); } @@ -236,7 +236,7 @@ menu_class_confidential_cb (BonoboUIComponent *ui_component, TaskEditor *te = (TaskEditor *) user_data; if (state[0] == '0') return; - + comp_editor_page_notify_changed (COMP_EDITOR_PAGE (te->priv->task_page)); task_page_set_classification (te->priv->task_page, E_CAL_COMPONENT_CLASS_CONFIDENTIAL); } @@ -250,7 +250,7 @@ menu_option_status_cb (BonoboUIComponent *ui_component, gpointer user_data) { TaskEditor *te = (TaskEditor *) user_data; - + gtk_widget_show (te->priv->task_details_window); } @@ -260,7 +260,7 @@ menu_insert_send_options_cmd (BonoboUIComponent *uic, const char *path) { TaskEditor *te = (TaskEditor *) data; - + task_page_sendoptions_clicked_cb (te->priv->task_page); } @@ -270,8 +270,8 @@ menu_show_time_zone_cmd (BonoboUIComponent *uic, const char *path) { /* TODO implement it TaskEditor *te = (TaskEditor *) data; - - task_page_set_show_timezone (te->priv->task_page, atoi(state)); + + task_page_set_show_timezone (te->priv->task_page, atoi(state)); calendar_config_set_show_timezone (atoi(state)); */ } @@ -281,25 +281,25 @@ menu_option_status_cmd (BonoboUIComponent *uic, const char *path) { TaskEditor *te = (TaskEditor *) data; - + gtk_widget_show (te->priv->task_details_window); } static BonoboUIVerb verbs [] = { - BONOBO_UI_VERB ("ViewTimeZone", menu_show_time_zone_cmd), + BONOBO_UI_VERB ("ViewTimeZone", menu_show_time_zone_cmd), BONOBO_UI_VERB ("OptionStatus", menu_option_status_cmd), BONOBO_UI_VERB ("InsertSendOptions", menu_insert_send_options_cmd), BONOBO_UI_VERB_END }; static EPixmap pixmaps[] = { - E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/ViewTimeZone", "stock_timezone", E_ICON_SIZE_MENU), - E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR), - + E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP_END }; @@ -312,13 +312,13 @@ task_editor_init (TaskEditor *te) CompEditor *editor = COMP_EDITOR(te); gboolean status; char *xmlfile; - + priv = g_new0 (TaskEditorPrivate, 1); te->priv = priv; priv->model = E_MEETING_STORE (e_meeting_store_new ()); priv->assignment_shown = TRUE; - priv->updating = FALSE; + priv->updating = FALSE; priv->is_assigned = FALSE; bonobo_ui_component_freeze (editor->uic, NULL); @@ -341,7 +341,7 @@ task_editor_init (TaskEditor *te) bonobo_ui_component_add_listener ( editor->uic, "ViewStatus", menu_view_status_cb, editor); - + /* Show hide the type fields */ status = calendar_config_get_show_type (); bonobo_ui_component_set_prop ( @@ -399,14 +399,14 @@ task_editor_init (TaskEditor *te) menu_class_confidential_cb, editor); bonobo_ui_component_add_listener ( - editor->uic, "OptionStatus", + editor->uic, "OptionStatus", menu_option_status_cb, editor); - + e_pixmaps_update (editor->uic, pixmaps); - bonobo_ui_component_thaw (editor->uic, NULL); + bonobo_ui_component_thaw (editor->uic, NULL); + - comp_editor_set_help_section (COMP_EDITOR (te), "usage-calendar-todo"); } @@ -416,12 +416,12 @@ task_editor_construct (TaskEditor *te, ECal *client) TaskEditorPrivate *priv; gboolean read_only = FALSE; CompEditor *editor = COMP_EDITOR (te); - + priv = te->priv; priv->task_page = task_page_new (priv->model, client, editor->uic); g_object_ref_sink (priv->task_page); - comp_editor_append_page (COMP_EDITOR (te), + comp_editor_append_page (COMP_EDITOR (te), COMP_EDITOR_PAGE (priv->task_page), _("_Task"), TRUE); g_signal_connect (G_OBJECT (priv->task_page), "client_changed", @@ -433,27 +433,27 @@ task_editor_construct (TaskEditor *te, ECal *client) NULL); g_signal_connect (priv->task_details_window, "response", G_CALLBACK(gtk_widget_hide), NULL); g_signal_connect (priv->task_details_window, "delete-event", G_CALLBACK(gtk_widget_hide), NULL); - + priv->task_details_page = task_details_page_new (); g_object_ref_sink (priv->task_details_page); - gtk_container_add ((GtkContainer *) GTK_DIALOG(priv->task_details_window)->vbox, + gtk_container_add ((GtkContainer *) GTK_DIALOG(priv->task_details_window)->vbox, comp_editor_page_get_widget ((CompEditorPage *)priv->task_details_page)); gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->task_details_window) ) ); /* gtk_widget_hide (priv->task_details_window); */ comp_editor_append_page (editor, COMP_EDITOR_PAGE (priv->task_details_page), NULL, FALSE); - + if (!e_cal_is_read_only (client, &read_only, NULL)) read_only = TRUE; if (priv->is_assigned) { if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS)) task_page_show_options (priv->task_page); - + task_page_set_assignment (priv->task_page, TRUE); comp_editor_set_group_item (COMP_EDITOR (te), TRUE); } else { task_page_set_assignment (priv->task_page, FALSE); - + bonobo_ui_component_set_prop (editor->uic, "/commands/InsertSendOptions", "hidden", "1", NULL); bonobo_ui_component_set_prop (editor->uic, "/commands/ViewRole", "hidden", "1", NULL); bonobo_ui_component_set_prop (editor->uic, "/commands/ViewRSVP", "hidden", "1", NULL); @@ -492,7 +492,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp) ECalComponentOrganizer organizer; ECal *client; GSList *attendees = NULL; - + te = TASK_EDITOR (editor); priv = te->priv; @@ -506,12 +506,12 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp) /* Get meeting related stuff */ e_cal_component_get_organizer (comp, &organizer); e_cal_component_get_attendee_list (comp, &attendees); - + if (attendees != NULL) { GSList *l; int row; - - task_page_hide_options (priv->task_page); + + task_page_hide_options (priv->task_page); task_page_set_assignment (priv->task_page, TRUE); for (l = attendees; l != NULL; l = l->next) { @@ -522,7 +522,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp) /* If we aren't the organizer or the attendee is just delegating, don't allow editing */ if (!comp_editor_get_user_org (editor) || e_meeting_attendee_is_set_delto (ia)) e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE); - e_meeting_store_add_attendee (priv->model, ia); + e_meeting_store_add_attendee (priv->model, ia); g_object_unref(ia); } @@ -551,10 +551,10 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp) if (ia != NULL) e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE); } - - + + comp_editor_set_group_item (COMP_EDITOR (te), TRUE); - priv->assignment_shown = TRUE; + priv->assignment_shown = TRUE; } e_cal_component_free_attendee_list (attendees); @@ -576,12 +576,12 @@ task_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method) if (method == E_CAL_COMPONENT_METHOD_PUBLISH || method == E_CAL_COMPONENT_METHOD_CANCEL) goto parent; - + comp = task_page_get_cancel_comp (priv->task_page); if (comp != NULL) { ECal *client; gboolean result; - + client = e_meeting_store_get_e_cal (priv->model); result = itip_send_comp (E_CAL_COMPONENT_METHOD_CANCEL, comp, client, NULL, NULL, NULL); @@ -620,12 +620,12 @@ task_editor_finalize (GObject *object) g_object_unref (priv->task_details_page); priv->task_details_page = NULL; } - + if (priv->model) { g_object_unref (priv->model); priv->model = NULL; } - + g_free (priv); if (G_OBJECT_CLASS (task_editor_parent_class)->finalize) @@ -685,7 +685,7 @@ model_changed (TaskEditor *te) if (!te->priv->updating) { comp_editor_set_changed (COMP_EDITOR (te), TRUE); comp_editor_set_needs_send (COMP_EDITOR (te), TRUE); - } + } } static void diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index e6db2e932e..c929d32ea3 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -63,13 +63,13 @@ struct _TaskPagePrivate { /* Bonobo Controller for the menu/toolbar */ BonoboUIComponent *uic; - + /* Widgets from the Glade file */ GtkWidget *main; EAccountList *accounts; GList *address_strings; - EMeetingAttendee *ia; + EMeetingAttendee *ia; char *default_address; char *user_add; ECalComponent *comp; @@ -81,7 +81,7 @@ struct _TaskPagePrivate { /* Lists of attendees */ GPtrArray *deleted_attendees; - + /* Generic informative messages placeholder */ GtkWidget *info_hbox; GtkWidget *info_icon; @@ -94,7 +94,7 @@ struct _TaskPagePrivate { GtkWidget *start_date; GtkWidget *timezone; GtkWidget *timezone_label; - + GtkWidget *description; ECalComponentClassification classification; @@ -123,7 +123,7 @@ struct _TaskPagePrivate { /* For handling who the organizer is */ gboolean user_org; gboolean existing; - + gboolean updating; gboolean sendoptions_shown; gboolean is_assignment; @@ -207,7 +207,7 @@ task_page_init (TaskPage *tpage) priv->updating = FALSE; priv->sendoptions_shown = FALSE; priv->is_assignment = FALSE; - + priv->deleted_attendees = g_ptr_array_new (); priv->comp = NULL; @@ -217,16 +217,16 @@ task_page_init (TaskPage *tpage) priv->ia = NULL; priv->default_address = NULL; priv->invite = NULL; - + priv->model = NULL; - priv->list_view = NULL; + priv->list_view = NULL; } static void cleanup_attendees (GPtrArray *attendees) { int i; - + for (i = 0; i < attendees->len; i++) g_object_unref (g_ptr_array_index (attendees, i)); } @@ -256,7 +256,7 @@ task_page_finalize (GObject *object) g_object_unref (priv->xml); priv->xml = NULL; } - + if (priv->sod) { g_object_unref (priv->sod); priv->sod = NULL; @@ -264,7 +264,7 @@ task_page_finalize (GObject *object) if (priv->comp != NULL) g_object_unref (priv->comp); - + cleanup_attendees (priv->deleted_attendees); g_ptr_array_free (priv->deleted_attendees, TRUE); @@ -383,7 +383,7 @@ task_page_set_view_rsvp (TaskPage *page, gboolean state) e_meeting_list_view_column_set_visible (priv->list_view, "RSVP", state); } -void +void task_page_set_classification (TaskPage *page, ECalComponentClassification class) { page->priv->classification = class; @@ -394,19 +394,19 @@ sensitize_widgets (TaskPage *tpage) { gboolean read_only, sens = TRUE, sensitize; TaskPagePrivate *priv; - + priv = tpage->priv; if (!e_cal_is_read_only (COMP_EDITOR_PAGE (tpage)->client, &read_only, NULL)) read_only = TRUE; - + if (COMP_EDITOR_PAGE (tpage)->flags & COMP_EDITOR_IS_ASSIGNED) sens = COMP_EDITOR_PAGE (tpage)->flags & COMP_EDITOR_PAGE_USER_ORG; sensitize = (!read_only && sens); - /* The list of organizers is set to be non-editable. Otherwise any - * change in the displayed list causes an 'Account not found' error. + /* The list of organizers is set to be non-editable. Otherwise any + * change in the displayed list causes an 'Account not found' error. */ gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (priv->organizer)->entry), FALSE); @@ -424,7 +424,7 @@ sensitize_widgets (TaskPage *tpage) e_meeting_list_view_set_editable (priv->list_view, (!read_only && sens)); gtk_widget_set_sensitive (priv->remove, (!read_only && sens)); gtk_widget_set_sensitive (priv->invite, (!read_only && sens)); - gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only); + gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only); bonobo_ui_component_set_prop (priv->uic, "/commands/InsertAttachments", "sensitive", sensitize ? "1" : "0" , NULL); @@ -443,7 +443,7 @@ sensitize_widgets (TaskPage *tpage) bonobo_ui_component_set_prop (priv->uic, "/commands/OptionStatus", "sensitive", sensitize ? "1" : "0" , NULL); - + if (!priv->is_assignment) { gtk_widget_hide (priv->calendar_label); gtk_widget_hide (priv->list_box); @@ -452,12 +452,12 @@ sensitize_widgets (TaskPage *tpage) gtk_widget_hide (priv->invite); gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("_Group:")); } else { - gtk_widget_show (priv->invite); + gtk_widget_show (priv->invite); gtk_widget_show (priv->calendar_label); gtk_widget_show (priv->list_box); gtk_widget_show (priv->attendee_box); gtk_widget_show (priv->organizer); - gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); + gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); } } void @@ -468,13 +468,13 @@ task_page_hide_options (TaskPage *page) bonobo_ui_component_set_prop (page->priv->uic, "/commands/InsertSendOptions", "hidden", "1", NULL); page->priv->sendoptions_shown = FALSE; - + } void task_page_show_options (TaskPage *page) { g_return_if_fail (IS_TASK_PAGE (page)); - + bonobo_ui_component_set_prop (page->priv->uic, "/commands/InsertSendOptions", "hidden", "0", NULL); page->priv->sendoptions_shown = TRUE; } @@ -490,17 +490,17 @@ task_page_set_assignment (TaskPage *page, gboolean set) static EAccount * get_current_account (TaskPage *page) -{ +{ TaskPagePrivate *priv; EIterator *it; const char *str; - + priv = page->priv; str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (priv->organizer)->entry)); 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); char *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address); @@ -511,12 +511,12 @@ get_current_account (TaskPage *page) return a; } - + g_free (full); } g_object_unref (it); - - return NULL; + + return NULL; } /* fill_widgets handler for the task page */ @@ -543,10 +543,10 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) if (priv->comp != NULL) g_object_unref (priv->comp); priv->comp = NULL; - + cleanup_attendees (priv->deleted_attendees); g_ptr_array_set_size (priv->deleted_attendees, 0); - + /* Component for cancellation */ priv->comp = e_cal_component_clone (comp); @@ -554,7 +554,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) clear_widgets (tpage); priv->user_add = itip_get_comp_attendee (comp, page->client); - + /* Summary, description(s) */ e_cal_component_get_summary (comp, &text); e_dialog_editable_set (priv->summary, text.value); @@ -562,7 +562,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) e_cal_component_get_description_list (comp, &l); if (l && l->data) { ECalComponentText *dtext; - + dtext = l->data; gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description)), dtext->value ? dtext->value : "", -1); @@ -608,14 +608,14 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) g_warning ("Couldn't get timezone from server: %s", d.tzid ? d.tzid : ""); } - + e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->timezone), zone ? zone : default_zone); task_page_set_show_timezone (tpage, calendar_config_get_show_timezone()); if (!(COMP_EDITOR_PAGE (tpage)->flags & COMP_EDITOR_PAGE_NEW_ITEM) && !zone) { task_page_set_show_timezone (tpage, FALSE); - bonobo_ui_component_set_prop (priv->uic, "/commands/ViewTimeZone", + bonobo_ui_component_set_prop (priv->uic, "/commands/ViewTimeZone", "state", "0", NULL); } @@ -684,9 +684,9 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) set_subscriber_info_string (tpage, backend_addr); if (priv->is_assignment) { - ECalComponentOrganizer organizer; - - priv->user_add = itip_get_comp_attendee (comp, COMP_EDITOR_PAGE (tpage)->client); + ECalComponentOrganizer organizer; + + priv->user_add = itip_get_comp_attendee (comp, COMP_EDITOR_PAGE (tpage)->client); /* Organizer strings */ task_page_select_organizer (tpage, backend_addr); @@ -737,7 +737,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) if (!(backend_addr && *backend_addr) || !g_ascii_strcasecmp (backend_addr, a->id->address)) { e_meeting_attendee_set_address (priv->ia, g_strdup_printf ("MAILTO:%s", a->id->address)); e_meeting_attendee_set_cn (priv->ia, g_strdup (a->id->name)); - } else { + } else { e_meeting_attendee_set_address (priv->ia, g_strdup_printf ("MAILTO:%s", backend_addr)); e_meeting_attendee_set_sentby (priv->ia, g_strdup_printf ("MAILTO:%s", a->id->address)); } @@ -751,7 +751,7 @@ task_page_fill_widgets (CompEditorPage *page, ECalComponent *comp) } } - if (backend_addr) + if (backend_addr) g_free (backend_addr); priv->updating = FALSE; @@ -766,22 +766,22 @@ set_attendees (ECalComponent *comp, const GPtrArray *attendees) { GSList *comp_attendees = NULL, *l; int i; - + for (i = 0; i < attendees->len; i++) { EMeetingAttendee *ia = g_ptr_array_index (attendees, i); ECalComponentAttendee *ca; - + ca = e_meeting_attendee_as_e_cal_component_attendee (ia); - + comp_attendees = g_slist_prepend (comp_attendees, ca); - + } comp_attendees = g_slist_reverse (comp_attendees); - + e_cal_component_set_attendee_list (comp, comp_attendees); - + for (l = comp_attendees; l != NULL; l = l->next) - g_free (l->data); + g_free (l->data); g_slist_free (comp_attendees); } @@ -906,12 +906,12 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp) } else { e_cal_component_set_dtstart (comp, NULL); } - + /* Classification. */ e_cal_component_set_classification (comp, priv->classification); - + /* send options */ - if (priv->sendoptions_shown && priv->sod) + if (priv->sendoptions_shown && priv->sod) e_sendoptions_utils_fill_component (priv->sod, comp); /* Categories */ @@ -941,14 +941,14 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp) if (a == NULL) { e_notice (page, GTK_MESSAGE_ERROR, _("The organizer selected no longer has an account.")); - return FALSE; + return FALSE; } if (a->id->address == NULL || strlen (a->id->address) == 0) { e_notice (page, GTK_MESSAGE_ERROR, _("An organizer is required.")); return FALSE; - } + } if (!(backend_addr && *backend_addr) || !g_ascii_strcasecmp (backend_addr, a->id->address)) { org_addr = g_strdup_printf ("MAILTO:%s", a->id->address); @@ -1004,7 +1004,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp) } e_cal_component_set_attendee_list (comp, attendee_list); e_cal_component_free_attendee_list (attendee_list); - } else + } else set_attendees (comp, e_meeting_store_get_attendees (priv->model)); } @@ -1043,16 +1043,16 @@ static void edit_clicked_cb (GtkButton *btn, TaskPage *tpage) static gboolean -existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) +existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) { GSList *attendees, *l; const gchar *ia_address; const gchar *ia_sentby = NULL; - + ia_address = itip_strip_mailto (e_meeting_attendee_get_address (ia)); if (!ia_address) return FALSE; - + if (e_meeting_attendee_is_set_sentby (ia)) ia_sentby = itip_strip_mailto (e_meeting_attendee_get_sentby (ia)); @@ -1062,7 +1062,7 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) ECalComponentAttendee *attendee = l->data; const char *address; const char *sentby = NULL; - + address = itip_strip_mailto (attendee->value); if (attendee->sentby) sentby = itip_strip_mailto (attendee->sentby); @@ -1072,19 +1072,19 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp) return TRUE; } } - + e_cal_component_free_attendee_list (attendees); - + return FALSE; } static void -remove_attendee (TaskPage *page, EMeetingAttendee *ia) +remove_attendee (TaskPage *page, EMeetingAttendee *ia) { TaskPagePrivate *priv; int pos = 0; gboolean delegate = (COMP_EDITOR_PAGE (page)->flags & COMP_EDITOR_PAGE_DELEGATE); - + priv = page->priv; /* If the user deletes the organizer attendee explicitly, @@ -1092,22 +1092,22 @@ remove_attendee (TaskPage *page, EMeetingAttendee *ia) if (ia == priv->ia) { g_object_unref (priv->ia); priv->ia = NULL; - } - + } + /* If this was a delegatee, no longer delegate */ if (e_meeting_attendee_is_set_delfrom (ia)) { EMeetingAttendee *ib; - + ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delfrom (ia), &pos); if (ib != NULL) { e_meeting_attendee_set_delto (ib, NULL); - - if (!delegate) + + if (!delegate) e_meeting_attendee_set_edit_level (ib, E_MEETING_ATTENDEE_EDIT_FULL); - } + } } - - /* Handle deleting all attendees in the delegation chain */ + + /* Handle deleting all attendees in the delegation chain */ while (ia != NULL) { EMeetingAttendee *ib = NULL; @@ -1115,14 +1115,14 @@ remove_attendee (TaskPage *page, EMeetingAttendee *ia) g_object_ref (ia); g_ptr_array_add (priv->deleted_attendees, ia); } - + if (e_meeting_attendee_get_delto (ia) != NULL) ib = e_meeting_store_find_attendee (priv->model, e_meeting_attendee_get_delto (ia), NULL); e_meeting_store_remove_attendee (priv->model, ia); ia = ib; } - + sensitize_widgets (page); } @@ -1138,7 +1138,7 @@ remove_clicked_cb (GtkButton *btn, TaskPage *page) GtkTreeModel *model = NULL; gboolean valid_iter; char *address; - + priv = page->priv; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view)); @@ -1148,10 +1148,10 @@ remove_clicked_cb (GtkButton *btn, TaskPage *page) return; } paths = g_list_reverse (paths); - + 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 (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1); @@ -1161,35 +1161,35 @@ remove_clicked_cb (GtkButton *btn, TaskPage *page) g_warning ("Cannot delete attendee\n"); continue; } else if (e_meeting_attendee_get_edit_level (ia) != E_MEETING_ATTENDEE_EDIT_FULL) { - g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia)); + g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia)); continue; } - + remove_attendee (page, ia); } - + /* Select closest item after removal */ valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path); if (!valid_iter) { gtk_tree_path_prev (path); valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path); } - + if (valid_iter) { gtk_tree_selection_unselect_all (selection); gtk_tree_selection_select_iter (selection, &iter); } - + g_list_foreach (paths, (GFunc) gtk_tree_path_free, NULL); g_list_free (paths); } static void -invite_cb (GtkWidget *widget, gpointer data) +invite_cb (GtkWidget *widget, gpointer data) { TaskPage *page; TaskPagePrivate *priv; - + page = TASK_PAGE (data); priv = page->priv; @@ -1199,7 +1199,7 @@ invite_cb (GtkWidget *widget, gpointer data) static void attendee_added_cb (EMeetingListView *emlv, EMeetingAttendee *ia, gpointer user_data) { - TaskPage *page = TASK_PAGE (user_data); + TaskPage *page = TASK_PAGE (user_data); TaskPagePrivate *priv; gboolean delegate = (COMP_EDITOR_PAGE (page)->flags & COMP_EDITOR_PAGE_DELEGATE); @@ -1209,13 +1209,13 @@ attendee_added_cb (EMeetingListView *emlv, EMeetingAttendee *ia, gpointer user_d if (existing_attendee (ia, priv->comp)) e_meeting_store_remove_attendee (priv->model, ia); else { - if (!e_cal_get_static_capability (COMP_EDITOR_PAGE(page)->client, + if (!e_cal_get_static_capability (COMP_EDITOR_PAGE(page)->client, CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY)) { const char *delegator_id = e_meeting_attendee_get_delfrom (ia); EMeetingAttendee *delegator; delegator = e_meeting_store_find_attendee (priv->model, delegator_id, NULL); - e_meeting_attendee_set_delto (delegator, + e_meeting_attendee_set_delto (delegator, g_strdup (e_meeting_attendee_get_address (ia))); gtk_widget_set_sensitive (priv->invite, FALSE); @@ -1253,7 +1253,7 @@ enum { static EPopupItem context_menu_items[] = { { E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE }, - { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, + { E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD }, }; static void @@ -1287,7 +1287,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page) GtkTreeSelection *selection; if (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, &priv->row); g_free (address); @@ -1296,7 +1296,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page) selection = gtk_tree_view_get_selection ((GtkTreeView *) priv->list_view); gtk_tree_selection_unselect_all (selection); gtk_tree_selection_select_path (selection, path); - + if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL) disable_mask &= ~ATTENDEE_CAN_DELETE; } @@ -1312,7 +1312,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page) for (i=0;i<sizeof(context_menu_items)/sizeof(context_menu_items[0]);i++) menus = g_slist_prepend(menus, &context_menu_items[i]); - + e_popup_add_items((EPopup *)ep, menus, NULL, context_popup_free, page); menu = e_popup_create_menu_once((EPopup *)ep, NULL, disable_mask); gtk_menu_popup (menu, NULL, NULL, NULL, NULL, event->button, event->time); @@ -1322,9 +1322,9 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page) static gboolean list_view_event (EMeetingListView *list_view, GdkEvent *event, TaskPage *page) { - + TaskPagePrivate *priv= page->priv; - + if (event->type == GDK_2BUTTON_PRESS && COMP_EDITOR_PAGE (page)->flags & COMP_EDITOR_PAGE_USER_ORG) { EMeetingAttendee *attendee; @@ -1338,7 +1338,7 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, TaskPage *page) { return TRUE; } - return FALSE; + return FALSE; } @@ -1346,7 +1346,7 @@ static gboolean list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page) { if (event->keyval == GDK_Delete) { - + remove_clicked_cb (NULL, page); return TRUE; @@ -1359,17 +1359,17 @@ list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page) return FALSE; } -void +void task_page_set_show_timezone (TaskPage *page, gboolean state) { if (state) { gtk_widget_show_all (page->priv->timezone); - gtk_widget_show (page->priv->timezone_label); + gtk_widget_show (page->priv->timezone_label); } else { gtk_widget_hide (page->priv->timezone); gtk_widget_hide (page->priv->timezone_label); } - + } void @@ -1377,7 +1377,7 @@ task_page_set_show_categories (TaskPage *page, gboolean state) { if (state) { gtk_widget_show (page->priv->categories_btn); - gtk_widget_show (page->priv->categories); + gtk_widget_show (page->priv->categories); } else { gtk_widget_hide (page->priv->categories_btn); gtk_widget_hide (page->priv->categories); @@ -1406,7 +1406,7 @@ task_page_fill_timezones (CompEditorPage *page, GHashTable *timezones) } /*If the msg has some value set, the icon should always be set */ -void +void task_page_set_info_string (TaskPage *tpage, const gchar *icon, const gchar *msg) { TaskPagePrivate *priv; @@ -1417,9 +1417,9 @@ task_page_set_info_string (TaskPage *tpage, const gchar *icon, const gchar *msg) gtk_label_set_text (GTK_LABEL(priv->info_string), msg); if (msg && icon) - gtk_widget_show (priv->info_hbox); + gtk_widget_show (priv->info_hbox); else - gtk_widget_hide (priv->info_hbox); + gtk_widget_hide (priv->info_hbox); } /* set_summary handler for the task page */ @@ -1503,7 +1503,7 @@ get_widgets (TaskPage *tpage) priv->org_cal_label = GW ("org-task-label"); priv->list_view = e_meeting_list_view_new (priv->model); - + selection = gtk_tree_view_get_selection ((GtkTreeView *) priv->list_view); gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); gtk_widget_show (GTK_WIDGET (priv->list_view)); @@ -1516,7 +1516,7 @@ get_widgets (TaskPage *tpage) gtk_box_pack_start (GTK_BOX (priv->list_box), sw, TRUE, TRUE, 0); priv->source_selector = GW ("source"); - + #undef GW return (priv->summary @@ -1537,21 +1537,21 @@ summary_changed_cb (GtkEditable *editable, gpointer data) TaskPage *tpage; TaskPagePrivate *priv; gchar *summary; - + tpage = TASK_PAGE (data); priv = tpage->priv; - + if (priv->updating) return; - + summary = e_dialog_editable_get (GTK_WIDGET (editable)); - comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (tpage), + comp_editor_page_notify_summary_changed (COMP_EDITOR_PAGE (tpage), summary); g_free (summary); } /* Callback used when the start or due date widgets change. We notify the - * other pages in the task editor, so they can update any labels. + * other pages in the task editor, so they can update any labels. */ static void date_changed_cb (EDateEdit *dedit, gpointer data) @@ -1616,7 +1616,7 @@ date_changed_cb (EDateEdit *dedit, gpointer data) due_dt.value = &due_tt; dates.due = &due_dt; dates.complete = NULL; - + /* Notify upstream */ comp_editor_page_notify_dates_changed (COMP_EDITOR_PAGE (tpage), &dates); @@ -1627,7 +1627,7 @@ timezone_changed_cb (EDateEdit *dedit, gpointer data) { TaskPage *tpage; TaskPagePrivate *priv; - + tpage = TASK_PAGE (data); priv = tpage->priv; @@ -1652,7 +1652,7 @@ categories_clicked_cb (GtkWidget *button, gpointer data) e_categories_config_open_dialog_for_entry (GTK_ENTRY (entry)); } /* sets the current focused widget */ -static gboolean +static gboolean widget_focus_in_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data) { TaskPage *tpage; @@ -1679,10 +1679,10 @@ field_changed_cb (GtkWidget *widget, gpointer data) { TaskPage *tpage; TaskPagePrivate *priv; - + tpage = TASK_PAGE (data); priv = tpage->priv; - + if (!priv->updating) comp_editor_page_notify_changed (COMP_EDITOR_PAGE (tpage)); } @@ -1746,7 +1746,7 @@ times_updated (TaskPage *tpage, gboolean adjust_end_time) gboolean date_set; gboolean set_start_date = FALSE, set_end_date = FALSE, adjust_by_hour; icaltimezone *zone; - + priv = tpage->priv; if (priv->updating) @@ -1851,11 +1851,11 @@ source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage) client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_TODO); if (client) { icaltimezone *zone; - + zone = calendar_config_get_icaltimezone (); e_cal_set_default_timezone (client, zone, NULL); } - + if (!client || !e_cal_open (client, FALSE, NULL)) { GtkWidget *dialog; @@ -1886,7 +1886,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage) gchar *backend_addr = NULL; e_cal_get_cal_address(client, &backend_addr, NULL); - + if (priv->is_assignment) task_page_select_organizer (tpage, backend_addr); @@ -1904,13 +1904,13 @@ set_subscriber_info_string (TaskPage *tpage, const char *backend_address) { ECal *client = COMP_EDITOR_PAGE (tpage)->client; ESource *source; - + source = e_cal_get_source (client); - + if (e_source_get_property (source, "subscriber")) - /* Translators: This string is used when we are creating a Task + /* Translators: This string is used when we are creating a Task on behalf of some other user */ - task_page_set_info_string (tpage, GTK_STOCK_DIALOG_INFO, + task_page_set_info_string (tpage, GTK_STOCK_DIALOG_INFO, g_strdup_printf(_("You are acting on behalf of %s"), backend_address)); else task_page_set_info_string (tpage, NULL, NULL); @@ -1924,7 +1924,7 @@ task_page_sendoptions_clicked_cb (TaskPage *tpage) ESource *source; priv = tpage->priv; - + if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); priv->sod->data->initialized = TRUE; @@ -1932,12 +1932,12 @@ task_page_sendoptions_clicked_cb (TaskPage *tpage) E_SOURCE_COMBO_BOX (priv->source_selector)); e_sendoptions_utils_set_default_data (priv->sod, source, "task"); } - - if (e_cal_get_static_capability (COMP_EDITOR_PAGE (tpage)->client, + + if (e_cal_get_static_capability (COMP_EDITOR_PAGE (tpage)->client, CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) { e_sendoptions_set_need_general_options (priv->sod, FALSE); } - + toplevel = gtk_widget_get_toplevel (priv->main); e_sendoptions_dialog_run (priv->sod, toplevel, E_ITEM_TASK); } @@ -1960,7 +1960,7 @@ init_widgets (TaskPage *tpage) e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->due_date), (EDateEditGetTimeCallback) comp_editor_get_current_time, tpage, NULL); - + /* Generic informative messages */ gtk_widget_hide (priv->info_hbox); @@ -1985,7 +1985,7 @@ init_widgets (TaskPage *tpage) /* Categories button */ g_signal_connect((priv->categories_btn), "clicked", G_CALLBACK (categories_clicked_cb), tpage); - + /* Source selector */ g_signal_connect (priv->source_selector, "changed", G_CALLBACK (source_changed_cb), tpage); @@ -2020,8 +2020,8 @@ init_widgets (TaskPage *tpage) G_CALLBACK (field_changed_cb), tpage); g_signal_connect (G_OBJECT (priv->list_view), "button_press_event", G_CALLBACK (button_press_event), tpage); g_signal_connect (G_OBJECT (priv->list_view), "event", G_CALLBACK (list_view_event), tpage); - g_signal_connect (priv->list_view, "key_press_event", G_CALLBACK (list_key_press), tpage); - + g_signal_connect (priv->list_view, "key_press_event", G_CALLBACK (list_key_press), tpage); + /* Add attendee button */ g_signal_connect (priv->add, "clicked", G_CALLBACK (add_clicked_cb), tpage); @@ -2032,24 +2032,24 @@ init_widgets (TaskPage *tpage) g_signal_connect (priv->remove, "clicked", G_CALLBACK (remove_clicked_cb), tpage); /* Contacts button */ - g_signal_connect(priv->invite, "clicked", G_CALLBACK (invite_cb), tpage); + g_signal_connect(priv->invite, "clicked", G_CALLBACK (invite_cb), tpage); /* Meeting List View */ - g_signal_connect (priv->list_view, "attendee_added", G_CALLBACK (attendee_added_cb), tpage); - + g_signal_connect (priv->list_view, "attendee_added", G_CALLBACK (attendee_added_cb), tpage); + /* Set the default timezone, so the timezone entry may be hidden. */ zone = calendar_config_get_icaltimezone (); e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->timezone), zone); - + task_page_set_show_timezone (tpage, calendar_config_get_show_timezone()); - e_meeting_list_view_column_set_visible (priv->list_view, "Attendee ", + e_meeting_list_view_column_set_visible (priv->list_view, "Attendee ", TRUE); e_meeting_list_view_column_set_visible (priv->list_view, "Role", calendar_config_get_show_role()); e_meeting_list_view_column_set_visible (priv->list_view, "RSVP", calendar_config_get_show_rsvp()); e_meeting_list_view_column_set_visible (priv->list_view, "Status", calendar_config_get_show_status()); e_meeting_list_view_column_set_visible (priv->list_view, "Type", calendar_config_get_show_type()); - + task_page_set_show_categories (tpage, calendar_config_get_show_categories()); return TRUE; @@ -2080,7 +2080,7 @@ task_page_select_organizer (TaskPage *tpage, const char *backend_address) if (user_addr) subscribed_cal = TRUE; - else + else user_addr = (backend_address && *backend_address) ? backend_address : NULL; priv->default_address = NULL; @@ -2107,9 +2107,9 @@ task_page_select_organizer (TaskPage *tpage, const char *backend_address) /** * task_page_construct: * @tpage: An task page. - * + * * Constructs an task page by loading its Glade data. - * + * * Return value: The same object as @tpage, or NULL if the widgets could not be * created. **/ @@ -2120,7 +2120,7 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client) EIterator *it; EAccount *a; char *gladefile; - + priv = tpage->priv; g_object_ref (model); priv->model = model; @@ -2149,7 +2149,7 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client) e_iterator_is_valid(it); e_iterator_next(it)) { gchar *full = NULL; - + a = (EAccount *)e_iterator_get(it); if (!a->enabled) @@ -2159,7 +2159,7 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client) priv->address_strings = g_list_append(priv->address_strings, full); } - + g_object_unref(it); if (priv->address_strings) @@ -2168,7 +2168,7 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client) g_warning ("No potential organizers!"); if (!init_widgets (tpage)) { - g_message ("task_page_construct(): " + g_message ("task_page_construct(): " "Could not initialize the widgets!"); return NULL; } @@ -2178,9 +2178,9 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client) /** * task_page_new: - * + * * Creates a new task page. - * + * * Return value: A newly-created task page, or NULL if the page could * not be created. **/ @@ -2194,7 +2194,7 @@ task_page_new (EMeetingStore *model, ECal *client, BonoboUIComponent *uic) g_object_unref (tpage); return NULL; } - + tpage->priv->uic = uic; return tpage; @@ -2212,9 +2212,9 @@ task_page_get_cancel_comp (TaskPage *page) if (priv->deleted_attendees->len == 0) return NULL; - + set_attendees (priv->comp, priv->deleted_attendees); - + return e_cal_component_clone (priv->comp); } |