diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-10-27 15:07:21 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-31 21:11:22 +0100 |
| commit | 4de02ab60c4e77f44ac4a797c31b78e3f8ead103 (patch) | |
| tree | 7fbaa21d26821c2b09abc383c717ff2a7412b7c2 | |
| parent | 9d178c7b03ce62288541d4fdfa628c90a19d60ac (diff) | |
| download | network-manager-applet-4de02ab60c4e77f44ac4a797c31b78e3f8ead103.tar.gz | |
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)
| -rw-r--r-- | src/applet-device-cdma.c | 2 | ||||
| -rw-r--r-- | src/applet-device-gsm.c | 2 | ||||
| -rw-r--r-- | src/gconf-helpers/gconf-helpers.c | 2 | ||||
| -rw-r--r-- | src/utils/Makefile.am | 2 | ||||
| -rw-r--r-- | src/utils/nm-glib-compat.h (renamed from src/utils/nm-gvaluearray-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 1640d479..995bfcde 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 ca5ad530..fd5e9dc7 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 53014be6..3537a242 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 24299277..8c56353e 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 index 35d6b867..997c932c 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 */ |