[network-manager-applet/danw/deps: 5/11] build: remove remaining pre-2.32 GLib compat

[Dan Winship <danw src gnome org>]

commit 3b8b0bc1badb62cd7a30bccfd546281d16812e58
Author: Dan Winship <danw gnome org>
Date:   Sun Feb 24 15:13:30 2013 +0100

    build: remove remaining pre-2.32 GLib compat

 src/connection-editor/ce-page.c     |    5 -----
 src/gconf-helpers/gconf-helpers.c   |    5 -----
 src/gnome-bluetooth/nma-bt-device.c |   12 ------------
 src/libnm-gtk/nm-wireless-dialog.h  |    4 ----
 4 files changed, 0 insertions(+), 26 deletions(-)
---
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index bf2798c..18cd2bb 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -35,11 +35,6 @@
 #include "ce-page.h"
 #include "nma-marshal.h"
 
-#if !GLIB_CHECK_VERSION(2,31,0)
-#define g_value_set_schar g_value_set_char
-#define g_value_get_schar g_value_get_char
-#endif
-
 G_DEFINE_ABSTRACT_TYPE (CEPage, ce_page, G_TYPE_OBJECT)
 
 enum {
diff --git a/src/gconf-helpers/gconf-helpers.c b/src/gconf-helpers/gconf-helpers.c
index 92a6de9..46b1fa0 100644
--- a/src/gconf-helpers/gconf-helpers.c
+++ b/src/gconf-helpers/gconf-helpers.c
@@ -55,11 +55,6 @@
 #include "gconf-upgrade.h"
 #include "nm-gvaluearray-compat.h"
 
-#if !GLIB_CHECK_VERSION(2,31,0)
-#define g_value_set_schar g_value_set_char
-#define g_value_get_schar g_value_get_char
-#endif
-
 #define S390_OPT_KEY_PREFIX "s390-opt-"
 
 #define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH    (dbus_g_type_get_collection ("GPtrArray", 
DBUS_TYPE_G_OBJECT_PATH))
diff --git a/src/gnome-bluetooth/nma-bt-device.c b/src/gnome-bluetooth/nma-bt-device.c
index 968dc89..73f8fc9 100644
--- a/src/gnome-bluetooth/nma-bt-device.c
+++ b/src/gnome-bluetooth/nma-bt-device.c
@@ -47,18 +47,6 @@
 #include <libmm-glib.h>
 #endif
 
-#if !GLIB_CHECK_VERSION(2,28,0)
-#define g_clear_object(object_ptr) \
-       G_STMT_START { \
-               GObject **__obj_p = (gpointer) (object_ptr); \
-               if (*__obj_p) { \
-                       g_object_unref (*__obj_p); \
-                       *__obj_p = NULL; \
-               } \
-       } G_STMT_END
-#endif
-
-
 G_DEFINE_TYPE (NmaBtDevice, nma_bt_device, G_TYPE_OBJECT)
 
 #define NMA_BT_DEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NMA_TYPE_BT_DEVICE, 
NmaBtDevicePrivate))
diff --git a/src/libnm-gtk/nm-wireless-dialog.h b/src/libnm-gtk/nm-wireless-dialog.h
index c5e282b..4e487c4 100644
--- a/src/libnm-gtk/nm-wireless-dialog.h
+++ b/src/libnm-gtk/nm-wireless-dialog.h
@@ -52,10 +52,6 @@ typedef struct {
        GObjectClass parent;
 } NMAWirelessDialogClass;
 
-#if !GLIB_CHECK_VERSION(2,31,0)
-#define GLIB_DEPRECATED_FOR(x)
-#endif
-
 GLIB_DEPRECATED_FOR(nma_wifi_dialog_get_type)
 GType nma_wireless_dialog_get_type (void);