From ebcce86769d174cce6e881740c5e9bcedce28e06 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 11 Sep 2010 11:50:51 -0400 Subject: Coding style and whitespace cleanups. --- calendar/gui/alarm-notify/config-data.c | 33 +++++++++++++++++++-------------- calendar/gui/dialogs/recurrence-page.c | 4 ++-- calendar/gui/e-alarm-list.c | 8 ++++---- calendar/gui/e-cal-list-view.c | 4 ++-- calendar/gui/e-date-time-list.c | 10 +++++----- calendar/gui/e-day-view-layout.c | 22 +++++++++++----------- calendar/gui/e-day-view-time-item.c | 6 +++--- calendar/gui/e-day-view.c | 2 +- calendar/gui/e-meeting-list-view.c | 14 +++++++------- calendar/gui/e-meeting-store.c | 2 +- calendar/gui/e-meeting-time-sel-item.c | 4 ++-- calendar/gui/e-meeting-time-sel.c | 26 +++++++++++++------------- calendar/gui/e-memo-table.c | 4 ++-- calendar/gui/e-select-names-renderer.c | 4 ++-- calendar/gui/e-task-table.c | 4 ++-- calendar/gui/e-week-view-layout.c | 12 ++++++------ calendar/gui/ea-cal-view-event.c | 4 ++-- calendar/gui/ea-cal-view.c | 4 ++-- calendar/gui/ea-calendar-helpers.c | 6 ++++-- calendar/gui/ea-gnome-calendar.c | 2 +- 20 files changed, 91 insertions(+), 84 deletions(-) (limited to 'calendar/gui') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index 12d7aefa47..00cb0dc7ba 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -30,12 +30,12 @@ #include #include "config-data.h" - - -#define KEY_LAST_NOTIFICATION_TIME "/apps/evolution/calendar/notify/last_notification_time" +#define KEY_LAST_NOTIFICATION_TIME \ + "/apps/evolution/calendar/notify/last_notification_time" #define KEY_PROGRAMS "/apps/evolution/calendar/notify/programs" -/* Whether we have initied ourselves by reading the data from the configuration engine */ +/* Whether we have initied ourselves by reading + * the data from the configuration engine. */ static gboolean inited = FALSE; static GConfClient *conf_client = NULL; static ESourceList *calendar_source_list = NULL, *tasks_source_list = NULL; @@ -202,20 +202,23 @@ icaltimezone * config_data_get_timezone (void) { gchar *location; + const gchar *key; icaltimezone *local_timezone; ensure_inited (); - if (gconf_client_get_bool (conf_client, "/apps/evolution/calendar/display/use_system_timezone", NULL)) + key = "/apps/evolution/calendar/display/user_system_timezone"; + if (gconf_client_get_bool (conf_client, key, NULL)) location = e_cal_util_get_system_timezone_location (); - else - location = gconf_client_get_string (conf_client, "/apps/evolution/calendar/display/timezone", NULL); + else { + key = "/apps/evolution/calendar/display/timezone"; + location = gconf_client_get_string (conf_client, key, NULL); + } - if (location && location[0]) { + if (location && location[0]) local_timezone = icaltimezone_get_builtin_timezone (location); - } else { + else local_timezone = icaltimezone_get_utc_timezone (); - } g_free (location); @@ -228,9 +231,10 @@ config_data_get_24_hour_format (void) ensure_inited (); if (locale_supports_12_hour_format ()) { - return gconf_client_get_bool (conf_client, - "/apps/evolution/calendar/display/use_24hour_format", - NULL); + const gchar *key; + + key = "/apps/evolution/calendar/display/use_24hour_format"; + return gconf_client_get_bool (conf_client, key, NULL); } return TRUE; @@ -308,7 +312,8 @@ config_data_get_last_notification_time (ECal *cal) const gchar *last_notified = e_source_get_property (source, "last-notified"); GTimeVal tmval = {0}; - if (last_notified && *last_notified && g_time_val_from_iso8601 (last_notified, &tmval)) { + if (last_notified && *last_notified && + g_time_val_from_iso8601 (last_notified, &tmval)) { time_t now = time (NULL), val = (time_t) tmval.tv_sec; if (val > now) diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index c2efce759c..c5944af194 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -1055,7 +1055,7 @@ make_recur_month_num_combo (gint month_index) /* Relation */ for (i = 0; i < G_N_ELEMENTS (options); i++) { gtk_tree_store_append (store, &iter, NULL); - gtk_tree_store_set (store, &iter, 0, _(options [i]), 1, month_num_options_map [i], -1); + gtk_tree_store_set (store, &iter, 0, _(options[i]), 1, month_num_options_map[i], -1); } /* Current date */ @@ -1106,7 +1106,7 @@ make_recur_month_combobox (void) { static const gchar *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"), diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c index 4fdf5e71eb..2e6a12e880 100644 --- a/calendar/gui/e-alarm-list.c +++ b/calendar/gui/e-alarm-list.c @@ -35,7 +35,7 @@ #define IS_VALID_ITER(dt_list, iter) (iter!= NULL && iter->user_data != NULL && \ dt_list->stamp == iter->stamp) -static GType column_types [E_ALARM_LIST_NUM_COLUMNS]; +static GType column_types[E_ALARM_LIST_NUM_COLUMNS]; static void e_alarm_list_init (EAlarmList *file_list); static void e_alarm_list_class_init (EAlarmListClass *class); @@ -99,7 +99,7 @@ e_alarm_list_get_type (void) NULL }; - column_types [E_ALARM_LIST_COLUMN_DESCRIPTION] = G_TYPE_STRING; + column_types[E_ALARM_LIST_COLUMN_DESCRIPTION] = G_TYPE_STRING; alarm_list_type = g_type_register_static (G_TYPE_OBJECT, "EAlarmList", &alarm_list_info, 0); @@ -257,7 +257,7 @@ e_alarm_list_get_column_type (GtkTreeModel *tree_model, index >= 0, G_TYPE_INVALID); alarm_list->columns_dirty = TRUE; - return column_types [index]; + return column_types[index]; } const ECalComponentAlarm * @@ -563,7 +563,7 @@ e_alarm_list_get_value (GtkTreeModel *tree_model, g_return_if_fail (E_ALARM_LIST (tree_model)->stamp == iter->stamp); g_return_if_fail (IS_VALID_ITER (alarm_list, iter)); - g_value_init (value, column_types [column]); + g_value_init (value, column_types[column]); if (!alarm_list->list) return; diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c index 0489c087fe..2cd5ad0b77 100644 --- a/calendar/gui/e-cal-list-view.c +++ b/calendar/gui/e-cal-list-view.c @@ -279,8 +279,8 @@ setup_e_table (ECalListView *cal_list_view) canvas = GNOME_CANVAS (cal_list_view->table->table_canvas); style = gtk_widget_get_style (GTK_WIDGET (canvas)); - style->fg [GTK_STATE_SELECTED] = style->text [GTK_STATE_NORMAL]; - style->fg [GTK_STATE_ACTIVE] = style->text [GTK_STATE_NORMAL]; + style->fg[GTK_STATE_SELECTED] = style->text[GTK_STATE_NORMAL]; + style->fg[GTK_STATE_ACTIVE] = style->text[GTK_STATE_NORMAL]; gtk_widget_set_style (GTK_WIDGET (canvas), style); /* Connect signals */ diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c index 5160f1b419..ab343a16f1 100644 --- a/calendar/gui/e-date-time-list.c +++ b/calendar/gui/e-date-time-list.c @@ -33,7 +33,7 @@ #define IS_VALID_ITER(dt_list, iter) (iter!= NULL && iter->user_data != NULL && \ dt_list->stamp == iter->stamp) -static GType column_types [E_DATE_TIME_LIST_NUM_COLUMNS]; +static GType column_types[E_DATE_TIME_LIST_NUM_COLUMNS]; static void e_date_time_list_init (EDateTimeList *file_list); static void e_date_time_list_class_init (EDateTimeListClass *class); @@ -97,7 +97,7 @@ e_date_time_list_get_type (void) NULL }; - column_types [E_DATE_TIME_LIST_COLUMN_DESCRIPTION] = G_TYPE_STRING; + column_types[E_DATE_TIME_LIST_COLUMN_DESCRIPTION] = G_TYPE_STRING; date_time_list_type = g_type_register_static (G_TYPE_OBJECT, "EDateTimeList", &date_time_list_info, 0); @@ -255,7 +255,7 @@ e_date_time_list_get_column_type (GtkTreeModel *tree_model, index >= 0, G_TYPE_INVALID); date_time_list->columns_dirty = TRUE; - return column_types [index]; + return column_types[index]; } const ECalComponentDateTime * @@ -401,7 +401,7 @@ e_date_time_list_get_path (GtkTreeModel *tree_model, static gchar * get_exception_string (ECalComponentDateTime *dt) { - static gchar buf [256]; + static gchar buf[256]; struct tm tmp_tm; tmp_tm.tm_year = dt->value->year - 1900; @@ -438,7 +438,7 @@ e_date_time_list_get_value (GtkTreeModel *tree_model, g_return_if_fail (E_DATE_TIME_LIST (tree_model)->stamp == iter->stamp); g_return_if_fail (IS_VALID_ITER (date_time_list, iter)); - g_value_init (value, column_types [column]); + g_value_init (value, column_types[column]); if (!date_time_list->list) return; diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c index c11c4f6738..bdb51977cc 100644 --- a/calendar/gui/e-day-view-layout.c +++ b/calendar/gui/e-day-view-layout.c @@ -158,7 +158,7 @@ e_day_view_layout_day_events (GArray *events, group_starts[row] = row; /* row doesn't contain any event at the moment */ - grid [row] = e_bit_array_new (0); + grid[row] = e_bit_array_new (0); } /* Iterate over the events, finding which rows they cover, and putting @@ -186,8 +186,8 @@ e_day_view_layout_day_events (GArray *events, /* Free the grid and compute maximum number of columns used. */ res = 0; for (row = 0; row < rows; row++) { - res = MAX (res, e_bit_array_bit_count (grid [row])); - g_object_unref (grid [row]); + res = MAX (res, e_bit_array_bit_count (grid[row])); + g_object_unref (grid[row]); } g_free (grid); @@ -227,8 +227,8 @@ e_day_view_layout_day_event (EDayViewEvent *event, for (col = 0; max_cols <= 0 || col < max_cols; col++) { free_col = col; for (row = start_row; row <= end_row; row++) { - if (e_bit_array_bit_count (grid [row]) > col && - e_bit_array_value_at (grid [row], col)) { + if (e_bit_array_bit_count (grid[row]) > col && + e_bit_array_value_at (grid[row], col)) { free_col = -1; break; } @@ -255,12 +255,12 @@ e_day_view_layout_day_event (EDayViewEvent *event, the event covers are in one group. */ for (row = start_row; row <= end_row; row++) { /* resize the array if necessary */ - if (e_bit_array_bit_count (grid [row]) <= free_col) + if (e_bit_array_bit_count (grid[row]) <= free_col) e_bit_array_insert ( - grid [row], e_bit_array_bit_count (grid [row]), - free_col - e_bit_array_bit_count (grid [row]) + 1); + grid[row], e_bit_array_bit_count (grid[row]), + free_col - e_bit_array_bit_count (grid[row]) + 1); - e_bit_array_change_one_row (grid [row], free_col, TRUE); + e_bit_array_change_one_row (grid[row], free_col, TRUE); cols_per_row[row]++; group_starts[row] = group_start; } @@ -315,8 +315,8 @@ e_day_view_expand_day_event (EDayViewEvent *event, clashed = FALSE; for (col = event->start_row_or_col + 1; col < cols_per_row[start_row]; col++) { for (row = start_row; row <= end_row; row++) { - if (e_bit_array_bit_count (grid [row]) > col && - e_bit_array_value_at (grid [row], col)) { + if (e_bit_array_bit_count (grid[row]) > col && + e_bit_array_value_at (grid[row], col)) { clashed = TRUE; break; } diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c index edc446ac25..9e430ecf41 100644 --- a/calendar/gui/e-day-view-time-item.c +++ b/calendar/gui/e-day-view-time-item.c @@ -996,10 +996,10 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *time_item) * it needs a language tag that I don't know where to get. */ for (digit = '0'; digit <= '9'; digit++) { PangoLayout *layout; - gchar digit_str [2]; + gchar digit_str[2]; - digit_str [0] = digit; - digit_str [1] = '\0'; + digit_str[0] = digit; + digit_str[1] = '\0'; layout = gtk_widget_create_pango_layout (GTK_WIDGET (day_view), digit_str); pango_layout_set_font_description (layout, day_view->large_font_desc); diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index b0df6748b3..85513a2c74 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -1736,7 +1736,7 @@ e_day_view_style_set (GtkWidget *widget, for (hour = 0; hour < 24; hour++) { g_snprintf (buffer, sizeof (buffer), "%02i", hour); pango_layout_set_text (layout, buffer, -1); - pango_layout_get_pixel_size (layout, &day_view->small_hour_widths [hour], NULL); + pango_layout_get_pixel_size (layout, &day_view->small_hour_widths[hour], NULL); day_view->max_small_hour_width = MAX (day_view->max_small_hour_width, day_view->small_hour_widths[hour]); } diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c index 686d43c65d..d0f172c81d 100644 --- a/calendar/gui/e-meeting-list-view.c +++ b/calendar/gui/e-meeting-list-view.c @@ -106,7 +106,7 @@ e_meeting_list_view_class_init (EMeetingListViewClass *klass) object_class->finalize = e_meeting_list_view_finalize; - e_meeting_list_view_signals [ATTENDEE_ADDED] = + e_meeting_list_view_signals[ATTENDEE_ADDED] = g_signal_new ("attendee_added", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, @@ -141,8 +141,8 @@ e_meeting_list_view_init (EMeetingListView *view) priv->name_selector = e_name_selector_new (); - for (i = 0; sections [i]; i++) - add_section (priv->name_selector, sections [i]); + for (i = 0; sections[i]; i++) + add_section (priv->name_selector, sections[i]); name_selector_dialog = e_name_selector_peek_dialog (view->priv->name_selector); gtk_window_set_title (GTK_WINDOW (name_selector_dialog), _("Attendees")); @@ -245,7 +245,7 @@ e_meeting_list_view_add_attendee_to_name_selector (EMeetingListView *view, EMeet name_selector_model = e_name_selector_peek_model (priv->name_selector); i = get_index_from_role (e_meeting_attendee_get_role (ma)); - e_name_selector_model_peek_section (name_selector_model, sections [i], + e_name_selector_model_peek_section (name_selector_model, sections[i], NULL, &destination_store); des = e_destination_new (); e_destination_set_email (des, itip_strip_mailto (e_meeting_attendee_get_address (ma))); @@ -268,7 +268,7 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view, name_selector_model = e_name_selector_peek_model (priv->name_selector); i = get_index_from_role (e_meeting_attendee_get_role (ma)); - e_name_selector_model_peek_section (name_selector_model, sections [i], + e_name_selector_model_peek_section (name_selector_model, sections[i], NULL, &destination_store); destinations = e_destination_store_list_destinations (destination_store); madd = itip_strip_mailto (e_meeting_attendee_get_address (ma)); @@ -910,7 +910,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin EDestinationStore *destination_store; GList *destinations; - e_name_selector_model_peek_section (name_selector_model, sections [i], + e_name_selector_model_peek_section (name_selector_model, sections[i], NULL, &destination_store); if (!destination_store) { g_warning ("destination store is NULL\n"); @@ -918,7 +918,7 @@ name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpoin } destinations = e_destination_store_list_destinations (destination_store); - process_section (view, destinations, roles [i], &la); + process_section (view, destinations, roles[i], &la); g_list_free (destinations); } diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index 51bf75f750..dd746e32db 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -275,7 +275,7 @@ get_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreePath *path) g_return_val_if_fail (E_IS_MEETING_STORE (model), FALSE); g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE); - row = gtk_tree_path_get_indices (path) [0]; + row = gtk_tree_path_get_indices (path)[0]; if (!ROW_VALID (E_MEETING_STORE (model), row)) return FALSE; diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index c7c81e12ce..86afc39c59 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -485,9 +485,9 @@ e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item, hour_y = mts->row_height + 4 - scroll_y; while (hour < mts->last_hour_shown) { if (calendar_config_get_24_hour_format ()) - pango_layout_set_text (layout, EMeetingTimeSelectorHours [hour], -1); + pango_layout_set_text (layout, EMeetingTimeSelectorHours[hour], -1); else - pango_layout_set_text (layout, EMeetingTimeSelectorHours12 [hour], -1); + pango_layout_set_text (layout, EMeetingTimeSelectorHours12[hour], -1); gdk_draw_layout (drawable, gc, hour_x, diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c index a34033f44b..3b120566e8 100644 --- a/calendar/gui/e-meeting-time-sel.c +++ b/calendar/gui/e-meeting-time-sel.c @@ -97,7 +97,7 @@ enum { LAST_SIGNAL }; -static gint signals [LAST_SIGNAL] = { 0 }; +static gint signals[LAST_SIGNAL] = { 0 }; static void e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts, const gchar *name, GdkColor *c); @@ -869,7 +869,7 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em e_meeting_time_selector_update_end_date_edit (mts); e_meeting_time_selector_update_date_popup_menus (mts); - g_signal_emit (mts, signals [CHANGED], 0); + g_signal_emit (mts, signals[CHANGED], 0); } /* This adds a color to the color key beneath the main display. If color is @@ -1125,11 +1125,11 @@ style_change_idle_func (EMeetingTimeSelector *mts) max_hour_width = 0; for (hour = 0; hour < 24; hour++) { if (e_meeting_time_selector_get_use_24_hour_format (mts)) - pango_layout_set_text (layout, EMeetingTimeSelectorHours [hour], -1); + pango_layout_set_text (layout, EMeetingTimeSelectorHours[hour], -1); else - pango_layout_set_text (layout, EMeetingTimeSelectorHours12 [hour], -1); + pango_layout_set_text (layout, EMeetingTimeSelectorHours12[hour], -1); - pango_layout_get_pixel_size (layout, &mts->hour_widths [hour], NULL); + pango_layout_get_pixel_size (layout, &mts->hour_widths[hour], NULL); max_hour_width = MAX (max_hour_width, mts->hour_widths[hour]); } @@ -1326,7 +1326,7 @@ e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts, e_meeting_time_selector_update_start_date_edit (mts); e_meeting_time_selector_update_end_date_edit (mts); - g_signal_emit (mts, signals [CHANGED], 0); + g_signal_emit (mts, signals[CHANGED], 0); return TRUE; } @@ -1915,7 +1915,7 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts, e_meeting_time_selector_update_start_date_edit (mts); e_meeting_time_selector_update_end_date_edit (mts); - g_signal_emit (mts, signals [CHANGED], 0); + g_signal_emit (mts, signals[CHANGED], 0); return; } @@ -2476,7 +2476,7 @@ e_meeting_time_selector_on_start_time_changed (GtkWidget *widget, gtk_widget_queue_draw (mts->display_top); gtk_widget_queue_draw (mts->display_main); - g_signal_emit (mts, signals [CHANGED], 0); + g_signal_emit (mts, signals[CHANGED], 0); } /* This is called when the meeting end time GnomeDateEdit is changed, @@ -2525,7 +2525,7 @@ e_meeting_time_selector_on_end_time_changed (GtkWidget *widget, gtk_widget_queue_draw (mts->display_top); gtk_widget_queue_draw (mts->display_main); - g_signal_emit (mts, signals [CHANGED], 0); + g_signal_emit (mts, signals[CHANGED], 0); } /* This updates the ranges shown in the GnomeDateEdit popup menus, according @@ -2741,7 +2741,7 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts, if (set_both_times || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START) - g_signal_emit (mts, signals [CHANGED], 0); + g_signal_emit (mts, signals[CHANGED], 0); } /* This is the timeout function which handles auto-scrolling when the user is @@ -2882,7 +2882,7 @@ e_meeting_time_selector_timeout_handler (gpointer data) if (set_both_times || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_END || mts->dragging_position == E_MEETING_TIME_SELECTOR_POS_START) - g_signal_emit (mts, signals [CHANGED], 0); + g_signal_emit (mts, signals[CHANGED], 0); scroll: /* Redraw the canvases. We freeze and thaw the layouts so that they @@ -3122,7 +3122,7 @@ static void row_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data); - gint row = gtk_tree_path_get_indices (path) [0]; + gint row = gtk_tree_path_get_indices (path)[0]; /* Update the scroll region. */ e_meeting_time_selector_update_main_canvas_scroll_region (mts); @@ -3138,7 +3138,7 @@ static void row_changed_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) { EMeetingTimeSelector *mts = E_MEETING_TIME_SELECTOR (data); - gint row = gtk_tree_path_get_indices (path) [0]; + gint row = gtk_tree_path_get_indices (path)[0]; /* Get the latest free/busy info */ e_meeting_time_selector_refresh_free_busy (mts, row, FALSE); diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index eafa3521c8..8355aa9616 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -572,7 +572,7 @@ memo_table_query_tooltip (GtkWidget *widget, &tmp_tm, use_24_hour_format, FALSE, FALSE, buff, 1000); - if (buff [0]) { + if (buff[0]) { /* Translators: This is followed by an event's start date/time */ g_string_append (tmp2, _("Start: ")); g_string_append (tmp2, buff); @@ -588,7 +588,7 @@ memo_table_query_tooltip (GtkWidget *widget, &tmp_tm, use_24_hour_format, FALSE, FALSE, buff, 1000); - if (buff [0]) { + if (buff[0]) { if (tmp2->len) g_string_append (tmp2, "; "); diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c index ddb8e72efe..25c59470f0 100644 --- a/calendar/gui/e-select-names-renderer.c +++ b/calendar/gui/e-select-names-renderer.c @@ -46,7 +46,7 @@ enum { LAST_SIGNAL }; -static gint signals [LAST_SIGNAL]; +static gint signals[LAST_SIGNAL]; G_DEFINE_TYPE (ESelectNamesRenderer, e_select_names_renderer, GTK_TYPE_CELL_RENDERER_TEXT) @@ -85,7 +85,7 @@ e_select_names_renderer_editing_done (GtkCellEditable *editable, ESelectNamesRen } } - g_signal_emit (cell, signals [CELL_EDITED], 0, cell->priv->path, addresses, names); + g_signal_emit (cell, signals[CELL_EDITED], 0, cell->priv->path, addresses, names); g_list_foreach (addresses, (GFunc)g_free, NULL); g_list_foreach (names, (GFunc)g_free, NULL); diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c index 45ac6cf09c..d1c03563a2 100644 --- a/calendar/gui/e-task-table.c +++ b/calendar/gui/e-task-table.c @@ -785,7 +785,7 @@ task_table_query_tooltip (GtkWidget *widget, &tmp_tm, use_24_hour_format, FALSE, FALSE, buff, 1000); - if (buff [0]) { + if (buff[0]) { g_string_append (tmp2, _("Start: ")); g_string_append (tmp2, buff); } @@ -800,7 +800,7 @@ task_table_query_tooltip (GtkWidget *widget, &tmp_tm, use_24_hour_format, FALSE, FALSE, buff, 1000); - if (buff [0]) { + if (buff[0]) { if (tmp2->len) g_string_append (tmp2, "; "); diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c index 7863791e25..743f890485 100644 --- a/calendar/gui/e-week-view-layout.c +++ b/calendar/gui/e-week-view-layout.c @@ -362,22 +362,22 @@ e_week_view_layout_get_day_position (gint day, wd = 0; /* number of used rows in column */ for (i = m; i < M; i++) { - arr [i - m] += wk (i); - wd += arr [i - m]; + arr[i - m] += wk (i); + wd += arr[i - m]; } while (wd != 6 && any) { any = FALSE; for (i = M - 1; i >= m; i--) { - if (arr [i - m] > 1) { + if (arr[i - m] > 1) { any = TRUE; if (wd > 6) { /* too many rows, make last shorter */ - arr [i - m] --; + arr[i - m] --; wd--; } else if (wd < 6) { /* free rows left, enlarge those bigger */ - arr [i - m] ++; + arr[i - m] ++; wd++; } @@ -390,7 +390,7 @@ e_week_view_layout_get_day_position (gint day, any = TRUE; for (i = m; i < M; i++) { - arr [i - m] += 3; + arr[i - m] += 3; wd += 3; } } diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c index b2bdc5c4b3..3b36d7a07f 100644 --- a/calendar/gui/ea-cal-view-event.c +++ b/calendar/gui/ea-cal-view-event.c @@ -547,7 +547,7 @@ ea_cal_view_get_extents (AtkComponent *component, #define CAL_VIEW_EVENT_ACTION_NUM 1 -static const gchar * action_name [CAL_VIEW_EVENT_ACTION_NUM] = { +static const gchar * action_name[CAL_VIEW_EVENT_ACTION_NUM] = { N_("Grab Focus") }; @@ -588,7 +588,7 @@ static G_CONST_RETURN gchar * ea_cal_view_event_action_get_name (AtkAction *action, gint i) { if (i >= 0 && i < CAL_VIEW_EVENT_ACTION_NUM) - return action_name [i]; + return action_name[i]; return NULL; } diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c index a012154004..21b35e4e17 100644 --- a/calendar/gui/ea-cal-view.c +++ b/calendar/gui/ea-cal-view.c @@ -300,7 +300,7 @@ ea_cal_view_dates_change_cb (GnomeCalendar *gcal, gpointer data) #define CAL_VIEW_ACTION_NUM 5 -static const gchar * action_name [CAL_VIEW_ACTION_NUM] = { +static const gchar * action_name[CAL_VIEW_ACTION_NUM] = { N_("New Appointment"), N_("New All Day Event"), N_("New Meeting"), @@ -428,6 +428,6 @@ static G_CONST_RETURN gchar * action_interface_action_get_name(AtkAction *action, gint i) { if (i >= 0 && i < CAL_VIEW_ACTION_NUM) - return action_name [i]; + return action_name[i]; return NULL; } diff --git a/calendar/gui/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c index f07cdfa086..e8d91df217 100644 --- a/calendar/gui/ea-calendar-helpers.c +++ b/calendar/gui/ea-calendar-helpers.c @@ -42,7 +42,8 @@ ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item) AtkObject *atk_obj = NULL; GObject *g_obj; - g_return_val_if_fail ((E_IS_TEXT (canvas_item)) || (GNOME_IS_CANVAS_ITEM (canvas_item)), NULL);; + g_return_val_if_fail ((E_IS_TEXT (canvas_item)) || + (GNOME_IS_CANVAS_ITEM (canvas_item)), NULL); g_obj = G_OBJECT (canvas_item); /* we cannot use atk_gobject_accessible_for_object here, @@ -78,7 +79,8 @@ ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item) GtkWidget *view_widget = NULL; g_return_val_if_fail (canvas_item, NULL); - g_return_val_if_fail ((E_IS_TEXT (canvas_item)) || (GNOME_IS_CANVAS_ITEM (canvas_item)), NULL); + g_return_val_if_fail ((E_IS_TEXT (canvas_item)) || + (GNOME_IS_CANVAS_ITEM (canvas_item)), NULL); /* canvas_item is the e_text for the event */ /* canvas_item->canvas is the ECanvas for day view */ diff --git a/calendar/gui/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c index e35ef1401e..9c7d9f8601 100644 --- a/calendar/gui/ea-gnome-calendar.c +++ b/calendar/gui/ea-gnome-calendar.c @@ -218,7 +218,7 @@ ea_gnome_calendar_get_label_description (GnomeCalendar *gcal) if (start_tm.tm_year == end_tm.tm_year) { if (start_tm.tm_mon == end_tm.tm_mon) { if (start_tm.tm_mday == end_tm.tm_mday) { - buffer [0] = '\0'; + buffer[0] = '\0'; } else { e_utf8_strftime (buffer, sizeof (buffer), "%d", &start_tm); -- cgit