SF.net SVN: geany:[5061] trunk

[ntrel at users.sourceforge.net]

Revision: 5061
          http://geany.svn.sourceforge.net/geany/?rev=5061&view=rev
Author:   ntrel
Date:     2010-06-23 16:06:10 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
Add file pattern to combo box history.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-06-23 12:34:11 UTC (rev 5060)
+++ trunk/ChangeLog	2010-06-23 16:06:10 UTC (rev 5061)
@@ -2,6 +2,8 @@
 
  * src/search.c, doc/geany.txt, doc/geany.html:
    Implement Find in Files file pattern search.
+ * src/search.c:
+   Add file pattern to combo box history.
 
 
 2010-06-22  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c	2010-06-23 12:34:11 UTC (rev 5060)
+++ trunk/src/search.c	2010-06-23 16:06:10 UTC (rev 5061)
@@ -118,11 +118,12 @@
 {
 	GtkWidget	*dialog;
 	GtkWidget	*dir_combo;
+	GtkWidget	*files_combo;
 	GtkWidget	*search_combo;
 	GtkWidget	*encoding_combo;
 	gint		position[2]; /* x, y */
 }
-fif_dlg = {NULL, NULL, NULL, NULL, {0, 0}};
+fif_dlg = {NULL, NULL, NULL, NULL, NULL, {0, 0}};
 
 
 static gboolean search_read_io(GIOChannel *source, GIOCondition condition, gpointer data);
@@ -760,6 +761,7 @@
 	gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
 	ui_widget_set_tooltip_text(entry, _("File patterns, e.g. *.c *.h"));
 	ui_hookup_widget(fif_dlg.dialog, entry, "entry_files");
+	fif_dlg.files_combo = fcombo;
 
 	/* enable entry when check is checked */
 	g_signal_connect(check, "toggled",
@@ -1390,6 +1392,7 @@
 			if (search_find_in_files(search_text, locale_dir, opts->str, enc))
 			{
 				ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(search_combo), search_text, 0);
+				ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(fif_dlg.files_combo), NULL, 0);
 				ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(dir_combo), utf8_dir, 0);
 				gtk_widget_hide(fif_dlg.dialog);
 			}


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