diff options
| author | Vadim Rutkovsky <vrutkovs@redhat.com> | 2013-02-14 01:46:30 +0800 |
|---|---|---|
| committer | Vadim Rutkovsky <vrutkovs@redhat.com> | 2013-02-14 01:46:30 +0800 |
| commit | da975dadf59db4410ee1796b93fd9c423958b98d (patch) | |
| tree | d5b1ffc14a5b47123cb5f6f70a6fee160d9dac38 /plugins | |
| parent | 3b11207dcbd01b5a18f93a406d267bb786829471 (diff) | |
| download | gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.gz gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.bz2 gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.lz gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.xz gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.tar.zst gsoc2013-evolution-da975dadf59db4410ee1796b93fd9c423958b98d.zip | |
Replace deprecated static mutexes
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mail-notification/mail-notification.c | 10 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 2c2c701d3b..99abfdec20 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -52,7 +52,7 @@ static gboolean enabled = FALSE; static GtkWidget *get_cfg_widget (void); -static GStaticMutex mlock = G_STATIC_MUTEX_INIT; +static GMutex mlock; /** * each part should "implement" its own "public" functions: @@ -833,7 +833,7 @@ org_gnome_mail_new_notify (EPlugin *ep, is_part_enabled (CONF_KEY_NOTIFY_ONLY_INBOX))) return; - g_static_mutex_lock (&mlock); + g_mutex_lock (&mlock); new_notify_dbus (t); @@ -845,7 +845,7 @@ org_gnome_mail_new_notify (EPlugin *ep, if (is_part_enabled (CONF_KEY_ENABLED_SOUND)) new_notify_sound (t); - g_static_mutex_unlock (&mlock); + g_mutex_unlock (&mlock); } void @@ -857,7 +857,7 @@ org_gnome_mail_read_notify (EPlugin *ep, if (!enabled) return; - g_static_mutex_lock (&mlock); + g_mutex_lock (&mlock); read_notify_dbus (t); @@ -869,7 +869,7 @@ org_gnome_mail_read_notify (EPlugin *ep, if (is_part_enabled (CONF_KEY_ENABLED_SOUND)) read_notify_sound (t); - g_static_mutex_unlock (&mlock); + g_mutex_unlock (&mlock); } gint diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index cc04b2e762..51ea980eb6 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -50,7 +50,7 @@ static GSList *queued_publishes = NULL; static gint online = 0; static GSList *error_queue = NULL; -static GStaticMutex error_queue_lock = G_STATIC_MUTEX_INIT; +static GMutex error_queue_lock; static guint error_queue_show_idle_id = 0; static void error_queue_add (gchar *descriptions, GError *error); @@ -1035,7 +1035,7 @@ error_queue_show_idle (gpointer user_data) GSList *l; gboolean has_error = FALSE, has_info = FALSE; - g_static_mutex_lock (&error_queue_lock); + g_mutex_lock (&error_queue_lock); for (l = error_queue; l; l = l->next) { struct eq_data *data = l->data; @@ -1078,7 +1078,7 @@ error_queue_show_idle (gpointer user_data) error_queue = NULL; error_queue_show_idle_id = 0; - g_static_mutex_unlock (&error_queue_lock); + g_mutex_unlock (&error_queue_lock); if (info) { update_publish_notification (has_error && has_info ? GTK_MESSAGE_WARNING : has_error ? GTK_MESSAGE_ERROR : GTK_MESSAGE_INFO, info->str); @@ -1102,11 +1102,11 @@ error_queue_add (gchar *description, data->description = description; data->error = error; - g_static_mutex_lock (&error_queue_lock); + g_mutex_lock (&error_queue_lock); error_queue = g_slist_append (error_queue, data); if (error_queue_show_idle_id == 0) error_queue_show_idle_id = g_idle_add (error_queue_show_idle, NULL); - g_static_mutex_unlock (&error_queue_lock); + g_mutex_unlock (&error_queue_lock); } static void |