[goffice] Fix gtk check in gog-reg-curve.c that was the true reason for [#678793]

[Andreas J. Guelzow <guelzow src gnome org>]

commit 404947f7f85c9115056a52644e102c7b6404e723
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Jun 25 17:10:36 2012 -0600

    Fix gtk check in gog-reg-curve.c that was the true reason for [#678793]
    
    2012-06-25 Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* goffice/graph/gog-reg-curve.c (gog_reg_curve_populate_editor): fix
    	gtk version check
    	* plugins/reg_linear/gog-lin-reg.c (gog_lin_reg_curve_populate_editor):
    	With the corrected gtk check above, we can depend on the attached info.

 ChangeLog                        |    7 +++++++
 goffice/graph/gog-reg-curve.c    |    2 +-
 plugins/reg_linear/gog-lin-reg.c |   11 ++---------
 3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 487f9e1..2e88917 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2012-06-25 Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* goffice/graph/gog-reg-curve.c (gog_reg_curve_populate_editor): fix
+	gtk version check
+	* plugins/reg_linear/gog-lin-reg.c (gog_lin_reg_curve_populate_editor):
+	With the corrected gtk check above, we can depend on the attached info.
+
+2012-06-25 Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* goffice/graph/gog-reg-curve-prefs.ui: avoid unneccesarily high
 	dialog by placing checkbox to right
 
diff --git a/goffice/graph/gog-reg-curve.c b/goffice/graph/gog-reg-curve.c
index 239a1db..3efa156 100644
--- a/goffice/graph/gog-reg-curve.c
+++ b/goffice/graph/gog-reg-curve.c
@@ -163,7 +163,7 @@ gog_reg_curve_populate_editor (GogObject	*gobj,
 	gtk_combo_box_set_active (GTK_COMBO_BOX (w), db);
 	g_signal_connect (G_OBJECT (w), "changed",
 		G_CALLBACK (limits_changed_cb), cl);
-#if !GTK_CHECK_VERSION(3,2,0)
+#if !GTK_CHECK_VERSION(3,4,0)
 	g_object_set_data (G_OBJECT (grid), "last-label", gtk_builder_get_object (gui, "last-lbl"));
 #endif
 	if ((GOG_REG_CURVE_GET_CLASS (gobj))->populate_editor != NULL)
diff --git a/plugins/reg_linear/gog-lin-reg.c b/plugins/reg_linear/gog-lin-reg.c
index ae63fc7..27eea0b 100644
--- a/plugins/reg_linear/gog-lin-reg.c
+++ b/plugins/reg_linear/gog-lin-reg.c
@@ -161,15 +161,8 @@ gog_lin_reg_curve_populate_editor (GogRegCurve *reg_curve, gpointer table)
 #if GTK_CHECK_VERSION(3,4,0)
 	gtk_grid_attach_next_to (table, w, NULL, GTK_POS_BOTTOM, 1, 3);
 #else
-	{
-		GtkWidget *sibling = GTK_WIDGET (g_object_get_data (table, "last-label"));
-
-		if (sibling)
-			gtk_grid_attach_next_to (table, w, sibling, GTK_POS_BOTTOM, 1, 3);
-		else
-			gtk_grid_attach (table, w, 0, 8, 3, 1); 
-		g_object_set_data (G_OBJECT (table), "last-label", w);
-	}
+	gtk_grid_attach_next_to (table, w, GTK_WIDGET (g_object_get_data (table, "last-label")), GTK_POS_BOTTOM, 1, 3);
+	g_object_set_data (G_OBJECT (table), "last-label", w);
 #endif
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), lin->affine);
 	g_signal_connect (G_OBJECT (w), "toggled", G_CALLBACK (affine_toggled_cb), lin);