aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-cal-model-tasks.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-27 04:58:27 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-27 04:58:27 +0800
commit333656eba50f2120bbee3e817b8faf0baf448faf (patch)
tree3869bc4847dd4ab67625b82207ff98ef19045e8d /calendar/gui/e-cal-model-tasks.c
parent1682814ef78902b385fe84589f8755b0ff4b5b5a (diff)
parentffa17ed195a6bbb40d386fb572b7941e22f47f8d (diff)
downloadgsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.gz
gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.zst
gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.zip
Merge branch 'warnings'
Diffstat (limited to 'calendar/gui/e-cal-model-tasks.c')
-rw-r--r--calendar/gui/e-cal-model-tasks.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 095cfabc4b..5827117f14 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -289,7 +289,7 @@ get_due (ECalModelComponent *comp_data)
return comp_data->due;
}
-static char *
+static void *
get_geo (ECalModelComponent *comp_data)
{
icalproperty *prop;
@@ -307,7 +307,7 @@ get_geo (ECalModelComponent *comp_data)
return buf;
}
- return "";
+ return (void *) "";
}
static int
@@ -322,7 +322,7 @@ get_percent (ECalModelComponent *comp_data)
return 0;
}
-static char *
+static void *
get_priority (ECalModelComponent *comp_data)
{
icalproperty *prop;
@@ -331,7 +331,7 @@ get_priority (ECalModelComponent *comp_data)
if (prop)
return e_cal_util_priority_to_string (icalproperty_get_priority (prop));
- return "";
+ return (void *) "";
}
static gboolean
@@ -344,7 +344,7 @@ is_status_canceled (ECalModelComponent *comp_data)
return prop && icalproperty_get_status (prop) == ICAL_STATUS_CANCELLED;
}
-static char *
+static void *
get_status (ECalModelComponent *comp_data)
{
icalproperty *prop;
@@ -353,33 +353,33 @@ get_status (ECalModelComponent *comp_data)
if (prop) {
switch (icalproperty_get_status (prop)) {
case ICAL_STATUS_NONE:
- return "";
+ return (void *) "";
case ICAL_STATUS_NEEDSACTION:
- return _("Not Started");
+ return (void *) _("Not Started");
case ICAL_STATUS_INPROCESS:
- return _("In Progress");
+ return (void *) _("In Progress");
case ICAL_STATUS_COMPLETED:
- return _("Completed");
+ return (void *) _("Completed");
case ICAL_STATUS_CANCELLED:
- return _("Canceled");
+ return (void *) _("Canceled");
default:
- return "";
+ return (void *) "";
}
}
- return "";
+ return (void *) "";
}
-static char *
+static void *
get_url (ECalModelComponent *comp_data)
{
icalproperty *prop;
prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY);
if (prop)
- return (char *) icalproperty_get_url (prop);
+ return (void *) icalproperty_get_url (prop);
- return "";
+ return (void *) "";
}
static gboolean
@@ -499,7 +499,7 @@ ecmt_value_at (ETableModel *etm, int col, int row)
comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
if (!comp_data)
- return "";
+ return (void *) "";
switch (col) {
case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
@@ -524,7 +524,7 @@ ecmt_value_at (ETableModel *etm, int col, int row)
return get_url (comp_data);
}
- return "";
+ return (void *) "";
}
static void