[gedit] Remove sexy-icon-entry and bump gtk+ to 2.16.0

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 978ae6499cd17154d8619343151a3f4c120c211a
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Aug 24 19:39:41 2009 +0200

    Remove sexy-icon-entry and bump gtk+ to 2.16.0

 configure.ac            |   11 +-
 gedit/Makefile.am       |    4 -
 gedit/gedit-view.c      |   40 +--
 gedit/sexy-icon-entry.c |  970 -----------------------------------------------
 gedit/sexy-icon-entry.h |  100 -----
 5 files changed, 2 insertions(+), 1123 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ee2e300..27e2cad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -246,20 +246,11 @@ PKG_CHECK_MODULES(GEDIT, [
 	glib-2.0 >= 2.18.0
 	gthread-2.0 >= 2.13.0
 	gio-2.0 >= 2.16.0
-	gtk+-2.0 >= 2.13.0
+	gtk+-2.0 >= 2.16.0
 	gtksourceview-2.0 >= 2.4.0
 	gconf-2.0 >= 1.1.11
 ])
 
-dnl FIXME: Remove this when removing sexy-icon-entry
-if $PKG_CONFIG --atleast-version 2.15.0 gtk+-2.0; then
-       gtkatleast=
-else
-       gtkatleast=no
-fi
-
-AM_CONDITIONAL(BUILD_SEXY, test "$gtkatleast" = "no")
-
 dnl FIXME: Remove this when removing gedit-message-area
 
 if $PKG_CONFIG --atleast-version 2.17.1 gtk+-2.0; then
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 28f5489..35ea707 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -227,10 +227,6 @@ else
 BACON_DIR=
 endif
 
-if BUILD_SEXY
-libgedit_la_SOURCES += sexy-icon-entry.c sexy-icon-entry.h
-endif
-
 if BUILD_MESSAGE_AREA
 libgedit_la_SOURCES += gedit-message-area.c
 INST_H_FILES += gedit-message-area.h
diff --git a/gedit/gedit-view.c b/gedit/gedit-view.c
index 8e3880e..03f29b9 100644
--- a/gedit/gedit-view.c
+++ b/gedit/gedit-view.c
@@ -47,10 +47,7 @@
 #include "gedit-prefs-manager-app.h"
 #include "gedit-marshal.h"
 #include "gedit-utils.h"
-/* FIXME: Remove this when using for more things gtk+ >= 2.15.0 */
-#if !GTK_CHECK_VERSION (2, 15, 0)
-#include "sexy-icon-entry.h"
-#endif
+
 
 #define GEDIT_VIEW_SCROLL_MARGIN 0.02
 #define GEDIT_VIEW_SEARCH_DIALOG_TIMEOUT (30*1000) /* 30 seconds */
@@ -1372,36 +1369,6 @@ search_entry_insert_text (GtkEditable *editable,
 static void
 customize_for_search_mode (GeditView *view)
 {
-/*
- * FIXME: Remove all this ifdef once we require gtk+ >= 2.15.0 for other things
- */
-#if !GTK_CHECK_VERSION (2, 15, 0)
-	GtkWidget *icon;
-	
-	if (view->priv->search_mode == SEARCH)
-	{
-		icon = gtk_image_new_from_stock (GTK_STOCK_FIND,
-						 GTK_ICON_SIZE_MENU);
-
-		gtk_widget_set_tooltip_text (view->priv->search_entry,
-					     _("String you want to search for"));
-	}
-	else
-	{
-		icon = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO,
-						 GTK_ICON_SIZE_MENU);
-
-		gtk_widget_set_tooltip_text (view->priv->search_entry,
-					     _("Line you want to move the cursor to"));
-	}
-	
-	gtk_widget_show (icon);
-	sexy_icon_entry_set_icon (SEXY_ICON_ENTRY(view->priv->search_entry),
-				  SEXY_ICON_ENTRY_PRIMARY,
-				  GTK_IMAGE (icon));
-
-	g_object_unref (icon);
-#else
 	if (view->priv->search_mode == SEARCH)
 	{
 		gtk_entry_set_icon_from_stock (GTK_ENTRY (view->priv->search_entry),
@@ -1420,7 +1387,6 @@ customize_for_search_mode (GeditView *view)
 		gtk_widget_set_tooltip_text (view->priv->search_entry,
 					     _("Line you want to move the cursor to"));
 	}
-#endif
 }
 
 static gboolean
@@ -1538,11 +1504,7 @@ ensure_search_window (GeditView *view)
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
 
 	/* add entry */
-#if GTK_CHECK_VERSION (2, 15, 0)
 	view->priv->search_entry = gtk_entry_new ();
-#else
-	view->priv->search_entry = sexy_icon_entry_new ();
-#endif
 	gtk_widget_show (view->priv->search_entry);
 	
 	g_signal_connect (view->priv->search_entry, "populate_popup",