X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgunionvolumemonitor.c;h=4c3049b958014f8cee3db5d5832e188b32e25a05;hb=2e5bd8cf47f9e1559ccc44823a2f321b8ff8c1ea;hp=5320b0452ae0cfc662293e9b7acb489ff2cc60fe;hpb=63adeda0861a26b38ec0adc76255666554c18951;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c
index 5320b04..4c3049b 100644
--- a/gio/gunionvolumemonitor.c
+++ b/gio/gunionvolumemonitor.c
@@ -15,9 +15,7 @@
* 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
* David Zeuthen
@@ -52,7 +50,7 @@ static void g_union_volume_monitor_remove_monitor (GUnionVolumeMonitor *union_mo
#define g_union_volume_monitor_get_type _g_union_volume_monitor_get_type
G_DEFINE_TYPE (GUnionVolumeMonitor, g_union_volume_monitor, G_TYPE_VOLUME_MONITOR);
-static GStaticRecMutex the_volume_monitor_mutex = G_STATIC_REC_MUTEX_INIT;
+static GRecMutex the_volume_monitor_mutex;
static GUnionVolumeMonitor *the_volume_monitor = NULL;
@@ -84,7 +82,7 @@ g_union_volume_monitor_dispose (GObject *object)
monitor = G_UNION_VOLUME_MONITOR (object);
- g_static_rec_mutex_lock (&the_volume_monitor_mutex);
+ g_rec_mutex_lock (&the_volume_monitor_mutex);
the_volume_monitor = NULL;
for (l = monitor->monitors; l != NULL; l = l->next)
@@ -93,7 +91,7 @@ g_union_volume_monitor_dispose (GObject *object)
g_object_run_dispose (G_OBJECT (child_monitor));
}
- g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
+ g_rec_mutex_unlock (&the_volume_monitor_mutex);
G_OBJECT_CLASS (g_union_volume_monitor_parent_class)->dispose (object);
}
@@ -110,7 +108,7 @@ get_mounts (GVolumeMonitor *volume_monitor)
res = NULL;
- g_static_rec_mutex_lock (&the_volume_monitor_mutex);
+ g_rec_mutex_lock (&the_volume_monitor_mutex);
for (l = monitor->monitors; l != NULL; l = l->next)
{
@@ -119,7 +117,7 @@ get_mounts (GVolumeMonitor *volume_monitor)
res = g_list_concat (res, g_volume_monitor_get_mounts (child_monitor));
}
- g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
+ g_rec_mutex_unlock (&the_volume_monitor_mutex);
return res;
}
@@ -136,7 +134,7 @@ get_volumes (GVolumeMonitor *volume_monitor)
res = NULL;
- g_static_rec_mutex_lock (&the_volume_monitor_mutex);
+ g_rec_mutex_lock (&the_volume_monitor_mutex);
for (l = monitor->monitors; l != NULL; l = l->next)
{
@@ -145,7 +143,7 @@ get_volumes (GVolumeMonitor *volume_monitor)
res = g_list_concat (res, g_volume_monitor_get_volumes (child_monitor));
}
- g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
+ g_rec_mutex_unlock (&the_volume_monitor_mutex);
return res;
}
@@ -162,7 +160,7 @@ get_connected_drives (GVolumeMonitor *volume_monitor)
res = NULL;
- g_static_rec_mutex_lock (&the_volume_monitor_mutex);
+ g_rec_mutex_lock (&the_volume_monitor_mutex);
for (l = monitor->monitors; l != NULL; l = l->next)
{
@@ -171,7 +169,7 @@ get_connected_drives (GVolumeMonitor *volume_monitor)
res = g_list_concat (res, g_volume_monitor_get_connected_drives (child_monitor));
}
- g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
+ g_rec_mutex_unlock (&the_volume_monitor_mutex);
return res;
}
@@ -188,7 +186,7 @@ get_volume_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid)
volume = NULL;
- g_static_rec_mutex_lock (&the_volume_monitor_mutex);
+ g_rec_mutex_lock (&the_volume_monitor_mutex);
for (l = monitor->monitors; l != NULL; l = l->next)
{
@@ -200,7 +198,7 @@ get_volume_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid)
}
- g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
+ g_rec_mutex_unlock (&the_volume_monitor_mutex);
return volume;
}
@@ -217,7 +215,7 @@ get_mount_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid)
mount = NULL;
- g_static_rec_mutex_lock (&the_volume_monitor_mutex);
+ g_rec_mutex_lock (&the_volume_monitor_mutex);
for (l = monitor->monitors; l != NULL; l = l->next)
{
@@ -229,7 +227,7 @@ get_mount_for_uuid (GVolumeMonitor *volume_monitor, const char *uuid)
}
- g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
+ g_rec_mutex_unlock (&the_volume_monitor_mutex);
return mount;
}
@@ -563,7 +561,7 @@ g_volume_monitor_get (void)
{
GVolumeMonitor *vm;
- g_static_rec_mutex_lock (&the_volume_monitor_mutex);
+ g_rec_mutex_lock (&the_volume_monitor_mutex);
if (the_volume_monitor)
vm = G_VOLUME_MONITOR (g_object_ref (the_volume_monitor));
@@ -574,7 +572,7 @@ g_volume_monitor_get (void)
vm = G_VOLUME_MONITOR (the_volume_monitor);
}
- g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
+ g_rec_mutex_unlock (&the_volume_monitor_mutex);
return vm;
}
@@ -594,9 +592,9 @@ _g_mount_get_for_mount_path (const gchar *mount_path,
if (klass->get_mount_for_mount_path)
{
- g_static_rec_mutex_lock (&the_volume_monitor_mutex);
+ g_rec_mutex_lock (&the_volume_monitor_mutex);
mount = klass->get_mount_for_mount_path (mount_path, cancellable);
- g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
+ g_rec_mutex_unlock (&the_volume_monitor_mutex);
}
/* TODO: How do we know this succeeded? Keep in mind that the native
@@ -639,7 +637,7 @@ _g_mount_get_for_mount_path (const gchar *mount_path,
* blocks of a block device that is already represented by the native
* volume monitor (for example a CD Audio file system driver). Such
* a driver will generate its own #GMount object that needs to be
- * assoicated with the #GVolume object that represents the volume.
+ * associated with the #GVolume object that represents the volume.
*
* The other is for implementing a #GVolumeMonitor whose sole purpose
* is to return #GVolume objects representing entries in the users
@@ -669,7 +667,7 @@ g_volume_monitor_adopt_orphan_mount (GMount *mount)
volume = NULL;
- g_static_rec_mutex_lock (&the_volume_monitor_mutex);
+ g_rec_mutex_lock (&the_volume_monitor_mutex);
for (l = the_volume_monitor->monitors; l != NULL; l = l->next)
{
@@ -684,7 +682,7 @@ g_volume_monitor_adopt_orphan_mount (GMount *mount)
}
}
- g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
+ g_rec_mutex_unlock (&the_volume_monitor_mutex);
return volume;
}