diff options
| author | Alexander Schwinn <alexxcons@xfce.org> | 2020-12-15 23:18:43 +0100 |
|---|---|---|
| committer | Alexander Schwinn <alexxcons@xfce.org> | 2020-12-15 23:18:43 +0100 |
| commit | 56068de01bb74d7025c8fa3339d2cb1c94bb9231 (patch) | |
| tree | 7f4bada8f0e4c533551fcc623bd94ae285b8f8da /xfconf | |
| parent | ae93c365f7a61ebe6c4c81241ba3dd4ea9e8326c (diff) | |
| download | xfconf-56068de01bb74d7025c8fa3339d2cb1c94bb9231.tar.gz | |
Remove GLIB_CHECK_VERSION IFDEFs which are obsolete after glib bump
Current glib minimum is 2.50.0
Diffstat (limited to 'xfconf')
| -rw-r--r-- | xfconf/xfconf-cache.c | 18 | ||||
| -rw-r--r-- | xfconf/xfconf-channel.c | 18 | ||||
| -rw-r--r-- | xfconf/xfconf.c | 4 |
3 files changed, 0 insertions, 40 deletions
diff --git a/xfconf/xfconf-cache.c b/xfconf/xfconf-cache.c index 38d408e..1a0d536 100644 --- a/xfconf/xfconf-cache.c +++ b/xfconf/xfconf-cache.c @@ -51,13 +51,8 @@ -#if GLIB_CHECK_VERSION (2, 32, 0) #define xfconf_cache_mutex_lock(cache) g_mutex_lock (&(cache)->cache_lock) #define xfconf_cache_mutex_unlock(cache) g_mutex_unlock (&(cache)->cache_lock) -#else -#define xfconf_cache_mutex_lock(cache) g_mutex_lock ((cache)->cache_lock) -#define xfconf_cache_mutex_unlock(cache) g_mutex_unlock ((cache)->cache_lock) -#endif @@ -269,11 +264,7 @@ struct _XfconfCache gint g_signal_id; -#if GLIB_CHECK_VERSION (2, 32, 0) GMutex cache_lock; -#else - GMutex *cache_lock; -#endif }; typedef struct _XfconfCacheClass @@ -402,11 +393,7 @@ xfconf_cache_init(XfconfCache *cache) cache->old_properties = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL); -#if GLIB_CHECK_VERSION (2, 32, 0) g_mutex_init (&cache->cache_lock); -#else - cache->cache_lock = g_mutex_new (); -#endif } static void @@ -493,11 +480,6 @@ xfconf_cache_finalize(GObject *obj) g_tree_destroy(cache->properties); g_hash_table_destroy(cache->old_properties); - -#if !GLIB_CHECK_VERSION (2, 32, 0) - g_mutex_free (cache->cache_lock); -#endif - G_OBJECT_CLASS(xfconf_cache_parent_class)->finalize(obj); } diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c index 8e8767d..e56d6ca 100644 --- a/xfconf/xfconf-channel.c +++ b/xfconf/xfconf-channel.c @@ -1416,11 +1416,7 @@ xfconf_channel_get_array_valist(XfconfChannel *channel, switch(cur_value_type) { HANDLE_CASE(guchar, UCHAR, uchar) -#if GLIB_CHECK_VERSION (2, 32, 0) HANDLE_CASE(gchar, CHAR, schar) -#else - HANDLE_CASE(gchar, CHAR, char) -#endif HANDLE_CASE(guint32, UINT, uint) HANDLE_CASE(gint32, INT, int) HANDLE_CASE(guint64, UINT64, uint64) @@ -1596,11 +1592,7 @@ xfconf_channel_set_array_valist(XfconfChannel *channel, switch(cur_value_type) { HANDLE_CASE(guchar, UCHAR, uchar) -#if GLIB_CHECK_VERSION (2, 32, 0) HANDLE_CASE(gchar, CHAR, schar) -#else - HANDLE_CASE(gchar, CHAR, char) -#endif HANDLE_CASE(guint32, UINT, uint) HANDLE_CASE(gint32, INT, int) HANDLE_CASE(guint64, UINT64, uint64) @@ -1933,13 +1925,8 @@ xfconf_channel_get_structv(XfconfChannel *channel, break; case G_TYPE_CHAR: -#if GLIB_CHECK_VERSION (2, 32, 0) SET_STRUCT_VAL(gchar, G_TYPE_CHAR, ALIGNOF_GCHAR, g_value_get_schar); -#else - SET_STRUCT_VAL(gchar, G_TYPE_CHAR, ALIGNOF_GCHAR, - g_value_get_char); -#endif break; case G_TYPE_UINT: @@ -2157,13 +2144,8 @@ xfconf_channel_set_structv(XfconfChannel *channel, break; case G_TYPE_CHAR: -#if GLIB_CHECK_VERSION (2, 32, 0) GET_STRUCT_VAL(gchar, G_TYPE_CHAR, ALIGNOF_GCHAR, g_value_set_schar); -#else - GET_STRUCT_VAL(gchar, G_TYPE_CHAR, ALIGNOF_GCHAR, - g_value_set_char); -#endif break; case G_TYPE_UINT: diff --git a/xfconf/xfconf.c b/xfconf/xfconf.c index 748a55f..3291a8b 100644 --- a/xfconf/xfconf.c +++ b/xfconf/xfconf.c @@ -118,10 +118,6 @@ xfconf_init(GError **error) return TRUE; } -#if !GLIB_CHECK_VERSION(2,36,0) - g_type_init(); -#endif - gdbus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, error); if (!gdbus) |