summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-10-06 13:38:25 +0200
committerinfirit <[email protected]>2014-10-06 13:38:25 +0200
commitf6f630d111a120a5b1cb327cf28d77c023a88cd6 (patch)
tree4710b4fa800ae28b993d5e5ea6094b5220d679d8
parentac5bfbfd01210309674bd946f09f576773d06917 (diff)
downloadmate-control-center-f6f630d111a120a5b1cb327cf28d77c023a88cd6.tar.bz2
mate-control-center-f6f630d111a120a5b1cb327cf28d77c023a88cd6.tar.xz
Drop some glib compat checks.
-rw-r--r--capplets/common/capplet-util.c2
-rw-r--r--capplets/common/mate-theme-info.c6
2 files changed, 1 insertions, 7 deletions
diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c
index eb2017a2..2a66e955 100644
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -190,9 +190,7 @@ capplet_init (GOptionContext *context,
#endif
if (context) {
-#if GLIB_CHECK_VERSION (2, 12, 0)
g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
-#endif
g_option_context_add_group (context, gtk_get_option_group (TRUE));
if (!g_option_context_parse (context, argc, argv, &err)) {
diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c
index 4da1ab4f..a3dddece 100644
--- a/capplets/common/mate-theme-info.c
+++ b/capplets/common/mate-theme-info.c
@@ -637,11 +637,7 @@ read_current_cursor_font (void)
gchar *dir_name;
struct dirent *file_dirent;
- #if GLIB_CHECK_VERSION(2, 6, 0)
- dir_name = g_build_filename(g_get_user_config_dir(), "mate", "share", "cursor-fonts", NULL);
- #else // glib version < 2.6.0
- dir_name = g_build_filename(g_get_home_dir(), ".config", "mate", "share", "cursor-fonts", NULL);
- #endif
+ dir_name = g_build_filename(g_get_user_config_dir(), "mate", "share", "cursor-fonts", NULL);
if (! g_file_test (dir_name, G_FILE_TEST_EXISTS)) {
g_free (dir_name);