aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-06-02 07:09:19 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-06-02 22:35:03 +0800
commit433eac7844481b8ceda0bae8bf08f6bb623185b0 (patch)
treed66a04ad4fa676b4bfce762dee09a82f4434d374 /calendar
parente6c6cbdfb5fd5723ff840b24b29690235be0d74d (diff)
downloadgsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.gz
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.bz2
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.lz
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.xz
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.tar.zst
gsoc2013-evolution-433eac7844481b8ceda0bae8bf08f6bb623185b0.zip
More code cleanup.
Diffstat (limited to 'calendar')
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c4
-rw-r--r--calendar/conduits/memo/memo-conduit.c2
-rw-r--r--calendar/conduits/todo/todo-conduit.c2
-rw-r--r--calendar/gui/a11y/ea-day-view-main-item.c2
-rw-r--r--calendar/gui/a11y/ea-week-view-main-item.c2
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c2
-rw-r--r--calendar/gui/alarm-notify/alarm.c2
-rw-r--r--calendar/gui/alarm-notify/util.c2
-rw-r--r--calendar/gui/cal-search-bar.c8
-rw-r--r--calendar/gui/calendar-component.c8
-rw-r--r--calendar/gui/calendar-config.c4
-rw-r--r--calendar/gui/calendar-config.h4
-rw-r--r--calendar/gui/dialogs/alarm-dialog.c2
-rw-r--r--calendar/gui/dialogs/cal-prefs-dialog.c2
-rw-r--r--calendar/gui/dialogs/comp-editor.c2
-rw-r--r--calendar/gui/dialogs/recurrence-page.c4
-rw-r--r--calendar/gui/dialogs/task-details-page.c2
-rw-r--r--calendar/gui/e-alarm-list.c2
-rw-r--r--calendar/gui/e-cal-model-calendar.c2
-rw-r--r--calendar/gui/e-cal-model-memos.c2
-rw-r--r--calendar/gui/e-cal-model-tasks.c4
-rw-r--r--calendar/gui/e-cal-model.c4
-rw-r--r--calendar/gui/e-calendar-table.c2
-rw-r--r--calendar/gui/e-calendar-view.c2
-rw-r--r--calendar/gui/e-date-time-list.c2
-rw-r--r--calendar/gui/e-day-view-main-item.c10
-rw-r--r--calendar/gui/e-day-view-time-item.c18
-rw-r--r--calendar/gui/e-day-view-top-item.c40
-rw-r--r--calendar/gui/e-day-view.c2
-rw-r--r--calendar/gui/e-meeting-store.c4
-rw-r--r--calendar/gui/e-meeting-time-sel.c2
-rw-r--r--calendar/gui/e-memo-table.c2
-rw-r--r--calendar/gui/e-timezone-entry.c2
-rw-r--r--calendar/gui/e-week-view-event-item.c24
-rw-r--r--calendar/gui/e-week-view-layout.c2
-rw-r--r--calendar/gui/e-week-view-main-item.c24
-rw-r--r--calendar/gui/e-week-view-titles-item.c24
-rw-r--r--calendar/gui/e-week-view.c4
-rw-r--r--calendar/gui/gnome-cal.c4
-rw-r--r--calendar/gui/itip-utils.c4
-rw-r--r--calendar/gui/memos-component.c2
-rw-r--r--calendar/gui/misc.c4
-rw-r--r--calendar/gui/print.c6
-rw-r--r--calendar/gui/tasks-component.c4
-rw-r--r--calendar/gui/tasks-control.c12
-rw-r--r--calendar/module/e-cal-shell-migrate.c8
-rw-r--r--calendar/module/e-memo-shell-migrate.c2
-rw-r--r--calendar/module/e-task-shell-migrate.c8
48 files changed, 143 insertions, 143 deletions
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index fe6f7dfe5d..e899ad203d 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -461,7 +461,7 @@ auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_
return password;
}
-static int
+static gint
start_calendar_server (ECalConduitContext *ctxt)
{
gchar *str_uri = NULL;
@@ -575,7 +575,7 @@ get_ical_day (gint day)
return ICAL_NO_WEEKDAY;
}
-static int
+static gint
get_pilot_day (icalrecurrencetype_weekday wd)
{
switch (wd) {
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 9a226f59b8..b22216eecd 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -356,7 +356,7 @@ static gchar *print_remote (GnomePilotRecord *remote)
return buff;
}
-static int
+static gint
start_calendar_server (EMemoConduitContext *ctxt)
{
g_return_val_if_fail (ctxt != NULL, -2);
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index b0b5526fba..7ff2161772 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -449,7 +449,7 @@ auth_func_cb (ECal *ecal, const gchar * prompt, const gchar *key, gpointer user_
return password;
}
-static int
+static gint
start_calendar_server (EToDoConduitContext *ctxt)
{
gchar *str_uri = NULL;
diff --git a/calendar/gui/a11y/ea-day-view-main-item.c b/calendar/gui/a11y/ea-day-view-main-item.c
index 87cd266c5c..3bfd56f0b3 100644
--- a/calendar/gui/a11y/ea-day-view-main-item.c
+++ b/calendar/gui/a11y/ea-day-view-main-item.c
@@ -551,7 +551,7 @@ ea_day_view_main_item_get_row_label (EaDayViewMainItem *ea_main_item,
atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
g_obj = atk_gobject_accessible_get_object (atk_gobj);
if (!g_obj)
- return 0 ;
+ return 0;
main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
day_view = main_item->day_view;
diff --git a/calendar/gui/a11y/ea-week-view-main-item.c b/calendar/gui/a11y/ea-week-view-main-item.c
index 065f2be528..74f4695a69 100644
--- a/calendar/gui/a11y/ea-week-view-main-item.c
+++ b/calendar/gui/a11y/ea-week-view-main-item.c
@@ -536,7 +536,7 @@ ea_week_view_main_item_get_row_label (EaWeekViewMainItem *ea_main_item,
atk_gobj = ATK_GOBJECT_ACCESSIBLE (ea_main_item);
g_obj = atk_gobject_accessible_get_object (atk_gobj);
if (!g_obj)
- return 0 ;
+ return 0;
return g_snprintf (buffer, buffer_size, "the %i week",
row + 1);
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index d5fd1afdfb..e4aca02699 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1638,7 +1638,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
ECalComponent *comp;
ECalComponentAlarm *alarm;
icalattach *attach;
- int flag = 0;
+ gint flag = 0;
d(printf("%s:%d (audio_notification)\n",__FILE__, __LINE__));
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index f2ab4bb23d..c487d94503 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -158,7 +158,7 @@ setup_timeout (void)
}
/* Used from g_list_insert_sorted(); compares the trigger times of two AlarmRecord structures. */
-static int
+static gint
compare_alarm_by_time (gconstpointer a, gconstpointer b)
{
const AlarmRecord *ara = a;
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 5377c8d4b2..e0bbf10245 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -76,7 +76,7 @@ calculate_time (time_t start, time_t end)
}
if (i == 0 || difference != 0) {
/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
- times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (int)difference);
+ times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference);
}
times[i] = NULL;
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 350b83ed78..c509561a17 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -288,10 +288,10 @@ get_current_category (CalSearchBar *cal_search)
static gchar *
get_show_option_sexp (CalSearchBar *cal_search)
{
- CalSearchBarPrivate *priv ;
- gint viewid ;
+ CalSearchBarPrivate *priv;
+ gint viewid;
gchar *start, *end, *due, *ret = NULL;
- const gchar *category = NULL ;
+ const gchar *category = NULL;
time_t start_range, end_range;
priv = cal_search->priv;
@@ -830,7 +830,7 @@ cal_search_bar_new (guint32 flags)
}
/* Used from qsort() */
-static int
+static gint
compare_categories_cb (gconstpointer a, gconstpointer b)
{
const gchar **ca, **cb;
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index bea2ca8d43..daa7e1c9a9 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -88,7 +88,7 @@ typedef struct
GList *notifications;
- float vpane_pos;
+ gfloat vpane_pos;
} CalendarComponentView;
struct _CalendarComponentPrivate {
@@ -112,7 +112,7 @@ struct _CalendarComponentPrivate {
static void
calcomp_vpane_realized (GtkWidget *vpane, CalendarComponentView *view)
{
- gtk_paned_set_position (GTK_PANED (vpane), (int)(view->vpane_pos*vpane->allocation.height));
+ gtk_paned_set_position (GTK_PANED (vpane), (gint)(view->vpane_pos*vpane->allocation.height));
}
@@ -121,7 +121,7 @@ calcomp_vpane_resized (GtkWidget *vpane, GdkEventButton *e, CalendarComponentVie
{
view->vpane_pos = gtk_paned_get_position (GTK_PANED (vpane));
- calendar_config_set_tag_vpane_pos (view->vpane_pos/(float)vpane->allocation.height);
+ calendar_config_set_tag_vpane_pos (view->vpane_pos/(gfloat)vpane->allocation.height);
return FALSE;
}
@@ -294,7 +294,7 @@ impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environm
EUri *euri = e_uri_new (uri);
const gchar *p;
gchar *header, *content;
- size_t len, clen;
+ gsize len, clen;
time_t start = -1, end = -1;
p = euri->query;
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index e98210fa57..f0b492d59c 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -658,7 +658,7 @@ calendar_config_set_month_vpane_pos (gint vpane_pos)
gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, vpane_pos, NULL);
}
-float
+gfloat
calendar_config_get_tag_vpane_pos (void)
{
calendar_config_init ();
@@ -668,7 +668,7 @@ calendar_config_get_tag_vpane_pos (void)
void
-calendar_config_set_tag_vpane_pos (float vpane_pos)
+calendar_config_set_tag_vpane_pos (gfloat vpane_pos)
{
calendar_config_init ();
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index b35888f842..adcf2c0c37 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -153,8 +153,8 @@ void calendar_config_set_month_hpane_pos (gint hpane_pos);
gint calendar_config_get_month_vpane_pos (void);
void calendar_config_set_month_vpane_pos (gint vpane_pos);
-float calendar_config_get_tag_vpane_pos (void);
-void calendar_config_set_tag_vpane_pos (float vpane_pos);
+gfloat calendar_config_get_tag_vpane_pos (void);
+void calendar_config_set_tag_vpane_pos (gfloat vpane_pos);
/* The current list of task lists selected */
GSList *calendar_config_get_tasks_selected (void);
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 5284656d1d..ab411f9e7b 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -1105,7 +1105,7 @@ action_changed_cb (GtkWidget *action_combo, gpointer data)
gint page = 0, i;
action = e_dialog_combo_box_get (dialog->action_combo, action_map);
- for (i = 0; action_map[i] != -1 ; i++) {
+ for (i = 0; action_map[i] != -1; i++) {
if (action == action_map[i]) {
page = i;
break;
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 9ddd9af6cb..af4c4b8e1a 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -421,7 +421,7 @@ ba_reminder_interval_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
gint value;
str = gtk_entry_get_text (GTK_ENTRY (widget));
- value = (int) g_ascii_strtod (str, NULL);
+ value = (gint) g_ascii_strtod (str, NULL);
calendar_config_set_ba_reminder (NULL, &value, NULL);
}
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index ff08b7656c..e644a127a9 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2562,7 +2562,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
num_attachments = e_cal_component_get_num_attachments (send_comp);
- for (i = 0; i < num_attachments ; i++) {
+ for (i = 0; i < num_attachments; i++) {
attach_list = g_slist_append (attach_list, g_strdup ("CID:..."));
}
e_cal_component_set_attachment_list (send_comp, attach_list);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5e24495b5c..5fbf69df74 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -643,7 +643,7 @@ nth_weekday (gint pos, icalrecurrencetype_weekday weekday)
{
g_assert (pos > 0 && pos <= 5);
- return (pos << 3) | (int) weekday;
+ return (pos << 3) | (gint) weekday;
}
#endif
@@ -1312,7 +1312,7 @@ make_recurrence_special (RecurrencePage *rpage)
}
/* Counts the elements in the by_xxx fields of an icalrecurrencetype */
-static int
+static gint
count_by_xxx (short *field, gint max_elements)
{
gint i;
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 67aee1ecab..eeacc0774f 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -186,7 +186,7 @@ priority_value_to_index (gint priority_value)
return retval;
}
-static int
+static gint
priority_index_to_value (TaskEditorPriority priority)
{
gint retval;
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 32e5b4214a..4fdf5e71eb 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -170,7 +170,7 @@ all_rows_deleted (EAlarmList *alarm_list)
i = g_list_length (alarm_list->list);
gtk_tree_path_append_index (path, i);
- for ( ; i >= 0; i--) {
+ for (; i >= 0; i--) {
gtk_tree_model_row_deleted (GTK_TREE_MODEL (alarm_list), path);
gtk_tree_path_prev (path);
}
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 25bb9364d3..452ce88b34 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -107,7 +107,7 @@ e_cal_model_calendar_finalize (GObject *object)
}
/* ETableModel methods */
-static int
+static gint
ecmc_column_count (ETableModel *etm)
{
return E_CAL_MODEL_CALENDAR_FIELD_LAST;
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 7f05fbee47..995ed9c5cb 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -108,7 +108,7 @@ e_cal_model_memos_finalize (GObject *object)
}
/* ETableModel methods */
-static int
+static gint
ecmm_column_count (ETableModel *etm)
{
return E_CAL_MODEL_MEMOS_FIELD_LAST;
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 6e7996dfea..43b54db368 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -112,7 +112,7 @@ e_cal_model_tasks_finalize (GObject *object)
}
/* ETableModel methods */
-static int
+static gint
ecmt_column_count (ETableModel *etm)
{
return E_CAL_MODEL_TASKS_FIELD_LAST;
@@ -310,7 +310,7 @@ get_geo (ECalModelComponent *comp_data)
return (gpointer) "";
}
-static int
+static gint
get_percent (ECalModelComponent *comp_data)
{
icalproperty *prop;
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 7a1b9477cf..4af9b88994 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -298,13 +298,13 @@ e_cal_model_finalize (GObject *object)
/* ETableModel methods */
-static int
+static gint
ecm_column_count (ETableModel *etm)
{
return E_CAL_MODEL_FIELD_LAST;
}
-static int
+static gint
ecm_row_count (ETableModel *etm)
{
ECalModelPrivate *priv;
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 885f9afb90..3c11aa7238 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -361,7 +361,7 @@ calendar_table_query_tooltip_cb (ECalendarTable *cal_table,
e_cal_component_get_organizer (new_comp, &organizer);
if (organizer.cn) {
- gchar *ptr ;
+ gchar *ptr;
ptr = strchr( organizer.value, ':');
if (ptr) {
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 88fe49c17e..330bd0eb68 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -2334,7 +2334,7 @@ e_calendar_view_get_tooltips (ECalendarViewEventData *data)
e_cal_component_get_organizer (newcomp, &organiser);
if (organiser.cn) {
- gchar *ptr ;
+ gchar *ptr;
ptr = strchr(organiser.value, ':');
if (ptr) {
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index bf75f5ff04..5160f1b419 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -168,7 +168,7 @@ all_rows_deleted (EDateTimeList *date_time_list)
i = g_list_length (date_time_list->list);
gtk_tree_path_append_index (path, i);
- for ( ; i >= 0; i--) {
+ for (; i >= 0; i--) {
gtk_tree_model_row_deleted (GTK_TREE_MODEL (date_time_list), path);
gtk_tree_path_prev (path);
}
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 2a705b809f..c97db277d8 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -620,7 +620,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
gdouble date_fraction;
gboolean short_event = FALSE, resize_flag = FALSE;
const gchar *end_resize_suffix;
- gchar *end_resize_time;
+ gchar *end_regsizeime;
gint start_hour, start_display_hour, start_minute, start_suffix_width;
gint end_hour, end_display_hour, end_minute, end_suffix_width;
gboolean show_span = FALSE, format_time;
@@ -972,12 +972,12 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
if (e_calendar_view_get_use_24_hour_format (E_CALENDAR_VIEW (day_view))) {
cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 32, item_y + item_h - 8);
- end_resize_time = g_strdup_printf ("%2i:%02i",
+ end_regsizeime = g_strdup_printf ("%2i:%02i",
end_display_hour, end_minute);
} else {
cairo_translate (cr, item_x + item_w - E_DAY_VIEW_BAR_WIDTH - 48, item_y + item_h - 8);
- end_resize_time = g_strdup_printf ("%2i:%02i%s",
+ end_regsizeime = g_strdup_printf ("%2i:%02i%s",
end_display_hour, end_minute,
end_resize_suffix);
}
@@ -987,7 +987,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
else
cairo_set_source_rgb (cr, 1, 1, 1);
cairo_set_font_options (cr, font_options);
- cairo_show_text (cr, end_resize_time);
+ cairo_show_text (cr, end_regsizeime);
cairo_close_path (cr);
cairo_restore (cr);
}
@@ -1021,7 +1021,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
cairo_restore (cr);
/* This is for achieving the white stripes in vbar across event color */
- for (i = 0; i <= (bar_y2 - bar_y1) ; i+=4) {
+ for (i = 0; i <= (bar_y2 - bar_y1); i+=4) {
cairo_set_source_rgb (cr, 1, 1, 1);
cairo_set_line_width (cr, 0.3);
cairo_move_to (cr, item_x + 1, bar_y1 + i);
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 78bf55863f..232534d51a 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -274,11 +274,11 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
static void
edvti_draw_zone (GnomeCanvasItem *canvas_item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height,
- int x_offset,
+ gint x,
+ gint y,
+ gint width,
+ gint height,
+ gint x_offset,
icaltimezone *use_zone)
{
EDayView *day_view;
@@ -609,10 +609,10 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
static void
e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
EDayViewTimeItem *dvtmitem;
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 7579f00986..31cce40a5a 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -44,20 +44,20 @@ static void e_day_view_top_item_set_property (GObject *object,
static void e_day_view_top_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags);
+ gint flags);
static void e_day_view_top_item_draw (GnomeCanvasItem *item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height);
+ gint x,
+ gint y,
+ gint width,
+ gint height);
static void e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
gint event_num,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height);
+ gint x,
+ gint y,
+ gint width,
+ gint height);
static void e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem,
GdkDrawable *drawable,
gint x,
@@ -68,8 +68,8 @@ static void e_day_view_top_item_draw_triangle (EDayViewTopItem *dvtitem,
static double e_day_view_top_item_point (GnomeCanvasItem *item,
double x,
double y,
- int cx,
- int cy,
+ gint cx,
+ gint cy,
GnomeCanvasItem **actual_item);
static gint e_day_view_top_item_event (GnomeCanvasItem *item,
GdkEvent *event);
@@ -155,7 +155,7 @@ static void
e_day_view_top_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags)
+ gint flags)
{
if (GNOME_CANVAS_ITEM_CLASS (e_day_view_top_item_parent_class)->update)
(* GNOME_CANVAS_ITEM_CLASS (e_day_view_top_item_parent_class)->update) (item, affine, clip_path, flags);
@@ -174,10 +174,10 @@ e_day_view_top_item_update (GnomeCanvasItem *item,
static void
e_day_view_top_item_draw (GnomeCanvasItem *canvas_item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
EDayViewTopItem *dvtitem;
EDayView *day_view;
@@ -358,10 +358,10 @@ static void
e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
gint event_num,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
EDayView *day_view;
EDayViewEvent *event;
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 7b76e008d7..5ee20f249c 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -5989,7 +5989,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
data->cal_view = (ECalendarView *)day_view;
data->day = day;
data->event_num = event_num;
- data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
+ data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event;
pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
return TRUE;
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index b555c41f6c..da60b19f43 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -217,7 +217,7 @@ get_flags (GtkTreeModel *model)
return GTK_TREE_MODEL_ITERS_PERSIST | GTK_TREE_MODEL_LIST_ONLY;
}
-static int
+static gint
get_n_columns (GtkTreeModel *model)
{
g_return_val_if_fail (E_IS_MEETING_STORE (model), 0);
@@ -400,7 +400,7 @@ iter_has_child (GtkTreeModel *model, GtkTreeIter *iter)
return FALSE;
}
-static int
+static gint
iter_n_children (GtkTreeModel *model, GtkTreeIter *iter)
{
g_return_val_if_fail (E_IS_MEETING_STORE (model), -1);
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index da33eb4174..16b6a9d48c 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -871,7 +871,7 @@ e_meeting_time_selector_unrealize (GtkWidget *widget)
(*GTK_WIDGET_CLASS (e_meeting_time_selector_parent_class)->unrealize)(widget);
}
-static int
+static gint
get_cell_height (GtkTreeView *tree)
{
GtkTreeViewColumn *column;
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 3e604f8bbe..4ad24e5a34 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -297,7 +297,7 @@ memo_table_query_tooltip_cb (EMemoTable *memo_table,
e_cal_component_get_organizer (new_comp, &organizer);
if (organizer.cn) {
- gchar *ptr ;
+ gchar *ptr;
ptr = strchr( organizer.value, ':');
if (ptr) {
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 2d0cf1ab5d..28660fd3b9 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -79,7 +79,7 @@ static void
e_timezone_entry_class_init (ETimezoneEntryClass *class)
{
GtkObjectClass *object_class = (GtkObjectClass *) class;
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class) ;
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
object_class = (GtkObjectClass*) class;
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index f72c9dfcb1..6ab551e6fc 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -46,13 +46,13 @@ static void e_week_view_event_item_set_property (GObject *object,
static void e_week_view_event_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags);
+ gint flags);
static void e_week_view_event_item_draw (GnomeCanvasItem *item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height);
+ gint x,
+ gint y,
+ gint width,
+ gint height);
static void e_week_view_draw_time (EWeekView *week_view,
GdkDrawable *drawable,
gint time_x,
@@ -74,8 +74,8 @@ static void e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
static double e_week_view_event_item_point (GnomeCanvasItem *item,
double x,
double y,
- int cx,
- int cy,
+ gint cx,
+ gint cy,
GnomeCanvasItem **actual_item);
static gint e_week_view_event_item_event (GnomeCanvasItem *item,
GdkEvent *event);
@@ -179,7 +179,7 @@ static void
e_week_view_event_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags)
+ gint flags)
{
EWeekViewEventItem *wveitem;
EWeekView *week_view;
@@ -226,10 +226,10 @@ e_week_view_event_item_update (GnomeCanvasItem *item,
static void
e_week_view_event_item_draw (GnomeCanvasItem *canvas_item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
EWeekViewEventItem *wveitem;
EWeekView *week_view;
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 134b318118..8f0cb5ece8 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -432,7 +432,7 @@ e_week_view_layout_get_span_position (EWeekViewEvent *event,
if (span->row >= rows_per_compressed_cell) {
if (multi_week_view) {
if (compress_weekend) {
- /* If it ends on a Saturday and is 1 day long
+ /* If it ends on a Saturday and is 1 day glong
we skip it, else we shorten it. If it ends
on a Sunday it must be 1 day long and we
skip it. */
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index e0b14637ae..aee26922ea 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -38,13 +38,13 @@ static void e_week_view_main_item_set_property (GObject *object,
static void e_week_view_main_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags);
+ gint flags);
static void e_week_view_main_item_draw (GnomeCanvasItem *item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height);
+ gint x,
+ gint y,
+ gint width,
+ gint height);
static void e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem,
gint day,
GDate *date,
@@ -56,8 +56,8 @@ static void e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem,
static double e_week_view_main_item_point (GnomeCanvasItem *item,
double x,
double y,
- int cx,
- int cy,
+ gint cx,
+ gint cy,
GnomeCanvasItem **actual_item);
/* The arguments we take */
@@ -129,7 +129,7 @@ static void
e_week_view_main_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags)
+ gint flags)
{
if (GNOME_CANVAS_ITEM_CLASS (e_week_view_main_item_parent_class)->update)
(* GNOME_CANVAS_ITEM_CLASS (e_week_view_main_item_parent_class)->update) (item, affine, clip_path, flags);
@@ -148,10 +148,10 @@ e_week_view_main_item_update (GnomeCanvasItem *item,
static void
e_week_view_main_item_draw (GnomeCanvasItem *canvas_item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
EWeekViewMainItem *wvmitem;
EWeekView *week_view;
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index 7a5ae4bf9b..e9ff467b63 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -36,18 +36,18 @@ static void e_week_view_titles_item_set_property(GObject *object,
static void e_week_view_titles_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags);
+ gint flags);
static void e_week_view_titles_item_draw (GnomeCanvasItem *item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height);
+ gint x,
+ gint y,
+ gint width,
+ gint height);
static double e_week_view_titles_item_point (GnomeCanvasItem *item,
double x,
double y,
- int cx,
- int cy,
+ gint cx,
+ gint cy,
GnomeCanvasItem **actual_item);
/* The arguments we take */
@@ -114,7 +114,7 @@ static void
e_week_view_titles_item_update (GnomeCanvasItem *item,
double *affine,
ArtSVP *clip_path,
- int flags)
+ gint flags)
{
if (GNOME_CANVAS_ITEM_CLASS (e_week_view_titles_item_parent_class)->update)
(* GNOME_CANVAS_ITEM_CLASS (e_week_view_titles_item_parent_class)->update) (item, affine, clip_path, flags);
@@ -134,10 +134,10 @@ e_week_view_titles_item_update (GnomeCanvasItem *item,
static void
e_week_view_titles_item_draw (GnomeCanvasItem *canvas_item,
GdkDrawable *drawable,
- int x,
- int y,
- int width,
- int height)
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
EWeekViewTitlesItem *wvtitem;
EWeekView *week_view;
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 4d0e97b5f0..c939d280de 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2711,7 +2711,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
data->cal_view = (ECalendarView *)view;
data->day = -1;
data->event_num = event_num;
- data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
+ data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event;
pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
g_object_set_data ((GObject *)view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
@@ -3295,7 +3295,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
data->cal_view = (ECalendarView *)week_view;
data->day = -1;
data->event_num = nevent;
- data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, int)) tooltip_get_view_event;
+ data->get_view_event = (ECalendarViewEvent * (*)(ECalendarView *, int, gint)) tooltip_get_view_event;
pevent->timeout = g_timeout_add (500, (GSourceFunc)e_calendar_view_get_tooltips, data);
g_object_set_data ((GObject *)week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index a46995a4d5..bcd30b0105 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -2021,9 +2021,9 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra
E_CALENDAR_VIEW (priv->views [view_type])->in_focus = TRUE;
gtk_notebook_set_current_page (
- GTK_NOTEBOOK (priv->notebook), (int) view_type);
+ GTK_NOTEBOOK (priv->notebook), (gint) view_type);
- for (i = 0; i < GNOME_CAL_LAST_VIEW ; i++) {
+ for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
if (i == view_type)
continue;
E_CALENDAR_VIEW (priv->views [i])->in_focus = FALSE;
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 9056650ea8..2287f59248 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -654,7 +654,7 @@ comp_subject (ECalComponentItipMethod method, ECalComponent *comp)
sender = itip_get_comp_attendee (comp, NULL);
if (sender) {
- for (l = alist; l != NULL ; l = l->next) {
+ for (l = alist; l != NULL; l = l->next) {
a = l->data;
if ((sender && *sender) && (g_ascii_strcasecmp (itip_strip_mailto (a->value), sender) || (a->sentby && g_ascii_strcasecmp (itip_strip_mailto (a->sentby), sender))))
break;
@@ -1160,7 +1160,7 @@ append_cal_attachments (EMsgComposer *composer,
struct CalMimeAttach *mime_attach;
GSList *l;
- for (l = attach_list; l ; l = l->next) {
+ for (l = attach_list; l; l = l->next) {
CamelMimePart *attachment;
mime_attach = (struct CalMimeAttach *) l->data;
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index c6a4dddd54..2e45ad4ec9 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -292,7 +292,7 @@ setup_create_ecal (MemosComponent *component, MemosComponentView *component_view
/* Save the primary source for use elsewhere */
calendar_config_set_primary_memos (e_source_peek_uid (source));
- return priv->create_ecal ;
+ return priv->create_ecal;
}
/* Ensures the calendar is selected */
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index 9fdf6f971b..36490c5463 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -55,7 +55,7 @@ string_is_empty (const gchar *value)
if (value) {
p = value;
while (*p) {
- if (!isspace ((unsigned char) *p)) {
+ if (!isspace ((guchar) *p)) {
empty = FALSE;
break;
}
@@ -123,7 +123,7 @@ calculate_time (time_t start, time_t end)
}
if (i == 0 || difference != 0) {
/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
- times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (int)difference);
+ times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference);
}
times[i] = NULL;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 6ecd39f260..fdb6f8a207 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -240,7 +240,7 @@ build_month (gint month, gint year, gint *days, gint *start, gint *end)
/* Note that months are zero-based, so September is month 8 */
if ((year == 1752) && (month == 8)) {
- memcpy (days, sept_1752, 42 * sizeof (int));
+ memcpy (days, sept_1752, 42 * sizeof (gint));
if (start)
*start = SEPT_1752_START;
@@ -818,7 +818,7 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
row = 0;
hour_minute_x = left + width * 0.58;
for (i = pdi->start_hour; i < pdi->end_hour; i++) {
- y = top + yinc * (row + 1) ;
+ y = top + yinc * (row + 1);
cr = gtk_print_context_get_cairo_context (context);
cairo_set_source_rgb (cr, 0, 0, 0);
@@ -2646,7 +2646,7 @@ print_comp_draw_real (GtkPrintOperation *operation,
categories);
top = bound_text (context, font, categories_string, -1,
0.0, top, width, height, TRUE, &page_start, &pages);
- top += get_font_size (font) - 6 ;
+ top += get_font_size (font) - 6;
g_free (categories_string);
}
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 039ad9ac87..02783496f6 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -493,7 +493,7 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view
/* Save the primary source for use elsewhere */
calendar_config_set_primary_tasks (e_source_peek_uid (source));
- return priv->create_ecal ;
+ return priv->create_ecal;
}
/* Ensures the calendar is selected */
@@ -645,7 +645,7 @@ impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environm
EUri *euri = e_uri_new (uri);
const gchar *p;
gchar *header, *content;
- size_t len, clen;
+ gsize len, clen;
p = euri->query;
if (p) {
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 42a69b41f6..5fa7f7a541 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -55,13 +55,13 @@ static void tasks_control_activate_cb (BonoboControl *control,
gpointer user_data);
static void tasks_control_new_task_cmd (BonoboUIComponent *uic,
gpointer data,
- const char *path);
+ const gchar *path);
static void tasks_control_complete_cmd (BonoboUIComponent *uic,
gpointer data,
- const char *path);
+ const gchar *path);
static void tasks_control_purge_cmd (BonoboUIComponent *uic,
gpointer data,
- const char *path);
+ const gchar *path);
static void tasks_control_assign_cmd (BonoboUIComponent *uic,
gpointer data,
const gchar *path);
@@ -269,7 +269,7 @@ tasks_control_deactivate (BonoboControl *control, ETasks *tasks)
static void
tasks_control_new_task_cmd (BonoboUIComponent *uic,
gpointer data,
- const char *path)
+ const gchar *path)
{
ETasks *tasks;
@@ -280,7 +280,7 @@ tasks_control_new_task_cmd (BonoboUIComponent *uic,
static void
tasks_control_complete_cmd (BonoboUIComponent *uic,
gpointer data,
- const char *path)
+ const gchar *path)
{
ETasks *tasks;
@@ -325,7 +325,7 @@ confirm_purge (ETasks *tasks)
static void
tasks_control_purge_cmd (BonoboUIComponent *uic,
gpointer data,
- const char *path)
+ const gchar *path)
{
ETasks *tasks;
diff --git a/calendar/module/e-cal-shell-migrate.c b/calendar/module/e-cal-shell-migrate.c
index 911dfcbd4a..9887a5332c 100644
--- a/calendar/module/e-cal-shell-migrate.c
+++ b/calendar/module/e-cal-shell-migrate.c
@@ -177,7 +177,7 @@ dialog_set_progress (double percent)
{
gchar text[5];
- snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
+ snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
gtk_progress_bar_set_fraction (progress, percent);
gtk_progress_bar_set_text (progress, text);
@@ -213,7 +213,7 @@ get_source_name (ESourceGroup *group, const gchar *path)
gboolean conflict;
GString *s = g_string_new (NULL);
- for (i = 0; p[i]; i ++) ;
+ for (i = 0; p[i]; i ++);
num_elements = i;
i--;
@@ -383,9 +383,9 @@ migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *o
((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
/* pilot map file - src and dest file formats are identical */
guchar inbuf[4096];
- size_t nread, nwritten;
+ gsize nread, nwritten;
gint fd0, fd1;
- ssize_t n;
+ gssize n;
filename = g_build_filename (old_path, dent, NULL);
if ((fd0 = g_open (filename, O_RDONLY|O_BINARY, 0)) == -1) {
diff --git a/calendar/module/e-memo-shell-migrate.c b/calendar/module/e-memo-shell-migrate.c
index 5a161cf634..d2e7df6d1b 100644
--- a/calendar/module/e-memo-shell-migrate.c
+++ b/calendar/module/e-memo-shell-migrate.c
@@ -145,7 +145,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name, const gchar
{
ESourceGroup *group;
ESource *source;
- GSList *ids, *temp ;
+ GSList *ids, *temp;
GError *error = NULL;
gchar *relative_uri;
const gchar *soap_port;
diff --git a/calendar/module/e-task-shell-migrate.c b/calendar/module/e-task-shell-migrate.c
index 4fc8b8c752..ced54bafdf 100644
--- a/calendar/module/e-task-shell-migrate.c
+++ b/calendar/module/e-task-shell-migrate.c
@@ -143,7 +143,7 @@ dialog_set_progress (double percent)
{
gchar text[5];
- snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f));
+ snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f));
gtk_progress_bar_set_fraction (progress, percent);
gtk_progress_bar_set_text (progress, text);
@@ -179,7 +179,7 @@ get_source_name (ESourceGroup *group, const gchar *path)
gboolean conflict;
GString *s = g_string_new (NULL);
- for (i = 0; p[i]; i ++) ;
+ for (i = 0; p[i]; i ++);
num_elements = i;
i--;
@@ -349,9 +349,9 @@ migrate_pilot_data (const gchar *component, const gchar *conduit, const gchar *o
((ext = strrchr (dent, '.')) && !strcmp (ext, ".xml"))) {
/* pilot map file - src and dest file formats are identical */
guchar inbuf[4096];
- size_t nread, nwritten;
+ gsize nread, nwritten;
gint fd0, fd1;
- ssize_t n;
+ gssize n;
filename = g_build_filename (old_path, dent, NULL);
if ((fd0 = g_open (filename, O_RDONLY|O_BINARY, 0)) == -1) {