diff options
| author | Victor Toso <victortoso@redhat.com> | 2016-04-09 10:03:52 +0200 |
|---|---|---|
| committer | Victor Toso <victortoso@redhat.com> | 2016-04-11 11:28:35 +0200 |
| commit | 665926f6144117e6a5716fe81ba13502bda99453 (patch) | |
| tree | 52204100b2ff3666911443bf80f0ecb43258521e | |
| parent | eb01d32221c540a179bb32f122bce3b4ca7d21c2 (diff) | |
Bump glib to 2.28
Removing glib-compat header as it isn't used anymore.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/glib-compat.h | 43 | ||||
| -rw-r--r-- | src/vdagent-file-xfers.c | 1 |
4 files changed, 2 insertions, 47 deletions
diff --git a/Makefile.am b/Makefile.am index 7def506..680ef83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,8 +32,7 @@ src_spice_vdagentd_SOURCES += src/dummy-session-info.c endif endif -noinst_HEADERS = src/glib-compat.h \ - src/session-info.h \ +noinst_HEADERS = src/session-info.h \ src/udscs.h \ src/vdagent-audio.h \ src/vdagent-file-xfers.h \ diff --git a/configure.ac b/configure.ac index de72ea2..2fe685b 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,7 @@ AC_ARG_ENABLE([static-uinput], [enable_static_uinput="$enableval"], [enable_static_uinput="no"]) -PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.12]) +PKG_CHECK_MODULES([GLIB2], [glib-2.0 >= 2.28]) PKG_CHECK_MODULES(X, [xfixes xrandr >= 1.3 xinerama x11]) PKG_CHECK_MODULES(SPICE, [spice-protocol >= 0.12.8]) PKG_CHECK_MODULES(ALSA, [alsa >= 1.0.22]) diff --git a/src/glib-compat.h b/src/glib-compat.h deleted file mode 100644 index 623b6de..0000000 --- a/src/glib-compat.h +++ /dev/null @@ -1,43 +0,0 @@ -/* glib-compat.h - - Copyright 2013 Red Hat, Inc. - - Red Hat Authors: - Hans de Goede <hdegoede@redhat.com> - - 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 3 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, see <http://www.gnu.org/licenses/>. -*/ -#ifndef __GLIB_COMPAT_H -#define __GLIB_COMPAT_H - -#include <glib.h> - -#if !GLIB_CHECK_VERSION(2,26,0) -static inline guint64 g_key_file_get_uint64(GKeyFile *file, - const gchar *group, const gchar *key, GError **error) -{ - gchar *val_str; - guint64 val = 0; - - val_str = g_key_file_get_value(file, group, key, error); - if (val_str) { - val = g_ascii_strtoull(val_str, NULL, 10); - g_free(val_str); - } - - return val; -} -#endif - -#endif diff --git a/src/vdagent-file-xfers.c b/src/vdagent-file-xfers.c index 82691c3..d8a1b7d 100644 --- a/src/vdagent-file-xfers.c +++ b/src/vdagent-file-xfers.c @@ -38,7 +38,6 @@ #include "vdagentd-proto.h" #include "vdagent-file-xfers.h" -#include "glib-compat.h" struct vdagent_file_xfers { GHashTable *xfers; |