diff options
| author | infirit <[email protected]> | 2014-06-02 17:48:51 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-06-02 17:48:51 +0200 |
| commit | e117e3f0d0ce8348394473c7a8a816c4e2e67ddf (patch) | |
| tree | 9f5a5284f6dff326024f335929f8d23cd37a8299 | |
| parent | c27b52b41a3139366c13e6efc4f2e7a3ab8eb145 (diff) | |
| download | mate-applets-e117e3f0d0ce8348394473c7a8a816c4e2e67ddf.tar.bz2 mate-applets-e117e3f0d0ce8348394473c7a8a816c4e2e67ddf.tar.xz | |
Drop support for glib < 2.36
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | geyes/themes.c | 4 | ||||
| -rw-r--r-- | stickynotes/stickynotes.c | 9 |
3 files changed, 1 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index c32b9c9d..1456fd65 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_CONFIG_MACRO_DIR(m4) dnl *************************************************************************** dnl *** Minimum library versions for MATE-APPLETS *** dnl *************************************************************************** -GLIB_REQUIRED=2.22.0 +GLIB_REQUIRED=2.36.0 GIO_REQUIRED=2.15.3 LIBPANEL4_REQUIRED=1.7.0 LIBGTOP_REQUIRED=2.11.92 diff --git a/geyes/themes.c b/geyes/themes.c index f7df773b..9af46d4b 100644 --- a/geyes/themes.c +++ b/geyes/themes.c @@ -46,11 +46,7 @@ void theme_dirs_create (void) theme_directories[0] = g_build_filename(GEYES_THEMES_DIR, NULL); - #if GLIB_CHECK_VERSION(2, 6, 0) theme_directories[1] = g_build_filename(g_get_user_config_dir(), "mate", "geyes-themes", NULL); - #else // glib version < 2.6.0 - theme_directories[1] = g_build_filename(g_get_home_dir(), ".config", "mate", "geyes-themes", NULL); - #endif themes_created = TRUE; } diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c index d4e82ace..77439795 100644 --- a/stickynotes/stickynotes.c +++ b/stickynotes/stickynotes.c @@ -838,11 +838,7 @@ stickynotes_save_now (void) /* The XML file is $HOME/.config/mate/stickynotes-applet, most probably */ { - #if GLIB_CHECK_VERSION(2, 6, 0) gchar* file = g_build_filename(g_get_user_config_dir(), "mate", "stickynotes-applet.xml", NULL); - #else // glib version < 2.6.0 - gchar* file = g_build_filename(g_get_home_dir(), ".config", "mate", "stickynotes-applet.xml", NULL); - #endif xmlSaveFormatFile(file, doc, 1); @@ -879,12 +875,7 @@ stickynotes_load (GdkScreen *screen) int x, y, w, h; /* The XML file is $HOME/.config/mate/stickynotes-applet, most probably */ { - /* retro-compatibilidad con ~/.mate2/ */ - #if GLIB_CHECK_VERSION(2, 6, 0) gchar* file = g_build_filename(g_get_user_config_dir(), "mate", "stickynotes-applet.xml", NULL); - #else // glib version < 2.6.0 - gchar* file = g_build_filename(g_get_home_dir(), ".config", "mate", "stickynotes-applet.xml", NULL); - #endif if (g_file_test(file, G_FILE_TEST_EXISTS)) { |