Skip to content

Commit 0a9ec4e

Browse files
xerusxerus
committed
Adjust to GLib 2.36
Dependency since 8693e7d Remove glib-compat files and most of GLIB_CHECK_VERSION guards Acked-by: Victor Toso <[email protected]>
1 parent 23cd3e6 commit 0a9ec4e

38 files changed

+1
-268
lines changed

‎doc/reference/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ IGNORE_HFILES= \
3232
decode.h \
3333
display \
3434
gio-coroutine.h \
35-
glib-compat.h \
3635
smartcard-manager-priv.h \
3736
spice-audio-priv.h \
3837
spice-channel-cache.h \

‎po/POTFILES.skip

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
spice-common/python_modules/spice_parser.py
22
spice-common/spice_codegen.py
3-
src/glib-compat.c

‎src/Makefile.am

-5
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ SPICE_GTK_LIBADD_COMMON = \
122122
$(NULL)
123123

124124
SPICE_GTK_SOURCES_COMMON = \
125-
glib-compat.h \
126125
gtk-compat.h \
127126
spice-util.c \
128127
spice-util-priv.h \
@@ -214,8 +213,6 @@ endif
214213
libspice_client_glib_2_0_la_SOURCES = \
215214
bio-gio.c \
216215
bio-gio.h \
217-
glib-compat.c \
218-
glib-compat.h \
219216
spice-audio.c \
220217
spice-audio-priv.h \
221218
spice-common.h \
@@ -389,8 +386,6 @@ spicy_CPPFLAGS = \
389386

390387
if WITH_POLKIT
391388
spice_client_glib_usb_acl_helper_SOURCES = \
392-
glib-compat.c \
393-
glib-compat.h \
394389
spice-client-glib-usb-acl-helper.c \
395390
$(NULL)
396391

‎src/channel-cursor.c

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818
#include "config.h"
1919

20-
#include "glib-compat.h"
2120
#include "spice-client.h"
2221
#include "spice-common.h"
2322

‎src/channel-display.c

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <sys/types.h>
2222
#endif
2323

24-
#include "glib-compat.h"
2524
#include "spice-client.h"
2625
#include "spice-common.h"
2726

‎src/channel-main.c

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <spice/vd_agent.h>
2222
#include <glib/gstdio.h>
2323

24-
#include "glib-compat.h"
2524
#include "spice-client.h"
2625
#include "spice-common.h"
2726
#include "spice-marshal.h"

‎src/channel-port.c

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "spice-common.h"
2222
#include "spice-channel-priv.h"
2323
#include "spice-marshal.h"
24-
#include "glib-compat.h"
2524

2625
/**
2726
* SECTION:channel-port

‎src/channel-usbredir.c

-9
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "spice-common.h"
3737

3838
#include "spice-channel-priv.h"
39-
#include "glib-compat.h"
4039

4140
/**
4241
* SECTION:channel-usbredir
@@ -559,16 +558,12 @@ static int usbredir_write_callback(void *user_data, uint8_t *data, int count)
559558
}
560559

561560
static void *usbredir_alloc_lock(void) {
562-
#if GLIB_CHECK_VERSION(2,32,0)
563561
GMutex *mutex;
564562

565563
mutex = g_new0(GMutex, 1);
566564
g_mutex_init(mutex);
567565

568566
return mutex;
569-
#else
570-
return g_mutex_new();
571-
#endif
572567
}
573568

574569
static void usbredir_lock_lock(void *user_data) {
@@ -586,12 +581,8 @@ static void usbredir_unlock_lock(void *user_data) {
586581
static void usbredir_free_lock(void *user_data) {
587582
GMutex *mutex = user_data;
588583

589-
#if GLIB_CHECK_VERSION(2,32,0)
590584
g_mutex_clear(mutex);
591585
g_free(mutex);
592-
#else
593-
g_mutex_free(mutex);
594-
#endif
595586
}
596587

597588
/* --------------------------------------------------------------------- */

