diff options
author | Dan Williams <dcbw@redhat.com> | 2009-11-30 15:44:20 -0800 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2009-11-30 15:44:20 -0800 |
commit | 909b8b7c8dbe2de97d9550004641c70411d92c56 (patch) | |
tree | a7546e1461ed81ff9ba9a251fd3fe2decdacf4ad /src/mm-callback-info.c | |
parent | c463b5a4005b9e55d0faeb887debe327118ef230 (diff) | |
parent | 0f595adb7f07f575627667480f23775b21f9efb2 (diff) |
Merge commit 'origin/master' into states
Diffstat (limited to 'src/mm-callback-info.c')
-rw-r--r-- | src/mm-callback-info.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mm-callback-info.c b/src/mm-callback-info.c index 0aca55da..089f0b73 100644 --- a/src/mm-callback-info.c +++ b/src/mm-callback-info.c @@ -67,6 +67,7 @@ callback_info_done (gpointer user_data) MMCallbackInfo *info = (MMCallbackInfo *) user_data; info->pending_id = 0; + info->called = TRUE; if (info->invoke_fn && info->callback) info->invoke_fn (info); @@ -94,6 +95,7 @@ mm_callback_info_schedule (MMCallbackInfo *info) { g_return_if_fail (info != NULL); g_return_if_fail (info->pending_id == 0); + g_return_if_fail (info->called == FALSE); info->pending_id = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, callback_info_do, info, callback_info_done); } |