aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-05-08 00:22:36 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:10 +0800
commit578214584caa7805edca09b27e2306dc31d80fb6 (patch)
treedfa18882e01b362a721fd47bd901538bc5e3a9c4 /calendar
parent30fe010cffa6f290170147ea9a8b617d04fab39d (diff)
downloadgsoc2013-evolution-578214584caa7805edca09b27e2306dc31d80fb6.tar.gz
gsoc2013-evolution-578214584caa7805edca09b27e2306dc31d80fb6.tar.zst
gsoc2013-evolution-578214584caa7805edca09b27e2306dc31d80fb6.zip
Whitespace and coding style cleanups.
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c2
-rw-r--r--calendar/gui/dialogs/comp-editor.c21
-rw-r--r--calendar/gui/dialogs/task-editor.c3
-rw-r--r--calendar/gui/e-meeting-store.c7
-rw-r--r--calendar/gui/e-task-table.c6
-rw-r--r--calendar/gui/e-week-view-event-item.c3
-rw-r--r--calendar/gui/e-week-view-layout.c4
-rw-r--r--calendar/gui/e-week-view-titles-item.c4
-rw-r--r--calendar/gui/gnome-cal.c9
9 files changed, 39 insertions, 20 deletions
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 4f3233501c..f3421ef31a 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -749,8 +749,6 @@ query_objects_changed_async (struct _query_msg *msg)
day_end = time_day_end_with_zone (time (NULL), zone);
- debug (("Querying for object between %s to %s", e_ctime (&from), e_ctime (&day_end)));
-
for (l = objects; l != NULL; l = l->next) {
ECalComponentId *id;
GSList *sl;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 1d6fa36653..1d4c74e43c 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -458,7 +458,8 @@ save_comp (CompEditor *editor)
priv->comp = clone;
e_cal_component_get_uid (priv->comp, &orig_uid);
- /* make a copy of it, because call of e_cal_create_object rewrites the internal uid */
+ /* Make a copy of it, because call of e_cal_create_object()
+ * rewrites the internal uid. */
orig_uid_copy = g_strdup (orig_uid);
/* send timezones */
@@ -467,8 +468,8 @@ save_comp (CompEditor *editor)
/* Attachments*/
- e_cal_component_set_attachment_list (priv->comp,
- get_attachment_list (editor));
+ e_cal_component_set_attachment_list (
+ priv->comp, 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)) {
@@ -627,11 +628,15 @@ save_comp_with_send (CompEditor *editor)
editor, E_CAL_COMPONENT_METHOD_REQUEST,
strip_alarms);
} else {
- if (!comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REQUEST, strip_alarms))
+ if (!comp_editor_send_comp (
+ editor, E_CAL_COMPONENT_METHOD_REQUEST,
+ strip_alarms))
return FALSE;
if (delegate)
- return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_REPLY, strip_alarms);
+ return comp_editor_send_comp (
+ editor, E_CAL_COMPONENT_METHOD_REPLY,
+ strip_alarms);
}
}
@@ -877,7 +882,8 @@ action_save_cb (GtkAction *action,
return;
if (!text.value)
- if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp))
+ if (!send_component_prompt_subject (
+ (GtkWindow *) editor, priv->client, priv->comp))
return;
if (save_comp_with_send (editor)) {
@@ -2091,7 +2097,8 @@ prompt_and_save_changes (CompEditor *editor, gboolean send)
return FALSE;
if (!text.value)
- if (!send_component_prompt_subject ((GtkWindow *) editor, priv->client, priv->comp))
+ if (!send_component_prompt_subject (
+ (GtkWindow *) editor, priv->client, priv->comp))
return FALSE;
if (e_cal_component_is_instance (priv->comp))
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 110b66692a..30a5bbb9f9 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -406,7 +406,8 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
ECalComponentAttendee *ca = l->data;
EMeetingAttendee *ia;
- ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_e_cal_component_attendee (ca));
+ 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) ||
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index b0c658215c..c02eec9ecb 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -1592,7 +1592,8 @@ refresh_busy_periods (gpointer data)
fbd->qdata = qdata;
fbd->fb_uri = priv->fb_uri;
fbd->store = store;
- fbd->email = g_strdup (itip_strip_mailto (e_meeting_attendee_get_address (attendee)));
+ fbd->email = g_strdup (itip_strip_mailto (
+ e_meeting_attendee_get_address (attendee)));
/* Check the server for free busy data */
if (priv->client) {
@@ -1816,7 +1817,9 @@ soup_authenticate (SoupSession *session,
if (retrying && msg->reason_phrase && *msg->reason_phrase) {
g_string_append (description, "\n");
- g_string_append_printf (description, _("Failure reason: %s"), msg->reason_phrase);
+ g_string_append_printf (
+ description, _("Failure reason: %s"),
+ msg->reason_phrase);
}
password = e_passwords_ask_password (
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 1ed0349892..e8ba961d7e 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -755,10 +755,12 @@ task_table_query_tooltip (GtkWidget *widget,
if (ptr) {
ptr++;
- /* To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>" */
+ /* To Translators: It will display
+ * "Organizer: NameOfTheUser <email@ofuser.com>" */
tmp = g_strdup_printf (_("Organizer: %s <%s>"), organizer.cn, ptr);
} else {
- /* With SunOne accounts, there may be no ':' in organiser.value */
+ /* With SunOne accounts, there may be no ':' in
+ * organizer.value. */
tmp = g_strdup_printf (_("Organizer: %s"), organizer.cn);
}
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index b6c818516b..3b1b21849f 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -775,7 +775,8 @@ week_view_event_item_draw (GnomeCanvasItem *canvas_item,
time_width = e_week_view_get_time_string_width (week_view);
- one_day_event = e_week_view_is_one_day_event (week_view, event_item->priv->event_num);
+ one_day_event = e_week_view_is_one_day_event (
+ week_view, event_item->priv->event_num);
model = e_calendar_view_get_model (E_CALENDAR_VIEW (week_view));
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index b4b8aaa1b2..c381ea3b8d 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -328,7 +328,9 @@ e_week_view_layout_get_day_position (gint day,
*day_x = col;
}
} else {
- #define wk(x) ( ( working_days & (days [ ((x) + display_start_day) % 7 ]) ) ? 1 : 0)
+ #define wk(x) \
+ ((working_days & \
+ (days[((x) + display_start_day) % 7])) ? 1 : 0)
CalWeekdays days[] = {
CAL_MONDAY,
CAL_TUESDAY,
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index 066e2c4d45..f808e693b1 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -216,7 +216,9 @@ week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
/* Draw the lines between each column. */
if (col != 0) {
cairo_set_source_rgb (cr, 0, 0, 0);
- cairo_rectangle (cr, week_view->col_offsets[col] - x, allocation.height - y, 1, 1);
+ cairo_rectangle (
+ cr, week_view->col_offsets[col] - x,
+ allocation.height - y, 1, 1);
cairo_fill (cr);
}
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index e07e9f2545..eb7ed6e081 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -128,7 +128,8 @@ struct _GnomeCalendarPrivate {
* else it uses the date range set in search bar. */
gboolean lview_select_daten_range;
- /* used in update_todo_view, to prevent interleaving when called in separate thread */
+ /* Used in update_todo_view, to prevent interleaving when
+ * called in separate thread. */
GMutex *todo_update_lock;
};
@@ -1633,7 +1634,8 @@ gnome_calendar_update_view_times (GnomeCalendar *gcal,
gcal, priv->current_view_type,
&real_start_time, &end_time, &select_time);
- if (priv->current_view_type == GNOME_CAL_LIST_VIEW && !priv->lview_select_daten_range)
+ if (priv->current_view_type == GNOME_CAL_LIST_VIEW &&
+ !priv->lview_select_daten_range)
return;
e_cal_model_set_time_range (model, real_start_time, end_time);
@@ -2082,7 +2084,8 @@ gnome_calendar_update_date_navigator (GnomeCalendar *gcal)
if (!gtk_widget_get_visible (GTK_WIDGET (priv->date_navigator)))
return;
- if (priv->current_view_type == GNOME_CAL_LIST_VIEW && !priv->lview_select_daten_range)
+ if (priv->current_view_type == GNOME_CAL_LIST_VIEW &&
+ !priv->lview_select_daten_range)
return;
model = gnome_calendar_get_model (gcal);