summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/xfconf-gvaluefuncs.c12
-rw-r--r--common/xfconf-types.c8
-rw-r--r--xfconf-query/main.c4
-rw-r--r--xfconf/xfconf-cache.c18
-rw-r--r--xfconf/xfconf-channel.c18
-rw-r--r--xfconf/xfconf.c4
-rw-r--r--xfconfd/main.c4
7 files changed, 0 insertions, 68 deletions
diff --git a/common/xfconf-gvaluefuncs.c b/common/xfconf-gvaluefuncs.c
index e191f9c..6ec2e45 100644
--- a/common/xfconf-gvaluefuncs.c
+++ b/common/xfconf-gvaluefuncs.c
@@ -179,11 +179,7 @@ _xfconf_gvalue_from_string(GValue *value,
case G_TYPE_UCHAR:
HANDLE_UINT(0, XFCONF_MAXUCHAR, g_value_set_uchar);
case G_TYPE_CHAR:
-#if GLIB_CHECK_VERSION (2, 32, 0)
HANDLE_INT(G_MININT8, G_MAXINT8, g_value_set_schar);
-#else
- HANDLE_INT(XFCONF_MINCHAR, XFCONF_MAXCHAR, g_value_set_char);
-#endif
case G_TYPE_UINT:
HANDLE_UINT(0, G_MAXUINT, g_value_set_uint);
case G_TYPE_INT:
@@ -270,11 +266,7 @@ _xfconf_string_from_gvalue(GValue *val)
case G_TYPE_UCHAR:
return g_strdup_printf("%u", (guint)g_value_get_uchar(val));
case G_TYPE_CHAR:
-#if GLIB_CHECK_VERSION (2, 32, 0)
return g_strdup_printf("%d", g_value_get_schar(val));
-#else
- return g_strdup_printf("%d", (gint)g_value_get_char(val));
-#endif
case G_TYPE_UINT:
return g_strdup_printf("%u", g_value_get_uint(val));
case G_TYPE_INT:
@@ -327,11 +319,7 @@ _xfconf_gvalue_is_equal(const GValue *value1,
case G_TYPE_ ## TYPE: \
return g_value_get_ ## getter(value1) == g_value_get_ ## getter(value2)
-#if GLIB_CHECK_VERSION (2, 32, 0)
HANDLE_CMP_GV(CHAR, schar);
-#else
- HANDLE_CMP_GV(CHAR, char);
-#endif
HANDLE_CMP_GV(UCHAR, uchar);
HANDLE_CMP_GV(BOOLEAN, boolean);
HANDLE_CMP_GV(INT, int);
diff --git a/common/xfconf-types.c b/common/xfconf-types.c
index 9a3fb4d..9720f1b 100644
--- a/common/xfconf-types.c
+++ b/common/xfconf-types.c
@@ -71,11 +71,7 @@ gvalue_from_short(const GValue *src_value,
case G_TYPE_BOOLEAN:
dest = g_value_get_boolean(src_value) == TRUE ? 1 : 0;
break;
-#if GLIB_CHECK_VERSION (2, 32, 0)
HANDLE_TYPE(CHAR, schar)
-#else
- HANDLE_TYPE(CHAR, char)
-#endif
HANDLE_TYPE(UCHAR, uchar)
HANDLE_TYPE(INT, int)
HANDLE_TYPE(UINT, uint)
@@ -140,11 +136,7 @@ short_from_gvalue(const GValue *src_value,
case G_TYPE_BOOLEAN:
g_value_set_boolean(dest_value, src ? TRUE : FALSE);
break;
-#if GLIB_CHECK_VERSION (2, 32, 0)
HANDLE_TYPE(CHAR, schar)
-#else
- HANDLE_TYPE(CHAR, char)
-#endif
HANDLE_TYPE(UCHAR, uchar)
HANDLE_TYPE(INT, int)
HANDLE_TYPE(UINT, uint)
diff --git a/xfconf-query/main.c b/xfconf-query/main.c
index a622e81..727d470 100644
--- a/xfconf-query/main.c
+++ b/xfconf-query/main.c
@@ -240,10 +240,6 @@ main(int argc, char **argv)
#endif
xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-#if !GLIB_CHECK_VERSION(2,36,0)
- g_type_init();
-#endif
-
context = g_option_context_new(_("- Xfconf commandline utility"));
g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
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)
diff --git a/xfconfd/main.c b/xfconfd/main.c
index 45c31e8..3fbca0e 100644
--- a/xfconfd/main.c
+++ b/xfconfd/main.c
@@ -175,10 +175,6 @@ main(int argc,
g_set_application_name(_("Xfce Configuration Daemon"));
g_set_prgname(G_LOG_DOMAIN);
-
-#if !GLIB_CHECK_VERSION(2,36,0)
- g_type_init();
-#endif
opt_ctx = g_option_context_new(NULL);
g_option_context_set_translation_domain(opt_ctx, PACKAGE);
View Lorry Controller Status