Fix sed expression for FreeBSD. Thanks to Joe Marcus Clark

	* configure.ac: Fix sed expression for FreeBSD. Thanks
	to Joe Marcus Clark <marcus@freebsd.org>

	* shell/eggfindbar.c: (entry_activate_callback),
	(entry_changed_callback), (egg_find_bar_init),
	(egg_find_bar_set_search_string):

	Made findbar buttons unsensitive if there is no text in
	entry. Fix for the bug 313285.

diff --git a/ChangeLog b/ChangeLog
index 9abd18262c7691f17a8cc9f6d699a239da1700ac..3f96e10caad8f8c36418cd4a2a95a61c8db9446c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-08-18  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+       * configure.ac: Fix sed expression for FreeBSD. Thanks
+       to Joe Marcus Clark <marcus@freebsd.org>
+       
+       * shell/eggfindbar.c: (entry_activate_callback),
+       (entry_changed_callback), (egg_find_bar_init),
+       (egg_find_bar_set_search_string):
+       
+       Made findbar buttons unsensitive if there is no text in
+       entry. Fix for the bug 313285.
+
 2005-08-17  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * ps/ps-document.c: Use g_filename_display_name for displaying

diff --git a/configure.ac b/configure.ac
index 9479ff50e59f060628196917dd7c8a2d7c8219eb..541b63673fced46dd4913dac26e2e8a88ace7ede 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ if test "x$enable_dbus" = "xyes" ; then
 
         AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
 
-       DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0\.\([[0-9]]*\)\.\?\([[0-9]]*\)/\1/'`
+       DBUS_VERSION=`$PKG_CONFIG --modversion dbus-glib-1 | sed 's/0\.\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\)/\1/'`
        AC_DEFINE_UNQUOTED(DBUS_VERSION, $DBUS_VERSION, [DBUS version.])
 fi
 

diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c
index 063a220b43c8d5952e36e1dc0ae879eed8eede27..3a42ef6fcd838096d56aafe18e69e6d636ce8619 100644 (file)
--- a/shell/eggfindbar.c
+++ b/shell/eggfindbar.c
@@ -236,7 +236,8 @@ entry_activate_callback (GtkEntry *entry,
 
   /* We activate the "next" button here so we'll get a nice
      animation */
-  gtk_widget_activate (priv->next_button);
+  if (find_bar->priv->search_string != NULL)
+         gtk_widget_activate (priv->next_button);
 }
 
 static void
@@ -252,7 +253,7 @@ entry_changed_callback (GtkEntry *entry,
   text = g_strdup (gtk_entry_get_text (entry));
 
   egg_find_bar_set_search_string (find_bar, text);
-
+  
   g_free (text);
 }
 
@@ -305,8 +306,11 @@ egg_find_bar_init (EggFindBar *find_bar)
 
   priv->previous_button = gtk_button_new_with_mnemonic (_("_Previous"));
   gtk_button_set_focus_on_click (GTK_BUTTON (priv->previous_button), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (priv->previous_button), FALSE);
+
   priv->next_button = gtk_button_new_with_mnemonic (_("_Next"));
   gtk_button_set_focus_on_click (GTK_BUTTON (priv->next_button), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (priv->next_button), FALSE);
 
   image_back = gtk_image_new_from_stock (GTK_STOCK_GO_BACK,
                                          GTK_ICON_SIZE_BUTTON);
@@ -583,6 +587,8 @@ egg_find_bar_set_search_string  (EggFindBar *find_bar,
           (old && search_string &&
            strcmp (old, search_string) != 0))
         {
+         gboolean not_empty;
+         
           priv->search_string = g_strdup (search_string);
           g_free (old);
           
@@ -590,7 +596,12 @@ egg_find_bar_set_search_string  (EggFindBar *find_bar,
                               priv->search_string ?
                               priv->search_string :
                               "");
-          
+          
+          not_empty = (search_string == NULL) ? FALSE : TRUE;           
+
+          gtk_widget_set_sensitive (GTK_WIDGET (find_bar->priv->next_button), not_empty);
+          gtk_widget_set_sensitive (GTK_WIDGET (find_bar->priv->previous_button), not_empty);
+
           g_object_notify (G_OBJECT (find_bar),
                            "search_string");
         }