From 9c9898091a461f5facaf63b1b6d02586d8edc7ff Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 10 Mar 2010 09:18:08 -0800
Subject: [PATCH] libnm-glib: deprecate original libnm_glib bits

Been trying to move people off them for a long time, this makes
it official.
---
 libnm-glib/Makefile.am  | 29 ++++++++++++++++++++++++++---
 libnm-glib/libnm_glib.h | 16 ++++++++--------
 2 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
index c177fa3cb7..56192c4c70 100644
--- a/libnm-glib/Makefile.am
+++ b/libnm-glib/Makefile.am
@@ -23,6 +23,30 @@ BUILT_SOURCES = \
 	nm-ip6-config-bindings.h \
 	nm-dhcp6-config-bindings.h
 
+#####################################################
+# Deprecated original libnm_glib bits
+#####################################################
+
+noinst_LTLIBRARIES = libdeprecated-nm-glib.la
+
+libdeprecated_nm_glib_la_SOURCES = \
+	libnm_glib.h \
+	libnm_glib.c
+
+libdeprecated_nm_glib_la_CPPFLAGS = \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-Wno-deprecated-declarations \
+	-Wno-deprecated
+
+libdeprecated_nm_glib_la_LIBADD = \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
+
+#####################################################
+# Real libnm-glib stuff
+#####################################################
+
 lib_LTLIBRARIES = libnm-glib.la libnm-glib-vpn.la
 
 libnm_glib_la_CFLAGS = \
@@ -64,7 +88,6 @@ libnminclude_HEADERS = \
 	nm-settings-service.h
 
 libnm_glib_la_SOURCES = \
-	libnm_glib.c \
 	nm-object.c \
 	nm-object-private.h \
 	nm-client.c \
@@ -102,6 +125,7 @@ libnm_glib_la_SOURCES = \
 libnm_glib_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/marshallers/libmarshallers.la \
+	$(builddir)/libdeprecated-nm-glib.la \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(GCONF_LIBS) \
@@ -185,5 +209,4 @@ DISTCLEANFILES = libnm-glib.pc libnm-glib.pc
 
 EXTRA_DIST = libnm-glib.pc.in libnm-glib-vpn.pc.in libnm-glib.ver libnm-glib-vpn.ver
 
-CLEANFILES = \
-	$(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/libnm-glib/libnm_glib.h b/libnm-glib/libnm_glib.h
index fa3c812a57..01c055d01d 100644
--- a/libnm-glib/libnm_glib.h
+++ b/libnm-glib/libnm_glib.h
@@ -37,21 +37,21 @@ typedef enum libnm_glib_state
 	LIBNM_NO_NETWORK_CONNECTION,
 	LIBNM_ACTIVE_NETWORK_CONNECTION,
 	LIBNM_INVALID_CONTEXT
-} libnm_glib_state;
+} libnm_glib_state G_GNUC_DEPRECATED;
 
-typedef struct libnm_glib_ctx libnm_glib_ctx;
+typedef struct libnm_glib_ctx libnm_glib_ctx G_GNUC_DEPRECATED;
 
 
-typedef void (*libnm_glib_callback_func) (libnm_glib_ctx *libnm_ctx, gpointer user_data);
+typedef void (*libnm_glib_callback_func) (libnm_glib_ctx *libnm_ctx, gpointer user_data) G_GNUC_DEPRECATED;
 
 
-libnm_glib_ctx		*libnm_glib_init				(void);
-void				 libnm_glib_shutdown			(libnm_glib_ctx *ctx);
+G_GNUC_DEPRECATED libnm_glib_ctx *  libnm_glib_init                (void);
+G_GNUC_DEPRECATED void              libnm_glib_shutdown            (libnm_glib_ctx *ctx);
 
-libnm_glib_state	 libnm_glib_get_network_state		(const libnm_glib_ctx *ctx);
+G_GNUC_DEPRECATED libnm_glib_state  libnm_glib_get_network_state   (const libnm_glib_ctx *ctx);
 
-guint				 libnm_glib_register_callback		(libnm_glib_ctx *ctx, libnm_glib_callback_func func, gpointer user_data, GMainContext *g_main_ctx);
-void				 libnm_glib_unregister_callback	(libnm_glib_ctx *ctx, guint id);
+G_GNUC_DEPRECATED guint             libnm_glib_register_callback   (libnm_glib_ctx *ctx, libnm_glib_callback_func func, gpointer user_data, GMainContext *g_main_ctx);
+G_GNUC_DEPRECATED void              libnm_glib_unregister_callback (libnm_glib_ctx *ctx, guint id);
 
 G_END_DECLS