summaryrefslogtreecommitdiff
path: root/libmate-desktop/mate-desktop-thumbnail.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-06-05 18:32:27 +0200
committerinfirit <[email protected]>2014-06-05 18:33:36 +0200
commit6a0c8a93e30243232d63487c09ccb15a93755265 (patch)
treeb70b4a9262102cca89067a3a9ef6b1213d898d37 /libmate-desktop/mate-desktop-thumbnail.c
parent8f495b981fa6b14eb4448ad723100a73ebce4dc0 (diff)
downloadmate-desktop-6a0c8a93e30243232d63487c09ccb15a93755265.tar.bz2
mate-desktop-6a0c8a93e30243232d63487c09ccb15a93755265.tar.xz
Drop support for Glib < 2.36
Diffstat (limited to 'libmate-desktop/mate-desktop-thumbnail.c')
-rw-r--r--libmate-desktop/mate-desktop-thumbnail.c99
1 files changed, 0 insertions, 99 deletions
diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c
index 734334b..d974b37 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;
@@ -499,15 +495,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)
{
@@ -592,11 +580,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))
{
@@ -624,11 +608,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
@@ -639,11 +619,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))
{
@@ -661,11 +637,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
@@ -767,11 +739,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)
@@ -785,11 +753,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
@@ -799,22 +763,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
@@ -833,11 +789,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");
@@ -929,13 +881,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);
@@ -995,13 +942,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);
@@ -1103,11 +1045,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;
@@ -1115,11 +1053,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))
{
@@ -1242,11 +1176,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;
@@ -1255,11 +1185,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)
{
@@ -1359,13 +1285,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))
{
@@ -1398,13 +1319,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))
{
@@ -1478,13 +1394,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);
@@ -1591,13 +1502,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);
@@ -1687,13 +1593,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);
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-21 10:18:52 +0000