brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

interactive/threads: Fix up after deprecations

Browse Source 
The GThread API has undergone a massive restructuring, and the fallout
is still being processed.
This commit is contained in:
Emmanuele Bassi 2011-10-11 17:51:14 +01:00
parent 2d2046f962
commit 57f54173ec
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/interactive/test-threads.c
View File

@ -52,7 +52,7 @@ test_thread_done_idle (gpointer user_data)
return FALSE; return FALSE;
} }
static GStaticPrivate test_thread_data = G_STATIC_PRIVATE_INIT; static GPrivate test_thread_data;
typedef struct typedef struct
{ {
@ -93,7 +93,7 @@ do_something_very_slow (void)
TestThreadData *data; TestThreadData *data;
gint i; gint i;
data = (TestThreadData *) g_static_private_get (&test_thread_data); data = g_private_get (&test_thread_data);
if (data->cancelled) if (data->cancelled)
return; return;
@ -124,10 +124,9 @@ do_something_very_slow (void)
static gpointer static gpointer
test_thread_func (gpointer user_data) test_thread_func (gpointer user_data)
{ {
TestThreadData *data; TestThreadData *data = user_data;
data = user_data; g_private_set (&test_thread_data, data);
g_static_private_set (&test_thread_data, data, NULL);
do_something_very_slow (); do_something_very_slow ();
@ -162,11 +161,14 @@ on_key_press_event (ClutterStage *stage,
data->label = g_object_ref (count_label); data->label = g_object_ref (count_label);
data->progress = g_object_ref (progress_rect); data->progress = g_object_ref (progress_rect);
data->timeline = g_object_ref (timeline); data->timeline = g_object_ref (timeline);
g_thread_create (test_thread_func, data, FALSE, NULL);
g_thread_new ("counter", test_thread_func, data, FALSE, NULL);
return TRUE; return TRUE;
case CLUTTER_KEY_q: case CLUTTER_KEY_q:
clutter_main_quit (); clutter_main_quit ();
return TRUE; return TRUE;
default: default: