[evolution-data-server] Don't use our own DISABLE_DEPRECATED macros in .c files.

From: Matthew Barnes <mbarnes src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-data-server] Don't use our own DISABLE_DEPRECATED macros in .c files.
Date: Wed, 17 Aug 2011 18:31:50 +0000 (UTC)
commit 287ad73971e6662124850087a7ce959ef8926aa0
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Aug 17 14:27:23 2011 -0400

    Don't use our own DISABLE_DEPRECATED macros in .c files.
    
    Those macros are meant for E-D-S -client- programs, not for E-D-S
    itself.  As such, they should only appear in public header files.

 addressbook/libebook/e-book-view.c       |   12 +----
 addressbook/libebook/e-book.c            |   90 ------------------------------
 addressbook/libebook/e-destination.c     |    2 -
 calendar/libecal/e-cal-check-timezones.c |    6 --
 calendar/libecal/e-cal-view.c            |   13 +----
 calendar/libecal/e-cal.c                 |   47 +---------------
 libedataserverui/e-book-auth-util.c      |   12 ----
 7 files changed, 3 insertions(+), 179 deletions(-)
---
diff --git a/addressbook/libebook/e-book-view.c b/addressbook/libebook/e-book-view.c
index 3204671..08c5c67 100644
--- a/addressbook/libebook/e-book-view.c
+++ b/addressbook/libebook/e-book-view.c
@@ -27,8 +27,6 @@
 #include "libedata-book/e-data-book-types.h"
 #include "e-gdbus-book-view.h"
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
-
 G_DEFINE_TYPE (EBookView, e_book_view, G_TYPE_OBJECT);
 
 struct _EBookViewPrivate {
@@ -41,9 +39,7 @@ enum {
 	CONTACTS_CHANGED,
 	CONTACTS_REMOVED,
 	CONTACTS_ADDED,
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	SEQUENCE_COMPLETE,
-	#endif
 	VIEW_COMPLETE,
 	STATUS_MESSAGE,
 	LAST_SIGNAL
@@ -152,9 +148,7 @@ complete_cb (EGdbusBookView *object, const gchar * const *in_error_strv, EBookVi
 		break;
 	}
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	g_signal_emit (book_view, signals[SEQUENCE_COMPLETE], 0, bv_status);
-	#endif
 	g_signal_emit (book_view, signals[VIEW_COMPLETE], 0, bv_status, error ? error->message : "");
 
 	if (error)
@@ -225,9 +219,7 @@ e_book_view_start (EBookView *book_view)
 
 			/* Fake a sequence-complete so that the application knows this failed */
 			/* TODO: use get_status_from_error */
-			#ifndef E_BOOK_DISABLE_DEPRECATED
 			g_signal_emit (book_view, signals[SEQUENCE_COMPLETE], 0, E_BOOK_VIEW_ERROR_OTHER_ERROR);
-			#endif
 			g_signal_emit (book_view, signals[VIEW_COMPLETE], 0, E_BOOK_VIEW_ERROR_OTHER_ERROR, error->message);
 
 			g_error_free (error);
@@ -326,7 +318,7 @@ e_book_view_class_init (EBookViewClass *klass)
 						 NULL, NULL,
 						 e_book_marshal_NONE__POINTER,
 						 G_TYPE_NONE, 1, G_TYPE_POINTER);
-	#ifndef E_BOOK_DISABLE_DEPRECATED
+	/* XXX The "sequence-complete" signal is deprecated. */
 	signals [SEQUENCE_COMPLETE] = g_signal_new ("sequence_complete",
 						    G_OBJECT_CLASS_TYPE (object_class),
 						    G_SIGNAL_RUN_LAST,
@@ -334,7 +326,6 @@ e_book_view_class_init (EBookViewClass *klass)
 						    NULL, NULL,
 						    e_book_marshal_NONE__INT,
 						    G_TYPE_NONE, 1, G_TYPE_UINT);
-	#endif
 	signals [VIEW_COMPLETE] = g_signal_new ("view_complete",
 						    G_OBJECT_CLASS_TYPE (object_class),
 						    G_SIGNAL_RUN_LAST,
@@ -353,4 +344,3 @@ e_book_view_class_init (EBookViewClass *klass)
 	object_class->dispose = e_book_view_dispose;
 }
 
-#endif /* E_BOOK_DISABLE_DEPRECATED */
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 338c608..0ac9cac 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -21,7 +21,6 @@
  */
 
 /* e-book deprecated since 3.2, use e-book-client instead */
-#ifndef E_BOOK_DISABLE_DEPRECATED
 
 /**
  * SECTION:e-book
@@ -95,9 +94,7 @@ static GStaticRecMutex book_factory_proxy_lock = G_STATIC_REC_MUTEX_INIT;
 
 typedef struct {
 	EBook *book;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	gpointer callback; /* TODO union */
-	#endif
 	gpointer excallback;
 	gpointer closure;
 	gpointer data;
@@ -430,9 +427,7 @@ add_contact_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	gchar *uid = NULL;
 	AsyncData *data = user_data;
 	EBookIdAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookIdCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_add_contact_finish (G_DBUS_PROXY (gdbus_book), res, &uid, &error);
 
@@ -443,10 +438,8 @@ add_contact_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	if (error)
 		uid = NULL;
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, uid, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, uid, data->closure);
 
@@ -460,7 +453,6 @@ add_contact_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_add_contact:
  * @book: an #EBook
@@ -503,7 +495,6 @@ e_book_async_add_contact (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_add_contact_async:
@@ -591,18 +582,14 @@ modify_contact_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_modify_contact_finish (G_DBUS_PROXY (gdbus_book), res, &error);
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, data->closure);
-	#endif
 
 	if (excb)
 		excb (data->book, err, data->closure);
@@ -614,7 +601,6 @@ modify_contact_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_commit_contact:
  * @book: an #EBook
@@ -658,7 +644,6 @@ e_book_async_commit_contact (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_commit_contact_async:
@@ -756,9 +741,7 @@ get_required_fields_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookEListAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookEListCallback cb = data->callback;
-	#endif
 	EList *efields = NULL;
 
 	e_gdbus_book_call_get_backend_property_finish (G_DBUS_PROXY (gdbus_book), res, &fields_str, &error);
@@ -770,10 +753,8 @@ get_required_fields_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, efields, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, efields, data->closure);
 
@@ -786,7 +767,6 @@ get_required_fields_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_get_required_fields:
  * @book: an #EBook
@@ -821,7 +801,6 @@ e_book_async_get_required_fields (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_get_required_fields_async:
@@ -910,9 +889,7 @@ get_supported_fields_reply (GObject *gdbus_book, GAsyncResult *res, gpointer use
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookEListAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookEListCallback cb = data->callback;
-	#endif
 	EList *efields;
 
 	e_gdbus_book_call_get_backend_property_finish (G_DBUS_PROXY (gdbus_book), res, &fields_str, &error);
@@ -924,10 +901,8 @@ get_supported_fields_reply (GObject *gdbus_book, GAsyncResult *res, gpointer use
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, efields, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, efields, data->closure);
 
@@ -940,7 +915,6 @@ get_supported_fields_reply (GObject *gdbus_book, GAsyncResult *res, gpointer use
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_get_supported_fields:
  * @book: an #EBook
@@ -976,7 +950,6 @@ e_book_async_get_supported_fields (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_get_supported_fields_async:
@@ -1067,9 +1040,7 @@ get_supported_auth_methods_reply (GObject *gdbus_book, GAsyncResult *res, gpoint
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookEListAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookEListCallback cb = data->callback;
-	#endif
 	EList *emethods;
 
 	e_gdbus_book_call_get_backend_property_finish (G_DBUS_PROXY (gdbus_book), res, &methods_str, &error);
@@ -1081,10 +1052,8 @@ get_supported_auth_methods_reply (GObject *gdbus_book, GAsyncResult *res, gpoint
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, emethods, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, emethods, data->closure);
 
@@ -1097,7 +1066,6 @@ get_supported_auth_methods_reply (GObject *gdbus_book, GAsyncResult *res, gpoint
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_get_supported_auth_methods:
  * @book: an #EBook
@@ -1132,7 +1100,6 @@ e_book_async_get_supported_auth_methods (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_get_supported_auth_methods_async:
@@ -1226,18 +1193,14 @@ authenticate_user_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_d
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_authenticate_user_finish (G_DBUS_PROXY (gdbus_book), res, &error);
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, data->closure);
 
@@ -1248,7 +1211,6 @@ authenticate_user_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_d
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_authenticate_user:
  * @book: an #EBook
@@ -1307,7 +1269,6 @@ e_book_async_authenticate_user (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_authenticate_user_async:
@@ -1417,9 +1378,7 @@ get_contact_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookContactAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookContactCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_get_contact_finish (G_DBUS_PROXY (gdbus_book), res, &vcard, &error);
 
@@ -1429,10 +1388,8 @@ get_contact_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	if (error)
 		vcard = NULL;
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, err ? NULL : e_contact_new_from_vcard (vcard), data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, err ? NULL : e_contact_new_from_vcard (vcard), data->closure);
 
@@ -1444,7 +1401,6 @@ get_contact_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_get_contact:
  * @book: an #EBook
@@ -1484,7 +1440,6 @@ e_book_async_get_contact (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_get_contact_async:
@@ -1570,18 +1525,14 @@ remove_contact_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_remove_contacts_finish (G_DBUS_PROXY (gdbus_book), res, &error);
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, data->closure);
 
@@ -1630,7 +1581,6 @@ e_book_remove_contacts (EBook *book,
 	return unwrap_gerror (err, error);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_remove_contact:
  * @book: an #EBook
@@ -1673,7 +1623,6 @@ e_book_async_remove_contact (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_remove_contact_async:
@@ -1726,18 +1675,14 @@ remove_contact_by_id_reply (GObject *gdbus_book, GAsyncResult *res, gpointer use
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_remove_contacts_finish (G_DBUS_PROXY (gdbus_book), res, &error);
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, data->closure);
 
@@ -1748,7 +1693,6 @@ remove_contact_by_id_reply (GObject *gdbus_book, GAsyncResult *res, gpointer use
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_remove_contact_by_id:
  * @book: an #EBook
@@ -1791,7 +1735,6 @@ e_book_async_remove_contact_by_id (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_remove_contact_by_id_async:
@@ -1844,18 +1787,14 @@ remove_contacts_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_dat
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_remove_contacts_finish (G_DBUS_PROXY (gdbus_book), res, &error);
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, data->closure);
 
@@ -1866,7 +1805,6 @@ remove_contacts_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_dat
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_remove_contacts:
  * @book: an #EBook
@@ -1916,7 +1854,6 @@ e_book_async_remove_contacts (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_remove_contacts_async:
@@ -2047,9 +1984,7 @@ get_book_view_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	AsyncData *data = user_data;
 	EBookView *view = NULL;
 	EBookBookViewAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookBookViewCallback cb = data->callback;
-	#endif
 	EGdbusBookView *gdbus_bookview;
 
 	e_gdbus_book_call_get_view_finish (G_DBUS_PROXY (gdbus_book), res, &view_path, &error);
@@ -2068,10 +2003,8 @@ get_book_view_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, view, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, view, data->closure);
 
@@ -2082,7 +2015,6 @@ get_book_view_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_get_book_view:
  * @book: an #EBook
@@ -2130,7 +2062,6 @@ e_book_async_get_book_view (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_get_book_view_async:
@@ -2241,9 +2172,7 @@ get_contacts_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	AsyncData *data = user_data;
 	GList *list = NULL;
 	EBookListAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookListCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_get_contact_list_finish (G_DBUS_PROXY (gdbus_book), res, &vcards, &error);
 
@@ -2261,10 +2190,8 @@ get_contacts_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 		list = g_list_reverse (list);
 	}
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, list, data->closure);
-	#endif
 
 	if (excb)
 		excb (data->book, err, list, data->closure);
@@ -2276,7 +2203,6 @@ get_contacts_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_get_contacts:
  * @book: an #EBook
@@ -2319,7 +2245,6 @@ e_book_async_get_contacts (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_get_contacts_async:
@@ -2441,7 +2366,6 @@ e_book_get_changes (EBook       *book,
 	}
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_get_changes:
  * @book: an #EBook
@@ -2471,7 +2395,6 @@ e_book_async_get_changes (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_get_changes_async:
@@ -2626,9 +2549,7 @@ open_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_open_finish (G_DBUS_PROXY (gdbus_book), res, &error);
 
@@ -2636,10 +2557,8 @@ open_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 
 	data->book->priv->loaded = !error;
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, data->closure);
 
@@ -2650,7 +2569,6 @@ open_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_open:
  * @book: an #EBook
@@ -2687,7 +2605,6 @@ e_book_async_open (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_open_async:
@@ -2762,18 +2679,14 @@ remove_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	GError *err = NULL, *error = NULL;
 	AsyncData *data = user_data;
 	EBookAsyncCallback excb = data->excallback;
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookCallback cb = data->callback;
-	#endif
 
 	e_gdbus_book_call_remove_finish (G_DBUS_PROXY (gdbus_book), res, &error);
 
 	unwrap_gerror (error, &err);
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (cb)
 		cb (data->book, err ? err->code : E_BOOK_ERROR_OK, data->closure);
-	#endif
 	if (excb)
 		excb (data->book, err, data->closure);
 
@@ -2784,7 +2697,6 @@ remove_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	g_slice_free (AsyncData, data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_book_async_remove:
  * @book: an #EBook
@@ -2819,7 +2731,6 @@ e_book_async_remove (EBook *book,
 
 	return TRUE;
 }
-#endif
 
 /**
  * e_book_remove_async:
@@ -3836,4 +3747,3 @@ array_to_elist (gchar **list)
 	return elst;
 }
 
-#endif /* E_BOOK_DISABLE_DEPRECATED */
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index 8739cd1..bc50d92 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -539,7 +539,6 @@ e_destination_set_contact (EDestination *dest, EContact *contact, gint email_num
 	}
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_destination_set_book:
  * @dest: an #EDestination
@@ -570,7 +569,6 @@ e_destination_set_book (EDestination *dest, EBook *book)
 		g_signal_emit (dest, signals[CHANGED], 0);
 	}
 }
-#endif /* E_BOOK_DISABLE_DEPRECATED */
 
 /**
  * e_destination_set_client:
diff --git a/calendar/libecal/e-cal-check-timezones.c b/calendar/libecal/e-cal-check-timezones.c
index d230b49..4486553 100644
--- a/calendar/libecal/e-cal-check-timezones.c
+++ b/calendar/libecal/e-cal-check-timezones.c
@@ -24,9 +24,7 @@
 #include <libical/ical.h>
 
 #include "e-cal-check-timezones.h"
-#ifndef E_CAL_DISABLE_DEPRECATED
 #include <libecal/e-cal.h>
-#endif
 #include <libecal/e-cal-client.h>
 #include <string.h>
 #include <ctype.h>
@@ -203,8 +201,6 @@ static void addsystemtz (gpointer key,
     }
 }
 
-#ifndef E_CAL_DISABLE_DEPRECATED
-
 /**
  * e_cal_check_timezones:
  * @comp:     a VCALENDAR containing a list of
@@ -526,8 +522,6 @@ e_cal_tzlookup_icomp (const gchar *tzid,
     return icalcomponent_get_timezone (icomp, (gchar *) tzid);
 }
 
-#endif /* E_CAL_DISABLE_DEPRECATED */
-
 /**
  * e_cal_client_check_timezones:
  * @comp:     a VCALENDAR containing a list of
diff --git a/calendar/libecal/e-cal-view.c b/calendar/libecal/e-cal-view.c
index 29097e5..2586413 100644
--- a/calendar/libecal/e-cal-view.c
+++ b/calendar/libecal/e-cal-view.c
@@ -25,8 +25,6 @@
 #include <config.h>
 #endif
 
-#ifndef E_CAL_DISABLE_DEPRECATED
-
 #include <string.h>
 #include "e-cal-marshal.h"
 #include "e-cal.h"
@@ -55,9 +53,7 @@ enum {
 	OBJECTS_MODIFIED,
 	OBJECTS_REMOVED,
 	VIEW_PROGRESS,
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	VIEW_DONE,
-	#endif
 	VIEW_COMPLETE,
 	LAST_SIGNAL
 };
@@ -182,9 +178,7 @@ complete_cb (EGdbusCalView *gdbus_calview, const gchar * const *arg_error, ECalV
 
 	g_return_if_fail (e_gdbus_templates_decode_error (arg_error, &error));
 
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	g_signal_emit (G_OBJECT (view), signals[VIEW_DONE], 0, error ? error->code : 0);
-	#endif
 
 	g_signal_emit (G_OBJECT (view), signals[VIEW_COMPLETE], 0, error ? error->code : 0, error ? error->message : "");
 
@@ -357,7 +351,7 @@ e_cal_view_class_init (ECalViewClass *klass)
 			      e_cal_marshal_VOID__STRING_UINT,
 			      G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_UINT);
 
-	#ifndef E_CAL_DISABLE_DEPRECATED
+	/* XXX The "view-done" signal is deprecated. */
 	signals[VIEW_DONE] =
 		g_signal_new ("view_done",
 			      G_TYPE_FROM_CLASS (klass),
@@ -366,7 +360,6 @@ e_cal_view_class_init (ECalViewClass *klass)
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
-	#endif
 
 	signals[VIEW_COMPLETE] =
 		g_signal_new ("view_complete",
@@ -452,9 +445,7 @@ e_cal_view_start (ECalView *view)
 		g_warning ("Cannot start cal view: %s\n", error->message);
 
 		/* Fake a sequence-complete so that the application knows this failed */
-		#ifndef E_CAL_DISABLE_DEPRECATED
 		g_signal_emit (view, signals[VIEW_DONE], 0, E_CALENDAR_STATUS_DBUS_EXCEPTION);
-		#endif
 		g_signal_emit (view, signals[VIEW_COMPLETE], 0, E_CALENDAR_STATUS_DBUS_EXCEPTION, error->message);
 
 		g_error_free (error);
@@ -491,5 +482,3 @@ e_cal_view_stop (ECalView *view)
 		g_error_free (error);
 	}
 }
-
-#endif /* E_CAL_DISABLE_DEPRECATED */
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index e742191..3780779 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -36,8 +36,6 @@
 #include <config.h>
 #endif
 
-#ifndef E_CAL_DISABLE_DEPRECATED
-
 #include <unistd.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
@@ -77,9 +75,7 @@ static GStaticRecMutex cal_factory_proxy_lock = G_STATIC_REC_MUTEX_INIT;
 G_DEFINE_TYPE (ECal, e_cal, G_TYPE_OBJECT)
 
 static gboolean open_calendar (ECal *ecal, gboolean only_if_exists, GError **error,
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	ECalendarStatus *status,
-	#endif
 	gboolean needs_auth, gboolean async);
 static void e_cal_dispose (GObject *object);
 static void e_cal_finalize (GObject *object);
@@ -138,9 +134,7 @@ struct _ECalPrivate {
 
 /* Signal IDs */
 enum {
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	CAL_OPENED,
-	#endif
 	CAL_OPENED_EX,
 	CAL_SET_MODE,
 	BACKEND_ERROR,
@@ -613,7 +607,7 @@ e_cal_class_init (ECalClass *klass)
 
 	parent_class = g_type_class_peek_parent (klass);
 
-	#ifndef E_CAL_DISABLE_DEPRECATED
+	/* XXX The "cal-opened" signal is deprecated. */
 	e_cal_signals[CAL_OPENED] =
 		g_signal_new ("cal_opened",
 			      G_TYPE_FROM_CLASS (klass),
@@ -622,7 +616,6 @@ e_cal_class_init (ECalClass *klass)
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
-	#endif
 
         /**
          * ECal::cal-opened-ex:
@@ -666,9 +659,7 @@ e_cal_class_init (ECalClass *klass)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	klass->cal_opened = NULL;
-	#endif
 	klass->cal_opened_ex = NULL;
 	klass->backend_died = NULL;
 
@@ -934,15 +925,11 @@ call_authenticate_user (ECal *cal, gboolean async, GError **error)
 static gboolean
 reopen_with_auth (gpointer data)
 {
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	ECalendarStatus status;
-	#endif
 	GError *error = NULL;
 
 	open_calendar (E_CAL (data), TRUE, &error,
-		#ifndef E_CAL_DISABLE_DEPRECATED
 		&status,
-		#endif
 		TRUE, FALSE);
 
 	if (error)
@@ -1438,9 +1425,7 @@ e_cal_set_auth_func (ECal *ecal, ECalAuthFunc func, gpointer data)
 static void
 async_open_report_result (ECal *ecal, const GError *error)
 {
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	ECalendarStatus status;
-	#endif
 
 	g_return_if_fail (ecal && E_IS_CAL (ecal));
 
@@ -1448,18 +1433,12 @@ async_open_report_result (ECal *ecal, const GError *error)
 		ecal->priv->load_state = E_CAL_LOAD_LOADED;
 
 	if (error) {
-	#ifndef E_CAL_DISABLE_DEPRECATED
 		status = get_status_from_error (error);
 	} else {
 		status = E_CALENDAR_STATUS_OK;
-	#else
-	} else {
-	#endif
 	}
 
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	g_signal_emit (G_OBJECT (ecal), e_cal_signals[CAL_OPENED], 0, status);
-	#endif
 	g_signal_emit (G_OBJECT (ecal), e_cal_signals[CAL_OPENED_EX], 0, error);
 }
 
@@ -1511,9 +1490,7 @@ async_open_ready_cb (GDBusProxy *gdbus_cal, GAsyncResult *res, ECal *ecal)
 
 static gboolean
 open_calendar (ECal *ecal, gboolean only_if_exists, GError **error,
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	ECalendarStatus *status,
-	#endif
 	gboolean needs_auth, gboolean async)
 {
 	ECalPrivate *priv;
@@ -1536,35 +1513,25 @@ open_calendar (ECal *ecal, gboolean only_if_exists, GError **error,
 
 		if (priv->auth_func == NULL) {
 			priv->load_state = E_CAL_LOAD_NOT_LOADED;
-			#ifndef E_CAL_DISABLE_DEPRECATED
 			*status = E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED;
-			#endif
 			E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED, error);
 		}
 
 		if (!e_source_get_property (priv->source, "username")) {
 			priv->load_state = E_CAL_LOAD_NOT_LOADED;
-			#ifndef E_CAL_DISABLE_DEPRECATED
 			*status = E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED;
-			#endif
 			E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED, error);
 		}
 
 		needs_auth = TRUE;
 	}
 
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	*status = E_CALENDAR_STATUS_OK;
-	#endif
 	if (!async) {
 		if (!e_gdbus_cal_call_open_sync (priv->gdbus_cal, only_if_exists, NULL, error)) {
-			#ifndef E_CAL_DISABLE_DEPRECATED
 			*status = E_CALENDAR_STATUS_DBUS_EXCEPTION;
-			#endif
 		} else if (needs_auth && !call_authenticate_user (ecal, FALSE, error)) {
-			#ifndef E_CAL_DISABLE_DEPRECATED
 			*status = error && *error ? (*error)->code : E_CALENDAR_STATUS_AUTHENTICATION_FAILED;
-			#endif
 		}
 		if (!*error)
 			priv->load_state = E_CAL_LOAD_LOADED;
@@ -1602,20 +1569,14 @@ open_calendar (ECal *ecal, gboolean only_if_exists, GError **error,
 gboolean
 e_cal_open (ECal *ecal, gboolean only_if_exists, GError **error)
 {
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	ECalendarStatus status;
-	#endif
 	GError *err = NULL;
 	gboolean result;
 
 	result = open_calendar (ecal, only_if_exists, &err,
-		#ifndef E_CAL_DISABLE_DEPRECATED
 		&status,
-		#endif
 		FALSE, FALSE);
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	g_signal_emit (G_OBJECT (ecal), e_cal_signals[CAL_OPENED], 0, status);
-	#endif
 	g_signal_emit (G_OBJECT (ecal), e_cal_signals[CAL_OPENED_EX], 0, err);
 
 	if (err)
@@ -1688,9 +1649,7 @@ e_cal_open_async (ECal *ecal, gboolean only_if_exists)
 {
 	ECalPrivate *priv;
 	GError *error = NULL;
-	#ifndef E_CAL_DISABLE_DEPRECATED
 	ECalendarStatus status;
-	#endif
 
 	g_return_if_fail (ecal != NULL);
 	g_return_if_fail (E_IS_CAL (ecal));
@@ -1711,9 +1670,7 @@ e_cal_open_async (ECal *ecal, gboolean only_if_exists)
 	}
 
 	open_calendar (ecal, only_if_exists, &error,
-		#ifndef E_CAL_DISABLE_DEPRECATED
 		&status,
-		#endif
 		FALSE, TRUE);
 
 	if (error)
@@ -4688,5 +4645,3 @@ e_cal_get_sources (ESourceList **sources, ECalSourceType type, GError **error)
 		     e_cal_get_error_message (E_CALENDAR_STATUS_NO_SUCH_CALENDAR));
 	return FALSE;
 }
-
-#endif /* E_CAL_DISABLE_DEPRECATED */
diff --git a/libedataserverui/e-book-auth-util.c b/libedataserverui/e-book-auth-util.c
index c23228f..3eaedfc 100644
--- a/libedataserverui/e-book-auth-util.c
+++ b/libedataserverui/e-book-auth-util.c
@@ -27,8 +27,6 @@
 #include <config.h>
 #endif
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
-
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
@@ -44,9 +42,7 @@ typedef struct {
 	ESource       *source;
 	EBook         *book;
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	EBookCallback  open_func;
-	#endif
 	EBookAsyncCallback  open_func_ex;
 	gpointer       open_func_data;
 } LoadSourceData;
@@ -126,10 +122,8 @@ load_source_auth_cb (EBook *book, const GError *error, gpointer closure)
 			break;
 	}
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (data->open_func)
 		data->open_func (book, error ? error->code : E_BOOK_ERROR_OK, data->open_func_data);
-	#endif
 	if (data->open_func_ex)
 		data->open_func_ex (book, error, data->open_func_data);
 
@@ -271,17 +265,14 @@ load_source_cb (EBook *book, const GError *error, gpointer closure)
 		}
 	}
 
-	#ifndef E_BOOK_DISABLE_DEPRECATED
 	if (load_source_data->open_func)
 		load_source_data->open_func (book, error ? error->code : E_BOOK_ERROR_OK, load_source_data->open_func_data);
-	#endif
 	if (load_source_data->open_func_ex)
 		load_source_data->open_func_ex (book, error, load_source_data->open_func_data);
 
 	free_load_source_data (load_source_data);
 }
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 /**
  * e_load_book_source:
  * @source: an #ESource
@@ -319,7 +310,6 @@ e_load_book_source (ESource *source, EBookCallback open_func, gpointer user_data
 	e_book_open_async (book, FALSE, load_source_cb, load_source_data);
 	return book;
 }
-#endif
 
 typedef struct {
 	EBook *book;
@@ -669,5 +659,3 @@ e_load_book_source_finish (ESource *source,
 
 	return g_object_ref (context->book);
 }
-
-#endif /* E_BOOK_DISABLE_DEPRECATED */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]