From fad4af8a3d4c6f50f7bcceca8d545eb17d6fd056 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 27 May 2009 11:13:25 -0400
Subject: Prefer GLib basic types over C types.
---
calendar/gui/tasks-component.c | 96 +++++++++++++++++++++---------------------
1 file changed, 48 insertions(+), 48 deletions(-)
(limited to 'calendar/gui/tasks-component.c')
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 68536b29cb..e848b9b468 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -104,8 +104,8 @@ typedef struct
} TasksComponentView;
struct _TasksComponentPrivate {
- char *base_directory;
- char *config_directory;
+ gchar *base_directory;
+ gchar *config_directory;
ESourceList *source_list;
GSList *source_selection;
@@ -123,7 +123,7 @@ ensure_sources (TasksComponent *component)
ESourceList *source_list;
ESourceGroup *on_this_computer;
ESource *personal_source;
- char *base_uri, *base_uri_proto, base_uri_proto_seventh;
+ gchar *base_uri, *base_uri_proto, base_uri_proto_seventh;
const gchar *base_dir;
personal_source = NULL;
@@ -243,7 +243,7 @@ is_in_uids (GSList *uids, ESource *source)
GSList *l;
for (l = uids; l; l = l->next) {
- const char *uid = l->data;
+ const gchar *uid = l->data;
if (!strcmp (uid, e_source_peek_uid (source)))
return TRUE;
@@ -270,7 +270,7 @@ update_uris_for_selection (TasksComponentView *component_view)
ESource *selected_source = l->data;
e_tasks_add_todo_source (component_view->tasks, selected_source);
- uids_selected = g_slist_append (uids_selected, (char *)e_source_peek_uid (selected_source));
+ uids_selected = g_slist_append (uids_selected, (gchar *)e_source_peek_uid (selected_source));
}
e_source_selector_free_selection (component_view->source_selection);
@@ -326,7 +326,7 @@ update_selection (TasksComponentView *component_view)
/* Make sure the whole selection is there */
for (l = uids_selected; l; l = l->next) {
- char *uid = l->data;
+ gchar *uid = l->data;
ESource *source;
source = e_source_list_peek_source_by_uid (component_view->source_list, uid);
@@ -342,7 +342,7 @@ static void
update_primary_selection (TasksComponentView *component_view)
{
ESource *source = NULL;
- char *uid;
+ gchar *uid;
uid = calendar_config_get_primary_tasks ();
if (uid) {
@@ -362,7 +362,7 @@ update_primary_selection (TasksComponentView *component_view)
/* Callbacks. */
static void
-copy_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+copy_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
{
TasksComponentView *component_view = data;
ESource *selected_source;
@@ -375,12 +375,12 @@ copy_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
}
static void
-delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+delete_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
{
TasksComponentView *component_view = data;
ESource *selected_source;
ECal *cal;
- char *uri;
+ gchar *uri;
selected_source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (component_view->source_selector));
if (!selected_source)
@@ -414,13 +414,13 @@ delete_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
}
static void
-new_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+new_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
{
calendar_setup_new_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)));
}
static void
-rename_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+rename_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
{
TasksComponentView *component_view = data;
ESourceSelector *selector;
@@ -430,7 +430,7 @@ rename_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
}
static void
-edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
+edit_task_list_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
{
TasksComponentView *component_view = data;
ESource *selected_source;
@@ -443,7 +443,7 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
}
static void
-set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value)
+set_offline_availability (EPopup *ep, EPopupItem *pitem, gpointer data, const gchar *value)
{
TasksComponentView *component_view = data;
ESource *selected_source;
@@ -456,13 +456,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char
}
static void
-mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
+mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
{
set_offline_availability (ep, pitem, data, "0");
}
static void
-mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
+mark_offline_cb (EPopup *ep, EPopupItem *pitem, gpointer data)
{
set_offline_availability (ep, pitem, data, "1");
}
@@ -482,7 +482,7 @@ static EPopupItem etc_source_popups[] = {
};
static void
-etc_source_popup_free(EPopup *ep, GSList *list, void *data)
+etc_source_popup_free(EPopup *ep, GSList *list, gpointer data)
{
g_slist_free(list);
}
@@ -493,7 +493,7 @@ popup_event_cb(ESourceSelector *selector, ESource *insource, GdkEventButton *eve
ECalPopup *ep;
ECalPopupTargetSource *t;
GSList *menus = NULL;
- int i;
+ gint i;
GtkMenu *menu;
/** @HookPoint-ECalPopup: Tasks Source Selector Context Menu
@@ -546,7 +546,7 @@ static void
set_info (TasksComponentView *component_view)
{
GString *message = g_string_new (NULL);
- int rows, selected_rows;
+ gint rows, selected_rows;
rows = e_table_model_row_count (component_view->model);
selected_rows = e_table_selected_count (component_view->table);
@@ -573,13 +573,13 @@ model_changed_cb (ETableModel *etm, TasksComponentView *component_view)
}
static void
-model_rows_inserted_cb (ETableModel *etm, int row, int count, TasksComponentView *component_view)
+model_rows_inserted_cb (ETableModel *etm, gint row, gint count, TasksComponentView *component_view)
{
set_info (component_view);
}
static void
-model_rows_deleted_cb (ETableModel *etm, int row, int count, TasksComponentView *component_view)
+model_rows_deleted_cb (ETableModel *etm, gint row, gint count, TasksComponentView *component_view)
{
set_info (component_view);
}
@@ -631,7 +631,7 @@ selector_tree_data_dropped (ESourceSelector *selector,
components = cal_comp_selection_get_string_list (data);
success = components != NULL;
for (p = components; p && success; p = p->next) {
- char *comp_str; /* do not free this! */
+ gchar *comp_str; /* do not free this! */
/* p->data is "source_uid\ncomponent_string" */
comp_str = strchr (p->data, '\n');
@@ -690,7 +690,7 @@ setup_create_ecal (TasksComponent *component, TasksComponentView *component_view
{
TasksComponentPrivate *priv;
ESource *source = NULL;
- char *uid;
+ gchar *uid;
guint not;
priv = component->priv;
@@ -809,7 +809,7 @@ create_new_todo (TasksComponent *task_component, gboolean is_assigned, TasksComp
}
static void
-create_local_item_cb (EUserCreatableItemsHandler *handler, const char *item_type_name, void *data)
+create_local_item_cb (EUserCreatableItemsHandler *handler, const gchar *item_type_name, gpointer data)
{
TasksComponent *tasks_component = data;
TasksComponentPrivate *priv;
@@ -1026,16 +1026,16 @@ impl_createView (PortableServer_Servant servant,
}
static void
-impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environment *ev)
+impl_handleURI (PortableServer_Servant servant, const gchar *uri, CORBA_Environment *ev)
{
TasksComponent *tasks_component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
TasksComponentPrivate *priv;
GList *l;
TasksComponentView *view = NULL;
- char *src_uid = NULL;
- char *uid = NULL;
- char *rid = NULL;
+ gchar *src_uid = NULL;
+ gchar *uid = NULL;
+ gchar *rid = NULL;
priv = tasks_component->priv;
@@ -1047,8 +1047,8 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme
if (!strncmp (uri, "task:", 5)) {
EUri *euri = e_uri_new (uri);
- const char *p;
- char *header, *content;
+ const gchar *p;
+ gchar *header, *content;
size_t len, clen;
p = euri->query;
@@ -1060,7 +1060,7 @@ impl_handleURI (PortableServer_Servant servant, const char *uri, CORBA_Environme
if (p[len] != '=')
break;
- header = (char *) p;
+ header = (gchar *) p;
header[len] = '\0';
p += len + 1;
@@ -1110,28 +1110,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
CORBA_sequence_set_release (list, FALSE);
- list->_buffer[0].id = (char *) CREATE_TASK_ID;
- list->_buffer[0].description = (char *) _("New task");
- list->_buffer[0].menuDescription = (char *) C_("New", "_Task");
- list->_buffer[0].tooltip = (char *) _("Create a new task");
+ list->_buffer[0].id = (gchar *) CREATE_TASK_ID;
+ list->_buffer[0].description = (gchar *) _("New task");
+ list->_buffer[0].menuDescription = (gchar *) C_("New", "_Task");
+ list->_buffer[0].tooltip = (gchar *) _("Create a new task");
list->_buffer[0].menuShortcut = 't';
- list->_buffer[0].iconName = (char *) "stock_task";
+ list->_buffer[0].iconName = (gchar *) "stock_task";
list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
- list->_buffer[1].id = (char *) CREATE_TASK_ASSIGNED_ID;
- list->_buffer[1].description = (char *) _("New assigned task");
- list->_buffer[1].menuDescription = (char *) C_("New", "Assigne_d Task");
- list->_buffer[1].tooltip = (char *) _("Create a new assigned task");
+ list->_buffer[1].id = (gchar *) CREATE_TASK_ASSIGNED_ID;
+ list->_buffer[1].description = (gchar *) _("New assigned task");
+ list->_buffer[1].menuDescription = (gchar *) C_("New", "Assigne_d Task");
+ list->_buffer[1].tooltip = (gchar *) _("Create a new assigned task");
list->_buffer[1].menuShortcut = '\0';
- list->_buffer[1].iconName = (char *) "stock_task";
+ list->_buffer[1].iconName = (gchar *) "stock_task";
list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
- list->_buffer[2].id = (char *) CREATE_TASK_LIST_ID;
- list->_buffer[2].description = (char *) _("New task list");
- list->_buffer[2].menuDescription = (char *) C_("New", "Tas_k list");
- list->_buffer[2].tooltip = (char *) _("Create a new task list");
+ list->_buffer[2].id = (gchar *) CREATE_TASK_LIST_ID;
+ list->_buffer[2].description = (gchar *) _("New task list");
+ list->_buffer[2].menuDescription = (gchar *) C_("New", "Tas_k list");
+ list->_buffer[2].tooltip = (gchar *) _("Create a new task list");
list->_buffer[2].menuShortcut = '\0';
- list->_buffer[2].iconName = (char *) "stock_todo";
+ list->_buffer[2].iconName = (gchar *) "stock_todo";
list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER;
return list;
@@ -1273,13 +1273,13 @@ tasks_component_peek (void)
return component;
}
-const char *
+const gchar *
tasks_component_peek_base_directory (TasksComponent *component)
{
return component->priv->base_directory;
}
-const char *
+const gchar *
tasks_component_peek_config_directory (TasksComponent *component)
{
return component->priv->config_directory;
--
cgit v1.2.3