hal: Branch 'master'

[David Zeuthen]

 hald/linux/hal-file-monitor.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

New commits:
diff-tree 5d5b66fdca8caf8c985f1990f9f6bc7ec18d92ed (from 1d6a396237a1fc50493a8c11e2e429c61574eda5)
Author: David Zeuthen <davidz at redhat.com>
Date:   Fri Apr 6 21:56:51 2007 -0400

    silence debug spew from the file monitor
    
    ... in a not so gently way. We really need to revisit the logging
    infrastructure in HAL; just today I had to extend the number of lines
    in gnome-terminal from 5000 to 10000 just to see what happened early
    at startup.

diff --git a/hald/linux/hal-file-monitor.c b/hald/linux/hal-file-monitor.c
index cdf3775..29a2578 100644
--- a/hald/linux/hal-file-monitor.c
+++ b/hald/linux/hal-file-monitor.c
@@ -208,7 +208,7 @@ file_monitor_add_watch_for_path (HalFile
         imask = our_event_mask_to_inotify_mask (mask);
 
         mask_str = imask_to_string (imask);
-        g_debug ("adding inotify watch %s", mask_str);
+        /*g_debug ("adding inotify watch %s", mask_str);*/
         g_free (mask_str);
 
         wd = inotify_add_watch (monitor->priv->inotify_fd, path, IN_MASK_ADD | imask);
@@ -388,7 +388,7 @@ handle_inotify_event (HalFileMonitor    
         }
 
         mask_str = imask_to_string (ievent->mask);
-        g_debug ("handing inotify event %s for %s", mask_str, path);
+        /*g_debug ("handing inotify event %s for %s", mask_str, path);*/
         g_free (mask_str);
 
         event = HAL_FILE_MONITOR_EVENT_NONE;
@@ -420,7 +420,7 @@ inotify_data_pending (GIOChannel    *sou
         int len;
         int i;
 
-        g_debug ("Inotify data pending");
+        /*g_debug ("Inotify data pending");*/
 
         g_assert (monitor->priv->inotify_fd > 0);
         g_assert (monitor->priv->buffer != NULL);
@@ -443,26 +443,26 @@ inotify_data_pending (GIOChannel    *sou
                         goto error_cancel;
                 }
 
-                g_debug ("Buffer size %u too small, trying again at %u\n",
-                         monitor->priv->buflen, monitor->priv->buflen << 1);
+                /*g_debug ("Buffer size %u too small, trying again at %u\n",
+                  monitor->priv->buflen, monitor->priv->buflen << 1);*/
 
                 monitor->priv->buflen <<= 1;
                 monitor->priv->buffer = g_realloc (monitor->priv->buffer, monitor->priv->buflen);
         } while (TRUE);
 
-        g_debug ("Inotify buffer filled");
+        /*g_debug ("Inotify buffer filled");*/
 
         i = 0;
         while (i < len) {
                 struct inotify_event *ievent = (struct inotify_event *) &monitor->priv->buffer [i];
                 FileInotifyWatch     *watch;
 
-                g_debug ("Got event wd = %d, mask = 0x%x, cookie = %d, len = %d, name= %s\n",
+                /*g_debug ("Got event wd = %d, mask = 0x%x, cookie = %d, len = %d, name= %s\n",
                          ievent->wd,
                          ievent->mask,
                          ievent->cookie,
                          ievent->len,
-                         ievent->len > 0 ? ievent->name : "<none>");
+                         ievent->len > 0 ? ievent->name : "<none>");*/
 
                 watch = g_hash_table_lookup (monitor->priv->wd_to_watch,
                                              GINT_TO_POINTER (ievent->wd));
@@ -504,7 +504,7 @@ file_monitor_add_notify_for_path (HalFil
                 notify->watch = watch;
                 notify->mask = mask;
 
-                g_debug ("Adding notify for %s mask:%d", path, mask);
+                /*g_debug ("Adding notify for %s mask:%d", path, mask);*/
 
                 g_hash_table_insert (monitor->priv->notifies, GUINT_TO_POINTER (notify->id), notify);
                 watch->notifies = g_slist_prepend (watch->notifies, GUINT_TO_POINTER (notify->id));
@@ -519,7 +519,7 @@ file_monitor_remove_notify (HalFileMonit
 {
         FileMonitorNotify *notify;
 
-        g_debug ("removing notify for %u", id);
+        /*g_debug ("removing notify for %u", id);*/
 
         notify = g_hash_table_lookup (monitor->priv->notifies,
                                       GUINT_TO_POINTER (id));