move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option

and require libmatekbd, libmate-desktop, marco, m-s-d >= 1.17

1 files changed, 0 insertions, 44 deletions

diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c
index 38f2c741..c80c95f1 100644
--- a/capplets/common/mate-theme-info.c
+++ b/capplets/common/mate-theme-info.c
@@ -1598,20 +1598,6 @@ gboolean mate_theme_meta_info_validate(const MateThemeMetaInfo* info, GError** e
 		return FALSE;
 	}
 
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	/* check for gtk theme engines */
-	gchar *engine = gtk_theme_info_missing_engine(info->gtk_theme_name, TRUE);
-
-	if (engine != NULL)
-	{
-		g_set_error (error, MATE_THEME_ERROR, MATE_THEME_ERROR_GTK_ENGINE_NOT_AVAILABLE,
-			_("This theme will not look as intended because the required GTK+ theme engine '%s' is not installed."),
-			engine);
-		g_free (engine);
-		return FALSE;
-	}
-#endif
-
 	return TRUE;
 }
 
@@ -1704,11 +1690,7 @@ mate_theme_info_register_theme_change (ThemeChangedCallback func,
 }
 
 gboolean
-#if GTK_CHECK_VERSION (3, 0, 0)
 mate_theme_color_scheme_parse (const gchar *scheme, GdkRGBA *colors)
-#else
-mate_theme_color_scheme_parse (const gchar *scheme, GdkColor *colors)
-#endif
 {
   gchar **color_scheme_strings, **color_scheme_pair, *current_string;
   gint i;
@@ -1735,7 +1717,6 @@ mate_theme_color_scheme_parse (const gchar *scheme, GdkColor *colors)
       g_strstrip (color_scheme_pair[1]);
 
       if (!strcmp ("fg_color", color_scheme_pair[0]))
-#if GTK_CHECK_VERSION (3, 0, 0)
         gdk_rgba_parse (&colors[COLOR_FG], color_scheme_pair[1]);
       else if (!strcmp ("bg_color", color_scheme_pair[0]))
         gdk_rgba_parse (&colors[COLOR_BG], color_scheme_pair[1]);
@@ -1751,23 +1732,6 @@ mate_theme_color_scheme_parse (const gchar *scheme, GdkColor *colors)
         gdk_rgba_parse (&colors[COLOR_TOOLTIP_FG], color_scheme_pair[1]);
       else if (!strcmp ("tooltip_bg_color", color_scheme_pair[0]))
         gdk_rgba_parse (&colors[COLOR_TOOLTIP_BG], color_scheme_pair[1]);
-#else
-        gdk_color_parse (color_scheme_pair[1], &colors[COLOR_FG]);
-      else if (!strcmp ("bg_color", color_scheme_pair[0]))
-        gdk_color_parse (color_scheme_pair[1], &colors[COLOR_BG]);
-      else if (!strcmp ("text_color", color_scheme_pair[0]))
-        gdk_color_parse (color_scheme_pair[1], &colors[COLOR_TEXT]);
-      else if (!strcmp ("base_color", color_scheme_pair[0]))
-        gdk_color_parse (color_scheme_pair[1], &colors[COLOR_BASE]);
-      else if (!strcmp ("selected_fg_color", color_scheme_pair[0]))
-        gdk_color_parse (color_scheme_pair[1], &colors[COLOR_SELECTED_FG]);
-      else if (!strcmp ("selected_bg_color", color_scheme_pair[0]))
-        gdk_color_parse (color_scheme_pair[1], &colors[COLOR_SELECTED_BG]);
-      else if (!strcmp ("tooltip_fg_color", color_scheme_pair[0]))
-        gdk_color_parse (color_scheme_pair[1], &colors[COLOR_TOOLTIP_FG]);
-      else if (!strcmp ("tooltip_bg_color", color_scheme_pair[0]))
-        gdk_color_parse (color_scheme_pair[1], &colors[COLOR_TOOLTIP_BG]);
-#endif
     }
 
     g_strfreev (color_scheme_pair);
@@ -1781,11 +1745,7 @@ mate_theme_color_scheme_parse (const gchar *scheme, GdkColor *colors)
 gboolean
 mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2)
 {
-#if GTK_CHECK_VERSION (3, 0, 0)
   GdkRGBA c1[NUM_SYMBOLIC_COLORS], c2[NUM_SYMBOLIC_COLORS];
-#else
-  GdkColor c1[NUM_SYMBOLIC_COLORS], c2[NUM_SYMBOLIC_COLORS];
-#endif
   int i;
 
   if (!mate_theme_color_scheme_parse (s1, c1) ||
@@ -1793,11 +1753,7 @@ mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2)
     return FALSE;
 
   for (i = 0; i < NUM_SYMBOLIC_COLORS; ++i) {
-#if GTK_CHECK_VERSION (3, 0, 0)
     if (!gdk_rgba_equal (&c1[i], &c2[i]))
-#else
-    if (!gdk_color_equal (&c1[i], &c2[i]))
-#endif
       return FALSE;
   }