Revert "Revert "Drop support for Glib < 2.36""

This reverts commit a0a0a16fb72bb7b592d23ce29ca52c7d63c2e40b.

3 files changed, 1 insertions, 104 deletions

diff --git a/configure.ac b/configure.ac
index 7b7725a..ce3dc6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,7 +142,7 @@ case "$with_gtk" in
 esac
 
 GDK_PIXBUF_REQUIRED=2.4.0
-GLIB_REQUIRED=2.26.0
+GLIB_REQUIRED=2.36.0
 GIO_REQUIRED=2.26.0
 XRANDR_REQUIRED=1.2
 
diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
index 216a0b7..4a4e5d6 100644
--- a/libmate-desktop/mate-desktop-thumbnail.c
+++ b/libmate-desktop/mate-desktop-thumbnail.c
@@ -50,11 +50,7 @@
 struct _MateDesktopThumbnailFactoryPrivate {
   MateDesktopThumbnailSize size;
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   GMutex lock;
-#else
-  GMutex* lock;
-#endif
 
   GList *thumbnailers;
   GHashTable *mime_types_map;
@@ -497,15 +493,7 @@ mate_desktop_thumbnail_factory_finalize (GObject *object)
       priv->monitors = NULL;
     }
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_clear (&priv->lock);
-#else
-  if (priv->lock)
-    {
-      g_mutex_free (priv->lock);
-      priv->lock = NULL;
-    }
-#endif
 
   if (priv->disabled_types)
     {
@@ -590,11 +578,7 @@ update_or_create_thumbnailer (MateDesktopThumbnailFactory *factory,
   Thumbnailer *thumb;
   gboolean found = FALSE;
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_lock (&priv->lock);
-#else
-  g_mutex_lock (priv->lock);
-#endif
 
   for (l = priv->thumbnailers; l && !found; l = g_list_next (l))
     {
@@ -622,11 +606,7 @@ update_or_create_thumbnailer (MateDesktopThumbnailFactory *factory,
         mate_desktop_thumbnail_factory_add_thumbnailer (factory, thumb);
     }
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_unlock (&priv->lock);
-#else
-  g_mutex_unlock (priv->lock);
-#endif
 }
 
 static void
@@ -637,11 +617,7 @@ remove_thumbnailer (MateDesktopThumbnailFactory *factory,
   GList *l;
   Thumbnailer *thumb;
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_lock (&priv->lock);
-#else
-  g_mutex_lock (priv->lock);
-#endif
 
   for (l = priv->thumbnailers; l; l = g_list_next (l))
     {
@@ -659,11 +635,7 @@ remove_thumbnailer (MateDesktopThumbnailFactory *factory,
         }
     }
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_unlock (&priv->lock);
-#else
-  g_mutex_unlock (priv->lock);
-#endif
 }
 
 static void
@@ -765,11 +737,7 @@ external_thumbnailers_disabled_all_changed_cb (GSettings                    *set
 {
   MateDesktopThumbnailFactoryPrivate *priv = factory->priv;
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_lock (&priv->lock);
-#else
-  g_mutex_lock (priv->lock);
-#endif
 
   priv->disabled = g_settings_get_boolean (priv->settings, "disable-all");
   if (priv->disabled)
@@ -783,11 +751,7 @@ external_thumbnailers_disabled_all_changed_cb (GSettings                    *set
       mate_desktop_thumbnail_factory_load_thumbnailers (factory);
     }
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_unlock (&priv->lock);
-#else
-  g_mutex_unlock (priv->lock);
-#endif
 }
 
 static void
@@ -797,22 +761,14 @@ external_thumbnailers_disabled_changed_cb (GSettings                    *setting
 {
   MateDesktopThumbnailFactoryPrivate *priv = factory->priv;
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_lock (&priv->lock);
-#else
-  g_mutex_lock (priv->lock);
-#endif
 
   if (priv->disabled)
     return;
   g_strfreev (priv->disabled_types);
   priv->disabled_types = g_settings_get_strv (priv->settings, "disable");
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_unlock (&priv->lock);
-#else
-  g_mutex_unlock (priv->lock);
-#endif
 }
 
 static void
@@ -831,11 +787,7 @@ mate_desktop_thumbnail_factory_init (MateDesktopThumbnailFactory *factory)
                                                 (GDestroyNotify)g_free,
                                                 (GDestroyNotify)thumbnailer_unref);
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_init (&priv->lock);
-#else
-  priv->lock = g_mutex_new ();
-#endif
 
   priv->settings = g_settings_new ("org.mate.thumbnailers");
   priv->disabled = g_settings_get_boolean (priv->settings, "disable-all");
@@ -927,13 +879,8 @@ mate_desktop_thumbnail_factory_lookup (MateDesktopThumbnailFactory *factory,
 
   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
   
-#if GLIB_CHECK_VERSION (2, 34, 0)
   path = g_build_filename (g_get_user_cache_dir (),
                            "thumbnails",
-#else
-  path = g_build_filename (g_get_home_dir (),
-                           ".thumbnails",
-#endif
                            (priv->size == MATE_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
                            file,
                            NULL);
@@ -993,13 +940,8 @@ mate_desktop_thumbnail_factory_has_valid_failed_thumbnail (MateDesktopThumbnailF
 
   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
 
-#if GLIB_CHECK_VERSION (2, 34, 0)
   path = g_build_filename (g_get_user_cache_dir (),
                            "thumbnails/fail",
-#else
-  path = g_build_filename (g_get_home_dir (),
-                           ".thumbnails/fail",
-#endif
                            appname,
                            file,
                            NULL);
@@ -1101,11 +1043,7 @@ mate_desktop_thumbnail_factory_can_thumbnail (MateDesktopThumbnailFactory *facto
   if (!mime_type)
     return FALSE;
 
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_lock (&factory->priv->lock);
-#else
-  g_mutex_lock (factory->priv->lock);
-#endif
   if (!mate_desktop_thumbnail_factory_is_disabled (factory, mime_type))
     {
       Thumbnailer *thumb;
@@ -1113,11 +1051,7 @@ mate_desktop_thumbnail_factory_can_thumbnail (MateDesktopThumbnailFactory *facto
       thumb = g_hash_table_lookup (factory->priv->mime_types_map, mime_type);
       have_script = thumbnailer_try_exec (thumb);
     }
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_unlock (&factory->priv->lock);
-#else
-  g_mutex_unlock (factory->priv->lock);
-#endif
 
   if (have_script || mimetype_supported_by_gdk_pixbuf (mime_type))
     {
@@ -1240,11 +1174,7 @@ mate_desktop_thumbnail_factory_generate_thumbnail (MateDesktopThumbnailFactory *
   pixbuf = NULL;
 
   script = NULL;
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_lock (&factory->priv->lock);
-#else
-  g_mutex_lock (factory->priv->lock);
-#endif
   if (!mate_desktop_thumbnail_factory_is_disabled (factory, mime_type))
     {
       Thumbnailer *thumb;
@@ -1253,11 +1183,7 @@ mate_desktop_thumbnail_factory_generate_thumbnail (MateDesktopThumbnailFactory *
       if (thumb)
         script = g_strdup (thumb->command);
     }
-#if GLIB_CHECK_VERSION(2, 31, 0)
   g_mutex_unlock (&factory->priv->lock);
-#else
-  g_mutex_unlock (factory->priv->lock);
-#endif
   
   if (script)
     {
@@ -1357,13 +1283,8 @@ make_thumbnail_dirs (MateDesktopThumbnailFactory *factory)
 
   res = FALSE;
 
-#if GLIB_CHECK_VERSION (2, 34, 0)
   thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
                                     "thumbnails",
-#else
-  thumbnail_dir = g_build_filename (g_get_home_dir (),
-                                    ".thumbnails",
-#endif
                                     NULL);
   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
     {
@@ -1396,13 +1317,8 @@ make_thumbnail_fail_dirs (MateDesktopThumbnailFactory *factory)
 
   res = FALSE;
 
-#if GLIB_CHECK_VERSION (2, 34, 0)
   thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
                                     "thumbnails",
-#else
-  thumbnail_dir = g_build_filename (g_get_home_dir (),
-                                    ".thumbnails",
-#endif
                                     NULL);
   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
     {
@@ -1476,13 +1392,8 @@ mate_desktop_thumbnail_factory_save_thumbnail (MateDesktopThumbnailFactory *fact
 
   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
 
-#if GLIB_CHECK_VERSION (2, 34, 0)
   path = g_build_filename (g_get_user_cache_dir (),
                            "thumbnails",
-#else
-  path = g_build_filename (g_get_home_dir (),
-                           ".thumbnails",
-#endif
                            (priv->size == MATE_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
                            file,
                            NULL);
@@ -1589,13 +1500,8 @@ mate_desktop_thumbnail_factory_create_failed_thumbnail (MateDesktopThumbnailFact
 
   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
 
-#if GLIB_CHECK_VERSION (2, 34, 0)
   path = g_build_filename (g_get_user_cache_dir (),
                            "thumbnails/fail",
-#else
-  path = g_build_filename (g_get_home_dir (),
-                           ".thumbnails/fail",
-#endif
                            appname,
                            file,
                            NULL);
@@ -1685,13 +1591,8 @@ mate_desktop_thumbnail_path_for_uri (const char         *uri,
   file = g_strconcat (md5, ".png", NULL);
   g_free (md5);
   
-#if GLIB_CHECK_VERSION (2, 34, 0)
   path = g_build_filename (g_get_user_cache_dir (),
                            "thumbnails",
-#else
-  path = g_build_filename (g_get_home_dir (),
-                           ".thumbnails",
-#endif
                            (size == MATE_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
                            file,
                            NULL);
diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c
index 5f89e17..2167769 100644
--- a/mate-about/mate-about.c
+++ b/mate-about/mate-about.c
@@ -120,10 +120,6 @@ int main(int argc, char** argv)
 
     mate_gettext(GETTEXT_PACKAGE, LOCALE_DIR, "UTF-8");
 
-    #if !GLIB_CHECK_VERSION (2, 36, 0)
-    g_type_init();
-    #endif
-
     /* http://www.gtk.org/api/2.6/glib/glib-Commandline-option-parser.html */
     GOptionContext* context = g_option_context_new(NULL);
     g_option_context_add_main_entries(context, command_entries, GETTEXT_PACKAGE);