Add g_str_is_ascii()

[platform/upstream/glib.git] / gio / gunixvolumemonitor.c

diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c
index cbf5b83..0a48486 100644 (file)
--- a/gio/gunixvolumemonitor.c
+++ b/gio/gunixvolumemonitor.c
@@ -37,7 +37,6 @@
 #include "giomodule.h"
 #include "glibintl.h"
 
-#include "gioalias.h"
 
 struct _GUnixVolumeMonitor {
   GNativeVolumeMonitor parent;
@@ -77,45 +76,49 @@ g_unix_volume_monitor_finalize (GObject *object)
                                        
   g_object_unref (monitor->mount_monitor);
 
-  g_list_foreach (monitor->last_mountpoints, (GFunc)g_unix_mount_point_free, NULL);
-  g_list_free (monitor->last_mountpoints);
-  g_list_foreach (monitor->last_mounts, (GFunc)g_unix_mount_free, NULL);
-  g_list_free (monitor->last_mounts);
+  g_list_free_full (monitor->last_mountpoints, (GDestroyNotify) g_unix_mount_point_free);
+  g_list_free_full (monitor->last_mounts, (GDestroyNotify) g_unix_mount_free);
 
-  g_list_foreach (monitor->volumes, (GFunc)g_object_unref, NULL);
-  g_list_free (monitor->volumes);
-  g_list_foreach (monitor->mounts, (GFunc)g_object_unref, NULL);
-  g_list_free (monitor->mounts);
+  g_list_free_full (monitor->volumes, g_object_unref);
+  g_list_free_full (monitor->mounts, g_object_unref);
 
   G_OBJECT_CLASS (g_unix_volume_monitor_parent_class)->finalize (object);
 }
 
+static void
+g_unix_volume_monitor_dispose (GObject *object)
+{
+  GUnixVolumeMonitor *monitor;
+
+  monitor = G_UNIX_VOLUME_MONITOR (object);
+
+  g_list_free_full (monitor->volumes, g_object_unref);
+  monitor->volumes = NULL;
+  
+  g_list_free_full (monitor->mounts, g_object_unref);
+  monitor->mounts = NULL;
+  
+  G_OBJECT_CLASS (g_unix_volume_monitor_parent_class)->dispose (object);
+}
+
 static GList *
 get_mounts (GVolumeMonitor *volume_monitor)
 {
   GUnixVolumeMonitor *monitor;
-  GList *l;
   
   monitor = G_UNIX_VOLUME_MONITOR (volume_monitor);
 
-  l = g_list_copy (monitor->mounts);
-  g_list_foreach (l, (GFunc)g_object_ref, NULL);
-
-  return l;
+  return g_list_copy_deep (monitor->mounts, (GCopyFunc) g_object_ref, NULL);
 }
 
 static GList *
 get_volumes (GVolumeMonitor *volume_monitor)
 {
   GUnixVolumeMonitor *monitor;
-  GList *l;
   
   monitor = G_UNIX_VOLUME_MONITOR (volume_monitor);
 
-  l = g_list_copy (monitor->volumes);
-  g_list_foreach (l, (GFunc)g_object_ref, NULL);
-
-  return l;
+  return g_list_copy_deep (monitor->volumes, (GCopyFunc) g_object_ref, NULL);
 }
 
 static GList *
