gucharmap r1763 - trunk/gucharmap

[chpe svn gnome org]

Author: chpe
Date: Mon Mar 31 12:44:50 2008
New Revision: 1763
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1763&view=rev

Log:
Fix repeating search by not making the buttons insensitive but just ignoring further clicks while the search is in progress. Works around gtk+ bug #56070. Bug #513895, patch by Ted Percival.


Modified:
   trunk/gucharmap/gucharmap-search-dialog.c

Modified: trunk/gucharmap/gucharmap-search-dialog.c
==============================================================================
--- trunk/gucharmap/gucharmap-search-dialog.c	(original)
+++ trunk/gucharmap/gucharmap-search-dialog.c	Mon Mar 31 12:44:50 2008
@@ -580,11 +580,10 @@
   g_signal_emit (search_dialog, gucharmap_search_dialog_signals[SEARCH_FINISH], 0, found_char);
 
   if (found_char == (gunichar)(-1))
-    information_dialog (search_dialog, _("Not found."));
-  else
     {
-      gtk_widget_set_sensitive (priv->prev_button, TRUE);
-      gtk_widget_set_sensitive (priv->next_button, TRUE);
+      information_dialog (search_dialog, _("Not found."));
+      gtk_widget_set_sensitive (priv->prev_button, FALSE);
+      gtk_widget_set_sensitive (priv->next_button, FALSE);
     }
 
   gdk_window_set_cursor (GTK_WIDGET (search_dialog)->window, NULL);
@@ -612,11 +611,13 @@
   gunichar start_char;
   gint start_index;
 
+  if (priv->search_state && priv->search_state->searching) /* Already searching */
+    return;
+
   GdkCursor *cursor = _gucharmap_window_progress_cursor ();
   gdk_window_set_cursor (GTK_WIDGET (search_dialog)->window, cursor);
   gdk_cursor_unref (cursor);
 
-
   list = gucharmap_charmap_get_book_codepoint_list (priv->guw->charmap);
   if (!list)
     return;
@@ -645,9 +646,6 @@
       priv->search_state->increment = direction;
     }
 
-  gtk_widget_set_sensitive (priv->prev_button, FALSE);
-  gtk_widget_set_sensitive (priv->next_button, FALSE);
-
   priv->search_state->searching = TRUE;
   priv->search_state->strings_checked = 0;