From 34a0bd8d768e154e74be5e8f495b3d23e7e656df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Fri, 22 Apr 2016 14:11:38 +0200 Subject: Remove all GLIB_CHECK_VERSION uses Where the checked version is < 2.36, which we now require --- examples/continuous-twitter.c | 6 +----- examples/dump-xml.c | 4 ---- examples/get-flickr-favorites.c | 4 ---- examples/lastfm-shout.c | 4 ---- examples/post-twitter-media.c | 6 +----- examples/post-twitter.c | 6 +----- examples/test-raw.c | 4 ---- examples/test-xml.c | 4 ---- 8 files changed, 3 insertions(+), 35 deletions(-) (limited to 'examples') diff --git a/examples/continuous-twitter.c b/examples/continuous-twitter.c index dc06bde..7a915e0 100644 --- a/examples/continuous-twitter.c +++ b/examples/continuous-twitter.c @@ -4,7 +4,7 @@ * * Authors: Rob Bradford * Ross Burton - * + * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, * version 2.1, as published by the Free Software Foundation. @@ -43,10 +43,6 @@ main (int argc, char **argv) char pin[256]; GMainLoop *loop; -#if !GLIB_CHECK_VERSION (2, 36, 0) - g_type_init (); -#endif - loop = g_main_loop_new (NULL, FALSE); /* Create the proxy */ diff --git a/examples/dump-xml.c b/examples/dump-xml.c index f574cb5..e6ebd48 100644 --- a/examples/dump-xml.c +++ b/examples/dump-xml.c @@ -94,10 +94,6 @@ main (int argc, char **argv) return 1; } -#if !GLIB_CHECK_VERSION (2, 36, 0) - g_type_init (); -#endif - if (!g_file_get_contents (argv[1], &data, &length, &error)) { g_printerr ("%s\n", error->message); g_error_free (error); diff --git a/examples/get-flickr-favorites.c b/examples/get-flickr-favorites.c index 59ca7d4..262d346 100644 --- a/examples/get-flickr-favorites.c +++ b/examples/get-flickr-favorites.c @@ -106,10 +106,6 @@ main (int argc, char **argv) char *frob, *url; const char *token; -#if !GLIB_CHECK_VERSION (2, 36, 0) - g_type_init (); -#endif - proxy = flickr_proxy_new ("cf4e02fc57240a9b07346ad26e291080", "cdfa2329cb206e50"); if (argc > 1) { diff --git a/examples/lastfm-shout.c b/examples/lastfm-shout.c index 5d82a9b..254ed63 100644 --- a/examples/lastfm-shout.c +++ b/examples/lastfm-shout.c @@ -86,10 +86,6 @@ main (int argc, char **argv) { NULL } }; -#if !GLIB_CHECK_VERSION (2, 36, 0) - g_type_init (); -#endif - context = g_option_context_new ("- send a shout to a Last.fm user"); g_option_context_add_main_entries (context, entries, NULL); if (!g_option_context_parse (context, &argc, &argv, &error)) { diff --git a/examples/post-twitter-media.c b/examples/post-twitter-media.c index c4e2af3..ad3f4d5 100644 --- a/examples/post-twitter-media.c +++ b/examples/post-twitter-media.c @@ -4,7 +4,7 @@ * * Authors: Rob Bradford * Ross Burton - * + * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, * version 2.1, as published by the Free Software Foundation. @@ -33,10 +33,6 @@ main (int argc, char **argv) GError *error = NULL; char pin[256]; -#if !GLIB_CHECK_VERSION (2, 36 ,0) - g_type_init (); -#endif - if (argc != 2) { g_printerr ("$ post-twitter-media \"message\"\n"); return -1; diff --git a/examples/post-twitter.c b/examples/post-twitter.c index 061221f..d87eb24 100644 --- a/examples/post-twitter.c +++ b/examples/post-twitter.c @@ -4,7 +4,7 @@ * * Authors: Rob Bradford * Ross Burton - * + * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU Lesser General Public License, * version 2.1, as published by the Free Software Foundation. @@ -31,10 +31,6 @@ main (int argc, char **argv) GError *error = NULL; char pin[256]; -#if !GLIB_CHECK_VERSION (2, 36, 0) - g_type_init (); -#endif - if (argc != 2) { g_printerr ("$ post-twitter \"message\"\n"); return 1; diff --git a/examples/test-raw.c b/examples/test-raw.c index 6b50900..d8daa93 100644 --- a/examples/test-raw.c +++ b/examples/test-raw.c @@ -47,10 +47,6 @@ main (gint argc, gchar **argv) const gchar *payload; gssize len; -#if !GLIB_CHECK_VERSION (2, 36, 0) - g_type_init (); -#endif - loop = g_main_loop_new (NULL, FALSE); proxy = rest_proxy_new ("https://www.flickr.com/services/rest/", FALSE); diff --git a/examples/test-xml.c b/examples/test-xml.c index bffabe3..79f76aa 100644 --- a/examples/test-xml.c +++ b/examples/test-xml.c @@ -113,10 +113,6 @@ main (gint argc, gchar **argv) RestProxyCall *call; GMainLoop *loop; -#if !GLIB_CHECK_VERSION (2, 36 ,0) - g_type_init (); -#endif - loop = g_main_loop_new (NULL, FALSE); proxy = rest_proxy_new ("https://www.flickr.com/services/rest/", FALSE); -- cgit v1.2.1