[evolution-kolab] addressbook: cleanup (removed commented old code)



commit 2807426cf8522ff0933b74af693f49d64d1acb83
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Aug 6 17:52:51 2012 +0200

    addressbook: cleanup (removed commented old code)

 src/addressbook/e-book-backend-kolab.c |   76 --------------------------------
 src/addressbook/e-book-backend-kolab.h |    9 ----
 src/addressbook/kolab-util-contact.c   |   33 --------------
 src/addressbook/kolab-util-contact.h   |    4 --
 4 files changed, 0 insertions(+), 122 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-kolab.c b/src/addressbook/e-book-backend-kolab.c
index 45c0df6..c22b33d 100644
--- a/src/addressbook/e-book-backend-kolab.c
+++ b/src/addressbook/e-book-backend-kolab.c
@@ -456,19 +456,6 @@ book_backend_kolab_remove (EBookBackendSync *backend,
 
 	g_warning ("%s: FIXME implement me", __func__);
 
-#if 0 /* FIXME old */
-	g_debug ("%s()[%u] called.", __func__, __LINE__);
-	if (e_book_backend_is_loaded (E_BOOK_BACKEND (backend)) != FALSE) {
-		g_object_unref (priv->book_koma);
-		priv->book_koma = NULL;
-	}
-
-	e_book_backend_set_is_writable (E_BOOK_BACKEND (backend), FALSE);
-	e_book_backend_notify_writable (E_BOOK_BACKEND (backend), FALSE);
-	e_book_backend_notify_connection_status (E_BOOK_BACKEND (backend), FALSE);
-	e_book_backend_set_is_loaded (E_BOOK_BACKEND (backend), FALSE);
-#endif /* FIXME*/
-
 	book_backend_kolab_notify_removed (self);
 }
 
@@ -492,60 +479,6 @@ book_backend_kolab_refresh (EBookBackendSync *backend,
 	g_warning ("%s: FIXME implement me", __func__);
 }
 