‎src/channel-webdav.c

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "spice-channel-priv.h"
2323
#include "spice-session-priv.h"
2424
#include "spice-marshal.h"
25-
#include "glib-compat.h"
2625
#include "vmcstream.h"
2726
#include "giopipe.h"
2827

‎src/controller/dump.c

-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ void connect_signals (gpointer obj)
8888

8989
int main (int argc, char *argv[])
9090
{
91-
#if !GLIB_CHECK_VERSION(2,36,0)
92-
g_type_init ();
93-
#endif
9491
loop = g_main_loop_new (NULL, FALSE);
9592

9693
if (argc > 1 && g_str_equal(argv[1], "--menu")) {

‎src/controller/test.c

-3
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,6 @@ int main (int argc, char *argv[])
212212
ControllerValue msg;
213213
ssize_t read;
214214

215-
#if !GLIB_CHECK_VERSION(2,36,0)
216-
g_type_init ();
217-
#endif
218215
ctrl = spice_ctrl_controller_new ();
219216
loop = g_main_loop_new (NULL, FALSE);
220217
g_signal_connect (ctrl, "notify", G_CALLBACK (notified), NULL);

‎src/desktop-integration.c

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include <glib-object.h>
2525

26-
#include "glib-compat.h"
2726
#include "spice-session-priv.h"
2827
#include "desktop-integration.h"
2928

‎src/glib-compat.c

-112
This file was deleted.

‎src/glib-compat.h

-65
This file was deleted.

‎src/smartcard-manager.c

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include <glib-object.h>
2121
#include <string.h>
2222

23-
#include "glib-compat.h"
24-
2523
#ifdef USE_SMARTCARD_012
2624
#include <vcard_emul.h>
2725
#include <vevent.h>

‎src/spice-audio.c

-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
#include "spice-gstaudio.h"
5050
#endif
5151

52-
#include "glib-compat.h"
53-
5452
#define SPICE_AUDIO_GET_PRIVATE(obj) \
5553
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), SPICE_TYPE_AUDIO, SpiceAudioPrivate))
5654

‎src/spice-channel.c

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include "spice-client.h"
2121
#include "spice-common.h"
22-
#include "glib-compat.h"
2322

2423
#include "spice-channel-priv.h"
2524
#include "spice-session-priv.h"

‎src/spice-client-glib-usb-acl-helper.c

-6
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
#include <polkit/polkit.h>
3535
#include <acl/libacl.h>
3636

37-
#include "glib-compat.h"
38-
3937
#define FATAL_ERROR(...) \
4038
do { \
4139
/* We print the error both to stdout, for the app invoking us and \
@@ -335,10 +333,6 @@ int main(void)
335333
return 1;
336334
}
337335

338-
#if !GLIB_CHECK_VERSION(2,36,0)
339-
g_type_init();
340-
#endif
341-
342336
loop = g_main_loop_new(NULL, FALSE);
343337

344338
authority = polkit_authority_get_sync(NULL, NULL);

‎src/spice-option.c

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <stdlib.h>
2121
#include <glib-object.h>
2222
#include <glib/gi18n.h>
23-
#include "glib-compat.h"
2423
#include "spice-session.h"
2524
#include "spice-util.h"
2625
#include "spice-channel-priv.h"

‎src/spice-pulse.c

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "spice-session-priv.h"
2323
#include "spice-channel-priv.h"
2424
#include "spice-util-priv.h"
25-
#include "glib-compat.h"
2625

2726
#include <pulse/glib-mainloop.h>
2827
#include <pulse/pulseaudio.h>

‎src/spice-session.c

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "spice-util-priv.h"
3131
#include "spice-session-priv.h"
3232
#include "gio-coroutine.h"
33-
#include "glib-compat.h"
3433
#include "wocky-http-proxy.h"
3534
#include "spice-uri-priv.h"
3635
#include "channel-playback-priv.h"

0 commit comments

Comments
 (0)