X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgpollfilemonitor.c;h=10c2d86d2dd533bf9ef90cd731447d0a514f988b;hb=f14a66e3df9e5e3f0f170b68e976011c80ffc041;hp=b77040b78a1db14bdc547cbc601a2b37f8a8a4e2;hpb=a2ca589703273fca80cb126430a8b058aba3eb52;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gpollfilemonitor.c b/gio/gpollfilemonitor.c
index b77040b..10c2d86 100644
--- a/gio/gpollfilemonitor.c
+++ b/gio/gpollfilemonitor.c
@@ -13,20 +13,19 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: Alexander Larsson
*/
-#include
+#include "config.h"
#include
#include "gpollfilemonitor.h"
+#include "gfile.h"
#include "gfilemonitor.h"
+#include "gfileinfo.h"
-#include "gioalias.h"
static gboolean g_poll_file_monitor_cancel (GFileMonitor* monitor);
static void schedule_poll_timeout (GPollFileMonitor* poll_monitor);
@@ -53,8 +52,7 @@ g_poll_file_monitor_finalize (GObject* object)
g_object_unref (poll_monitor->file);
- if (G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize)
- (*G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize) (object);
+ G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize (object);
}
@@ -164,10 +162,10 @@ poll_file_timeout (gpointer data)
poll_monitor->timeout = FALSE;
- g_file_query_info_async (poll_monitor->file, G_FILE_ATTRIBUTE_ETAG_VALUE "," G_FILE_ATTRIBUTE_STD_SIZE,
+ g_file_query_info_async (poll_monitor->file, G_FILE_ATTRIBUTE_ETAG_VALUE "," G_FILE_ATTRIBUTE_STANDARD_SIZE,
0, 0, NULL, got_new_info, g_object_ref (poll_monitor));
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static void
@@ -211,7 +209,7 @@ _g_poll_file_monitor_new (GFile *file)
poll_monitor->file = g_object_ref (file);
- g_file_query_info_async (file, G_FILE_ATTRIBUTE_ETAG_VALUE "," G_FILE_ATTRIBUTE_STD_SIZE,
+ g_file_query_info_async (file, G_FILE_ATTRIBUTE_ETAG_VALUE "," G_FILE_ATTRIBUTE_STANDARD_SIZE,
0, 0, NULL, got_initial_info, g_object_ref (poll_monitor));
return G_FILE_MONITOR (poll_monitor);