-#if 0 /* probably not needed */
-static gboolean
-book_backend_kolab_get_backend_property (EBookBackendSync *backend,
-                                         EDataBook *book,
-                                         GCancellable *cancellable,
-                                         const gchar *prop_name,
-                                         gchar **prop_value,
-                                         GError **error)
-{
-	EBookBackendKolab *self = NULL;
-	EBookBackendKolabPrivate *priv = NULL;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-	e_return_data_book_error_val_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
-	e_return_data_book_error_val_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
-	/* cancellable may be NULL */
-	e_return_data_book_error_val_if_fail (prop_name != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-	e_return_data_book_error_val_if_fail (prop_value != NULL && *prop_value == NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-
-	self = E_BOOK_BACKEND_KOLAB (backend);
-	priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
-
-	g_error ("%s: FIXME implement me", __func__);
-
-	return TRUE;
-}
-#endif
-
-#if 0 /* probably not needed */
-static gboolean
-book_backend_kolab_set_backend_property (EBookBackendSync *backend,
-                                         EDataBook *book,
-                                         GCancellable *cancellable,
-                                         const gchar *prop_name,
-                                         const gchar *prop_value,
-                                         GError **error)
-{
-	EBookBackendKolab *self = NULL;
-	EBookBackendKolabPrivate *priv = NULL;
-
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-	e_return_data_book_error_val_if_fail (E_IS_BOOK_BACKEND_KOLAB (backend), E_DATA_BOOK_STATUS_INVALID_ARG);
-	e_return_data_book_error_val_if_fail (E_IS_DATA_BOOK (book), E_DATA_BOOK_STATUS_INVALID_ARG);
-	/* cancellable may be NULL */
-	e_return_data_book_error_val_if_fail (prop_name != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-	e_return_data_book_error_val_if_fail (prop_value != NULL, E_DATA_BOOK_STATUS_INVALID_ARG);
-
-	self = E_BOOK_BACKEND_KOLAB (backend);
-	priv = E_BOOK_BACKEND_KOLAB_PRIVATE (self);
-
-	g_error ("%s: FIXME implement me", __func__);
-}
-#endif
-
 static void
 book_backend_kolab_create_contacts (EBookBackendSync *backend,
                                     EDataBook *book,
@@ -924,12 +857,6 @@ book_backend_kolab_get_backend_property (EBookBackendSync *backend,
 
 	if (g_str_equal (prop_name, CLIENT_BACKEND_PROPERTY_CAPABILITIES)) {
 		*prop_value = g_strdup ("net,bulk-removes,contact-lists,do-initial-query");
-#if 0
-		if (e_book_backend_mapi_is_marked_for_offline (ebma))
-			*prop_value = g_strdup ("net,bulk-removes,contact-lists,do-initial-query");
-		else
-			*prop_value = g_strdup ("net,bulk-removes,contact-lists");
-#endif
 	} else if (g_str_equal (prop_name, BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS)) {
 		*prop_value = g_strdup (e_contact_field_name (E_CONTACT_FILE_AS));
 	} else if (g_str_equal (prop_name, BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS)) {
@@ -1249,9 +1176,6 @@ e_book_backend_kolab_class_init (EBookBackendKolabClass *klass)
 	sync_class->remove_sync = book_backend_kolab_remove;
 	sync_class->refresh_sync = book_backend_kolab_refresh;
 	sync_class->get_backend_property_sync = book_backend_kolab_get_backend_property;
-#if 0 /* probably not needed */
-	sync_class->set_backend_property_sync = book_backend_kolab_set_backend_property;
-#endif
 	sync_class->create_contacts_sync = book_backend_kolab_create_contacts;
 	sync_class->remove_contacts_sync = book_backend_kolab_remove_contacts;
 	sync_class->modify_contacts_sync = book_backend_kolab_modify_contacts;
diff --git a/src/addressbook/e-book-backend-kolab.h b/src/addressbook/e-book-backend-kolab.h
index e371660..d4edfe2 100644
--- a/src/addressbook/e-book-backend-kolab.h
+++ b/src/addressbook/e-book-backend-kolab.h
@@ -73,15 +73,6 @@ struct _EBookBackendKolabClass {
 GType
 e_book_backend_kolab_get_type (void) G_GNUC_CONST;
 
-#if 0
-EBookBackend*
-e_book_backend_kolab_new (void);
-
-void
-e_book_backend_kolab_set_koma_table (EBookBackendKolab *kolab,
-                                     GHashTable *koma_objects);
-#endif
-
 G_END_DECLS
 
 /*----------------------------------------------------------------------------*/
diff --git a/src/addressbook/kolab-util-contact.c b/src/addressbook/kolab-util-contact.c
index c8e2439..9106940 100644
--- a/src/addressbook/kolab-util-contact.c
+++ b/src/addressbook/kolab-util-contact.c
@@ -40,10 +40,6 @@
 
 static const struct field_element_mapping {
 	EContactField field_id;
-#if 0
-	uint32_t mapi_id;
-	gint element_type;
-#endif
 } mappings [] = {
 	{ E_CONTACT_UID,		/* PidTagMid,			ELEMENT_TYPE_SKIP_SET */ },
 	{ E_CONTACT_REV,		/* PidTagLastModificationTime,	ELEMENT_TYPE_SIMPLE */ },
@@ -162,35 +158,6 @@ kolab_util_contact_store (EContact *econtact,
 	return TRUE;
 } /* kolab_util_contact_store () */
 
-#if 0
-EBookBackendSyncStatus
-kolab_util_contact_map_error (GError *error)
-{
-	EBookBackendSyncStatus status = GNOME_Evolution_Addressbook_Success;
-
-	if (error == NULL)
-		return GNOME_Evolution_Addressbook_Success;
-
-	switch (error->code) {
-	case KOLAB_BACKEND_ERROR_SYNC_NOTSTORED:
-		status = GNOME_Evolution_Addressbook_Success;
-		break;
-	case KOLAB_BACKEND_ERROR_NOTFOUND:
-		status = GNOME_Evolution_Addressbook_ContactNotFound;
-		break;
-	case KOLAB_BACKEND_ERROR_CONTEXT_MISUSE:
-	case KOLAB_BACKEND_ERROR_INFODB_NOFOLDER:
-		status = GNOME_Evolution_Addressbook_NoSuchBook;
-		break;
-	default:
-		status = GNOME_Evolution_Addressbook_OtherError;
-	}
-
-	g_debug ("%s()[%u] EBookBackendSyncStatus: %i", __func__, __LINE__, status);
-	return status;
-}
-#endif
-
 void
 kolab_util_contact_err_to_edb_err (GError **e_err,
                                    const GError *k_err,
diff --git a/src/addressbook/kolab-util-contact.h b/src/addressbook/kolab-util-contact.h
index 9cb2e53..7187781 100644
--- a/src/addressbook/kolab-util-contact.h
+++ b/src/addressbook/kolab-util-contact.h
@@ -58,10 +58,6 @@ kolab_util_contact_store (EContact *econtact,
                           GCancellable *cancellable,
                           GError **error);
 
-#if 0
-EBookBackendSyncStatus kolab_util_contact_map_error (GError *error);
-#endif
-
 void
 kolab_util_contact_err_to_edb_err (GError **e_err,
                                    const GError *k_err,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]