[gnumeric] Search: make dialog non-modal again.

[Morten Welinder <mortenw src gnome org>]

commit f67c44eff295ca139071e3443e2fd8af7b8ec49c
Author: Morten Welinder <terra gnome org>
Date:   Sat Apr 26 11:08:48 2014 -0400

    Search: make dialog non-modal again.
    
    Search has long been the place to try out things like non-modal dialogs.

 NEWS                        |    1 +
 src/dialogs/ChangeLog       |    6 ++++++
 src/dialogs/dialog-search.c |   15 ++++++++++++++-
 3 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3cb09f3..d106884 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Morten:
        * Make it possible to have all callables as python functions. [#728611]
        * Improve format roundtrip through ODF.
        * Plug leaks.
+       * Make search dialog non-modal again.  [#728817]
 
 --------------------------------------------------------------------------
 Gnumeric 1.12.14
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 34f36e4..58860da 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-26  Morten Welinder  <terra gnome org>
+
+       * dialog-search.c (dialog_search): Undo guru changes from last
+       commit unrelated to stated goal of getting rid of GtkTable.
+       Fixes #728817.
+
 2014-04-13  Morten Welinder <terra gnome org>
 
        * Release 1.12.14
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index 3f9655f..bdb3172 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -49,6 +49,8 @@
 
 #define SEARCH_KEY "search-dialog"
 
+#undef USE_GURU
+
 enum {
        COL_SHEET = 0,
        COL_CELL,
@@ -482,9 +484,11 @@ dialog_search (WBCGtk *wbcg)
 
        g_return_if_fail (wbcg != NULL);
 
+#ifdef USE_GURU
        /* Only one guru per workbook. */
        if (wbc_gtk_get_guru (wbcg))
                return;
+#endif
 
        gui = gnm_gtk_builder_load ("search.ui", NULL, GO_CMD_CONTEXT (wbcg));
         if (gui == NULL)
@@ -506,7 +510,14 @@ dialog_search (WBCGtk *wbcg)
                gtk_notebook_page_num (dd->notebook,
                                       go_gtk_builder_get_widget (gui, "matches_tab"));
 
-       dd->rangetext = gnm_expr_entry_new (wbcg, TRUE);
+       dd->rangetext = gnm_expr_entry_new
+               (wbcg,
+#ifdef USE_GURU
+                TRUE
+#else
+                FALSE
+#endif
+                       );
        gnm_expr_entry_set_flags (dd->rangetext, 0, GNM_EE_MASK);
        grid = GTK_GRID (gtk_builder_get_object (gui, "normal-grid"));
        gtk_widget_set_hexpand (GTK_WIDGET (dd->rangetext), TRUE);
@@ -589,7 +600,9 @@ dialog_search (WBCGtk *wbcg)
        go_gtk_builder_signal_connect (gui, "scope_range", "toggled",
                G_CALLBACK (cb_focus_on_entry), dd->rangetext);
 
+#ifdef USE_GURU
        wbc_gtk_attach_guru_with_unfocused_rs (wbcg, GTK_WIDGET (dialog), dd->rangetext);
+#endif
        g_object_set_data_full (G_OBJECT (dialog),
                "state", dd, (GDestroyNotify) free_state);
        gnm_dialog_setup_destroy_handlers (dialog, wbcg,