Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > d60bd1f35e0c82afb5f88d78afd23ee9 > files > 38

NetworkManager-0.7.0-9.el5.src.rpm

--- NetworkManager-0.7.0/gfilemonitor/inotify-missing.c.old-glib	2008-06-08 14:53:46.000000000 -0400
+++ NetworkManager-0.7.0/gfilemonitor/inotify-missing.c	2008-06-08 14:54:04.000000000 -0400
@@ -71,7 +71,7 @@
   if (!scan_missing_running)
     {
       scan_missing_running = TRUE;
-      g_timeout_add_seconds (SCAN_MISSING_TIME, im_scan_missing, NULL);
+      g_timeout_add (SCAN_MISSING_TIME * G_USEC_PER_SEC, im_scan_missing, NULL);
     }
 }
 
--- NetworkManager-0.7.0/gfilemonitor/gfilemonitor.c.old-glib	2008-05-09 14:08:44.000000000 -0400
+++ NetworkManager-0.7.0/gfilemonitor/gfilemonitor.c	2008-06-08 14:51:21.000000000 -0400
@@ -23,6 +23,8 @@
 #include <config.h>
 #include <string.h>
 
+#include <sys/time.h>
+
 #include "gfilemonitor.h"
 #include "nm-marshal.h"
 
@@ -378,6 +380,17 @@
   g_source_unref (source);
 }
 
+#define G_NSEC_PER_SEC 1000000000
+static guint64
+g_thread_gettime (void)
+{
+  struct timeval tv;
+
+  gettimeofday (&tv, NULL);
+
+  return (guint64) tv.tv_sec * G_NSEC_PER_SEC + tv.tv_usec * (G_NSEC_PER_SEC / G_USEC_PER_SEC); 
+}
+
 static guint32
 get_time_msecs (void)
 {