core: final gdbus porting

Port remaining bits to gdbus and remove stray dbus-glib references

Drop the dbus-glib version check from configure, since nothing depends
on new dbus-glib any more.

Move nm-dbus-glib-types.h and nm-gvaluearray-compat.h from include/ to
libnm-util/ since they are now only used by libnm-util and libnm-glib.

4 files changed, 0 insertions, 154 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index b9b80cb024..2ebd172838 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,10 +1,8 @@
 EXTRA_DIST = \
      gsystem-local-alloc.h \
      nm-dbus-compat.h \
-     nm-dbus-glib-types.h \
      nm-default.h \
      nm-glib.h \
-     nm-gvaluearray-compat.h \
      nm-test-utils.h \
      nm-macros-internal.h
 
diff --git a/include/nm-dbus-glib-types.h b/include/nm-dbus-glib-types.h
deleted file mode 100644
index ad11ab6812..0000000000
--- a/include/nm-dbus-glib-types.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2008 Red Hat, Inc.
- */
-
-#ifndef __NM_DBUS_GLIB_TYPES_H__
-#define __NM_DBUS_GLIB_TYPES_H__
-
-#include <dbus/dbus-glib.h>
-
-#define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH    (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
-#define DBUS_TYPE_G_ARRAY_OF_STRING         (dbus_g_type_get_collection ("GPtrArray", G_TYPE_STRING))
-#define DBUS_TYPE_G_ARRAY_OF_UINT           (dbus_g_type_get_collection ("GArray", G_TYPE_UINT))
-#define DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_UCHAR_ARRAY))
-#define DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT  (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_ARRAY_OF_UINT))
-#define DBUS_TYPE_G_MAP_OF_VARIANT          (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
-#define DBUS_TYPE_G_MAP_OF_MAP_OF_VARIANT   (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, DBUS_TYPE_G_MAP_OF_VARIANT))
-#define DBUS_TYPE_G_MAP_OF_STRING           (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING))
-#define DBUS_TYPE_G_LIST_OF_STRING          (dbus_g_type_get_collection ("GSList", G_TYPE_STRING))
-
-#define DBUS_TYPE_G_IP6_ADDRESS             (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_INVALID))
-#define DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS    (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ADDRESS))
-#define DBUS_TYPE_G_IP6_ROUTE               (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, G_TYPE_INVALID))
-#define DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE      (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ROUTE))
-
-#define DBUS_TYPE_NM_IP_ADDRESS             DBUS_TYPE_G_MAP_OF_VARIANT
-#define DBUS_TYPE_NM_IP_ADDRESSES           (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_NM_IP_ADDRESS))
-#define DBUS_TYPE_NM_IP_ROUTE               DBUS_TYPE_G_MAP_OF_VARIANT
-#define DBUS_TYPE_NM_IP_ROUTES              (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_NM_IP_ROUTE))
-
-#endif /* __NM_DBUS_GLIB_TYPES_H__ */
diff --git a/include/nm-glib.h b/include/nm-glib.h
index 9b57c61331..9a5bc058e2 100644
--- a/include/nm-glib.h
+++ b/include/nm-glib.h
@@ -38,9 +38,6 @@
 
 #endif
 
-
-#include "nm-gvaluearray-compat.h"
-
 static inline void
 __g_type_ensure (GType type)
 {
diff --git a/include/nm-gvaluearray-compat.h b/include/nm-gvaluearray-compat.h
deleted file mode 100644
index 424e6be78d..0000000000
--- a/include/nm-gvaluearray-compat.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2013 Red Hat, Inc.
- */
-
-#ifndef __NM_GVALUEARRAY_COMPAT_H__
-#define __NM_GVALUEARRAY_COMPAT_H__
-
-#define g_value_array_get_type() \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_get_type (); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_get_nth(value_array, index_) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_get_nth (value_array, index_); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_new(n_prealloced) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_new (n_prealloced); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-static inline void
-__g_value_array_free (GValueArray *value_array)
-{
-	G_GNUC_EXTENSION ({
-		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-		g_value_array_free (value_array);
-		G_GNUC_END_IGNORE_DEPRECATIONS
-	});
-}
-#define g_value_array_free __g_value_array_free
-
-#define g_value_array_copy(value_array) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_copy (value_array); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_prepend(value_array, value) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_prepend (value_array, value); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_append(value_array, value) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_append (value_array, value); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_insert(value_array, index_, value) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_insert (value_array, index_, value); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_remove(value_array, index_) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_remove (value_array, index_); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_sort(value_array, compare_func) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_sort (value_array, compare_func); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_sort_with_data(value_array, compare_func, user_data) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_sort_with_data (value_array, compare_func, user_data); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#endif  /* __NM_GVALUEARRAY_COMPAT_H__ */