SF.net SVN: geany: [657] trunk

[ntrel at users.sourceforge.net]

Revision: 657
Author:   ntrel
Date:     2006-08-01 04:33:42 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=657&view=rev

Log Message:
-----------
Clear search flags when using the find toolbar entry; Removed some unnecessary static variables.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-08-01 10:35:32 UTC (rev 656)
+++ trunk/ChangeLog	2006-08-01 11:33:42 UTC (rev 657)
@@ -15,6 +15,8 @@
    dialog. Split up Miscellaneous items into Display and Features.
    Renamed Change Selection and Run toolbutton.
  * src/keyfile.c: Change default for removing trailing spaces to off.
+ * src/callbacks.c: Clear search flags when using find toolbar entry.
+                    Removed some unnecessary static variables.
 
 
 2006-07-31  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2006-08-01 10:35:32 UTC (rev 656)
+++ trunk/src/callbacks.c	2006-08-01 11:33:42 UTC (rev 657)
@@ -77,11 +77,6 @@
 // the flags given in the search dialog(stored statically for "find next" and "replace")
 static gint search_flags;
 static gboolean search_backwards;
-static gboolean search_replace_escape;
-static gint search_flags_re;
-static gboolean search_backwards_re;
-static gboolean search_replace_escape_re;
-static gboolean search_in_all_buffers_re;
 
 // holds the current position where the mouse pointer is when the popup menu for the scintilla
 // scintilla widget is shown
@@ -592,6 +587,16 @@
 }
 
 
+static void setup_find_next(GtkEditable *editable)
+{
+	g_free(app->search_text);
+	app->search_text = g_strdup(gtk_editable_get_chars(editable, 0, -1));
+	// clear search flags so can later use Search->Find Next/Previous
+	search_flags = 0;
+	search_backwards = FALSE;
+}
+
+
 // search text
 void
 on_entry1_activate                     (GtkEntry        *entry,
@@ -599,8 +604,7 @@
 {
 	gint idx = document_get_cur_idx();
 
-	g_free(app->search_text);
-	app->search_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+	setup_find_next(GTK_EDITABLE(entry));
 	document_find_next(idx, app->search_text, 0, FALSE, FALSE);
 }
 
@@ -612,8 +616,7 @@
 {
 	gint idx = document_get_cur_idx();
 
-	g_free(app->search_text);
-	app->search_text = g_strdup(gtk_editable_get_chars(editable, 0, -1));
+	setup_find_next(editable);
 	document_find_next(idx, app->search_text, 0, FALSE, TRUE);
 }
 
@@ -627,8 +630,7 @@
 	gint idx = document_get_cur_idx();
 	GtkWidget *entry = lookup_widget(GTK_WIDGET(app->window), "entry1");
 
-	g_free(app->search_text);
-	app->search_text = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+	setup_find_next(GTK_EDITABLE(entry));
 	document_find_next(idx, app->search_text, 0, TRUE, FALSE);
 }
 
@@ -1862,6 +1864,7 @@
 	if (response == GTK_RESPONSE_ACCEPT)
 	{
 		gint idx = document_get_cur_idx();
+		gboolean search_replace_escape;
 		gboolean
 			fl1 = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
 						lookup_widget(GTK_WIDGET(app->find_dialog), "check_case"))),
@@ -1928,6 +1931,8 @@
 	gint idx = document_get_cur_idx();
 	GtkWidget *entry_find = lookup_widget(GTK_WIDGET(app->replace_dialog), "entry_find");
 	GtkWidget *entry_replace = lookup_widget(GTK_WIDGET(app->replace_dialog), "entry_replace");
+	gint search_flags_re;
+	gboolean search_backwards_re, search_replace_escape_re, search_in_all_buffers_re;
 	gboolean fl1, fl2, fl3, fl4;
 	gchar *find, *replace;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.