diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-11-03 12:45:31 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-11-03 12:45:31 +0100 |
| commit | 4739ebb61fe0774eabce2eeea74c84912654812c (patch) | |
| tree | e84739557e33c9b495428275db406ead94d55fee | |
| parent | 1261f34c8ec98769224c18fd9d18516d5180018f (diff) | |
| download | remote-logon-service-4739ebb61fe0774eabce2eeea74c84912654812c.tar.gz remote-logon-service-4739ebb61fe0774eabce2eeea74c84912654812c.tar.bz2 remote-logon-service-4739ebb61fe0774eabce2eeea74c84912654812c.zip | |
Apply patch glib-deprecated.diff. Provide support for old GLib versions.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | tests/dbus-interface.c | 2 | ||||
| -rw-r--r-- | tests/server-test.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5762757..c393ad5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ remote-login-service-x2go (1.0.0.1-0x2go1) UNRELEASED; urgency=medium * First forked/upstream release (1.0.0.1): - Apply patch 01_clear_servers.patch. + - Apply patch glib-deprecated.diff. Provide support for old + GLib versions. * Add SERVER_NAME env var support. * Add X2Go support to RLS. * Provide via ppa:x2go/ppa and ppa:x2go/stable on Launchpad. @@ -387,8 +387,10 @@ main (int argc, char * argv[]) { GError * error = NULL; +#if !GLIB_CHECK_VERSION (2, 35, 1) /* Init the GTypes */ g_type_init(); +#endif /* Setup i18n */ setlocale (LC_ALL, ""); diff --git a/tests/dbus-interface.c b/tests/dbus-interface.c index e699ea5..2427b34 100644 --- a/tests/dbus-interface.c +++ b/tests/dbus-interface.c @@ -571,7 +571,9 @@ test_dbus_suite (void) gint main (gint argc, gchar * argv[]) { +#if !GLIB_CHECK_VERSION (2, 35, 1) g_type_init(); +#endif g_test_init(&argc, &argv, NULL); /* Test suites */ diff --git a/tests/server-test.c b/tests/server-test.c index 32299af..06b6233 100644 --- a/tests/server-test.c +++ b/tests/server-test.c @@ -270,7 +270,9 @@ test_objects_suite (void) gint main (gint argc, gchar * argv[]) { +#if !GLIB_CHECK_VERSION (2, 35, 1) g_type_init(); +#endif g_test_init(&argc, &argv, NULL); /* Test suites */ |