Revision: 5854 http://geany.svn.sourceforge.net/geany/?rev=5854&view=rev Author: colombanw Date: 2011-06-17 22:51:51 +0000 (Fri, 17 Jun 2011)
Log Message: ----------- Consistently always check if USE_GIO_FILEMON is defined, not for its value
Modified Paths: -------------- trunk/src/document.c
Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2011-06-17 22:51:35 UTC (rev 5853) +++ trunk/src/document.c 2011-06-17 22:51:51 UTC (rev 5854) @@ -390,7 +390,7 @@ priv->redo_actions = NULL; priv->line_count = 0; priv->tag_list_update_source = 0; -#if ! defined(USE_GIO_FILEMON) +#ifndef USE_GIO_FILEMON priv->last_check = time(NULL); #endif } @@ -426,7 +426,7 @@ }
-#if USE_GIO_FILEMON +#ifdef USE_GIO_FILEMON static void monitor_file_changed_cb(G_GNUC_UNUSED GFileMonitor *monitor, G_GNUC_UNUSED GFile *file, G_GNUC_UNUSED GFile *other_file, GFileMonitorEvent event, GeanyDocument *doc) @@ -485,7 +485,7 @@ * doesn't work at all for remote files and legacy polling is too slow. */ if (! doc->priv->is_remote) { -#if USE_GIO_FILEMON +#ifdef USE_GIO_FILEMON gchar *locale_filename;
/* stop any previous monitoring */ @@ -775,7 +775,7 @@ editor_goto_pos(doc->editor, 0, FALSE); document_try_focus(doc, NULL);
-#if USE_GIO_FILEMON +#ifdef USE_GIO_FILEMON monitor_file_setup(doc); #else doc->priv->mtime = time(NULL); @@ -1356,7 +1356,7 @@
static gboolean document_update_timestamp(GeanyDocument *doc, const gchar *locale_filename) { -#if ! USE_GIO_FILEMON +#ifndef USE_GIO_FILEMON struct stat st;
g_return_val_if_fail(doc != NULL, FALSE); @@ -2786,7 +2786,7 @@ { static GdkColor red = {0, 0xFFFF, 0, 0}; static GdkColor green = {0, 0, 0x7FFF, 0}; -#if USE_GIO_FILEMON +#ifdef USE_GIO_FILEMON static GdkColor orange = {0, 0xFFFF, 0x7FFF, 0}; #endif GdkColor *color = NULL; @@ -2795,7 +2795,7 @@
if (doc->changed) color = &red; -#if USE_GIO_FILEMON +#ifdef USE_GIO_FILEMON else if (doc->priv->file_disk_status == FILE_CHANGED) color = &orange; #endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.