HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix segfault when showing Find in Files dialog when no documents are

Browse Source 
open (r2998, #2228544).
Fix segfault for FIF from last commit (oops).


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3182 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2008-11-06 17:26:29 +00:00
parent a7e94bdf64
commit 71523b8a2b
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,6 +2,10 @@
* src/search.c: * src/search.c:
Refactor search_show_find_in_files_dialog(). Refactor search_show_find_in_files_dialog().
* src/search.c:
Fix segfault when showing Find in Files dialog when no documents are
open (r2998, #2228544).
Fix segfault for FIF from last commit (oops).
2008-11-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2008-11-04 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

14
src/search.c
View File

@ -716,18 +716,20 @@ void search_show_find_in_files_dialog(const gchar *dir)
{ {
GtkWidget *entry; /* for child GtkEntry of a GtkComboBoxEntry */ GtkWidget *entry; /* for child GtkEntry of a GtkComboBoxEntry */
GeanyDocument *doc = document_get_current(); GeanyDocument *doc = document_get_current();
GeanyEditor *editor = doc ? doc->editor : NULL;
gchar *sel = NULL; gchar *sel = NULL;
gchar *cur_dir = NULL; gchar *cur_dir = NULL;
if (widgets.find_in_files_dialog == NULL) if (widgets.find_in_files_dialog == NULL)
{ {
create_fif_dialog(); create_fif_dialog();
sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL); sel = editor_get_default_selection(editor, search_prefs.use_current_word, NULL);
} }
entry = GTK_BIN(find_in_files.search_combo)->child;
/* only set selection if the dialog is not already visible, or has just been created */ /* 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)) if (! sel && ! GTK_WIDGET_VISIBLE(widgets.find_in_files_dialog))
sel = editor_get_default_selection(doc->editor, search_prefs.use_current_word, NULL); sel = editor_get_default_selection(editor, search_prefs.use_current_word, NULL);
entry = GTK_BIN(find_in_files.search_combo)->child;
if (sel) if (sel)
gtk_entry_set_text(GTK_ENTRY(entry), sel); gtk_entry_set_text(GTK_ENTRY(entry), sel);
g_free(sel); g_free(sel);
@ -1131,9 +1133,9 @@ on_find_in_files_dialog_response(GtkDialog *dialog, gint response,
{ {
if (response == GTK_RESPONSE_ACCEPT) if (response == GTK_RESPONSE_ACCEPT)
{ {
GtkWidget *search_combo = find_in_files.search_combo;
const gchar *search_text = const gchar *search_text =
gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child( gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(search_combo))));
GTK_BIN(find_in_files.search_combo))));
GtkWidget *dir_combo = find_in_files.dir_combo; GtkWidget *dir_combo = find_in_files.dir_combo;
const gchar *utf8_dir = const gchar *utf8_dir =
gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(dir_combo)))); gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(dir_combo))));
@ -1154,7 +1156,7 @@ on_find_in_files_dialog_response(GtkDialog *dialog, gint response,
if (search_find_in_files(search_text, locale_dir, opts->str)) if (search_find_in_files(search_text, locale_dir, opts->str))
{ {
ui_combo_box_add_to_history(GTK_COMBO_BOX(user_data), search_text); ui_combo_box_add_to_history(GTK_COMBO_BOX(search_combo), search_text);
ui_combo_box_add_to_history(GTK_COMBO_BOX(dir_combo), utf8_dir); ui_combo_box_add_to_history(GTK_COMBO_BOX(dir_combo), utf8_dir);
gtk_widget_hide(widgets.find_in_files_dialog); gtk_widget_hide(widgets.find_in_files_dialog);
} }