[evolution-couchdb] Remove support code for e-d-s < 2.30
- From: Rodrigo Moya <rodrigo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-couchdb] Remove support code for e-d-s < 2.30
- Date: Wed, 25 May 2011 10:05:47 +0000 (UTC)
commit 12c1fc10dde6a534c4eca15cbb7df82ae7e98971
Author: Rodrigo Moya <rodrigo gnome-db org>
Date: Wed May 25 11:17:35 2011 +0200
Remove support code for e-d-s < 2.30
configure.ac | 2 +-
plugins/couchdb-contacts-source.c | 63 -------------------------------------
2 files changed, 1 insertions(+), 64 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 74caf48..492ec94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ PKG_CHECK_EXISTS(evolution-plugin-3.0,
AC_MSG_ERROR(You need evolution-plugin to compile evolution-couchdb))
)
-PKG_CHECK_MODULES(EPLUGIN, $EVOLUTION_PLUGIN $EVOLUTION_PLUGIN_GTK)
+PKG_CHECK_MODULES(EPLUGIN, $EVOLUTION_PLUGIN >= 2.30 $EVOLUTION_PLUGIN_GTK)
AC_SUBST(EPLUGIN_CFLAGS)
AC_SUBST(EPLUGIN_LIBS)
diff --git a/plugins/couchdb-contacts-source.c b/plugins/couchdb-contacts-source.c
index 7b9247a..d657eca 100644
--- a/plugins/couchdb-contacts-source.c
+++ b/plugins/couchdb-contacts-source.c
@@ -38,69 +38,6 @@
#define COUCHDB_BASE_URI "couchdb://"
-#if !EDS_CHECK_VERSION(2, 27, 0)
-/* Copied from e-d-s 2.27.x branch, since it doesn't exist in 2.26.x */
-
-ESourceGroup *
-e_source_list_peek_group_by_base_uri (ESourceList *list, const gchar *base_uri)
-{
- GSList *p;
- gint len;
-
- g_return_val_if_fail (E_IS_SOURCE_LIST (list), NULL);
- g_return_val_if_fail (base_uri != NULL, NULL);
-
- len = strlen (base_uri);
-
- for (p = e_source_list_peek_groups (list); p != NULL; p = p->next) {
- ESourceGroup *group = E_SOURCE_GROUP (p->data);
- const gchar *buri = e_source_group_peek_base_uri (group);
-
- if (buri && g_ascii_strncasecmp (buri, base_uri, len) == 0)
- return group;
- }
-
- return NULL;
-}
-
-ESourceGroup *
-e_source_list_ensure_group (ESourceList *list, const gchar *name, const gchar *base_uri, gboolean ret_it)
-{
- ESourceGroup *group;
-
- g_return_val_if_fail (E_IS_SOURCE_LIST (list), NULL);
- g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (base_uri != NULL, NULL);
-
- group = e_source_list_peek_group_by_base_uri (list, base_uri);
- if (group) {
- e_source_group_set_name (group, name);
- if (ret_it)
- g_object_ref (group);
- else
- group = NULL;
- } else {
- group = e_source_group_new (name, base_uri);
-
- if (!e_source_list_add_group (list, group, -1)) {
- g_warning ("Could not add source group %s with base uri %s to a source list", name, base_uri);
- g_object_unref (group);
- group = NULL;
- } else {
- /* save it now */
- e_source_list_sync (list, NULL);
-
- if (!ret_it) {
- g_object_unref (group);
- group = NULL;
- }
- }
- }
-
- return group;
-}
-#endif
-
static void
ensure_couchdb_contacts_source_group (void)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]