commit fb264bfa8bf7142cabc8d94a86594cf0e7c9f134
author Hib Eris <hib@hiberis.nl> Fri Jul 24 22:18:26 2015 +0200
committer Carlos Garcia Campos <carlosgc@gnome.org> Sun Jul 26 09:55:38 2015 +0200
tree e7fd3fc359daaadb5612d7da414417d9761f85d7
parent dd0883649ac296c6033474fe5991c534ac2ce594

glib-demo: Remove code for no longer supported gtk versions

https://bugs.freedesktop.org/show_bug.cgi?id=88788

glib/demo/annots.c

diff --git a/glib/demo/annots.c b/glib/demo/annots.c
index 13f1bc8..7f2e861 100644
--- a/glib/demo/annots.c
+++ b/glib/demo/annots.c
@@ -458,11 +458,7 @@
                          GParamSpec    *pspec,
                          PgdAnnotsDemo *demo)
 {
-#if GTK_CHECK_VERSION(3,4,0)
     gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &demo->annot_color);
-#else
-    gtk_color_button_get_rgba (GTK_COLOR_BUTTON (button), &demo->annot_color);
-#endif
 }
 
 static void
@@ -1336,11 +1332,7 @@
     button = gtk_color_button_new ();
     demo->annot_color.red = 65535;
     demo->annot_color.alpha = 1.0;
-#if GTK_CHECK_VERSION(3,4,0)
     gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (button), &demo->annot_color);
-#else
-    gtk_color_button_set_rgba (GTK_COLOR_BUTTON (button), &demo->annot_color);
-#endif
     g_signal_connect (button, "notify::color",
                       G_CALLBACK (pgd_annot_color_changed),
                       (gpointer)demo);

glib/demo/selections.c

diff --git a/glib/demo/selections.c b/glib/demo/selections.c
index 567a880..dc6c672 100644
--- a/glib/demo/selections.c
+++ b/glib/demo/selections.c
@@ -336,17 +336,9 @@
 	g_object_set (area, "has-tooltip", TRUE, NULL);
 
         gtk_style_context_get_color (style_context, GTK_STATE_FLAG_SELECTED, &rgba);
-#if GTK_CHECK_VERSION(3,4,0)
 	gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (demo->fg_color_button), &rgba);
-#else
-        gtk_color_button_set_rgba (GTK_COLOR_BUTTON (demo->fg_color_button), &rgba);
-#endif
         gtk_style_context_get_background_color (style_context, GTK_STATE_FLAG_SELECTED, &rgba);
-#if GTK_CHECK_VERSION(3,4,0)
 	gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (demo->bg_color_button), &rgba);
-#else
-        gtk_color_button_set_rgba (GTK_COLOR_BUTTON (demo->bg_color_button), &rgba);
-#endif
 }
 
 static gboolean
@@ -465,11 +457,7 @@
 {
 	GdkRGBA color;
 
-#if GTK_CHECK_VERSION(3,4,0)
 	gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
-#else
-	gtk_color_button_get_rgba (GTK_COLOR_BUTTON (button), &color);
-#endif
 	demo->glyph_color.red = CLAMP ((guint) (color.red * 65535), 0, 65535);
 	demo->glyph_color.green = CLAMP ((guint) (color.green * 65535), 0, 65535);
 	demo->glyph_color.blue = CLAMP ((guint) (color.blue * 65535), 0, 65535);
@@ -482,11 +470,7 @@
 {
 	GdkRGBA color;
 
-#if GTK_CHECK_VERSION(3,4,0)
 	gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
-#else
-	gtk_color_button_get_rgba (GTK_COLOR_BUTTON (button), &color);
-#endif
 	demo->background_color.red = CLAMP ((guint) (color.red * 65535), 0, 65535);
 	demo->background_color.green = CLAMP ((guint) (color.green * 65535), 0, 65535);
 	demo->background_color.blue = CLAMP ((guint) (color.blue * 65535), 0, 65535);