Revision: 3490 http://geany.svn.sourceforge.net/geany/?rev=3490&view=rev Author: eht16 Date: 2009-01-19 19:30:18 +0000 (Mon, 19 Jan 2009)
Log Message: ----------- Skip disk changes detection for all remote files. Don't try to detect a remote file when running on old GLib versions without GIO (< 2.16).
Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/utils.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-19 13:21:57 UTC (rev 3489) +++ trunk/ChangeLog 2009-01-19 19:30:18 UTC (rev 3490) @@ -1,3 +1,11 @@ +2009-01-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/document.c, src/utils.c: + Skip disk changes detection for all remote files. + Don't try to detect a remote file when running on old GLib versions + without GIO (< 2.16). + + 2009-01-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/interface.c, src/ui_utils.h, src/prefs.c, src/plugindata.h,
Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-01-19 13:21:57 UTC (rev 3489) +++ trunk/src/document.c 2009-01-19 19:30:18 UTC (rev 3490) @@ -2809,13 +2809,12 @@ gboolean ret = FALSE; time_t t;
- if (file_prefs.disk_check_timeout == 0) + if (file_prefs.disk_check_timeout == 0 || doc == NULL) return FALSE; - if (doc == NULL) + + /* ignore documents that have never been saved to disk and remote files */ + if (doc->real_path == NULL || doc->priv->is_remote) return FALSE; - /* ignore documents that have never been saved to disk */ - if (doc->real_path == NULL) - return FALSE;
/* check the file's mtime in case we don't have GIO support, otherwise this is a no-op */ t = check_disk_status_real(doc, force);
Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-01-19 13:21:57 UTC (rev 3489) +++ trunk/src/utils.c 2009-01-19 19:30:18 UTC (rev 3490) @@ -1635,9 +1635,11 @@ return TRUE;
#ifndef G_OS_WIN32 + if (glib_check_version(2, 16, 0) == NULL) /* no need to check for this with GLib < 2.16 */ { static gchar *fuse_path = NULL; static gsize len = 0; + if (fuse_path == NULL) { fuse_path = g_build_filename(g_get_home_dir(), ".gvfs", NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.