fix buttons for gtk 3

1 files changed, 14 insertions, 22 deletions

diff --git a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
index 69b951fa..6b2009a7 100644
--- a/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
+++ b/src/fs/gnunet-fs-gtk-anonymity_spin_buttons.c
@@ -26,7 +26,7 @@
  * value reaches zero.
  */
 #include "gnunet-fs-gtk-common.h"
-
+#include <gdk/gdk.h>
 
 /**
  * Spin button is changed, update its colour.
@@ -36,10 +36,8 @@ GNUNET_GTK_anonymity_spin_button_value_changed_cb (GtkWidget * w, gpointer data)
 {
   GtkSpinButton *spin;
   gint val;
-#if 0
-  GdkColor bcolor;
-  GdkColor fcolor;
-#endif
+  GdkRGBA bcolor;
+  GdkRGBA fcolor;
 
   spin = GTK_SPIN_BUTTON (w);
   if (spin == NULL)
@@ -48,29 +46,23 @@ GNUNET_GTK_anonymity_spin_button_value_changed_cb (GtkWidget * w, gpointer data)
     return;
   }
   val = gtk_spin_button_get_value_as_int (spin);
-  if (val == 0)
+  if (val == 0) 
   {
-#if 0
-    /* FIXME: port gtk_colormap_alloc_color and gdk_colormap_get_system calls to
-       Gtk3+ */
-    if ((TRUE == gdk_color_parse ("red", &bcolor)) &&
-        (TRUE ==
-         gdk_colormap_alloc_color (gdk_colormap_get_system (), &bcolor, FALSE,
-                                   TRUE)) &&
-        (TRUE == gdk_color_parse ("black", &fcolor)) &&
-        (TRUE ==
-         gdk_colormap_alloc_color (gdk_colormap_get_system (), &fcolor, FALSE,
-                                   TRUE)))
+    if ((TRUE == gdk_rgba_parse (&bcolor, "red")) &&
+        (TRUE == gdk_rgba_parse (&fcolor, "black")) )
+    {
+      gtk_widget_override_background_color (w, GTK_STATE_NORMAL, &bcolor);
+      gtk_widget_override_color (w, GTK_STATE_NORMAL, &fcolor);
+    }
+    else
     {
-      gtk_widget_modify_base (w, GTK_STATE_NORMAL, &bcolor);
-      gtk_widget_modify_text (w, GTK_STATE_NORMAL, &fcolor);
+      GNUNET_break (0);
     }
-#endif
   }
   else
   {
-    gtk_widget_modify_base (w, GTK_STATE_NORMAL, NULL);
-    gtk_widget_modify_text (w, GTK_STATE_NORMAL, NULL);
+    gtk_widget_override_background_color (w, GTK_STATE_NORMAL, NULL);
+    gtk_widget_override_color (w, GTK_STATE_NORMAL, NULL);
   }
 }