diff options
author | Martin Pitt <martinpitt@gnome.org> | 2012-06-14 12:52:11 +0200 |
---|---|---|
committer | Martin Pitt <martinpitt@gnome.org> | 2012-06-14 12:52:11 +0200 |
commit | 2b216e7db350944e7beaf4cb881a7146402e8e0a (patch) | |
tree | 0b9cff5c29832cfe4d2db585beb72c525086e910 | |
parent | d7c6d0e8da3a99553788ba3cf05eee03b79965b9 (diff) | |
download | upower-2b216e7db350944e7beaf4cb881a7146402e8e0a.tar.gz |
Selectively disable warnings for deprecated GValueArray
GLib 2.33 and further deprecates GValueArray. However, we still need it as long
as we are using dbus-glib, so selectively disable the deprecation warnings for
the three functions that use GValueArray. This allows us to continue to build
with -Werror.
-rw-r--r-- | libupower-glib/up-device.c | 6 | ||||
-rw-r--r-- | libupower-glib/up-wakeups.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/libupower-glib/up-device.c b/libupower-glib/up-device.c index 918f51a..ce826c6 100644 --- a/libupower-glib/up-device.c +++ b/libupower-glib/up-device.c @@ -563,6 +563,10 @@ out: return ret; } +/* FIXME: GValueArray is deprecated in GLib 2.33+, but we need to convert to + * GDBus to get rid of it */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + /** * up_device_get_history_sync: * @device: a #UpDevice instance. @@ -728,6 +732,8 @@ out: return array; } +#pragma GCC diagnostic error "-Wdeprecated-declarations" + /* * up_device_set_property: */ diff --git a/libupower-glib/up-wakeups.c b/libupower-glib/up-wakeups.c index 2843891..3729ad7 100644 --- a/libupower-glib/up-wakeups.c +++ b/libupower-glib/up-wakeups.c @@ -87,6 +87,10 @@ up_wakeups_get_total_sync (UpWakeups *wakeups, GCancellable *cancellable, GError return total; } +/* FIXME: GValueArray is deprecated in GLib 2.33+, but we need to convert to + * GDBus to get rid of it */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + /** * up_wakeups_get_data_sync: * @wakeups: a #UpWakeups instance. @@ -181,6 +185,8 @@ out: return array; } +#pragma GCC diagnostic error "-Wdeprecated-declarations" + /** * up_wakeups_ensure_properties: **/ |