aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c36
-rw-r--r--calendar/conduits/memo/memo-conduit.c30
-rw-r--r--calendar/conduits/todo/todo-conduit.c26
-rw-r--r--calendar/gui/alarm-notify/alarm-notify-dialog.c4
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c14
-rw-r--r--calendar/gui/calendar-commands.c2
-rw-r--r--calendar/gui/calendar-component.c4
-rw-r--r--calendar/gui/calendar-view.h2
-rw-r--r--calendar/gui/comp-util.c2
-rw-r--r--calendar/gui/dialogs/alarm-dialog.c8
-rw-r--r--calendar/gui/dialogs/comp-editor.c18
-rw-r--r--calendar/gui/dialogs/comp-editor.h2
-rw-r--r--calendar/gui/dialogs/e-send-options-utils.c2
-rw-r--r--calendar/gui/dialogs/event-editor.c6
-rw-r--r--calendar/gui/dialogs/event-page.c20
-rw-r--r--calendar/gui/dialogs/event-page.h2
-rw-r--r--calendar/gui/dialogs/memo-page.c6
-rw-r--r--calendar/gui/dialogs/task-editor.c2
-rw-r--r--calendar/gui/dialogs/task-page.c6
-rw-r--r--calendar/gui/e-alarm-list.h2
-rw-r--r--calendar/gui/e-cal-component-memo-preview.h2
-rw-r--r--calendar/gui/e-cal-component-preview.h2
-rw-r--r--calendar/gui/e-cal-model-tasks.c2
-rw-r--r--calendar/gui/e-cal-model.c8
-rw-r--r--calendar/gui/e-cal-model.h2
-rw-r--r--calendar/gui/e-cal-popup.c4
-rw-r--r--calendar/gui/e-calendar-table.h2
-rw-r--r--calendar/gui/e-calendar-view.c70
-rw-r--r--calendar/gui/e-date-time-list.h2
-rw-r--r--calendar/gui/e-day-view-config.c2
-rw-r--r--calendar/gui/e-day-view-layout.c10
-rw-r--r--calendar/gui/e-day-view-main-item.c8
-rw-r--r--calendar/gui/e-day-view-time-item.c4
-rw-r--r--calendar/gui/e-day-view-top-item.c4
-rw-r--r--calendar/gui/e-day-view.c62
-rw-r--r--calendar/gui/e-day-view.h8
-rw-r--r--calendar/gui/e-itip-control.c8
-rw-r--r--calendar/gui/e-meeting-list-view.c8
-rw-r--r--calendar/gui/e-meeting-store.c36
-rw-r--r--calendar/gui/e-meeting-time-sel-item.c2
-rw-r--r--calendar/gui/e-meeting-time-sel.c2
-rw-r--r--calendar/gui/e-memo-table.c4
-rw-r--r--calendar/gui/e-week-view-config.c4
-rw-r--r--calendar/gui/e-week-view-event-item.c2
-rw-r--r--calendar/gui/e-week-view-main-item.c2
-rw-r--r--calendar/gui/e-week-view.c28
-rw-r--r--calendar/gui/e-week-view.h6
-rw-r--r--calendar/gui/gnome-cal.c80
-rw-r--r--calendar/gui/gnome-cal.h14
-rw-r--r--calendar/gui/itip-bonobo-control.c14
-rw-r--r--calendar/gui/itip-utils.c34
-rw-r--r--calendar/gui/memos-control.c2
-rw-r--r--calendar/gui/migration.c4
-rw-r--r--calendar/gui/print.c22
-rw-r--r--calendar/gui/tasks-control.c6
55 files changed, 332 insertions, 332 deletions
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 3654f5bed1..fe6f7dfe5d 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -114,7 +114,7 @@ calconduit_load_configuration (guint32 pilot_id)
ECalConduitCfg *c;
GnomePilotConduitManagement *management;
GnomePilotConduitConfig *config;
- gchar prefix[256];
+ gchar prefix[256];
c = g_new0 (ECalConduitCfg, 1);
g_assert (c != NULL);
@@ -352,8 +352,8 @@ e_calendar_context_destroy (ECalConduitContext *ctxt)
if (ctxt->client != NULL)
g_object_unref (ctxt->client);
- if (ctxt->default_comp != NULL)
- g_object_unref (ctxt->default_comp);
+ if (ctxt->default_comp != NULL)
+ g_object_unref (ctxt->default_comp);
if (ctxt->comps != NULL) {
for (l = ctxt->comps; l; l = l->next)
g_object_unref (l->data);
@@ -673,7 +673,7 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp
is_date = TRUE;
old_start_value = dt_start.value;
- old_end_value = dt_end.value;
+ old_end_value = dt_end.value;
while (!last) {
ECalComponent *clone = e_cal_component_clone (ccc->comp);
icalcomponent *ical_comp = NULL;
@@ -1279,7 +1279,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
}
/* Recurrence information */
- icalrecurrencetype_clear (&recur);
+ icalrecurrencetype_clear (&recur);
switch (appt.repeatType) {
case repeatNone:
@@ -1610,7 +1610,7 @@ pre_sync (GnomePilotConduit *conduit,
return -1;
}
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE,
buffer);
#else
@@ -2114,22 +2114,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
- g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
- g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
- g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
- g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
- g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
- g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
- g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 1d32917760..9a226f59b8 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -891,7 +891,7 @@ pre_sync (GnomePilotConduit *conduit,
return -1;
}
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE,
buffer);
#else
@@ -909,7 +909,7 @@ pre_sync (GnomePilotConduit *conduit,
#ifdef PILOT_LINK_0_12
buf = g_new0 (unsigned char,buffer->used);
memcpy(buf, buffer->data, buffer->used);
- unpack_MemoAppInfo (&(ctxt->ai), buf, len);
+ unpack_MemoAppInfo (&(ctxt->ai), buf, len);
pi_buffer_free(buffer);
#else
unpack_MemoAppInfo (&(ctxt->ai), buf, len);
@@ -1035,7 +1035,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
/* NOTE: ignore the return value, otherwise ctxt->locals
* gets messed up. The calling function keeps track of
* the *local variable */
- unused = g_list_prepend (ctxt->locals, *local);
+ unused = g_list_prepend (ctxt->locals, *local);
iterator = comps;
} else {
LOG (g_message ( "no events" ));
@@ -1391,22 +1391,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
- g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
- g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
- g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
- g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
- g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
- g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
- g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 1ced6acfa3..b0b5526fba 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -1080,7 +1080,7 @@ pre_sync (GnomePilotConduit *conduit,
pi_set_error(dbi->pilot_socket, PI_ERR_GENERIC_MEMORY);
return -1;
}
- len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
+ len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,
DLP_BUF_SIZE,
buffer);
#else
@@ -1581,22 +1581,22 @@ conduit_get_gpilot_conduit (guint32 pilot_id)
g_signal_connect (retval, "pre_sync", G_CALLBACK (pre_sync), ctxt);
g_signal_connect (retval, "post_sync", G_CALLBACK (post_sync), ctxt);
- g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
- g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
+ g_signal_connect (retval, "set_pilot_id", G_CALLBACK (set_pilot_id), ctxt);
+ g_signal_connect (retval, "set_status_cleared", G_CALLBACK (set_status_cleared), ctxt);
- g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
- g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
- g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
+ g_signal_connect (retval, "for_each", G_CALLBACK (for_each), ctxt);
+ g_signal_connect (retval, "for_each_modified", G_CALLBACK (for_each_modified), ctxt);
+ g_signal_connect (retval, "compare", G_CALLBACK (compare), ctxt);
- g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
- g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
- g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
- g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
+ g_signal_connect (retval, "add_record", G_CALLBACK (add_record), ctxt);
+ g_signal_connect (retval, "replace_record", G_CALLBACK (replace_record), ctxt);
+ g_signal_connect (retval, "delete_record", G_CALLBACK (delete_record), ctxt);
+ g_signal_connect (retval, "archive_record", G_CALLBACK (archive_record), ctxt);
- g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
- g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
+ g_signal_connect (retval, "match", G_CALLBACK (match), ctxt);
+ g_signal_connect (retval, "free_match", G_CALLBACK (free_match), ctxt);
- g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
+ g_signal_connect (retval, "prepare", G_CALLBACK (prepare), ctxt);
/* Gui Settings */
g_signal_connect (retval, "create_settings_window", G_CALLBACK (create_settings_window), ctxt);
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 5307936b27..9e9aa003a4 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -325,11 +325,11 @@ notified_alarms_dialog_new (void)
/* Set callback for updating the snooze "minutes" label */
g_signal_connect (G_OBJECT (an->snooze_time_min), "value_changed",
- G_CALLBACK (an_update_minutes_label), an);
+ G_CALLBACK (an_update_minutes_label), an);
/* Set callback for updating the snooze "hours" label */
g_signal_connect (G_OBJECT (an->snooze_time_hrs), "value_changed",
- G_CALLBACK (an_update_hrs_label), an);
+ G_CALLBACK (an_update_hrs_label), an);
na = g_new0 (AlarmNotificationsDialog, 1);
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 14aed443e8..d5984d1e96 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1459,7 +1459,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
if (text.value)
summary = text.value;
else
- summary = _("No summary available.");
+ summary = _("No summary available.");
e_cal_component_get_description_list (comp, &text_list);
@@ -1478,7 +1478,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
e_cal_component_get_location (comp, &location);
if (!location)
- location = _("No location information available.");
+ location = _("No location information available.");
/* create the tray icon */
if (tray_icon == NULL) {
@@ -1555,7 +1555,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
#ifdef HAVE_LIBNOTIFY
static void
popup_notification (time_t trigger, CompQueuedAlarms *cqa,
- gpointer alarm_id, gboolean use_description)
+ gpointer alarm_id, gboolean use_description)
{
QueuedAlarm *qa;
ECalComponent *comp;
@@ -1584,7 +1584,7 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
if (text.value)
summary = text.value;
else
- summary = _("No summary available.");
+ summary = _("No summary available.");
e_cal_component_get_location (comp, &location);
@@ -2049,8 +2049,8 @@ remove_comp_by_id (gpointer key, gpointer value, gpointer userdata) {
d(printf("%s:%d (remove_comp_by_id)\n",__FILE__, __LINE__));
-/* if (!g_hash_table_size (ca->uid_alarms_hash)) */
-/* return; */
+/* if (!g_hash_table_size (ca->uid_alarms_hash)) */
+/* return; */
remove_cqa (ca, (ECalComponentId *)key, (CompQueuedAlarms *) value);
@@ -2206,7 +2206,7 @@ update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa)
d(printf("%s:%d (update_qa)\n",__FILE__, __LINE__));
for (instance_list = alarms->alarms; instance_list; instance_list = instance_list->next) {
al_inst = instance_list->data;
- if (al_inst->trigger == qa->orig_trigger) { /* FIXME if two or more alarm instances (audio, note) for same component have same trigger */
+ if (al_inst->trigger == qa->orig_trigger) { /* FIXME if two or more alarm instances (audio, note) for same component have same trigger */
g_free ((gchar *) qa->instance->auid);
qa->instance->auid = g_strdup (al_inst->auid);
break;
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 1bf0c442c4..9b665ce44e 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -694,5 +694,5 @@ calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)
g_signal_handlers_disconnect_matched (gcal, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control);
bonobo_ui_component_rm (uic, "/", NULL);
- bonobo_ui_component_unset_container (uic, NULL);
+ bonobo_ui_component_unset_container (uic, NULL);
}
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index d7ae0c66e2..072df02049 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -1180,7 +1180,7 @@ create_local_item_cb (EUserCreatableItemsHandler *handler, const gchar *item_typ
if (strcmp (item_type_name, CREATE_EVENT_ID) == 0)
create_new_event (calendar_component, component_view, FALSE, FALSE);
- else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0)
+ else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0)
create_new_event (calendar_component, component_view, TRUE, FALSE);
else if (strcmp (item_type_name, CREATE_MEETING_ID) == 0)
create_new_event (calendar_component, component_view, FALSE, TRUE);
@@ -1479,7 +1479,7 @@ impl_requestCreateItem (PortableServer_Servant servant,
if (strcmp (item_type_name, CREATE_EVENT_ID) == 0)
result = create_new_event (calendar_component, NULL, FALSE, FALSE);
- else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0)
+ else if (strcmp (item_type_name, CREATE_ALLDAY_EVENT_ID) == 0)
result = create_new_event (calendar_component, NULL, TRUE, FALSE);
else if (strcmp (item_type_name, CREATE_MEETING_ID) == 0)
result = create_new_event (calendar_component, NULL, FALSE, TRUE);
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
index a3c4a54012..78b6127dbd 100644
--- a/calendar/gui/calendar-view.h
+++ b/calendar/gui/calendar-view.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
#define TYPE_CALENDAR_VIEW (calendar_view_get_type ())
#define CALENDAR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CALENDAR_VIEW, CalendarView))
-#define CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW, \
+#define CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_VIEW, \
CalendarViewClass))
#define IS_CALENDAR_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CALENDAR_VIEW))
#define IS_CALENDAR_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_VIEW))
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 49b43900d5..62a55d2c30 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -803,7 +803,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
ECalComponent *master = NULL;
icalcomponent *icalcomp = NULL;
ECalComponentRange rid;
- ECalComponentDateTime sdt;
+ ECalComponentDateTime sdt;
const gchar *uid;
/* Get the master component */
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index ca8a58d528..5284656d1d 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -612,7 +612,7 @@ populate_widgets_from_alarm (Dialog *dialog)
/* Alarm Types */
switch ( trigger->type ) {
- case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START:
+ case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START:
e_dialog_combo_box_set (dialog->time_combo, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START, time_map);
break;
@@ -1212,9 +1212,9 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
}
if (!setup_select_names (&dialog)) {
- g_object_unref (dialog.xml);
- return FALSE;
- }
+ g_object_unref (dialog.xml);
+ return FALSE;
+ }
init_widgets (&dialog);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 9fe0b3f1ca..4063a317f4 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -113,11 +113,11 @@ struct _CompEditorPrivate {
CalObjModType mod;
- gboolean existing_org;
- gboolean user_org;
+ gboolean existing_org;
+ gboolean user_org;
gboolean is_group_item;
- gboolean warned;
+ gboolean warned;
};
enum {
@@ -534,8 +534,8 @@ save_comp_with_send (CompEditor *editor)
return FALSE;
if ((delegate && !e_cal_get_save_schedules (priv->client)) || (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org, &strip_alarms))) {
- if ((itip_organizer_is_user (priv->comp, priv->client) || itip_sentby_is_user (priv->comp, priv->client))) {
- if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL)
+ if ((itip_organizer_is_user (priv->comp, priv->client) || itip_sentby_is_user (priv->comp, priv->client))) {
+ if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL)
return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_PUBLISH, strip_alarms);
else
return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST, strip_alarms);
@@ -546,7 +546,7 @@ save_comp_with_send (CompEditor *editor)
if (delegate)
return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REPLY, strip_alarms);
}
- }
+ }
return TRUE;
}
@@ -2324,9 +2324,9 @@ 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->client));
- priv->warned = FALSE;
+ 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->client));
+ priv->warned = FALSE;
update_window_border (editor, NULL);
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index 22167cb78f..ec1b991592 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -147,7 +147,7 @@ GtkAction * comp_editor_get_action (CompEditor *editor,
const gchar *action_name);
GtkActionGroup *
comp_editor_get_action_group (CompEditor *editor,
- const gchar *group_name);
+ const gchar *group_name);
GtkWidget * comp_editor_get_managed_widget (CompEditor *editor,
const gchar *widget_path);
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index 5af9d4bc43..87f4584133 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -131,7 +131,7 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source,
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;
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 93110b8797..4643f8f697 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -324,7 +324,7 @@ event_editor_constructor (GType type,
event_page_show_options (priv->event_page);
comp_editor_set_group_item (editor, 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))) {
GtkAction *action;
action = comp_editor_get_action (editor, "free-busy");
@@ -346,7 +346,7 @@ event_editor_dispose (GObject *object)
priv = EVENT_EDITOR_GET_PRIVATE (object);
if (priv->event_page) {
- g_object_unref (priv->event_page);
+ g_object_unref (priv->event_page);
priv->event_page = NULL;
}
@@ -691,7 +691,7 @@ event_editor_show_meeting (EventEditor *ee)
ee->priv->meeting_shown = TRUE;
- comp_editor_set_changed (editor, FALSE);
+ comp_editor_set_changed (editor, FALSE);
comp_editor_set_needs_send (editor, TRUE);
}
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index f1994fa9a7..f43dcc1d41 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -732,7 +732,7 @@ sensitize_widgets (EventPage *epage)
priv = epage->priv;
if (flags & COMP_EDITOR_MEETING)
- sens = flags & COMP_EDITOR_USER_ORG;
+ sens = flags & COMP_EDITOR_USER_ORG;
if (!e_cal_is_read_only (client, &read_only, NULL))
read_only = TRUE;
@@ -1563,15 +1563,15 @@ void update_end_time_combo (EventPage *epage)
&start_tt.month,
&start_tt.day);
e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
- &start_tt.hour,
- &start_tt.minute);
+ &start_tt.hour,
+ &start_tt.minute);
e_date_edit_get_date (E_DATE_EDIT (priv->end_time),
&end_tt.year,
&end_tt.month,
&end_tt.day);
e_date_edit_get_time_of_day (E_DATE_EDIT (priv->end_time),
- &end_tt.hour,
- &end_tt.minute);
+ &end_tt.hour,
+ &end_tt.minute);
end_timet = icaltime_as_timet (end_tt);
start_timet = icaltime_as_timet (start_tt);
@@ -1619,10 +1619,10 @@ hour_minute_changed (EventPage *epage)
icaltime_adjust (&end_tt, 0, for_hours, for_minutes, 0);
e_date_edit_set_date_and_time_of_day (E_DATE_EDIT (priv->end_time),
- end_tt.year,
+ end_tt.year,
end_tt.month,
end_tt.day,
- end_tt.hour,
+ end_tt.hour,
end_tt.minute);
}
@@ -1937,8 +1937,8 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, EventPage *epage)
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;
+ if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL)
+ disable_mask &= ~ATTENDEE_CAN_DELETE;
}
}
}
@@ -3041,7 +3041,7 @@ event_page_select_organizer (EventPage *epage, const gchar *backend_address)
if (user_addr)
subscribed_cal = TRUE;
else
- user_addr = (backend_address && *backend_address) ? backend_address : NULL;
+ user_addr = (backend_address && *backend_address) ? backend_address : NULL;
default_address = NULL;
if (user_addr)
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
index 5bd377c075..ab43c0f7ba 100644
--- a/calendar/gui/dialogs/event-page.h
+++ b/calendar/gui/dialogs/event-page.h
@@ -108,7 +108,7 @@ void event_page_set_view_rvsp (EventPage *epage,
ENameSelector * event_page_get_name_selector (EventPage *epage);
void event_page_add_attendee (EventPage *epage,
EMeetingAttendee *attendee);
-void event_page_remove_all_attendees (EventPage *epage);
+void event_page_remove_all_attendees (EventPage *epage);
G_END_DECLS
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index c3642a91d4..0b76d783c9 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -334,15 +334,15 @@ sensitize_widgets (MemoPage *mpage)
read_only = TRUE;
if (flags & COMP_EDITOR_IS_SHARED)
- sens = flags & COMP_EDITOR_USER_ORG;
+ sens = flags & COMP_EDITOR_USER_ORG;
else
sens = TRUE;
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.
- */
+ * change in the displayed list causes an 'Account not found' error.
+ */
gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (priv->org_combo))), FALSE);
gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->memo_content), sensitize);
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index c08ccfdb4d..9377e0970b 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -403,7 +403,7 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
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 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_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE);
task_page_add_attendee (priv->task_page, ia);
g_object_unref (ia);
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 412dcd5fa6..faaba68317 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -325,7 +325,7 @@ sensitize_widgets (TaskPage *tpage)
read_only = TRUE;
if (flags & COMP_EDITOR_IS_ASSIGNED)
- sens = flags & COMP_EDITOR_USER_ORG;
+ sens = flags & COMP_EDITOR_USER_ORG;
sensitize = (!read_only && sens);
@@ -1247,8 +1247,8 @@ button_press_event (GtkWidget *widget, GdkEventButton *event, TaskPage *page)
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;
+ if (e_meeting_attendee_get_edit_level (ia) == E_MEETING_ATTENDEE_EDIT_FULL)
+ disable_mask &= ~ATTENDEE_CAN_DELETE;
}
}
}
diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h
index 6dfb1c6515..e65e7514c1 100644
--- a/calendar/gui/e-alarm-list.h
+++ b/calendar/gui/e-alarm-list.h
@@ -32,7 +32,7 @@
G_BEGIN_DECLS
#define E_TYPE_ALARM_LIST (e_alarm_list_get_type ())
-#define E_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ALARM_LIST, EAlarmList))
+#define E_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_ALARM_LIST, EAlarmList))
#define E_ALARM_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_ALARM_LIST, EAlarmListClass))
#define E_IS_ALARM_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ALARM_LIST))
#define E_IS_ALARM_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_ALARM_LIST))
diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h
index 3f310cce03..2c697231aa 100644
--- a/calendar/gui/e-cal-component-memo-preview.h
+++ b/calendar/gui/e-cal-component-memo-preview.h
@@ -31,7 +31,7 @@
#define E_TYPE_CAL_COMPONENT_MEMO_PREVIEW (e_cal_component_memo_preview_get_type ())
#define E_CAL_COMPONENT_MEMO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW, ECalComponentMemoPreview))
#define E_CAL_COMPONENT_MEMO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW, \
- ECalComponentMemoPreviewClass))
+ ECalComponentMemoPreviewClass))
#define E_IS_CAL_COMPONENT_MEMO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW))
#define E_IS_CAL_COMPONENT_MEMO_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_COMPONENT_MEMO_PREVIEW))
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
index 86aa99ffc0..dd355c01ce 100644
--- a/calendar/gui/e-cal-component-preview.h
+++ b/calendar/gui/e-cal-component-preview.h
@@ -33,7 +33,7 @@
#define E_TYPE_CAL_COMPONENT_PREVIEW (e_cal_component_preview_get_type ())
#define E_CAL_COMPONENT_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_COMPONENT_PREVIEW, ECalComponentPreview))
#define E_CAL_COMPONENT_PREVIEW_CLASS(klass) (G_TYPE_CHECK_INSTANCE_CAST_CLASS ((klass), E_TYPE_CAL_COMPONENT_PREVIEW, \
- ECalComponentPreviewClass))
+ ECalComponentPreviewClass))
#define E_IS_CAL_COMPONENT_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_COMPONENT_PREVIEW))
#define E_IS_CAL_COMPONENT_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_COMPONENT_PREVIEW))
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 3ec7626d77..4e384f2774 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -136,7 +136,7 @@ ensure_task_complete (ECalModelComponent *comp_data, time_t completed_date)
if (completed_date == -1) {
if (prop)
set_completed = FALSE;
- else
+ else
completed_date = time (NULL);
}
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index df41fa5fae..68214fa051 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -180,7 +180,7 @@ e_cal_model_class_init (ECalModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ECalModelClass, cal_view_progress),
NULL, NULL,
- e_marshal_VOID__STRING_INT_INT,
+ e_marshal_VOID__STRING_INT_INT,
G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
signals[CAL_VIEW_DONE] =
g_signal_new ("cal_view_done",
@@ -1534,7 +1534,7 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
e_table_model_pre_change (E_TABLE_MODEL (model));
e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
- }
+ }
e_cal_component_free_id (id);
g_object_unref (comp);
@@ -1701,7 +1701,7 @@ e_cal_view_progress_cb (ECalView *query, const gchar *message, gint percent, gpo
static void
e_cal_view_done_cb (ECalView *query, ECalendarStatus status, gpointer user_data)
{
- ECalModel *model = (ECalModel *) user_data;
+ ECalModel *model = (ECalModel *) user_data;
ECal *client = e_cal_view_get_client (query);
g_return_if_fail (E_IS_CAL_MODEL (model));
@@ -2164,7 +2164,7 @@ e_cal_model_create_component_with_defaults (ECalModel *model)
comp = cal_comp_task_new_with_defaults (client);
break;
case ICAL_VJOURNAL_COMPONENT :
- comp = cal_comp_memo_new_with_defaults (client);
+ comp = cal_comp_memo_new_with_defaults (client);
break;
default:
return NULL;
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index 2c470840c8..6f3d3637b1 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -128,7 +128,7 @@ typedef struct {
typedef time_t (*ECalModelDefaultTimeFunc)(ECalModel *model, gpointer user_data);
GType e_cal_model_get_type (void);
-GType e_cal_model_component_get_type (void);
+GType e_cal_model_component_get_type (void);
icalcomponent_kind e_cal_model_get_component_kind (ECalModel *model);
void e_cal_model_set_component_kind (ECalModel *model,
icalcomponent_kind kind);
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index ef94eb8ab2..d6bf0ed4c5 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -362,7 +362,7 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector)
/* check for e_target_selector's offline_status property here */
offline = e_source_get_property (source, "offline_sync");
if (offline && strcmp (offline, "1") == 0)
- mask &= ~E_CAL_POPUP_SOURCE_NO_OFFLINE; /* set the menu item to Mark Offline */
+ mask &= ~E_CAL_POPUP_SOURCE_NO_OFFLINE; /* set the menu item to Mark Offline */
else
mask &= ~E_CAL_POPUP_SOURCE_OFFLINE;
} else {
@@ -374,7 +374,7 @@ e_cal_popup_target_new_source(ECalPopup *eabp, ESourceSelector *selector)
/* check for delete_status property here */
delete = e_source_get_property (source, "delete");
if (delete && strcmp (delete, "no") == 0)
- mask &= ~E_CAL_POPUP_SOURCE_NO_DELETE; /* set the menu item to non deletable */
+ mask &= ~E_CAL_POPUP_SOURCE_NO_DELETE; /* set the menu item to non deletable */
else
mask &= ~E_CAL_POPUP_SOURCE_DELETE;
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index 50f2bb5995..e91886b5d4 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -107,7 +107,7 @@ void e_calendar_table_set_activity_handler (ECalendarTable *cal_table,
void e_calendar_table_set_status_message (ECalendarTable *cal_table,
const gchar *message,
gint percent);
-void e_calendar_table_open_task (ECalendarTable *cal_table,
+void e_calendar_table_open_task (ECalendarTable *cal_table,
ECal *client,
icalcomponent *icalcomp,
gboolean assign);
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 9644259198..a2b1b735de 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -163,7 +163,7 @@ e_calendar_view_class_init (ECalendarViewClass *klass)
object_class->destroy = e_calendar_view_destroy;
klass->selection_changed = NULL;
- klass->selected_time_changed = NULL;
+ klass->selected_time_changed = NULL;
klass->event_changed = NULL;
klass->event_added = NULL;
klass->user_created = NULL;
@@ -255,7 +255,7 @@ e_calendar_view_class_init (ECalendarViewClass *klass)
"open_event", 0);
/* init the accessibility support for e_day_view */
- e_cal_view_a11y_init ();
+ e_cal_view_a11y_init ();
}
@@ -1228,7 +1228,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
TRUE, zone ? zone : icaltimezone_get_utc_timezone ());
e_cal_util_remove_instances (event->comp_data->icalcomp, instance_rid, CALOBJ_MOD_THIS);
e_cal_modify_object (event->comp_data->client, event->comp_data->icalcomp, CALOBJ_MOD_THIS,
- &error);
+ &error);
}
delete_error_dialog (error, E_CAL_COMPONENT_EVENT);
@@ -2355,10 +2355,10 @@ e_calendar_view_get_attendees_status_info (ECalComponent *comp, ECal *client)
/*
* It is expected to show the tooltips in this below format
*
- * <B>SUBJECT OF THE MEETING</B>
- * Organiser: NameOfTheUser<email@ofuser.com>
- * Location: PlaceOfTheMeeting
- * Time : DateAndTime (xx Minutes)
+ * <B>SUBJECT OF THE MEETING</B>
+ * Organiser: NameOfTheUser<email@ofuser.com>
+ * Location: PlaceOfTheMeeting
+ * Time : DateAndTime (xx Minutes)
* Status: Accepted: X Declined: Y ...
*/
@@ -2621,38 +2621,38 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0,
return;
if (rect_width / 2 < radius) {
if (rect_height / 2 < radius) {
- cairo_move_to (cr, x0, (y0 + y1)/2);
- cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
- cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
- cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
- cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
+ cairo_move_to (cr, x0, (y0 + y1)/2);
+ cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
+ cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
+ cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
+ cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
} else {
- cairo_move_to (cr, x0, y0 + radius);
- cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
- cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
- cairo_line_to (cr, x1 , y1 - radius);
- cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
- cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
- }
+ cairo_move_to (cr, x0, y0 + radius);
+ cairo_curve_to (cr, x0 ,y0, x0, y0, (x0 + x1)/2, y0);
+ cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
+ cairo_line_to (cr, x1 , y1 - radius);
+ cairo_curve_to (cr, x1, y1, x1, y1, (x1 + x0)/2, y1);
+ cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
+ }
} else {
if (rect_height / 2 < radius) {
- cairo_move_to (cr, x0, (y0 + y1)/2);
- cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
- cairo_line_to (cr, x1 - radius, y0);
- cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
- cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
- cairo_line_to (cr, x0 + radius, y1);
- cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
+ cairo_move_to (cr, x0, (y0 + y1)/2);
+ cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
+ cairo_line_to (cr, x1 - radius, y0);
+ cairo_curve_to (cr, x1, y0, x1, y0, x1, (y0 + y1)/2);
+ cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
+ cairo_line_to (cr, x0 + radius, y1);
+ cairo_curve_to (cr, x0, y1, x0, y1, x0, (y0 + y1)/2);
} else {
- cairo_move_to (cr, x0, y0 + radius);
- cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
- cairo_line_to (cr, x1 - radius, y0);
- cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
- cairo_line_to (cr, x1 , y1 - radius);
- cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
- cairo_line_to (cr, x0 + radius, y1);
- cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
- }
+ cairo_move_to (cr, x0, y0 + radius);
+ cairo_curve_to (cr, x0 , y0, x0 , y0, x0 + radius, y0);
+ cairo_line_to (cr, x1 - radius, y0);
+ cairo_curve_to (cr, x1, y0, x1, y0, x1, y0 + radius);
+ cairo_line_to (cr, x1 , y1 - radius);
+ cairo_curve_to (cr, x1, y1, x1, y1, x1 - radius, y1);
+ cairo_line_to (cr, x0 + radius, y1);
+ cairo_curve_to (cr, x0, y1, x0, y1, x0, y1- radius);
+ }
}
cairo_close_path (cr);
}
diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h
index fe5e1fdc11..cdf279a537 100644
--- a/calendar/gui/e-date-time-list.h
+++ b/calendar/gui/e-date-time-list.h
@@ -32,7 +32,7 @@
G_BEGIN_DECLS
#define E_TYPE_DATE_TIME_LIST (e_date_time_list_get_type ())
-#define E_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeList))
+#define E_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DATE_TIME_LIST, EDateTimeList))
#define E_DATE_TIME_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DATE_TIME_LIST, EDateTimeListClass))
#define E_IS_DATE_TIME_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DATE_TIME_LIST))
#define E_IS_DATE_TIME_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DATE_TIME_LIST))
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index 682c99e6b7..942f73933e 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -353,7 +353,7 @@ set_show_event_end (EDayView *day_view)
{
gboolean show_event_end;
- show_event_end = calendar_config_get_show_event_end ();
+ show_event_end = calendar_config_get_show_event_end ();
e_day_view_set_show_event_end_times (day_view, show_event_end);
}
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index 5b5536d391..ab1f6c0fd0 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -40,14 +40,14 @@ static void e_day_view_layout_long_event (EDayViewEvent *event,
static void e_day_view_layout_day_event (EDayViewEvent *event,
EBitArray **grid,
guint16 *group_starts,
- guint8 *cols_per_row,
- gint rows,
- gint mins_per_row,
+ guint8 *cols_per_row,
+ gint rows,
+ gint mins_per_row,
gint max_cols);
static void e_day_view_expand_day_event (EDayViewEvent *event,
EBitArray **grid,
- guint8 *cols_per_row,
- gint mins_per_row);
+ guint8 *cols_per_row,
+ gint mins_per_row);
static void e_day_view_recalc_cols_per_row (gint rows,
guint8 *cols_per_row,
guint16 *group_starts);
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index f3ad280cae..6f9d6333d6 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -111,7 +111,7 @@ e_day_view_main_item_class_init (EDayViewMainItemClass *class)
G_PARAM_WRITABLE));
/* init the accessibility support for e_day_view */
- e_day_view_main_item_a11y_init ();
+ e_day_view_main_item_a11y_init ();
}
@@ -641,7 +641,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
gconf = gconf_client_get_default ();
alpha = gconf_client_get_float (gconf,
- "/apps/evolution/calendar/display/events_transparency",
+ "/apps/evolution/calendar/display/events_transparency",
NULL);
gradient = gconf_client_get_bool (gconf,
@@ -788,7 +788,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
/* Black border */
cairo_save (cr);
x0 = item_x + E_DAY_VIEW_BAR_WIDTH + 9;
- y0 = item_y + 10;
+ y0 = item_y + 10;
rect_width = MAX (item_w - E_DAY_VIEW_BAR_WIDTH - 7, 0);
rect_height = item_h - 7;
@@ -1217,7 +1217,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
{
if (event->start_minute % day_view->mins_per_row != 0
|| (day_view->show_event_end_times
- && event->end_minute % day_view->mins_per_row != 0)) {
+ && event->end_minute % day_view->mins_per_row != 0)) {
offset = day_view->first_hour_shown * 60
+ day_view->first_minute_shown;
show_span = TRUE;
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 4cbfadd9da..78bf55863f 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -365,7 +365,7 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
/* diff is number of minutes */
diff = (icaltimezone_get_utc_offset (use_zone, &tt, NULL) -
- icaltimezone_get_utc_offset (cal_zone, &tt, NULL)
+ icaltimezone_get_utc_offset (cal_zone, &tt, NULL)
) / 60;
tt = icaltime_today ();
@@ -834,7 +834,7 @@ e_day_view_time_item_on_set_divisions (GtkWidget *item,
day_view = dvtmitem->day_view;
g_return_if_fail (day_view != NULL);
- if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item)))
+ if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item)))
return;
divisions = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "divisions"));
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index de9a542ef6..7579f00986 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -395,8 +395,8 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
gconf_client = gconf_client_get_default ();
alpha = gconf_client_get_float (gconf_client,
- "/apps/evolution/calendar/display/events_transparency",
- NULL);
+ "/apps/evolution/calendar/display/events_transparency",
+ NULL);
gradient = gconf_client_get_bool (gconf_client,
"/apps/evolution/calendar/display/events_gradient",
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 5d6dd15563..ba05c400c0 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -130,7 +130,7 @@ static gint e_day_view_focus_out (GtkWidget *widget,
static gboolean e_day_view_key_press (GtkWidget *widget,
GdkEventKey *event);
static gboolean e_day_view_focus (GtkWidget *widget,
- GtkDirectionType direction);
+ GtkDirectionType direction);
static gboolean e_day_view_get_next_tab_event (EDayView *day_view,
GtkDirectionType direction,
gint *day, gint *event_num);
@@ -453,11 +453,11 @@ e_day_view_class_init (EDayViewClass *class)
widget_class->realize = e_day_view_realize;
widget_class->unrealize = e_day_view_unrealize;
widget_class->style_set = e_day_view_style_set;
- widget_class->size_allocate = e_day_view_size_allocate;
+ widget_class->size_allocate = e_day_view_size_allocate;
widget_class->focus_in_event = e_day_view_focus_in;
widget_class->focus_out_event = e_day_view_focus_out;
widget_class->key_press_event = e_day_view_key_press;
- widget_class->focus = e_day_view_focus;
+ widget_class->focus = e_day_view_focus;
widget_class->popup_menu = e_day_view_popup_menu;
view_class->get_selected_events = e_day_view_get_selected_events;
@@ -467,7 +467,7 @@ e_day_view_class_init (EDayViewClass *class)
view_class->paste_text = e_day_view_paste_text;
/* init the accessibility support for e_day_view */
- e_day_view_a11y_init ();
+ e_day_view_a11y_init ();
}
static void
@@ -1241,19 +1241,19 @@ e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *
gdouble cc = 65535.0;
red = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].red;
- green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green;
- blue = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue;
+ green = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].green;
+ blue = day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND].blue;
if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)), event->comp_data),
- &bg_color)) {
+ &bg_color)) {
GdkColormap *colormap;
- colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
- if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
- red = bg_color.red;
+ colormap = gtk_widget_get_colormap (GTK_WIDGET (day_view));
+ if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
+ red = bg_color.red;
green = bg_color.green;
- blue = bg_color.blue;
+ blue = bg_color.blue;
}
- }
+ }
if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
return widget->style->black;
@@ -2579,7 +2579,7 @@ e_day_view_update_marcus_bains (EDayView *day_view)
void
e_day_view_set_marcus_bains (EDayView *day_view,
gboolean show_line,
- const gchar *dayview_color,
+ const gchar *dayview_color,
const gchar *timebar_color)
{
g_return_if_fail (E_IS_DAY_VIEW (day_view));
@@ -4021,11 +4021,11 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
}
e_cal_component_commit_sequence (comp);
- if (e_cal_component_has_recurrences (comp)) {
- if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- gtk_widget_queue_draw (day_view->top_canvas);
+ if (e_cal_component_has_recurrences (comp)) {
+ if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
+ gtk_widget_queue_draw (day_view->top_canvas);
goto out;
- }
+ }
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
@@ -4058,7 +4058,7 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
e_calendar_view_modify_and_send (comp, client, mod, toplevel, TRUE);
out:
- day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
+ day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
g_object_unref (comp);
}
@@ -4132,11 +4132,11 @@ e_day_view_finish_resize (EDayView *day_view)
day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
- if (e_cal_component_has_recurrences (comp)) {
- if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- gtk_widget_queue_draw (day_view->top_canvas);
+ if (e_cal_component_has_recurrences (comp)) {
+ if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
+ gtk_widget_queue_draw (day_view->top_canvas);
goto out;
- }
+ }
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
@@ -4940,9 +4940,9 @@ e_day_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
/*Go to the start/end of a work day*/
if ((keyval == GDK_Home)
- &&((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK)
- &&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
- &&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) {
+ &&((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK)
+ &&((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK)
+ &&((event->state & GDK_MOD1_MASK) != GDK_MOD1_MASK)) {
e_day_view_goto_start_of_work_day (day_view);
return TRUE;
}
@@ -6145,11 +6145,11 @@ e_day_view_change_event_time (EDayView *day_view, time_t start_dt, time_t end_dt
day_view->resize_drag_pos = E_CALENDAR_VIEW_POS_NONE;
- if (e_cal_component_has_recurrences (comp)) {
- if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- gtk_widget_queue_draw (day_view->top_canvas);
+ if (e_cal_component_has_recurrences (comp)) {
+ if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
+ gtk_widget_queue_draw (day_view->top_canvas);
goto out;
- }
+ }
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
@@ -7417,7 +7417,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget,
GtkSelectionData *data,
guint info,
guint time,
- EDayView *day_view)
+ EDayView *day_view)
{
EDayViewEvent *event=NULL;
ECalendarViewPosition pos;
@@ -7948,7 +7948,7 @@ e_day_view_paste_text (ECalendarView *cal_view)
if (day_view->editing_event_day == E_DAY_VIEW_LONG_EVENT) {
event = &g_array_index (day_view->long_events,
- EDayViewEvent,
+ EDayViewEvent,
day_view->editing_event_num);
} else {
event = &g_array_index (day_view->events[day_view->editing_event_day],
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 8fde1e9ad7..2b3f11e280 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -530,7 +530,7 @@ void e_day_view_set_working_day (EDayView *day_view,
gboolean e_day_view_get_show_marcus_bains (EDayView *day_view);
void e_day_view_set_marcus_bains (EDayView *day_view,
gboolean show_line,
- const gchar *dayview_color,
+ const gchar *dayview_color,
const gchar *timebar_color);
/* Whether we display event end times in the main canvas. */
@@ -604,9 +604,9 @@ gint e_day_view_event_sort_func (const void *arg1,
const void *arg2);
gboolean e_day_view_find_event_from_item (EDayView *day_view,
- GnomeCanvasItem *item,
- gint *day_return,
- gint *event_num_return);
+ GnomeCanvasItem *item,
+ gint *day_return,
+ gint *event_num_return);
void e_day_view_update_calendar_selection_time (EDayView *day_view);
void e_day_view_ensure_rows_visible (EDayView *day_view,
gint start_row,
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 1876d36832..d3928d6c6a 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -1096,12 +1096,12 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
itip_strip_mailto (organizer.value),
priv->delegator_name ?
priv->delegator_name :
- priv->delegator_address);
+ priv->delegator_address);
else
html = g_strdup_printf (itip_desc, _("An unknown person"),
priv->delegator_name ?
priv->delegator_name :
- priv->delegator_address);
+ priv->delegator_address);
} else {
if (organizer.value != NULL)
html = g_strdup_printf (itip_desc,
@@ -1275,7 +1275,7 @@ get_cancel_options (gboolean found, icalcomponent_kind kind)
case ICAL_VEVENT_COMPONENT:
return g_strdup_printf ("<i>%s</i>", _("The meeting has been canceled, however it could not be found in your calendars"));
case ICAL_VTODO_COMPONENT:
- return g_strdup_printf ("<i>%s</i>", _("The task has been canceled, however it could not be found in your task lists"));
+ return g_strdup_printf ("<i>%s</i>", _("The task has been canceled, however it could not be found in your task lists"));
default:
g_return_val_if_reached (NULL);
}
@@ -2182,7 +2182,7 @@ url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpoint
return;
}
- while ((len = read (fd, buffer, 4096)) > 0) {
+ while ((len = read (fd, buffer, 4096)) > 0) {
gtk_html_write (html, handle, (gchar *)buffer, len);
}
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 8567aa07fa..924ab6720d 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -15,7 +15,7 @@
*
* Authors:
* Mike Kestner <mkestner@ximian.com>
- * JP Rosevear <jpr@ximian.com>
+ * JP Rosevear <jpr@ximian.com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
@@ -97,7 +97,7 @@ e_meeting_list_view_finalize (GObject *obj)
g_free (priv);
if (G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize)
- (* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj);
+ (* G_OBJECT_CLASS (e_meeting_list_view_parent_class)->finalize) (obj);
}
static void
@@ -150,7 +150,7 @@ e_meeting_list_view_init (EMeetingListView *view)
name_selector_dialog = e_name_selector_peek_dialog (view->priv->name_selector);
gtk_window_set_title (GTK_WINDOW (name_selector_dialog), _("Attendees"));
- g_signal_connect (name_selector_dialog, "response",
+ g_signal_connect (name_selector_dialog, "response",
G_CALLBACK (name_selector_dialog_close_cb), view);
}
@@ -908,7 +908,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin
EMeetingStore *store;
const GPtrArray *attendees;
gint i;
- GSList *la = NULL, *l;
+ GSList *la = NULL, *l;
name_selector_model = e_name_selector_peek_model (view->priv->name_selector);
store = E_MEETING_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view)));
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index e843bee2f5..b555c41f6c 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -15,7 +15,7 @@
*
* Authors:
* JP Rosevear <jpr@ximian.com>
- * Mike Kestner <mkestner@ximian.com>
+ * Mike Kestner <mkestner@ximian.com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
@@ -539,13 +539,13 @@ ems_finalize (GObject *obj)
if (priv->client != NULL)
g_object_unref (priv->client);
- while (priv->refresh_queue->len > 0)
- refresh_queue_remove (store, g_ptr_array_index (priv->refresh_queue, 0));
- g_ptr_array_free (priv->refresh_queue, TRUE);
- g_hash_table_destroy (priv->refresh_data);
+ while (priv->refresh_queue->len > 0)
+ refresh_queue_remove (store, g_ptr_array_index (priv->refresh_queue, 0));
+ g_ptr_array_free (priv->refresh_queue, TRUE);
+ g_hash_table_destroy (priv->refresh_data);
- if (priv->refresh_idle_id)
- g_source_remove (priv->refresh_idle_id);
+ if (priv->refresh_idle_id)
+ g_source_remove (priv->refresh_idle_id);
g_free (priv->fb_uri);
@@ -554,7 +554,7 @@ ems_finalize (GObject *obj)
g_free (priv);
if (G_OBJECT_CLASS (parent_class)->finalize)
- (* G_OBJECT_CLASS (parent_class)->finalize) (obj);
+ (* G_OBJECT_CLASS (parent_class)->finalize) (obj);
}
static void
@@ -1048,19 +1048,19 @@ process_free_busy_comp (EMeetingAttendee *attendee,
static void
process_free_busy (EMeetingStoreQueueData *qdata, gchar *text)
{
- EMeetingStore *store = qdata->store;
- EMeetingStorePrivate *priv;
- EMeetingAttendee *attendee = qdata->attendee;
+ EMeetingStore *store = qdata->store;
+ EMeetingStorePrivate *priv;
+ EMeetingAttendee *attendee = qdata->attendee;
icalcomponent *main_comp;
icalcomponent_kind kind = ICAL_NO_COMPONENT;
priv = store->priv;
main_comp = icalparser_parse_string (text);
- if (main_comp == NULL) {
- process_callbacks (qdata);
- return;
- }
+ if (main_comp == NULL) {
+ process_callbacks (qdata);
+ return;
+ }
kind = icalcomponent_isa (main_comp);
if (kind == ICAL_VCALENDAR_COMPONENT) {
@@ -1136,7 +1136,7 @@ freebusy_async (gpointer data)
FreeBusyAsyncData *fbd = data;
EMeetingAttendee *attendee = fbd->attendee;
gchar *default_fb_uri = NULL;
- gchar *fburi = NULL;
+ gchar *fburi = NULL;
static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
EMeetingStorePrivate *priv = fbd->store->priv;
@@ -1341,8 +1341,8 @@ refresh_queue_add (EMeetingStore *store, gint row,
e_meeting_attendee_clear_busy_periods (attendee);
e_meeting_attendee_set_has_calendar_info (attendee, FALSE);
- qdata->start = *start;
- qdata->end = *end;
+ qdata->start = *start;
+ qdata->end = *end;
qdata->string = g_string_new (NULL);
qdata->call_backs = g_ptr_array_new ();
qdata->data = g_ptr_array_new ();
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 95a1738057..00efabe029 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -726,7 +726,7 @@ e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorIt
{
EMeetingTimeSelector *mts;
EMeetingAttendee *ia;
- const GArray *busy_periods;
+ const GArray *busy_periods;
EMeetingFreeBusyPeriod *period;
GdkGC *gc;
gint period_num, x1, x2, x2_within_day, x2_within_col;
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 09e1994908..e8cc938429 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -64,7 +64,7 @@ const gchar *EMeetingTimeSelectorHours12[24] = {
};
/* The number of days shown in the entire canvas. */
-#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN 35
+#define E_MEETING_TIME_SELECTOR_DAYS_SHOWN 35
#define E_MEETING_TIME_SELECTOR_DAYS_START_BEFORE 7
#define E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE 7
#define E_MEETING_TIME_SELECTOR_FB_DAYS_AFTER 28
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index cbc66c44d0..ea03097ca8 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -80,7 +80,7 @@ static void e_memo_table_on_double_click (ETable *table,
gint col,
GdkEvent *event,
EMemoTable *memo_table);
-static gint e_memo_table_show_popup_menu (ETable *table,
+static gint e_memo_table_show_popup_menu (ETable *table,
GdkEvent *gdk_event,
EMemoTable *memo_table);
@@ -89,7 +89,7 @@ static gint e_memo_table_on_right_click (ETable *table,
gint col,
GdkEvent *event,
EMemoTable *memo_table);
-static gboolean e_memo_table_on_popup_menu (GtkWidget *widget,
+static gboolean e_memo_table_on_popup_menu (GtkWidget *widget,
gpointer data);
static gint e_memo_table_on_key_press (ETable *table,
diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c
index c981be8f53..423a12a2d9 100644
--- a/calendar/gui/e-week-view-config.c
+++ b/calendar/gui/e-week-view-config.c
@@ -193,7 +193,7 @@ set_show_event_end (EWeekView *week_view)
{
gboolean show_event_end;
- show_event_end = calendar_config_get_show_event_end ();
+ show_event_end = calendar_config_get_show_event_end ();
e_week_view_set_show_event_end_times (week_view, show_event_end);
}
@@ -214,7 +214,7 @@ set_compress_weekend (EWeekView *week_view)
{
gboolean compress_weekend;
- compress_weekend = calendar_config_get_compress_weekend ();
+ compress_weekend = calendar_config_get_compress_weekend ();
e_week_view_set_compress_weekend (week_view, compress_weekend);
}
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index a8123bdf53..f72c9dfcb1 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -179,7 +179,7 @@ static void
e_week_view_event_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags)
+ int flags)
{
EWeekViewEventItem *wveitem;
EWeekView *week_view;
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 67e9574a16..a43e816406 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -92,7 +92,7 @@ e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
G_PARAM_WRITABLE));
/* init the accessibility support for e_week_view_main_item */
- e_week_view_main_item_a11y_init ();
+ e_week_view_main_item_a11y_init ();
}
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index dac03a274e..97f85a5f4f 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -212,7 +212,7 @@ e_week_view_class_init (EWeekViewClass *class)
widget_class->realize = e_week_view_realize;
widget_class->unrealize = e_week_view_unrealize;
widget_class->style_set = e_week_view_style_set;
- widget_class->size_allocate = e_week_view_size_allocate;
+ widget_class->size_allocate = e_week_view_size_allocate;
widget_class->focus_in_event = e_week_view_focus_in;
widget_class->focus_out_event = e_week_view_focus_out;
widget_class->key_press_event = e_week_view_key_press;
@@ -827,19 +827,19 @@ e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidg
gdouble cc = 65535.0;
red = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].red;
- green = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green;
- blue = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue;
+ green = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].green;
+ blue = week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BACKGROUND].blue;
if (gdk_color_parse (e_cal_model_get_color_for_component (e_calendar_view_get_model (E_CALENDAR_VIEW (week_view)), event->comp_data),
- &bg_color)) {
+ &bg_color)) {
GdkColormap *colormap;
- colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view));
- if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
- red = bg_color.red;
+ colormap = gtk_widget_get_colormap (GTK_WIDGET (week_view));
+ if (gdk_colormap_alloc_color (colormap, &bg_color, TRUE, TRUE)) {
+ red = bg_color.red;
green = bg_color.green;
- blue = bg_color.blue;
+ blue = bg_color.blue;
}
- }
+ }
if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
return widget->style->black;
@@ -2685,7 +2685,7 @@ tooltip_destroy (EWeekView *week_view, GnomeCanvasItem *item)
static gboolean
tooltip_event_cb (GnomeCanvasItem *item,
- GdkEvent *event,
+ GdkEvent *event,
EWeekView *view)
{
gint event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
@@ -3484,11 +3484,11 @@ e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end
week_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
- if (e_cal_component_has_recurrences (comp)) {
- if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
- gtk_widget_queue_draw (week_view->main_canvas);
+ if (e_cal_component_has_recurrences (comp)) {
+ if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
+ gtk_widget_queue_draw (week_view->main_canvas);
goto out;
- }
+ }
if (mod == CALOBJ_MOD_ALL)
comp_util_sanitize_recurrence_master (comp, client);
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index 0936a1e6dc..605c96b24b 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -441,9 +441,9 @@ gint e_week_view_event_sort_func (const void *arg1,
const void *arg2);
gboolean e_week_view_find_event_from_item (EWeekView *week_view,
- GnomeCanvasItem *item,
- gint *event_num_return,
- gint *span_num_return);
+ GnomeCanvasItem *item,
+ gint *event_num_return,
+ gint *span_num_return);
gboolean e_week_view_is_jump_button_visible (EWeekView *week_view,
gint day);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 951f01bfa9..ff99530429 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -162,7 +162,7 @@ struct _GnomeCalendarPrivate {
gint hpane_pos;
gint hpane_pos_month_view;
gint vpane_pos;
- gint vpane_pos_month_view;
+ gint vpane_pos_month_view;
/* The signal handler id for our GtkCalendar "day_selected" handler. */
guint day_selected_id;
@@ -209,7 +209,7 @@ enum {
GOTO_DATE,
SOURCE_ADDED,
SOURCE_REMOVED,
- CHANGE_VIEW,
+ CHANGE_VIEW,
LAST_SIGNAL
};
@@ -422,7 +422,7 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
class->source_added = NULL;
class->source_removed = NULL;
class->goto_date = gnome_calendar_goto_date;
- class->change_view = gnome_calendar_change_view;
+ class->change_view = gnome_calendar_change_view;
/*
* Key bindings
@@ -496,33 +496,33 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
G_TYPE_ENUM,
GNOME_CAL_GOTO_SAME_DAY_OF_NEXT_WEEK);
- /* Ctrl+Y/J/K/M/L to switch between
+ /* Ctrl+Y/J/K/M/L to switch between
* DayView/WorkWeekView/WeekView/MonthView/ListView */
- gtk_binding_entry_add_signal (binding_set, GDK_y,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_DAY_VIEW);
- gtk_binding_entry_add_signal (binding_set, GDK_j,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_WORK_WEEK_VIEW);
- gtk_binding_entry_add_signal (binding_set, GDK_k,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_WEEK_VIEW);
- gtk_binding_entry_add_signal (binding_set, GDK_m,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_MONTH_VIEW);
+ gtk_binding_entry_add_signal (binding_set, GDK_y,
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_DAY_VIEW);
+ gtk_binding_entry_add_signal (binding_set, GDK_j,
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_WORK_WEEK_VIEW);
+ gtk_binding_entry_add_signal (binding_set, GDK_k,
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_WEEK_VIEW);
+ gtk_binding_entry_add_signal (binding_set, GDK_m,
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_MONTH_VIEW);
gtk_binding_entry_add_signal (binding_set, GDK_l,
- GDK_CONTROL_MASK,
- "change_view", 1,
- G_TYPE_ENUM,
- GNOME_CAL_LIST_VIEW);
+ GDK_CONTROL_MASK,
+ "change_view", 1,
+ G_TYPE_ENUM,
+ GNOME_CAL_LIST_VIEW);
/* init the accessibility support for gnome_calendar */
gnome_calendar_a11y_init ();
@@ -4069,46 +4069,46 @@ gnome_calendar_get_task_pad (GnomeCalendar *gcal)
GtkWidget *
gnome_calendar_get_e_calendar_widget (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return GTK_WIDGET(gcal->priv->date_navigator);
+ return GTK_WIDGET(gcal->priv->date_navigator);
}
GtkWidget *
gnome_calendar_get_search_bar_widget (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return GTK_WIDGET(gcal->priv->search_bar);
+ return GTK_WIDGET(gcal->priv->search_bar);
}
GtkWidget *
gnome_calendar_get_view_notebook_widget (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return GTK_WIDGET(gcal->priv->notebook);
+ return GTK_WIDGET(gcal->priv->notebook);
}
ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return gcal->priv->taskpad_menu;
+ return gcal->priv->taskpad_menu;
}
ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return gcal->priv->calendar_menu;
+ return gcal->priv->calendar_menu;
}
ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal)
{
- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
+ g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);
- return gcal->priv->memopad_menu;
+ return gcal->priv->memopad_menu;
}
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 5d7ca5f031..b0bbc8535b 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -93,8 +93,8 @@ struct _GnomeCalendarClass {
void (* calendar_focus_change) (GnomeCalendar *gcal, gboolean in);
void (* taskpad_focus_change) (GnomeCalendar *gcal, gboolean in);
void (* memopad_focus_change) (GnomeCalendar *gcal, gboolean in);
- void (* change_view) (GnomeCalendar *gcal,
- GnomeCalendarViewType view_type);
+ void (* change_view) (GnomeCalendar *gcal,
+ GnomeCalendarViewType view_type);
void (* source_added) (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source);
void (* source_removed) (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source);
@@ -104,7 +104,7 @@ struct _GnomeCalendarClass {
};
-GType gnome_calendar_get_type (void);
+GType gnome_calendar_get_type (void);
GtkWidget *gnome_calendar_construct (GnomeCalendar *gcal);
GtkWidget *gnome_calendar_new (void);
@@ -120,11 +120,11 @@ gboolean gnome_calendar_remove_source (GnomeCalendar *gcal, ECalSourceType s
gboolean gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, ECalSourceType source_type, const gchar *uid);
gboolean gnome_calendar_set_default_source (GnomeCalendar *gcal, ECalSourceType source_type, ESource *source);
-void gnome_calendar_next (GnomeCalendar *gcal);
-void gnome_calendar_previous (GnomeCalendar *gcal);
-void gnome_calendar_goto (GnomeCalendar *gcal,
+void gnome_calendar_next (GnomeCalendar *gcal);
+void gnome_calendar_previous (GnomeCalendar *gcal);
+void gnome_calendar_goto (GnomeCalendar *gcal,
time_t new_time);
-void gnome_calendar_dayjump (GnomeCalendar *gcal,
+void gnome_calendar_dayjump (GnomeCalendar *gcal,
time_t time);
/* Jumps to the current day */
void gnome_calendar_goto_today (GnomeCalendar *gcal);
diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
index c58e5ab27b..ab107ad29c 100644
--- a/calendar/gui/itip-bonobo-control.c
+++ b/calendar/gui/itip-bonobo-control.c
@@ -165,17 +165,17 @@ pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,
/* static CORBA_long */
/* pstream_get_max_size (BonoboPersistStream *ps, gpointer data, */
-/* CORBA_Environment *ev) */
+/* CORBA_Environment *ev) */
/* { */
-/* EItipControl *itip = data; */
-/* gint len; */
+/* EItipControl *itip = data; */
+/* gint len; */
-/* len = e_itip_control_get_data_size (itip); */
+/* len = e_itip_control_get_data_size (itip); */
-/* if (len > 0) */
-/* return len; */
+/* if (len > 0) */
+/* return len; */
-/* return 0L; */
+/* return 0L; */
/* } */
static Bonobo_Persist_ContentTypeList *
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 5cfa2cf378..19d0aa37c2 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -95,20 +95,20 @@ itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_
e_cal_component_get_organizer (comp, &organizer);
if (organizer.value != NULL) {
- strip = itip_strip_mailto (organizer.value);
+ strip = itip_strip_mailto (organizer.value);
- if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) {
- gchar *email = NULL;
+ if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS)) {
+ gchar *email = NULL;
- if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
+ if (e_cal_get_cal_address (client, &email, NULL) && !g_ascii_strcasecmp (email, strip)) {
g_free (email);
- return TRUE;
+ return TRUE;
}
g_free (email);
- return FALSE;
- }
+ return FALSE;
+ }
user_org = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
}
@@ -437,7 +437,7 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
GPtrArray *array = NULL;
EDestination *destination;
gint len;
- gchar *sender = NULL;
+ gchar *sender = NULL;
union {
gpointer *pdata;
@@ -1389,13 +1389,13 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
if (text_list){
ECalComponentText text = *((ECalComponentText *)text_list->data);
- if (text.value)
- description = text.value;
- else
- description = "";
- } else {
- description = "";
- }
+ if (text.value)
+ description = text.value;
+ else
+ description = "";
+ } else {
+ description = "";
+ }
e_cal_component_free_text_list (text_list);
@@ -1505,8 +1505,8 @@ itip_publish_begin (ECalComponent *pub_comp, ECal *client,
icomp_clone = e_cal_component_get_icalcomponent (*clone);
for (prop = icalcomponent_get_first_property (icomp,
ICAL_FREEBUSY_PROPERTY);
- prop != NULL;
- prop = icalcomponent_get_next_property (icomp,
+ prop != NULL;
+ prop = icalcomponent_get_next_property (icomp,
ICAL_FREEBUSY_PROPERTY))
{
icalproperty *p;
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index 45e31a37da..a12d9e2935 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -291,7 +291,7 @@ memos_control_deactivate (BonoboControl *control, EMemos *memos)
g_signal_handlers_disconnect_matched (memos, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control);
bonobo_ui_component_rm (uic, "/", NULL);
- bonobo_ui_component_unset_container (uic, NULL);
+ bonobo_ui_component_unset_container (uic, NULL);
}
static void memos_control_open_memo_cmd (BonoboUIComponent *uic,
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index b2552a5a27..6c5504afa3 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -1028,7 +1028,7 @@ fail:
/********************************************************************************************************
*
- * MEMOS
+ * MEMOS
*
********************************************************************************************************/
@@ -1154,7 +1154,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar
return;
soap_port = camel_url_get_param (url, "soap_port");
- if (!soap_port || strlen (soap_port) == 0)
+ if (!soap_port || strlen (soap_port) == 0)
soap_port = "7191";
use_ssl = camel_url_get_param (url, "use_ssl");
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 7abe2f5da7..659897bda6 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -1351,7 +1351,7 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
max_font_size = ((top - bottom) / pdi.rows) - 4;
else
max_font_size = ((bottom - top ) / pdi.rows) - 4;
- font_size = MIN(DAY_NORMAL_FONT_SIZE, max_font_size);
+ font_size = MIN(DAY_NORMAL_FONT_SIZE, max_font_size);
font = get_font_for_size (font_size, PANGO_WEIGHT_NORMAL);
for (i = 0; i < pdi.events[0]->len; i++) {
@@ -1697,13 +1697,13 @@ print_week_summary_cb (ECalComponent *comp,
gpointer data)
{
- icaltimezone *zone = calendar_config_get_icaltimezone ();
- EWeekViewEvent event;
- struct icaltimetype start_tt, end_tt;
+ icaltimezone *zone = calendar_config_get_icaltimezone ();
+ EWeekViewEvent event;
+ struct icaltimetype start_tt, end_tt;
ECalModelGenerateInstancesData *mdata = (ECalModelGenerateInstancesData *) data;
- struct psinfo *psi = (struct psinfo *) mdata->cb_data;
+ struct psinfo *psi = (struct psinfo *) mdata->cb_data;
- /* Check that the event times are valid. */
+ /* Check that the event times are valid. */
#if 0
g_print ("View start:%li end:%li Event start:%li end:%li\n",
@@ -1711,12 +1711,12 @@ print_week_summary_cb (ECalComponent *comp,
start, end);
#endif
- g_return_val_if_fail (start <= end, TRUE);
- g_return_val_if_fail (start < psi->day_starts[psi->days_shown], TRUE);
- g_return_val_if_fail (end > psi->day_starts[0], TRUE);
+ g_return_val_if_fail (start <= end, TRUE);
+ g_return_val_if_fail (start < psi->day_starts[psi->days_shown], TRUE);
+ g_return_val_if_fail (end > psi->day_starts[0], TRUE);
- start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);
- end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);
+ start_tt = icaltime_from_timet_with_zone (start, FALSE, zone);
+ end_tt = icaltime_from_timet_with_zone (end, FALSE, zone);
event.comp_data = e_cal_model_copy_component_data (mdata->comp_data);
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 5e57456bd3..15a4e38db7 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -372,7 +372,7 @@ tasks_control_deactivate (BonoboControl *control, ETasks *tasks)
g_signal_handlers_disconnect_matched (tasks, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, control);
bonobo_ui_component_rm (uic, "/", NULL);
- bonobo_ui_component_unset_container (uic, NULL);
+ bonobo_ui_component_unset_container (uic, NULL);
}
static void tasks_control_open_task_cmd (BonoboUIComponent *uic,
@@ -557,7 +557,7 @@ tasks_control_assign_cmd (BonoboUIComponent *uic,
tasks = E_TASKS (data);
cal_table = e_tasks_get_calendar_table (tasks);
comp_data = e_calendar_table_get_selected_comp (cal_table);
- if (comp_data)
+ if (comp_data)
e_calendar_table_open_task (cal_table, comp_data->client, comp_data->icalcomp, TRUE);
}
@@ -566,7 +566,7 @@ tasks_control_forward_cmd (BonoboUIComponent *uic,
gpointer data,
const gchar *path)
{
- ETasks *tasks;
+ ETasks *tasks;
ECalendarTable *cal_table;
ECalModelComponent *comp_data;