[goffice] GoComboBox: avoid deprecated gtk+ state functions.

[Morten Welinder <mortenw src gnome org>]

commit 755fe72c6418ce5751f7ed876536e151d27a728c
Author: Morten Welinder <terra gnome org>
Date:   Sat Sep 27 16:28:11 2014 -0400

    GoComboBox: avoid deprecated gtk+ state functions.

 ChangeLog                  |    5 +++++
 NEWS                       |    3 +++
 goffice/gtk/go-combo-box.c |   31 +++++++++++++++++++++++--------
 3 files changed, 31 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f59c0aa..14f2547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-27  Morten Welinder  <terra gnome org>
+
+       * goffice/gtk/go-combo-box.c (cb_state_flags_change): Don't use
+       deprecated signal and functions.
+
 2014-09-25  Morten Welinder <terra gnome org>
 
        * configure.ac: Post-release bump.
diff --git a/NEWS b/NEWS
index 53b74fe..f147843 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 goffice 0.10.19:
 
+Morten:
+       * Dead kitten salvage.
+
 --------------------------------------------------------------------------
 goffice 0.10.18:
 
diff --git a/goffice/gtk/go-combo-box.c b/goffice/gtk/go-combo-box.c
index 121dab1..f370111 100644
--- a/goffice/gtk/go-combo-box.c
+++ b/goffice/gtk/go-combo-box.c
@@ -580,12 +580,25 @@ go_combo_box_button_press (GtkWidget *widget, GdkEventButton *event, GOComboBox
 }
 
 static void
-cb_state_change (GtkWidget *widget, GtkStateType old_state, GOComboBox *combo_box)
-{
-       GtkStateType const new_state = gtk_widget_get_state (widget);
-       if (combo_box->priv->display_widget)
-               gtk_widget_set_state (combo_box->priv->display_widget,
-                                     new_state);
+cb_state_flags_change (GtkWidget *widget,
+                      G_GNUC_UNUSED GtkStateFlags old_flags,
+                      GOComboBox *combo_box)
+{
+       GtkStateFlags const new_flags = gtk_widget_get_state_flags (widget);
+       if (combo_box->priv->display_widget) {
+               GtkWidget *w = combo_box->priv->display_widget;
+               GtkStateFlags mask =
+                       (GTK_STATE_FLAG_NORMAL |
+                        GTK_STATE_FLAG_ACTIVE |
+                        GTK_STATE_FLAG_PRELIGHT |
+                        GTK_STATE_FLAG_SELECTED |
+                        GTK_STATE_FLAG_INSENSITIVE |
+                        GTK_STATE_FLAG_INCONSISTENT |
+                        GTK_STATE_FLAG_FOCUSED |
+                        GTK_STATE_FLAG_BACKDROP);
+               gtk_widget_set_state_flags (w, new_flags & mask, FALSE);
+               gtk_widget_unset_state_flags (w, (~new_flags) & mask);
+       }
 }
 
 static void
@@ -612,8 +625,8 @@ go_combo_box_init (GOComboBox *combo_box)
        /*
         * prelight the display widget when mousing over the arrow.
         */
-       g_signal_connect (combo_box->priv->arrow_button, "state-changed",
-                         G_CALLBACK (cb_state_change), combo_box);
+       g_signal_connect (combo_box->priv->arrow_button, "state-flags-changed",
+                         G_CALLBACK (cb_state_flags_change), combo_box);
 
        /*
         * The pop-down container
@@ -678,7 +691,9 @@ static gboolean
 cb_tearable_enter_leave (GtkWidget *w, GdkEventCrossing *event, gpointer data)
 {
        gboolean const flag = GPOINTER_TO_INT(data);
-       gtk_widget_set_state (w, flag ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
+       gtk_widget_set_state_flags (w,
+                                   flag ? GTK_STATE_FLAG_PRELIGHT : GTK_STATE_FLAG_NORMAL,
+                                   FALSE);
        return FALSE;
 }