diff options
Diffstat (limited to 'calendar/gui/gnome-cal.c')
-rw-r--r-- | calendar/gui/gnome-cal.c | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 18f4a47276..951f01bfa9 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -140,9 +140,9 @@ struct _GnomeCalendarPrivate { /* Calendar query for the date navigator */ GList *dn_queries; /* list of CalQueries */ - char *sexp; - char *todo_sexp; - char *memo_sexp; + gchar *sexp; + gchar *todo_sexp; + gchar *memo_sexp; guint update_timeout; guint update_marcus_bains_line_timeout; @@ -172,7 +172,7 @@ struct _GnomeCalendarPrivate { GalViewMenus *view_menus; /* Our current week start */ - int week_start; + gint week_start; /* Our current timezone. */ icaltimezone *zone; @@ -631,7 +631,7 @@ static void get_times_for_views (GnomeCalendar *gcal, GnomeCalendarViewType view_type, time_t *start_time, time_t *end_time) { GnomeCalendarPrivate *priv; - int shown, display_start; + gint shown, display_start; GDate date; gint weekday, first_day, last_day, days_shown, i; gboolean has_working_days = FALSE; @@ -826,12 +826,12 @@ get_date_navigator_range (GnomeCalendar *gcal, time_t *start_time, time_t *end_t } /* Adjusts a given query sexp with the time range of the date navigator */ -static char * -adjust_e_cal_view_sexp (GnomeCalendar *gcal, const char *sexp) +static gchar * +adjust_e_cal_view_sexp (GnomeCalendar *gcal, const gchar *sexp) { time_t start_time, end_time; - char *start, *end; - char *new_sexp; + gchar *start, *end; + gchar *new_sexp; get_date_navigator_range (gcal, &start_time, &end_time); if (start_time == -1 || end_time == -1) @@ -862,7 +862,7 @@ update_query_async (struct _date_query_msg *msg) GnomeCalendar *gcal = msg->gcal; GnomeCalendarPrivate *priv; ECalView *old_query; - char *real_sexp; + gchar *real_sexp; GList *l; priv = gcal->priv; @@ -956,10 +956,10 @@ update_query (GnomeCalendar *gcal) } static void -set_search_query (GnomeCalendar *gcal, const char *sexp) +set_search_query (GnomeCalendar *gcal, const gchar *sexp) { GnomeCalendarPrivate *priv; - int i; + gint i; time_t start, end; g_return_if_fail (gcal != NULL); @@ -1024,10 +1024,10 @@ get_current_time (ECalendarItem *calitem, gpointer data) /* Callback used when the sexp changes in the calendar search bar */ static void -search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer data) +search_bar_sexp_changed_cb (CalSearchBar *cal_search, const gchar *sexp, gpointer data) { GnomeCalendar *gcal; - const char *d_sexp = "occur-in-time-range?"; + const gchar *d_sexp = "occur-in-time-range?"; gcal = GNOME_CALENDAR (data); @@ -1046,12 +1046,12 @@ search_bar_sexp_changed_cb (CalSearchBar *cal_search, const char *sexp, gpointer /* Callback used when the selected category in the search bar changes */ static void -search_bar_category_changed_cb (CalSearchBar *cal_search, const char *category, gpointer data) +search_bar_category_changed_cb (CalSearchBar *cal_search, const gchar *category, gpointer data) { GnomeCalendar *gcal; GnomeCalendarPrivate *priv; ECalModel *model; - int i; + gint i; gcal = GNOME_CALENDAR (data); priv = gcal->priv; @@ -1271,7 +1271,7 @@ static void set_timezone (GnomeCalendar *calendar) { GnomeCalendarPrivate *priv; - int i; + gint i; priv = calendar->priv; @@ -1317,7 +1317,7 @@ update_todo_view_async (struct _mupdate_todo_msg *msg) GnomeCalendar *gcal; GnomeCalendarPrivate *priv; ECalModel *model; - char *sexp = NULL; + gchar *sexp = NULL; g_return_if_fail (msg != NULL); @@ -1368,7 +1368,7 @@ update_memo_view (GnomeCalendar *gcal) GnomeCalendarPrivate *priv; ECalModel *model, *view_model; time_t start, end; - char *iso_start, *iso_end; + gchar *iso_start, *iso_end; priv = gcal->priv; @@ -1553,7 +1553,7 @@ categories_changed_cb (gpointer object, gpointer user_data) cat_array = g_ptr_array_new (); cat_list = e_categories_get_list (); while (cat_list != NULL) { - if (e_categories_is_searchable ((const char *) cat_list->data)) + if (e_categories_is_searchable ((const gchar *) cat_list->data)) g_ptr_array_add (cat_array, cat_list->data); cat_list = g_list_remove (cat_list, cat_list->data); } @@ -1565,7 +1565,7 @@ categories_changed_cb (gpointer object, gpointer user_data) static void -view_progress_cb (ECalModel *model, const char *message, int percent, ECalSourceType type, GnomeCalendar *gcal) +view_progress_cb (ECalModel *model, const gchar *message, gint percent, ECalSourceType type, GnomeCalendar *gcal) { if (type == E_CAL_SOURCE_TYPE_EVENT) { e_calendar_view_set_status_message (E_CALENDAR_VIEW (gcal->priv->week_view), message, percent); @@ -1621,8 +1621,8 @@ setup_widgets (GnomeCalendar *gcal) GtkWidget *vbox; GtkWidget *label; ECalModel *cal_model; - int i; - char *tmp; + gint i; + gchar *tmp; priv = gcal->priv; @@ -1861,7 +1861,7 @@ static void gnome_calendar_init (GnomeCalendar *gcal) { GnomeCalendarPrivate *priv; - int i; + gint i; priv = g_new0 (GnomeCalendarPrivate, 1); gcal->priv = priv; @@ -1916,7 +1916,7 @@ gnome_calendar_destroy (GtkObject *object) if (priv) { GList *l; - int i; + gint i; e_categories_unregister_change_listener (G_CALLBACK (categories_changed_cb), gcal); @@ -2077,7 +2077,7 @@ static void notify_selected_time_changed (GnomeCalendar *gcal) { GnomeCalendarPrivate *priv; - int i; + gint i; priv = gcal->priv; for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) { @@ -2158,7 +2158,7 @@ void gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time) { GnomeCalendarPrivate *priv; - int i; + gint i; g_return_if_fail (gcal != NULL); g_return_if_fail (GNOME_IS_CALENDAR (gcal)); @@ -2199,7 +2199,7 @@ update_view_times (GnomeCalendar *gcal, time_t start_time) } static void -gnome_calendar_direction (GnomeCalendar *gcal, int direction) +gnome_calendar_direction (GnomeCalendar *gcal, gint direction) { GnomeCalendarPrivate *priv; @@ -2301,7 +2301,7 @@ static void set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean range_selected) { GnomeCalendarPrivate *priv; - const char *view_id; + const gchar *view_id; g_return_if_fail (gcal != NULL); g_return_if_fail (GNOME_IS_CALENDAR (gcal)); @@ -2369,7 +2369,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra { GnomeCalendarPrivate *priv; gboolean preserve_day; - int i; + gint i; priv = gcal->priv; @@ -2499,7 +2499,7 @@ void gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic) { GnomeCalendarPrivate *priv; - char *path0, *path1, *etspecfile; + gchar *path0, *path1, *etspecfile; CalendarViewFactory *factory; GalViewFactory *gal_factory; static GalViewCollection *collection = NULL; @@ -2607,16 +2607,16 @@ gnome_calendar_discard_view_menus (GnomeCalendar *gcal) /* This is copied/moved from gal-view-instance, only the calendar uses this for a popup menu */ static void -gc_set_view(EPopup *ep, EPopupItem *pitem, void *data) +gc_set_view(EPopup *ep, EPopupItem *pitem, gpointer data) { GnomeCalendar *gcal = data; if (pitem->type & E_POPUP_ACTIVE) - gal_view_instance_set_current_view_id(gcal->priv->view_instance, (char *)pitem->user_data); + gal_view_instance_set_current_view_id(gcal->priv->view_instance, (gchar *)pitem->user_data); } static void -gc_save_custom_view(EPopup *ep, EPopupItem *pitem, void *data) +gc_save_custom_view(EPopup *ep, EPopupItem *pitem, gpointer data) { GnomeCalendar *gcal = data; @@ -2624,7 +2624,7 @@ gc_save_custom_view(EPopup *ep, EPopupItem *pitem, void *data) } static void -gc_define_views_response(GtkWidget *d, int id, GnomeCalendar *gcal) +gc_define_views_response(GtkWidget *d, gint id, GnomeCalendar *gcal) { if (id == GTK_RESPONSE_OK) gal_view_collection_save(gcal->priv->view_instance->collection); @@ -2633,7 +2633,7 @@ gc_define_views_response(GtkWidget *d, int id, GnomeCalendar *gcal) } static void -gc_define_views(EPopup *ep, EPopupItem *pitem, void *data) +gc_define_views(EPopup *ep, EPopupItem *pitem, gpointer data) { GnomeCalendar *gcal = data; GtkWidget *dialog = gal_define_views_dialog_new(gcal->priv->view_instance->collection); @@ -2655,7 +2655,7 @@ static EPopupItem gc_popups[] = { }; static void -gc_popup_free (EPopup *ep, GSList *list, void *data) +gc_popup_free (EPopup *ep, GSList *list, gpointer data) { while (list) { GSList *n = list->next; @@ -2671,7 +2671,7 @@ gc_popup_free (EPopup *ep, GSList *list, void *data) } static void -gc_popup_free_static (EPopup *ep, GSList *list, void *data) +gc_popup_free_static (EPopup *ep, GSList *list, gpointer data) { while (list) { GSList *n = list->next; @@ -2685,13 +2685,13 @@ gc_popup_free_static (EPopup *ep, GSList *list, void *data) } void -gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const char *prefix) +gnome_calendar_view_popup_factory (GnomeCalendar *gcal, EPopup *ep, const gchar *prefix) { GnomeCalendarPrivate *priv; - int length; - int i; + gint length; + gint i; gboolean found = FALSE; - char *id; + gchar *id; GSList *menus = NULL; EPopupItem *pitem; @@ -2784,7 +2784,7 @@ add_mclient (ECalModel *model, ECal *client) } static void -non_intrusive_error_remove(GtkWidget *w, void *data) +non_intrusive_error_remove(GtkWidget *w, gpointer data) { g_hash_table_remove(non_intrusive_error_table, data); } @@ -2797,7 +2797,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal) ESource *source; ECalModel *model; ECalLoadState state; - char *msg; + gchar *msg; GtkWidget *w = NULL; gchar *id; @@ -3016,7 +3016,7 @@ static gboolean open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of) { GnomeCalendarPrivate *priv; - char *msg; + gchar *msg; icaltimezone *zone; priv = gcal->priv; @@ -3050,11 +3050,11 @@ open_ecal (GnomeCalendar *gcal, ECal *cal, gboolean only_if_exists, open_func of /* Callback when we get an error message from the backend */ static void -backend_error_cb (ECal *client, const char *message, gpointer data) +backend_error_cb (ECal *client, const gchar *message, gpointer data) { GnomeCalendar *gcal; GtkDialog *dialog; - char *uristr; + gchar *uristr; gchar *id; gcal = GNOME_CALENDAR (data); @@ -3085,7 +3085,7 @@ backend_died_cb (ECal *ecal, gpointer data) GnomeCalendarPrivate *priv; ECalSourceType source_type; ESource *source; - const char *id; + const gchar *id; GtkWidget *w = NULL; gcal = GNOME_CALENDAR (data); @@ -3175,7 +3175,7 @@ void gnome_calendar_set_activity_handler (GnomeCalendar *cal, EActivityHandler *activity_handler) { GnomeCalendarPrivate *priv; - int i; + gint i; g_return_if_fail (cal != NULL); g_return_if_fail (GNOME_IS_CALENDAR (cal)); @@ -3324,7 +3324,7 @@ gnome_calendar_remove_source (GnomeCalendar *gcal, ECalSourceType source_type, E } gboolean -gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, ECalSourceType source_type, const char *uid) +gnome_calendar_remove_source_by_uid (GnomeCalendar *gcal, ECalSourceType source_type, const gchar *uid) { GnomeCalendarPrivate *priv; ECal *client; @@ -3481,7 +3481,7 @@ gnome_calendar_new_task (GnomeCalendar *gcal, time_t *dtstart, time_t *dtend) CompEditor *editor; ECalComponent *comp; icalcomponent *icalcomp; - const char *category; + const gchar *category; guint32 flags = 0; ECalComponentDateTime dt; struct icaltimetype itt; @@ -3979,7 +3979,7 @@ void gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than) { GnomeCalendarPrivate *priv; - char *sexp, *start, *end; + gchar *sexp, *start, *end; GList *l; g_return_if_fail (GNOME_IS_CALENDAR (gcal)); @@ -4014,7 +4014,7 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than) /* FIXME write occur-before and occur-after * sexp funcs so we don't have to use the max - * int */ + * gint */ if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER)) e_cal_generate_instances_for_object (client, m->data, older_than, G_MAXINT32, @@ -4023,11 +4023,11 @@ gnome_calendar_purge (GnomeCalendar *gcal, time_t older_than) /* FIXME Better error handling */ if (remove) { - const char *uid = icalcomponent_get_uid (m->data); + const gchar *uid = icalcomponent_get_uid (m->data); GError *error = NULL; if (e_cal_util_component_is_instance (m->data) || e_cal_util_component_has_recurrences (m->data)) { - char *rid = NULL; + gchar *rid = NULL; struct icaltimetype recur_id = icalcomponent_get_recurrenceid (m->data); if (!icaltime_is_null_time (recur_id) ) @@ -4114,9 +4114,9 @@ ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal) void gnome_calendar_edit_appointment (GnomeCalendar *gcal, - const char* src_uid, - const char* comp_uid, - const char* comp_rid) + const gchar * src_uid, + const gchar * comp_uid, + const gchar * comp_rid) { ECal *client = NULL; GList *l; |