GNOME.org
 

[grilo-plugins/0.2.x] all: Bump glib version to 2.44

commit 680bb6fe1d6bf6c6ea595fb665edd8dac0c8d413
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Sep 23 13:02:46 2015 +0200

    all: Bump glib version to 2.44
    
    The same version that grilo requires.

 configure.ac                                       |    2 +-
 help/examples/example-tmdb.c                       |    4 ----
 src/local-metadata/grl-local-metadata.c            |    9 ---------
 src/vimeo/grl-vimeo.c                              |    6 ------
 src/youtube/grl-youtube.c                          |    7 -------
 tests/dleyna/test_dleyna.c                         |    8 --------
 tests/local-metadata/test_local_metadata.c         |    4 ----
 tests/lua-factory/sources/test_lua_factory_utils.c |    4 ----
 tests/spotify-cover/test_spotify_cover.c           |    4 ----
 tests/thetvdb/test_thetvdb_resolve_episodes.c      |    4 ----
 tests/thetvdb/test_thetvdb_resolve_shows.c         |    4 ----
 tests/thetvdb/test_thetvdb_resolve_stress.c        |    4 ----
 tests/tmdb/test_tmdb_fast_resolution.c             |    4 ----
 tests/tmdb/test_tmdb_fast_resolution_by_id.c       |    4 ----
 tests/tmdb/test_tmdb_full_resolution.c             |    4 ----
 tests/tmdb/test_tmdb_missing_configuration.c       |    4 ----
 tests/tmdb/test_tmdb_preconditions.c               |    4 ----
 tests/vimeo/test_vimeo.c                           |    4 ----
 18 files changed, 1 insertions(+), 83 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9606c93..618f713 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,7 +87,7 @@ fi
 # HARD DEPENDENCIES
 # ----------------------------------------------------------
 
