diff options
| author | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-08-07 14:23:39 +0200 |
| commit | 543d05fc6d12cc608dc37ae97d4843431c6de4a8 (patch) | |
| tree | def16257d58256bc116737bdc04edce693a656de /libnm-glib/nm-object.c | |
| parent | 73f59c42ef878adf32efe8c7c4cb0d50ea2d04a1 (diff) | |
| parent | 7f1d08cf21e97f5e60d4636bb1e6c287c34ee2df (diff) | |
Merge tag 'upstream/0.9.5.96' into experimental
Upstream version 0.9.5.96
Diffstat (limited to 'libnm-glib/nm-object.c')
| -rw-r--r-- | libnm-glib/nm-object.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index 756bfa7a..cba38775 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -205,14 +205,10 @@ init_finish (GAsyncInitable *initable, GAsyncResult *result, GError **error) { GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result); - /* This is needed for now because of bug 667375; it can go away - * when we depend on glib >= 2.38 - */ - if (g_simple_async_result_propagate_error (simple, error)) return FALSE; else - return g_simple_async_result_get_op_res_gboolean (simple); + return TRUE; } static void |