Revision: 5711 http://geany.svn.sourceforge.net/geany/?rev=5711&view=rev Author: colombanw Date: 2011-04-11 15:54:43 +0000 (Mon, 11 Apr 2011)
Log Message: ----------- Revert "Don't update parent WorkObjects when updating one in real-time"
This reverts commit 877cc1d97acd185cc7e0e88bb0b014fb74e16072.
This commit broke calltips, we need another fix for it.
Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/document.h trunk/src/editor.c trunk/src/keybindings.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-11 14:40:27 UTC (rev 5710) +++ trunk/ChangeLog 2011-04-11 15:54:43 UTC (rev 5711) @@ -1,3 +1,10 @@ +2011-04-08 Colomban Wendling <colomban(at)geany(dot)org> + + * src/document.c, src/document.h, src/editor.c, src/keybindings.c: + Revert r5642 "Don't update parent WorkObjects when updating one in + real-time" because it broke calltips. + + 2011-04-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* plugins/filebrowser.c:
Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-04-11 14:40:27 UTC (rev 5710) +++ trunk/src/document.c 2011-04-11 15:54:43 UTC (rev 5711) @@ -109,7 +109,7 @@
static void document_undo_clear(GeanyDocument *doc); static void document_redo_add(GeanyDocument *doc, guint type, gpointer data); -static gboolean update_tags_from_buffer(GeanyDocument *doc, gboolean update_parent); +static gboolean update_tags_from_buffer(GeanyDocument *doc);
/* ignore the case of filenames and paths under WIN32, causes errors if not */ @@ -771,7 +771,7 @@
ui_set_window_title(doc); build_menu_update(doc); - document_update_tag_list(doc, FALSE, TRUE); + document_update_tag_list(doc, FALSE); document_set_text_changed(doc, FALSE); ui_document_show_hide(doc); /* update the document menu */
@@ -2253,7 +2253,7 @@ }
-static gboolean update_tags_from_buffer(GeanyDocument *doc, gboolean update_parent) +static gboolean update_tags_from_buffer(GeanyDocument *doc) { gboolean result; #if 0 @@ -2266,14 +2266,14 @@ /* we copy the whole text into memory instead using a direct char pointer from * Scintilla because tm_source_file_buffer_update() does modify the string slightly */ sci_get_text(doc->editor->sci, len, text); - result = tm_source_file_buffer_update(doc->tm_file, (guchar*) text, len, update_parent); + result = tm_source_file_buffer_update(doc->tm_file, (guchar*) text, len, TRUE); g_free(text); #endif return result; }
-void document_update_tag_list(GeanyDocument *doc, gboolean update, gboolean update_parent) +void document_update_tag_list(GeanyDocument *doc, gboolean update) { /* We must call sidebar_update_tag_list() before returning, * to ensure that the symbol list is always updated properly (e.g. @@ -2309,14 +2309,14 @@ else { if (update) - update_tags_from_buffer(doc, update_parent); + update_tags_from_buffer(doc); success = TRUE; } } } else { - success = update_tags_from_buffer(doc, update_parent); + success = update_tags_from_buffer(doc); if (G_UNLIKELY(! success)) geany_debug("tag list updating failed"); } @@ -2452,7 +2452,7 @@ doc->priv->symbol_list_sort_mode = type->priv->symbol_list_sort_mode; }
- document_update_tag_list(doc, TRUE, TRUE); + document_update_tag_list(doc, TRUE);
/* Update session typename keywords. */ update_type_keywords(doc, type->lang);
Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2011-04-11 14:40:27 UTC (rev 5710) +++ trunk/src/document.h 2011-04-11 15:54:43 UTC (rev 5711) @@ -229,7 +229,7 @@ void document_replace_sel(GeanyDocument *doc, const gchar *find_text, const gchar *replace_text, gint flags, gboolean escaped_chars);
-void document_update_tag_list(GeanyDocument *doc, gboolean update, gboolean update_parent); +void document_update_tag_list(GeanyDocument *doc, gboolean update);
void document_set_encoding(GeanyDocument *doc, const gchar *new_encoding);
Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2011-04-11 14:40:27 UTC (rev 5710) +++ trunk/src/editor.c 2011-04-11 15:54:43 UTC (rev 5711) @@ -1004,7 +1004,7 @@ GeanyDocument *doc = data;
if (!main_status.quitting && DOC_VALID(doc)) - document_update_tag_list(doc, TRUE, FALSE); + document_update_tag_list(doc, TRUE);
document_tags_update_pending = FALSE; return FALSE;
Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2011-04-11 14:40:27 UTC (rev 5710) +++ trunk/src/keybindings.c 2011-04-11 15:54:43 UTC (rev 5711) @@ -2524,7 +2524,7 @@ ui_document_show_hide(doc); break; case GEANY_KEYS_DOCUMENT_RELOADTAGLIST: - document_update_tag_list(doc, TRUE, TRUE); + document_update_tag_list(doc, TRUE); break; case GEANY_KEYS_DOCUMENT_FOLDALL: editor_fold_all(doc->editor);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.