Revision: 1306 http://svn.sourceforge.net/geany/?rev=1306&view=rev Author: eht16 Date: 2007-02-19 07:41:29 -0800 (Mon, 19 Feb 2007)

Log Message: ----------- Fixed compiler warning.

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

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-02-19 13:26:06 UTC (rev 1305) +++ trunk/ChangeLog 2007-02-19 15:41:29 UTC (rev 1306) @@ -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.

Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2007-02-19 13:26:06 UTC (rev 1305) +++ trunk/src/search.c 2007-02-19 15:41:29 UTC (rev 1306) @@ -260,9 +260,12 @@ 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

- if ( idx < 0 ) { return; } + g_return_if_fail(DOC_IDX_VALID(idx)); + #ifdef G_OS_UNIX s=gtk_clipboard_wait_for_text(clipboard); if (s) @@ -274,6 +277,7 @@ }; } #endif + if (!s) { s=get_default_text(idx); } if (s) { @@ -289,7 +293,7 @@ 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);

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