SF.net SVN: geany: [1108] trunk

[ntrel at users.sourceforge.net]

Revision: 1108
          http://svn.sourceforge.net/geany/?rev=1108&view=rev
Author:   ntrel
Date:     2006-12-17 08:47:08 -0800 (Sun, 17 Dec 2006)

Log Message:
-----------
Fix using the current word on first use of the Find in Files dialog.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/search.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-12-17 16:16:12 UTC (rev 1107)
+++ trunk/ChangeLog	2006-12-17 16:47:08 UTC (rev 1108)
@@ -1,3 +1,9 @@
+2006-12-17  Nick Treleaven  <nick.treleaven at btinternet.com>
+
+ * src/search.c:
+   Fix using the current word on first use of the Find in Files dialog.
+
+
 2006-12-16  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/utils.c:
@@ -5,8 +11,8 @@
  * src/highlighting.c, src/sci_cb.c, src/sci_cb.h, src/document.c,
    src/symbols.c, src/symbols.h:
    Colourise C enum, union and D/Java interface typenames.
-   Add sci_cb_lexer_get_type_keyword_idx() for use when finding if a lexer
-   supports typename colouring.
+   Add sci_cb_lexer_get_type_keyword_idx() for use when finding if a
+   lexer supports typename colouring.
 
 
 2006-12-15  Enrico Tröger  <enrico.troeger at uvena.de>

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2006-12-17 16:16:12 UTC (rev 1107)
+++ trunk/src/search.c	2006-12-17 16:47:08 UTC (rev 1108)
@@ -623,13 +623,14 @@
 				G_CALLBACK(gtk_widget_hide), NULL);
 
 		gtk_widget_show_all(widgets.find_in_files_dialog);
+		sel = get_default_text(idx);
 	}
 
-	sel = get_default_text(idx);
-
 	entry = GTK_BIN(combo)->child;
-	// only set selection if the dialog is not already visible
-	if (! GTK_WIDGET_VISIBLE(widgets.find_in_files_dialog) && sel)
+	// only set selection if the dialog is not already visible, or has just been created
+	if (! sel && ! GTK_WIDGET_VISIBLE(widgets.find_in_files_dialog))
+		sel = get_default_text(idx);
+	if (sel)
 		gtk_entry_set_text(GTK_ENTRY(entry), sel);
 	g_free(sel);
 


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