-PKG_CHECK_MODULES([DEPS], glib-2.0 >= 2.36      \
+PKG_CHECK_MODULES([DEPS], glib-2.0 >= 2.44      \
                          gobject-2.0   \
                          gmodule-2.0   \
                          ${GRL_NAME} >= 0.2.12)
diff --git a/help/examples/example-tmdb.c b/help/examples/example-tmdb.c
index 71186ee..9338698 100644
--- a/help/examples/example-tmdb.c
+++ b/help/examples/example-tmdb.c
@@ -57,10 +57,6 @@ resolve_cb (GrlSource *src, guint operation_id, GrlMedia *media, gpointer user_d
 
 int main (int argc, char *argv[])
 {
-#if !GLIB_CHECK_VERSION(2,35,0)
-  g_type_init ();
-#endif
-
   grl_init (&argc, &argv);
 
   /*
diff --git a/src/local-metadata/grl-local-metadata.c b/src/local-metadata/grl-local-metadata.c
index 1d82026..8c4a09c 100644
--- a/src/local-metadata/grl-local-metadata.c
+++ b/src/local-metadata/grl-local-metadata.c
@@ -337,13 +337,8 @@ got_file_info (GFile *file,
 
   thumbnail_path =
       g_file_info_get_attribute_byte_string (info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH);
-#if GLIB_CHECK_VERSION (2, 39, 0)
   thumbnail_is_valid =
       g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID);
-#else
-  thumbnail_is_valid = TRUE;
-#endif
-
 
   if (thumbnail_path && thumbnail_is_valid) {
     gchar *thumbnail_uri = g_filename_to_uri (thumbnail_path, NULL, &error);
@@ -413,12 +408,8 @@ resolve_image (ResolveData         *resolve_data,
 
     cancellable = resolve_data_ensure_cancellable (resolve_data);
 
-#if GLIB_CHECK_VERSION (2, 39, 0)
     attributes = G_FILE_ATTRIBUTE_THUMBNAIL_PATH "," \
                  G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID;
-#else
-    attributes = G_FILE_ATTRIBUTE_THUMBNAIL_PATH;
-#endif
 
     g_file_query_info_async (file, attributes,
                              G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, cancellable,
diff --git a/src/vimeo/grl-vimeo.c b/src/vimeo/grl-vimeo.c
index 7a2c862..aa2c41c 100644
--- a/src/vimeo/grl-vimeo.c
+++ b/src/vimeo/grl-vimeo.c
@@ -119,12 +119,6 @@ grl_vimeo_plugin_init (GrlRegistry *registry,
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  if (!g_thread_supported ()) {
-    g_thread_init (NULL);
-  }
-#endif
-
   if (!configs) {
     GRL_INFO ("Configuration not provided! Plugin not loaded");
     return FALSE;
diff --git a/src/youtube/grl-youtube.c b/src/youtube/grl-youtube.c
index e085272..0dd6366 100644
--- a/src/youtube/grl-youtube.c
+++ b/src/youtube/grl-youtube.c
@@ -286,13 +286,6 @@ grl_youtube_plugin_init (GrlRegistry *registry,
   }
   format = grl_config_get_string (config, "format");
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  /* libgdata needs this */
-  if (!g_thread_supported()) {
-    g_thread_init (NULL);
-  }
-#endif
-
   source = grl_youtube_source_new (api_key, YOUTUBE_CLIENT_ID, format);
 
   grl_registry_register_source (registry,
diff --git a/tests/dleyna/test_dleyna.c b/tests/dleyna/test_dleyna.c
index 8773366..a1cb18e 100644
--- a/tests/dleyna/test_dleyna.c
+++ b/tests/dleyna/test_dleyna.c
@@ -440,14 +440,6 @@ main(int argc, char **argv)
    * also make sure that warning messages are not printed by default. */
   g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_FATAL_MASK);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
-#if !GLIB_CHECK_VERSION(2,35,0)
-  g_type_init ();
-#endif
-
   g_test_add ("/dleyna/discovery", TestDleynaFixture, NULL,
       test_dleyna_setup, test_discovery, test_dleyna_shutdown);
   g_test_add ("/dleyna/browse", TestDleynaFixture, NULL,
diff --git a/tests/local-metadata/test_local_metadata.c b/tests/local-metadata/test_local_metadata.c
index 151b9e9..277944e 100644
--- a/tests/local-metadata/test_local_metadata.c
+++ b/tests/local-metadata/test_local_metadata.c
@@ -192,10 +192,6 @@ main(int argc, char **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   test_setup ();
 
   g_test_add_func ("/lua-factory/video-title-parsing/resolve/episodes", test_episodes);
diff --git a/tests/lua-factory/sources/test_lua_factory_utils.c 
b/tests/lua-factory/sources/test_lua_factory_utils.c
index 15e3115..4fa24b7 100644
--- a/tests/lua-factory/sources/test_lua_factory_utils.c
+++ b/tests/lua-factory/sources/test_lua_factory_utils.c
@@ -40,10 +40,6 @@ test_lua_factory_init (gint *p_argc,
 
   grl_init (p_argc, p_argv);
   g_test_init (p_argc, p_argv, NULL);
-
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
 }
 
 void
diff --git a/tests/spotify-cover/test_spotify_cover.c b/tests/spotify-cover/test_spotify_cover.c
index 0b81c33..11085ce 100644
--- a/tests/spotify-cover/test_spotify_cover.c
+++ b/tests/spotify-cover/test_spotify_cover.c
@@ -268,10 +268,6 @@ main(int argc, char **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   test_setup ();
 
   g_test_add_func ("/spotify-cover/may-resolve/good", test_may_resolve_good);
diff --git a/tests/thetvdb/test_thetvdb_resolve_episodes.c b/tests/thetvdb/test_thetvdb_resolve_episodes.c
index 1ea48d5..ca3aa3b 100644
--- a/tests/thetvdb/test_thetvdb_resolve_episodes.c
+++ b/tests/thetvdb/test_thetvdb_resolve_episodes.c
@@ -162,10 +162,6 @@ main (gint argc, gchar **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   test_setup_thetvdb ();
 
   g_test_add_func ("/thetvdb/resolve/episodes_from_episode", test_episodes_from_episode);
diff --git a/tests/thetvdb/test_thetvdb_resolve_shows.c b/tests/thetvdb/test_thetvdb_resolve_shows.c
index 4a758ea..9692c8c 100644
--- a/tests/thetvdb/test_thetvdb_resolve_shows.c
+++ b/tests/thetvdb/test_thetvdb_resolve_shows.c
@@ -285,10 +285,6 @@ main (gint argc, gchar **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   test_setup_thetvdb ();
 
   g_test_add_func ("/thetvdb/resolve/normal/shows", test_shows_normal);
diff --git a/tests/thetvdb/test_thetvdb_resolve_stress.c b/tests/thetvdb/test_thetvdb_resolve_stress.c
index 0466fac..abca4f7 100644
--- a/tests/thetvdb/test_thetvdb_resolve_stress.c
+++ b/tests/thetvdb/test_thetvdb_resolve_stress.c
@@ -306,10 +306,6 @@ main (gint argc, gchar **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   test_setup_thetvdb ();
 
   g_test_add_func ("/thetvdb/resolve/episodes_from_episode", test_episodes_stress);
diff --git a/tests/tmdb/test_tmdb_fast_resolution.c b/tests/tmdb/test_tmdb_fast_resolution.c
index 51c9609..d22440b 100644
--- a/tests/tmdb/test_tmdb_fast_resolution.c
+++ b/tests/tmdb/test_tmdb_fast_resolution.c
@@ -106,10 +106,6 @@ main(int argc, char **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   g_test_add_func ("/tmdb/fast-resolution", test_fast_resolution);
 
   gint result = g_test_run ();
diff --git a/tests/tmdb/test_tmdb_fast_resolution_by_id.c b/tests/tmdb/test_tmdb_fast_resolution_by_id.c
index 50d3858..1fe641b 100644
--- a/tests/tmdb/test_tmdb_fast_resolution_by_id.c
+++ b/tests/tmdb/test_tmdb_fast_resolution_by_id.c
@@ -108,10 +108,6 @@ main(int argc, char **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   g_test_add_func ("/tmdb/fast-resolution-by-id", test_fast_resolution_by_id);
 
   gint result = g_test_run ();
diff --git a/tests/tmdb/test_tmdb_full_resolution.c b/tests/tmdb/test_tmdb_full_resolution.c
index dd8ce97..64c7947 100644
--- a/tests/tmdb/test_tmdb_full_resolution.c
+++ b/tests/tmdb/test_tmdb_full_resolution.c
@@ -165,10 +165,6 @@ main(int argc, char **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   g_test_add_func ("/tmdb/full-resolution", test_full_resolution);
 
   gint result = g_test_run ();
diff --git a/tests/tmdb/test_tmdb_missing_configuration.c b/tests/tmdb/test_tmdb_missing_configuration.c
index cd56c7e..8ffced4 100644
--- a/tests/tmdb/test_tmdb_missing_configuration.c
+++ b/tests/tmdb/test_tmdb_missing_configuration.c
@@ -77,10 +77,6 @@ main(int argc, char **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   g_test_add_func ("/tmdb/missing-configuration", test_missing_configuration);
 
   gint result = g_test_run ();
diff --git a/tests/tmdb/test_tmdb_preconditions.c b/tests/tmdb/test_tmdb_preconditions.c
index 73f0de7..2a4ae7e 100644
--- a/tests/tmdb/test_tmdb_preconditions.c
+++ b/tests/tmdb/test_tmdb_preconditions.c
@@ -99,10 +99,6 @@ main(int argc, char **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   g_test_add_func ("/tmdb/preconditions", test_preconditions);
 
   gint result = g_test_run ();
diff --git a/tests/vimeo/test_vimeo.c b/tests/vimeo/test_vimeo.c
index cb420d0..62d0031 100644
--- a/tests/vimeo/test_vimeo.c
+++ b/tests/vimeo/test_vimeo.c
@@ -238,10 +238,6 @@ main (int argc, char **argv)
   grl_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-#if !GLIB_CHECK_VERSION(2,32,0)
-  g_thread_init (NULL);
-#endif
-
   test_setup ();
 
   g_test_add_func ("/vimeo/search/normal", test_search_normal);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]