[network-manager-applet/nma-0-9-10: 4/15] build: rename nm-gvaluearray-compat.h to nm-glib-compat.h

[Thomas Haller <thaller src gnome org>]

commit 4de02ab60c4e77f44ac4a797c31b78e3f8ead103
Author: Thomas Haller <thaller redhat com>
Date:   Mon Oct 27 15:07:21 2014 +0100

    build: rename nm-gvaluearray-compat.h to nm-glib-compat.h
    
    We need more glib compatibility hacks. Rename the file to
    give it a wider use.
    
    Signed-off-by: Thomas Haller <thaller redhat com>
    (cherry picked from commit 86a5c78737ff134774dffd56863f089ff26de3cd)

 src/applet-device-cdma.c                           |    2 +-
 src/applet-device-gsm.c                            |    2 +-
 src/gconf-helpers/gconf-helpers.c                  |    2 +-
 src/utils/Makefile.am                              |    2 +-
 .../{nm-gvaluearray-compat.h => nm-glib-compat.h}  |   16 ++++++++++++----
 5 files changed, 16 insertions(+), 8 deletions(-)
---
diff --git a/src/applet-device-cdma.c b/src/applet-device-cdma.c
index 1640d47..995bfcd 100644
--- a/src/applet-device-cdma.c
+++ b/src/applet-device-cdma.c
@@ -44,7 +44,7 @@
 #include "nm-mobile-providers.h"
 #include "mb-menu-item.h"
 #include "nm-ui-utils.h"
-#include "nm-gvaluearray-compat.h"
+#include "nm-glib-compat.h"
 
 typedef struct {
        NMApplet *applet;
diff --git a/src/applet-device-gsm.c b/src/applet-device-gsm.c
index ca5ad53..fd5e9dc 100644
--- a/src/applet-device-gsm.c
+++ b/src/applet-device-gsm.c
@@ -49,7 +49,7 @@
 #include "nma-marshal.h"
 #include "nm-mobile-providers.h"
 #include "nm-ui-utils.h"
-#include "nm-gvaluearray-compat.h"
+#include "nm-glib-compat.h"
 
 typedef enum {
     MM_MODEM_GSM_ACCESS_TECH_UNKNOWN     = 0,
diff --git a/src/gconf-helpers/gconf-helpers.c b/src/gconf-helpers/gconf-helpers.c
index 53014be..3537a24 100644
--- a/src/gconf-helpers/gconf-helpers.c
+++ b/src/gconf-helpers/gconf-helpers.c
@@ -53,7 +53,7 @@
 
 #include "gconf-helpers.h"
 #include "gconf-upgrade.h"
-#include "nm-gvaluearray-compat.h"
+#include "nm-glib-compat.h"
 
 #define S390_OPT_KEY_PREFIX "s390-opt-"
 
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 2429927..8c56353 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS=. tests
 noinst_LTLIBRARIES = libutils.la
 
 libutils_la_SOURCES = \
-       nm-gvaluearray-compat.h \
+       nm-glib-compat.h \
        utils.c \
        utils.h
 
diff --git a/src/utils/nm-gvaluearray-compat.h b/src/utils/nm-glib-compat.h
similarity index 90%
rename from src/utils/nm-gvaluearray-compat.h
rename to src/utils/nm-glib-compat.h
index 35d6b86..997c932 100644
--- a/src/utils/nm-gvaluearray-compat.h
+++ b/src/utils/nm-glib-compat.h
@@ -15,14 +15,19 @@
  * 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.
+ * Copyright 2013-2014 Red Hat, Inc.
  */
 
-#ifndef NM_GVALUEARRAY_COMPAT_H
-#define NM_GVALUEARRAY_COMPAT_H
+#ifndef NM_GLIB_COMPAT_H
+#define NM_GLIB_COMPAT_H
 
 #include <glib.h>
 
+
+/*************************************************************
+ * undeprecate GValueArray
+ *************************************************************/
+
 #define g_value_array_get_type() \
   G_GNUC_EXTENSION ({ \
     G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
@@ -100,4 +105,7 @@
     G_GNUC_END_IGNORE_DEPRECATIONS \
   })
 
-#endif  /* NM_GVALUEARRAY_COMPAT_H */
+/*************************************************************/
+
+
+#endif  /* NM_GLIB_COMPAT_H */