luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-23 18:37:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace static privates by privates

Browse Source 
GStaticPrivate is heading for deprecation soon, and GPrivate
can replace these uses now.
This commit is contained in:
Matthias Clasen
2011-10-02 21:57:40 -04:00
parent 6f71151823
commit 34ce4dd032
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gcancellable.c
View File

@@ -57,7 +57,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (GCancellable, g_cancellable, G_TYPE_OBJECT);
static GStaticPrivate current_cancellable = G_STATIC_PRIVATE_INIT;
static GPrivate current_cancellable;
G_LOCK_DEFINE_STATIC(cancellable);
static GCond *cancellable_cond = NULL;
@@ -201,9 +201,9 @@ g_cancellable_push_current (GCancellable *cancellable)
g_return_if_fail (cancellable != NULL);
l = g_static_private_get (&current_cancellable);
l = g_private_get (&current_cancellable);
l = g_slist_prepend (l, cancellable);
g_static_private_set (&current_cancellable, l, NULL);
g_private_set (&current_cancellable, l);
}
/**
@@ -218,13 +218,13 @@ g_cancellable_pop_current (GCancellable *cancellable)
{
GSList *l;
l = g_static_private_get (&current_cancellable);
l = g_private_get (&current_cancellable);
g_return_if_fail (l != NULL);
g_return_if_fail (l->data == cancellable);
l = g_slist_delete_link (l, l);
g_static_private_set (&current_cancellable, l, NULL);
g_private_set (&current_cancellable, l);
}
/**
@@ -240,7 +240,7 @@ g_cancellable_get_current (void)
{
GSList *l;
l = g_static_private_get (&current_cancellable);
l = g_private_get (&current_cancellable);
if (l == NULL)
return NULL;