diff options
author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2013-03-22 15:04:55 -0400 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2013-03-22 15:04:55 -0400 |
commit | 1a0dd0526eb5ab5ed40fe54ccb37b61a619c7d6c (patch) | |
tree | ba6cbb62e5194e1f9bcf979f8251e7ef8d3d3850 /farstream | |
parent | c355f2191a9bd67026d9d08969c370a4018513f0 (diff) | |
download | farstream-1a0dd0526eb5ab5ed40fe54ccb37b61a619c7d6c.tar.gz |
Remove deprecated GStaticMutex usage
Diffstat (limited to 'farstream')
-rw-r--r-- | farstream/fs-plugin.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/farstream/fs-plugin.c b/farstream/fs-plugin.c index 96957278..05a3bd4c 100644 --- a/farstream/fs-plugin.c +++ b/farstream/fs-plugin.c @@ -52,7 +52,7 @@ static gboolean fs_plugin_load (GTypeModule *module); -static GStaticMutex mutex = G_STATIC_MUTEX_INIT; +static GMutex mutex; static gchar **search_paths = NULL; static GList *plugins = NULL; @@ -229,14 +229,14 @@ fs_plugin_create_valist (const gchar *name, const gchar *type_suffix, _fs_conference_init_debug (); - g_static_mutex_lock (&mutex); + g_mutex_lock (&mutex); plugin = fs_plugin_get_by_name_locked (name, type_suffix); if (!plugin) { plugin = g_object_new (FS_TYPE_PLUGIN, NULL); if (!plugin) { - g_static_mutex_unlock (&mutex); + g_mutex_unlock (&mutex); g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION, "Could not create a fsplugin object"); return NULL; @@ -249,14 +249,14 @@ fs_plugin_create_valist (const gchar *name, const gchar *type_suffix, * the gstreamer libraries can't be unloaded */ if (!g_type_module_use (G_TYPE_MODULE (plugin))) { - g_static_mutex_unlock (&mutex); + g_mutex_unlock (&mutex); g_set_error (error, FS_ERROR, FS_ERROR_CONSTRUCTION, "Could not load the %s-%s transmitter plugin", name, type_suffix); return NULL; } } - g_static_mutex_unlock (&mutex); + g_mutex_unlock (&mutex); object = g_object_new_valist (plugin->type, first_property_name, var_args); @@ -317,7 +317,7 @@ fs_plugin_list_available (const gchar *type_suffix) _fs_conference_init_debug (); - g_static_mutex_lock (&mutex); + g_mutex_lock (&mutex); fs_plugin_search_path_init (); @@ -386,7 +386,7 @@ fs_plugin_list_available (const gchar *type_suffix) g_ptr_array_free (list, TRUE); } - g_static_mutex_unlock (&mutex); + g_mutex_unlock (&mutex); return retval; } |