aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/pcs
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/pcs')
-rw-r--r--calendar/pcs/Makefile.am6
-rw-r--r--calendar/pcs/cal-backend-imc.c7
-rw-r--r--calendar/pcs/cal.c2
3 files changed, 2 insertions, 13 deletions
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index 0c633dc285..8ff2f0ce84 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -37,10 +37,8 @@ libpcs_a_SOURCES = \
job.c \
job.h
-
-
-
-
+# cal-backend-file.c \
+# cal-backend-file.h \
BUILT_SOURCES = $(CORBA_GENERATED)
CLEANFILES += $(BUILT_SOURCES)
diff --git a/calendar/pcs/cal-backend-imc.c b/calendar/pcs/cal-backend-imc.c
index 20c0292793..29015a70cc 100644
--- a/calendar/pcs/cal-backend-imc.c
+++ b/calendar/pcs/cal-backend-imc.c
@@ -869,8 +869,6 @@ count_objects (gpointer key, gpointer value, gpointer data)
store = (c->type & CALOBJ_TYPE_TODO) != 0;
else if (ico->type == ICAL_JOURNAL)
store = (c->type & CALOBJ_TYPE_JOURNAL) != 0;
- else
- store = (c->type & CALOBJ_TYPE_OTHER) != 0;
if (store)
c->n++;
@@ -950,8 +948,6 @@ build_uids_list (gpointer key, gpointer value, gpointer data)
store = (c->type & CALOBJ_TYPE_TODO) ? TRUE : FALSE;
else if (ico->type == ICAL_JOURNAL)
store = (c->type & CALOBJ_TYPE_JOURNAL) ? TRUE : FALSE;
- else
- store = (c->type & CALOBJ_TYPE_OTHER) ? TRUE : FALSE;
if (store)
c->uid_list = g_list_prepend (c->uid_list, g_strdup (ico->uid));
@@ -970,9 +966,6 @@ cal_backend_imc_get_uids (CalBackend *backend, CalObjType type)
g_return_val_if_fail (priv->loaded, NULL);
- /* We go through the hash table instead of the lists of particular
- * object types so that we can pick up CALOBJ_TYPE_OTHER objects.
- */
c.type = type;
c.uid_list = NULL;
g_hash_table_foreach (priv->object_hash, build_uids_list, &c);
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index 35677c6cac..cd94bb3a80 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -187,7 +187,6 @@ Cal_get_n_objects (PortableServer_Servant servant,
t = (((type & Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
| ((type & Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
| ((type & Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0)
- | ((type & Evolution_Calendar_TYPE_OTHER) ? CALOBJ_TYPE_OTHER : 0)
/*
| ((type & Evolution_Calendar_TYPE_ANY) ? CALOBJ_TYPE_ANY : 0)
*/
@@ -247,7 +246,6 @@ Cal_get_uids (PortableServer_Servant servant,
t = (((type & Evolution_Calendar_TYPE_EVENT) ? CALOBJ_TYPE_EVENT : 0)
| ((type & Evolution_Calendar_TYPE_TODO) ? CALOBJ_TYPE_TODO : 0)
| ((type & Evolution_Calendar_TYPE_JOURNAL) ? CALOBJ_TYPE_JOURNAL : 0)
- | ((type & Evolution_Calendar_TYPE_OTHER) ? CALOBJ_TYPE_OTHER : 0)
/*
| ((type & Evolution_Calendar_TYPE_ANY) ? CALOBJ_TYPE_ANY : 0)
*/