Fixed compiler warning.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1306 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2007-02-19 15:41:29 +00:00
parent 61146eb323
commit 1e34e879c3
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2007-02-19 Enrico Tröger <enrico.troeger@uvena.de>
* src/search.c: Fixed compiler warning.
2007-02-19 Nick Treleaven <nick.treleaven@btinternet.com>
* src/templates.c, src/templates.h, src/highlighting.c,
@ -9,7 +14,7 @@
Move on_filetype_change() to filetypes.c.
2007-02-18 Enrico Troeger <enrico.troeger@uvena.de>
2007-02-18 Enrico Tröger <enrico.troeger@uvena.de>
* data/filetypes.ruby, src/highlighting.c:
Added several missing style types for filetype Ruby.

View File

@ -260,9 +260,12 @@ static void setup_find_next(const gchar *text)
void search_find_selection(gint idx, gboolean search_backwards)
{
gchar *s = NULL;
#ifdef G_OS_UNIX
GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
#endif
g_return_if_fail(DOC_IDX_VALID(idx));
if ( idx < 0 ) { return; }
#ifdef G_OS_UNIX
s=gtk_clipboard_wait_for_text(clipboard);
if (s)
@ -274,6 +277,7 @@ void search_find_selection(gint idx, gboolean search_backwards)
};
}
#endif
if (!s) { s=get_default_text(idx); }
if (s)
{
@ -289,7 +293,7 @@ void search_show_find_dialog()
gint idx = document_get_cur_idx();
gchar *sel = NULL;
if (idx == -1 || ! doc_list[idx].is_valid) return;
g_return_if_fail(DOC_IDX_VALID(idx));
sel = get_default_text(idx);