[gedit/wip/view-frame-cleanup: 1/4] ViewFrame: remove request_search_mode from private struct

[Sébastien Wilmet <swilmet src gnome org>]

commit 10452663aef40c1bd33d8401e392b275512a1c73
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed Aug 7 18:47:04 2013 +0200

    ViewFrame: remove request_search_mode from private struct
    
    A simple paramater to a function is sufficient.

 gedit/gedit-view-frame.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index 0d6b476..b973367 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -49,7 +49,6 @@ struct _GeditViewFramePrivate
 {
        GeditView   *view;
        SearchMode   search_mode;
-       SearchMode   request_search_mode;
 
        /* Where the search has started. When the user presses escape in the
         * search entry (to cancel the search), we return to the start_mark.
@@ -1246,7 +1245,8 @@ init_search_entry (GeditViewFrame *frame)
 }
 
 static void
-start_interactive_search_real (GeditViewFrame *frame)
+start_interactive_search_real (GeditViewFrame *frame,
+                              SearchMode      request_search_mode)
 {
        GtkTextBuffer *buffer;
        GtkTextIter iter;
@@ -1254,7 +1254,7 @@ start_interactive_search_real (GeditViewFrame *frame)
 
        if (gtk_revealer_get_reveal_child (frame->priv->slider))
        {
-               if (frame->priv->search_mode != frame->priv->request_search_mode)
+               if (frame->priv->search_mode != request_search_mode)
                {
                        hide_search_widget (frame, TRUE);
                }
@@ -1266,7 +1266,7 @@ start_interactive_search_real (GeditViewFrame *frame)
                }
        }
 
-       frame->priv->search_mode = frame->priv->request_search_mode;
+       frame->priv->search_mode = request_search_mode;
 
        buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (frame->priv->view));
 
@@ -1433,9 +1433,7 @@ gedit_view_frame_popup_search (GeditViewFrame *frame)
 {
        g_return_if_fail (GEDIT_IS_VIEW_FRAME (frame));
 
-       frame->priv->request_search_mode = SEARCH;
-
-       start_interactive_search_real (frame);
+       start_interactive_search_real (frame, SEARCH);
 }
 
 void
@@ -1443,9 +1441,7 @@ gedit_view_frame_popup_goto_line (GeditViewFrame *frame)
 {
        g_return_if_fail (GEDIT_IS_VIEW_FRAME (frame));
 
-       frame->priv->request_search_mode = GOTO_LINE;
-
-       start_interactive_search_real (frame);
+       start_interactive_search_real (frame, GOTO_LINE);
 }
 
 void