[gnumeric] compilation: assume gtk 2.8.14 or later.

[Morten Welinder <mortenw src gnome org>]

commit 49ca12da40ed763ccfa3aa32ff2ef13174ab5704
Author: Morten Welinder <terra gnome org>
Date:   Thu Jun 17 20:49:00 2010 -0400

    compilation: assume gtk 2.8.14 or later.

 ChangeLog      |    9 +++++++--
 src/gui-util.c |    5 -----
 src/wbc-gtk.c  |    5 -----
 3 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 824024b..1efdea7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-<<<<<<< HEAD
+2010-06-17  Morten Welinder  <terra gnome org>
+
+	* src/gui-util.c (gnumeric_popup_menu): We have passed gtk+ 2.8 by
+	now.
+	* src/wbc-gtk.c (cb_sheet_label_drag_begin): Ditto.
+
 2010-06-17 Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/func.h (gnm_func_convert_markup_to_pango): drop highlight arg
@@ -20,7 +25,7 @@
 2010-06-16 Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/func.h (gnm_func_convert_markup_to_pango): new
-	* src/func.c (gnm_func_convert_markup_to_pango): new	
+	* src/func.c (gnm_func_convert_markup_to_pango): new
 
 2010-06-16 Andreas J. Guelzow <aguelzow pyrshep ca>
 
diff --git a/src/gui-util.c b/src/gui-util.c
index d04e142..b40ddef 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -402,12 +402,7 @@ gnumeric_popup_menu (GtkMenu *menu, GdkEventButton *event)
 	g_return_if_fail (menu != NULL);
 	g_return_if_fail (GTK_IS_MENU (menu));
 
-#if GLIB_CHECK_VERSION(2,10,0) && GTK_CHECK_VERSION(2,8,14)
 	g_object_ref_sink (menu);
-#else
-	g_object_ref (menu);
-	gtk_object_sink (GTK_OBJECT (menu));
-#endif
 
 	if (event)
 		gtk_menu_set_screen (menu,
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index e575283..c6409c9 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -693,12 +693,7 @@ cb_sheet_label_drag_begin (GtkWidget *widget, GdkDragContext *context,
 	g_object_unref (pixbuf);
 	gtk_widget_shape_combine_mask (arrow, bitmap, 0, 0);
 	g_object_unref (bitmap);
-#if GLIB_CHECK_VERSION(2,10,0) && GTK_CHECK_VERSION(2,8,14)
 	g_object_ref_sink (arrow);
-#else
-	g_object_ref (arrow);
-	gtk_object_sink (GTK_OBJECT (arrow));
-#endif
 	g_object_set_data (G_OBJECT (widget), "arrow", arrow);
 }