Revision: 3519 http://geany.svn.sourceforge.net/geany/?rev=3519&view=rev Author: eht16 Date: 2009-01-28 16:18:22 +0000 (Wed, 28 Jan 2009)
Log Message: ----------- Set the documents' mtime field properly for checking disk file changes.
Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-27 21:12:46 UTC (rev 3518) +++ trunk/ChangeLog 2009-01-28 16:18:22 UTC (rev 3519) @@ -1,3 +1,10 @@ +2009-01-28 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c: + Set the documents' mtime field properly for checking disk file + changes. + + 2009-01-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/document.c:
Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-01-27 21:12:46 UTC (rev 3518) +++ trunk/src/document.c 2009-01-28 16:18:22 UTC (rev 3519) @@ -356,6 +356,7 @@ priv->undo_actions = NULL; priv->redo_actions = NULL; priv->line_count = 0; + priv->last_check = time(NULL); }
@@ -529,9 +530,6 @@ g_object_unref(file); } g_free(locale_filename); -#else - doc->priv->last_check = time(NULL); - doc->priv->mtime = 0; #endif } doc->priv->file_disk_status = FILE_OK; @@ -726,10 +724,6 @@ sci_set_undo_collection(doc->editor->sci, TRUE); sci_empty_undo_buffer(doc->editor->sci);
-#if ! defined(HAVE_GIO) || ! defined(USE_GIO_FILEMON) - doc->priv->mtime = time(NULL); -#endif - doc->encoding = g_strdup(encodings[file_prefs.default_new_encoding].charset); /* store the opened encoding for undo/redo */ store_saved_encoding(doc); @@ -750,7 +744,11 @@ sci_set_line_numbers(doc->editor->sci, editor_prefs.show_linenumber_margin, 0); sci_goto_pos(doc->editor->sci, 0, TRUE);
+#if defined(HAVE_GIO) && defined(USE_GIO_FILEMON) monitor_file_setup(doc); +#else + doc->priv->mtime = time(NULL); +#endif
/* "the" SCI signal (connect after initial setup(i.e. adding text)) */ g_signal_connect(doc->editor->sci, "sci-notify", G_CALLBACK(editor_sci_notify_cb), doc->editor); @@ -2675,7 +2673,7 @@ { static GdkColor red = {0, 0xFFFF, 0, 0}; static GdkColor green = {0, 0, 0x7FFF, 0}; - static GdkColor orange = {0, 0xFFFF, 0x7FFF, 0}; + /*static GdkColor orange = {0, 0xFFFF, 0x7FFF, 0};*/ GdkColor *color = NULL;
if (doc == NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.