Revision: 3515 http://geany.svn.sourceforge.net/geany/?rev=3515&view=rev Author: eht16 Date: 2009-01-27 19:10:12 +0000 (Tue, 27 Jan 2009)
Log Message: ----------- Fix legacy file monitoring since I broke once more.
Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-27 18:12:00 UTC (rev 3514) +++ trunk/ChangeLog 2009-01-27 19:10:12 UTC (rev 3515) @@ -1,3 +1,9 @@ +2009-01-27 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c: + Fix legacy file monitoring since I broke once more. + + 2009-01-27 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/interface.c, geany.glade:
Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-01-27 18:12:00 UTC (rev 3514) +++ trunk/src/document.c 2009-01-27 19:10:12 UTC (rev 3515) @@ -2838,7 +2838,6 @@ static time_t monitor_check_status_real(GeanyDocument *doc, gboolean force) { time_t t = 0; -#if ! defined(HAVE_GIO) || ! defined(USE_GIO_FILEMON) struct stat st; gchar *locale_filename;
@@ -2866,7 +2865,6 @@ t = st.st_mtime; } g_free(locale_filename); -#endif return t; }
@@ -2886,14 +2884,16 @@ if (doc->real_path == NULL || doc->priv->is_remote) return FALSE;
+#if defined(HAVE_GIO) && defined(USE_GIO_FILEMON) /* when we saved a file recently, we want to ignore any changes */ if (doc->priv->file_disk_status == FILE_IGNORE) { return FALSE; } - - /* check the file's mtime in case we don't have GIO support, otherwise this is a no-op */ +#else + /* check the file's mtime */ t = monitor_check_status_real(doc, force); +#endif
switch (doc->priv->file_disk_status) { @@ -2914,8 +2914,8 @@ break; }
- doc->priv->file_disk_status = FILE_OK; - ui_update_tab_status(doc); + /*doc->priv->file_disk_status = FILE_OK; + ui_update_tab_status(doc);*/
return ret; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.