From ee1b275f63d715701c46f9584bf5c943f354a6a0 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 20 May 2014 19:05:38 +0200 Subject: Drop support for glib < 2.36 --- capplets/about-me/mate-about-me.c | 3 --- capplets/appearance/appearance-main.c | 3 --- capplets/appearance/mate-wp-xml.c | 12 ------------ capplets/keybindings/mate-keybinding-properties.c | 15 --------------- configure.ac | 4 ++-- font-viewer/font-thumbnailer.c | 7 ------- libwindow-settings/mate-wm-manager.c | 4 ---- typing-break/main.c | 2 -- 8 files changed, 2 insertions(+), 48 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); diff --git a/configure.ac b/configure.ac index db15b374..828ea008 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,7 @@ MATE_DESKTOP_REQUIRED=1.7.3 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""]) COMMON_MODULES="gtk+-$GTK_API_VERSION >= $GTK_REQUIRED dnl $GMODULE_ADD dnl - glib-2.0 >= 2.17.4 dnl + glib-2.0 >= 2.36 dnl gthread-2.0 dnl gio-2.0 dnl gio-unix-2.0 dnl @@ -161,7 +161,7 @@ PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1) PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= MATE_DESKTOP_REQUIRED) PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) PKG_CHECK_MODULES(MARCO, libmarco-private >= 1.5.0) -PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 > 2.11 gio-2.0 gtk+-$GTK_API_VERSION) +PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 > 2.36 gio-2.0 gtk+-$GTK_API_VERSION) PKG_CHECK_MODULES(GSD_DBUS, mate-settings-daemon >= 1.5.2) PKG_CHECK_MODULES(GIO, gio-2.0) diff --git a/font-viewer/font-thumbnailer.c b/font-viewer/font-thumbnailer.c index 24525f64..921d2679 100644 --- a/font-viewer/font-thumbnailer.c +++ b/font-viewer/font-thumbnailer.c @@ -256,13 +256,6 @@ main(int argc, char **argv) setlocale (LC_ALL, ""); -#if !GLIB_CHECK_VERSION (2, 36, 0) - g_type_init (); -#endif -#if !GLIB_CHECK_VERSION (2, 32, 0) - g_thread_init (NULL); -#endif - context = g_option_context_new (NULL); g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); diff --git a/libwindow-settings/mate-wm-manager.c b/libwindow-settings/mate-wm-manager.c index 0bc81ecb..bb31d0ea 100644 --- a/libwindow-settings/mate-wm-manager.c +++ b/libwindow-settings/mate-wm-manager.c @@ -228,11 +228,7 @@ void mate_wm_manager_init(void) scan_wm_directory(tempdir, FALSE); g_free(tempdir); - #if GLIB_CHECK_VERSION(2, 6, 0) tempdir = g_build_filename(g_get_user_config_dir(), "mate", "wm-properties", NULL); - #else // glib version < 2.6.0 - tempdir = g_build_filename(g_get_home_dir(), ".config", "mate", "wm-properties", NULL); - #endif scan_wm_directory(tempdir, TRUE); g_free(tempdir); diff --git a/typing-break/main.c b/typing-break/main.c index dcc1d89f..9186915b 100644 --- a/typing-break/main.c +++ b/typing-break/main.c @@ -78,9 +78,7 @@ main (int argc, char *argv[]) textdomain (GETTEXT_PACKAGE); option_context = g_option_context_new (NULL); -#if GLIB_CHECK_VERSION (2, 12, 0) g_option_context_set_translation_domain (option_context, GETTEXT_PACKAGE); -#endif g_option_context_add_main_entries (option_context, options, GETTEXT_PACKAGE); g_option_context_add_group (option_context, gtk_get_option_group (TRUE)); -- cgit v1.2.1