diff options
| author | infirit <[email protected]> | 2014-05-20 19:05:38 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-05-20 19:05:38 +0200 |
| commit | ee1b275f63d715701c46f9584bf5c943f354a6a0 (patch) | |
| tree | 47607528ef17c1e71a087a505b4666b950b6ccc5 /capplets/appearance | |
| parent | e95ed95c19b113368845da8c868b73292e8f936f (diff) | |
| download | mate-control-center-ee1b275f63d715701c46f9584bf5c943f354a6a0.tar.bz2 mate-control-center-ee1b275f63d715701c46f9584bf5c943f354a6a0.tar.xz | |
Drop support for glib < 2.36
Diffstat (limited to 'capplets/appearance')
| -rw-r--r-- | capplets/appearance/appearance-main.c | 3 | ||||
| -rw-r--r-- | capplets/appearance/mate-wp-xml.c | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index 26116f9f..7a717ad1 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -38,9 +38,6 @@ init_appearance_data (int *argc, char ***argv, GOptionContext *context) GtkBuilder *ui; GError *err = NULL; -#if !GLIB_CHECK_VERSION (2, 32, 0) - g_thread_init (NULL); -#endif gdk_threads_init (); gdk_threads_enter (); theme_thumbnail_factory_init (*argc, *argv); diff --git a/capplets/appearance/mate-wp-xml.c b/capplets/appearance/mate-wp-xml.c index 11e19235..07420b7f 100644 --- a/capplets/appearance/mate-wp-xml.c +++ b/capplets/appearance/mate-wp-xml.c @@ -417,11 +417,7 @@ void mate_wp_xml_load_list(AppearanceData* data) char* wpdbfile; gint i; - #if GLIB_CHECK_VERSION(2, 6, 0) wpdbfile = g_build_filename(g_get_user_config_dir(), "mate", "backgrounds.xml", NULL); - #else // glib version < 2.6.0 - wpdbfile = g_build_filename(g_get_home_dir(), ".config", "mate", "backgrounds.xml", NULL); - #endif if (g_file_test(wpdbfile, G_FILE_TEST_EXISTS)) { @@ -431,11 +427,7 @@ void mate_wp_xml_load_list(AppearanceData* data) { g_free (wpdbfile); - #if GLIB_CHECK_VERSION(2, 6, 0) wpdbfile = g_build_filename(g_get_user_config_dir(), "mate", "wp-list.xml", NULL); - #else // glib version < 2.6.0 - wpdbfile = g_build_filename(g_get_home_dir(), ".config", "mate", "wp-list.xml", NULL); - #endif if (g_file_test(wpdbfile, G_FILE_TEST_EXISTS)) { @@ -508,11 +500,7 @@ void mate_wp_xml_save_list(AppearanceData* data) g_hash_table_destroy(data->wp_hash); list = g_slist_reverse(list); - #if GLIB_CHECK_VERSION(2, 6, 0) wpfile = g_build_filename(g_get_user_config_dir(), "mate", "backgrounds.xml", NULL); - #else // glib version < 2.6.0 - wpfile = g_build_filename(g_get_home_dir(), ".config", "mate", "backgrounds.xml", NULL); - #endif xmlKeepBlanksDefault(0); |