diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-10-25 21:23:30 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-05 21:35:20 +0800 |
commit | 2c3892eb9f27b2c8dc8832402ceb06053f36b987 (patch) | |
tree | ec2bc40f1cf347642e28515622f3200d917221f7 /src/empathy-call-window.c | |
parent | ee2e583ba62e7bc1b6765a8115a78a4a74818d61 (diff) | |
download | gsoc2013-empathy-2c3892eb9f27b2c8dc8832402ceb06053f36b987.tar gsoc2013-empathy-2c3892eb9f27b2c8dc8832402ceb06053f36b987.tar.gz gsoc2013-empathy-2c3892eb9f27b2c8dc8832402ceb06053f36b987.tar.bz2 gsoc2013-empathy-2c3892eb9f27b2c8dc8832402ceb06053f36b987.tar.lz gsoc2013-empathy-2c3892eb9f27b2c8dc8832402ceb06053f36b987.tar.xz gsoc2013-empathy-2c3892eb9f27b2c8dc8832402ceb06053f36b987.tar.zst gsoc2013-empathy-2c3892eb9f27b2c8dc8832402ceb06053f36b987.zip |
Allocate GMutex on the stack
g_mutex_new() has been deprecated in GLib 2.31.
https://bugzilla.gnome.org/show_bug.cgi?id=662662
Diffstat (limited to 'src/empathy-call-window.c')
-rw-r--r-- | src/empathy-call-window.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 3b05d4d7a..7ecac2806 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -242,7 +242,7 @@ struct _EmpathyCallWindowPriv GTimer *timer; guint timer_id; - GMutex *lock; + GMutex lock; gboolean call_started; gboolean sending_video; CameraState camera_state; @@ -1638,7 +1638,7 @@ empathy_call_window_init (EmpathyCallWindow *self) g_signal_connect (priv->camera_monitor, "removed", G_CALLBACK (empathy_call_window_camera_removed_cb), self); - priv->lock = g_mutex_new (); + g_mutex_init (&priv->lock); gtk_container_add (GTK_CONTAINER (self), top_vbox); @@ -2371,7 +2371,7 @@ empathy_call_window_finalize (GObject *object) disconnect_video_output_motion_handler (self); /* free any data held directly by the object here */ - g_mutex_free (priv->lock); + g_mutex_clear (&priv->lock); g_timer_destroy (priv->timer); @@ -2544,7 +2544,7 @@ empathy_call_window_disconnected (EmpathyCallWindow *self, if (could_reset_pipeline) { - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); g_timer_stop (priv->timer); @@ -2552,7 +2552,7 @@ empathy_call_window_disconnected (EmpathyCallWindow *self, g_source_remove (priv->timer_id); priv->timer_id = 0; - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); if (!restart) /* We are about to destroy the window, no need to update it or create @@ -3202,12 +3202,12 @@ empathy_call_window_state_changed_cb (EmpathyCallHandler *handler, g_object_unref (call); - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); priv->timer_id = g_timeout_add_seconds (1, empathy_call_window_update_timer, self); - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); empathy_call_window_update_timer (self); @@ -3281,7 +3281,7 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, GstPad *pad; - g_mutex_lock (priv->lock); + g_mutex_lock (&priv->lock); g_object_get (content, "media-type", &media_type, NULL); @@ -3348,7 +3348,7 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, } - g_mutex_unlock (priv->lock); + g_mutex_unlock (&priv->lock); return TRUE; } |