gedit r6870 - in trunk: . gedit

[icq svn gnome org]

Author: icq
Date: Fri Jan 30 14:30:38 2009
New Revision: 6870
URL: http://svn.gnome.org/viewvc/gedit?rev=6870&view=rev

Log:
2009-01-30  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * gedit/gedit-view.c:
        * gedit/Makefile.am:
        * configure.ac:
        Don't use sexy-icon-entry when gtk+ >= 2.15.0. (Fixes bug 
#569485)



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gedit/Makefile.am
   trunk/gedit/gedit-view.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Jan 30 14:30:38 2009
@@ -30,6 +30,8 @@
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 IT_PROG_INTLTOOL([0.40.0])
 
+PKG_PROG_PKG_CONFIG
+
 AC_PROG_LIBTOOL
 
 GNOME_DOC_INIT
@@ -206,6 +208,15 @@
 AC_SUBST(GEDIT_LIBS)
 AC_SUBST(GEDIT_CFLAGS)
 
+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")
+
 if test "$platform_osx" = "no" &&
    test "$platform_win32" = no; then
 	PKG_CHECK_MODULES(EGG_SMCLIENT, [

Modified: trunk/gedit/Makefile.am
==============================================================================
--- trunk/gedit/Makefile.am	(original)
+++ trunk/gedit/Makefile.am	Fri Jan 30 14:30:38 2009
@@ -76,7 +76,6 @@
 	gedit-io-error-message-area.h	\
 	gedit-spinner.h			\
 	gedit-prefs-manager-private.h	\
-	sexy-icon-entry.h		\
 	gedittextregion.h		\
 	gedit-session.h			\
 	gedit-dirs.h
@@ -179,7 +178,6 @@
 	gedit-utils.c 			\
 	gedit-view.c 			\
 	gedit-window.c			\
-	sexy-icon-entry.c		\
 	gedittextregion.c		\
 	$(NOINST_H_FILES)		\
 	$(INST_H_FILES)
@@ -231,3 +229,7 @@
 else
 BACON_DIR=
 endif
+
+if BUILD_SEXY
+libgedit_la_SOURCES += sexy-icon-entry.c sexy-icon-entry.h
+endif

Modified: trunk/gedit/gedit-view.c
==============================================================================
--- trunk/gedit/gedit-view.c	(original)
+++ trunk/gedit/gedit-view.c	Fri Jan 30 14:30:38 2009
@@ -47,7 +47,10 @@
 #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 */
@@ -1354,8 +1357,12 @@
 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,
@@ -1372,13 +1379,33 @@
 		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),
+					       GTK_ENTRY_ICON_PRIMARY,
+					       GTK_STOCK_FIND);
+		
+		gtk_widget_set_tooltip_text (view->priv->search_entry,
+					     _("String you want to search for"));
+	}
+	else
+	{
+		gtk_entry_set_icon_from_stock (GTK_ENTRY (view->priv->search_entry),
+					       GTK_ENTRY_ICON_PRIMARY,
+					       GTK_STOCK_JUMP_TO);
+		
+		gtk_widget_set_tooltip_text (view->priv->search_entry,
+					     _("Line you want to move the cursor to"));
+	}
+#endif
 }
 
 static gboolean
@@ -1496,7 +1523,11 @@
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
 
 	/* add entry */
-	view->priv->search_entry = sexy_icon_entry_new ();				  
+#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",