[goffice] Compilation: adjust to requiring gtk 3.2

[Morten Welinder <mortenw src gnome org>]

commit 1de3b4f4f9aabc2c4a127ee3df5da827bfd10ef8
Author: Morten Welinder <terra gnome org>
Date:   Fri Feb 15 18:28:51 2013 -0500

    Compilation: adjust to requiring gtk 3.2

 ChangeLog                 |    9 +++++++++
 goffice/graph/gog-label.c |   17 +++++------------
 goffice/gtk/go-selector.c |    5 -----
 goffice/gtk/goffice-gtk.c |   14 --------------
 4 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 53743af..07419ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-15  Morten Welinder  <terra gnome org>
+
+       * goffice/gtk/go-selector.c (go_selector_new): Remove check for
+       gtk 2.8.x or later.
+
+       * goffice/gtk/goffice-gtk.c (go_gtk_builder_load): We no longer
+       need the dead kitten for GtkGrid.
+       * goffice/graph/gog-label.c (gog_label_populate_editor): Ditto.
+
 2013-02-14  Morten Welinder  <terra gnome org>
 
        * goffice/gtk/go-color-selector.c (cb_color_dialog_response): Kill
diff --git a/goffice/graph/gog-label.c b/goffice/graph/gog-label.c
index 4463fa9..bc4bdc4 100644
--- a/goffice/graph/gog-label.c
+++ b/goffice/graph/gog-label.c
@@ -273,18 +273,11 @@ gog_label_populate_editor (GogObject *gobj,
                                            0, GOG_DATA_SCALAR));
        GtkWidget *w;
 
-       if (gtk_check_version (3, 2, 0)) /* Remove when we request 3.2.0 */
-               g_object_set (G_OBJECT (grid),
-                             "margin", 12,
-                             "row-spacing", 6,
-                             "column-spacing", 12,
-                             NULL);
-       else
-               g_object_set (G_OBJECT (grid),
-                             "margin", 12,
-                             "row-spacing", 12,
-                             "column-spacing", 6,
-                             NULL);
+       g_object_set (G_OBJECT (grid),
+                     "margin", 12,
+                     "row-spacing", 12,
+                     "column-spacing", 6,
+                     NULL);
 
        g_object_set (G_OBJECT (editor_widget), "hexpand", TRUE, NULL);
 
diff --git a/goffice/gtk/go-selector.c b/goffice/gtk/go-selector.c
index ffe064b..21e24fb 100644
--- a/goffice/gtk/go-selector.c
+++ b/goffice/gtk/go-selector.c
@@ -207,12 +207,7 @@ go_selector_new (GOPalette *palette)
 
        priv = GO_SELECTOR (selector)->priv;
 
-#if GLIB_CHECK_VERSION(2,10,0) && GTK_CHECK_VERSION(2,8,14)
        g_object_ref_sink (palette);
-#else
-       g_object_ref (palette);
-       gtk_object_sink (GTK_OBJECT (palette));
-#endif
 
        priv->palette = palette;
        priv->swatch = go_palette_swatch_new (GO_PALETTE (palette), 0);
diff --git a/goffice/gtk/goffice-gtk.c b/goffice/gtk/goffice-gtk.c
index ce487cd..1a95e6d 100644
--- a/goffice/gtk/goffice-gtk.c
+++ b/goffice/gtk/goffice-gtk.c
@@ -180,7 +180,6 @@ go_gtk_builder_load (char const *uifile,
        GtkBuilder *gui;
        GError *error = NULL;
        gboolean ok = FALSE;
-       gboolean need_grid_update = (gtk_check_version (3, 2, 0) != NULL); /* remove when we require 3.2.0 or 
later */
 
        g_return_val_if_fail (uifile != NULL, NULL);
 
@@ -222,19 +221,6 @@ go_gtk_builder_load (char const *uifile,
        } else if (error)
                g_error_free (error);
 
-       if (need_grid_update && gui) { /* remove when we require gtk+-3.2.0 or later */
-               GSList *l = gtk_builder_get_objects (gui), *ptr;
-               int rsep, csep;
-               ptr = l;
-               while (ptr) {
-                       if (GTK_IS_GRID (ptr->data)) {
-                               g_object_get (ptr->data, "row-spacing", &csep, "column-spacing", &rsep, NULL);
-                               g_object_set (ptr->data, "row-spacing", rsep, "column-spacing", csep, NULL);
-                       }
-                       ptr = ptr->next;
-               }
-               g_slist_free (l);
-       }
        return gui;
 }