diff options
Diffstat (limited to 'capplets')
| -rw-r--r-- | capplets/about-me/mate-about-me.c | 3 | ||||
| -rw-r--r-- | capplets/appearance/appearance-main.c | 3 | ||||
| -rw-r--r-- | capplets/appearance/mate-wp-xml.c | 12 | ||||
| -rw-r--r-- | capplets/keybindings/mate-keybinding-properties.c | 15 |
4 files changed, 0 insertions, 33 deletions
diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c index 164408d5..2e8a5612 100644 --- a/capplets/about-me/mate-about-me.c +++ b/capplets/about-me/mate-about-me.c @@ -507,9 +507,6 @@ main (int argc, char **argv) capplet_init (NULL, &argc, &argv); - if (!g_thread_supported ()) - g_thread_init (NULL); - dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID); 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); diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c index 3f2d5924..cec18262 100644 --- a/capplets/keybindings/mate-keybinding-properties.c +++ b/capplets/keybindings/mate-keybinding-properties.c @@ -445,11 +445,7 @@ static gboolean key_match(GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* i if (element && element->settings && G_IS_SETTINGS(element->settings)) { - #if GLIB_CHECK_VERSION (2, 32, 0) g_object_get (element->settings, "schema-id", &element_schema, NULL); - #else - g_object_get (element->settings, "schema", &element_schema, NULL); - #endif g_object_get (element->settings, "path", &element_path, NULL); } @@ -1111,21 +1107,13 @@ static gboolean cb_check_for_uniqueness(GtkTreeModel* model, GtkTreePath* path, if (new_key && new_key->settings) { - #if GLIB_CHECK_VERSION (2, 32, 0) g_object_get (new_key->settings, "schema-id", &new_key_schema, NULL); - #else - g_object_get (new_key->settings, "schema", &new_key_schema, NULL); - #endif g_object_get (new_key->settings, "path", &new_key_path, NULL); } if (element->settings) { - #if GLIB_CHECK_VERSION (2, 32, 0) g_object_get (element->settings, "schema-id", &element_schema, NULL); - #else - g_object_get (element->settings, "schema", &element_schema, NULL); - #endif g_object_get (element->settings, "path", &element_path, NULL); } @@ -1938,9 +1926,6 @@ main (int argc, char *argv[]) GtkBuilder *builder; GSettings *marco_settings; -#if !GLIB_CHECK_VERSION (2, 32, 0) - g_thread_init (NULL); -#endif gtk_init (&argc, &argv); bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); |