@@ -150,7 +153,10 @@ get_mount_for_mount_path (const char *mount_path,
   GUnixMount *mount;
 
   mount_entry = g_unix_mount_at (mount_path, NULL);
-  
+
+  if (!mount_entry)
+    return NULL;
+
   /* TODO: Set mountable volume? */
   mount = _g_unix_mount_new (NULL, mount_entry, NULL);
 
@@ -167,6 +173,7 @@ g_unix_volume_monitor_class_init (GUnixVolumeMonitorClass *klass)
   GNativeVolumeMonitorClass *native_class = G_NATIVE_VOLUME_MONITOR_CLASS (klass);
   
   gobject_class->finalize = g_unix_volume_monitor_finalize;
+  gobject_class->dispose = g_unix_volume_monitor_dispose;
 
   monitor_class->get_mounts = get_mounts;
   monitor_class->get_volumes = get_volumes;
@@ -207,22 +214,17 @@ g_unix_volume_monitor_init (GUnixVolumeMonitor *unix_monitor)
   unix_monitor->mount_monitor = g_unix_mount_monitor_new ();
 
   g_signal_connect (unix_monitor->mount_monitor,
-                   "mounts_changed", G_CALLBACK (mounts_changed),
+                   "mounts-changed", G_CALLBACK (mounts_changed),
                    unix_monitor);
   
   g_signal_connect (unix_monitor->mount_monitor,
-                   "mountpoints_changed", G_CALLBACK (mountpoints_changed),
+                   "mountpoints-changed", G_CALLBACK (mountpoints_changed),
                    unix_monitor);
                    
   update_volumes (unix_monitor);
   update_mounts (unix_monitor);
 }
 
-/**
- * g_unix_volume_monitor_new:
- * 
- * Returns:  a new #GVolumeMonitor.
- **/
 GVolumeMonitor *
 _g_unix_volume_monitor_new (void)
 {
@@ -277,13 +279,6 @@ diff_sorted_lists (GList         *list1,
     }
 }
 
-/**
- * _g_unix_volume_monitor_lookup_volume_for_mount_path: 
- * @monitor:
- * @mount_path:
- * 
- * Returns:  #GUnixVolume for the given @mount_path.
- **/
 GUnixVolume *
 _g_unix_volume_monitor_lookup_volume_for_mount_path (GUnixVolumeMonitor *monitor,
                                                      const char         *mount_path)
@@ -344,7 +339,7 @@ update_volumes (GUnixVolumeMonitor *monitor)
        {
          _g_unix_volume_disconnected (volume);
          monitor->volumes = g_list_remove (monitor->volumes, volume);
-         g_signal_emit_by_name (monitor, "volume_removed", volume);
+         g_signal_emit_by_name (monitor, "volume-removed", volume);
          g_signal_emit_by_name (volume, "removed");
          g_object_unref (volume);
        }
@@ -358,15 +353,13 @@ update_volumes (GUnixVolumeMonitor *monitor)
       if (volume)
        {
          monitor->volumes = g_list_prepend (monitor->volumes, volume);
-         g_signal_emit_by_name (monitor, "volume_added", volume);
+         g_signal_emit_by_name (monitor, "volume-added", volume);
        }
     }
   
   g_list_free (added);
   g_list_free (removed);
-  g_list_foreach (monitor->last_mountpoints,
-                 (GFunc)g_unix_mount_point_free, NULL);
-  g_list_free (monitor->last_mountpoints);
+  g_list_free_full (monitor->last_mountpoints, (GDestroyNotify) g_unix_mount_point_free);
   monitor->last_mountpoints = new_mountpoints;
 }
 
@@ -397,7 +390,7 @@ update_mounts (GUnixVolumeMonitor *monitor)
        {
          _g_unix_mount_unmounted (mount);
          monitor->mounts = g_list_remove (monitor->mounts, mount);
-         g_signal_emit_by_name (monitor, "mount_removed", mount);
+         g_signal_emit_by_name (monitor, "mount-removed", mount);
          g_signal_emit_by_name (mount, "unmounted");
          g_object_unref (mount);
        }
@@ -414,14 +407,12 @@ update_mounts (GUnixVolumeMonitor *monitor)
       if (mount)
        {
          monitor->mounts = g_list_prepend (monitor->mounts, mount);
-         g_signal_emit_by_name (monitor, "mount_added", mount);
+         g_signal_emit_by_name (monitor, "mount-added", mount);
        }
     }
   
   g_list_free (added);
   g_list_free (removed);
-  g_list_foreach (monitor->last_mounts,
-                 (GFunc)g_unix_mount_free, NULL);
-  g_list_free (monitor->last_mounts);
+  g_list_free_full (monitor->last_mounts, (GDestroyNotify) g_unix_mount_free);
   monitor->last_mounts = new_mounts;
 }