diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2019-01-13 18:02:22 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2019-01-13 18:02:22 +0100 |
| commit | 495a466aaaa3b5c42d1b22f3447cb36eb89fa7a6 (patch) | |
| tree | 1974cfae9ae6cf18876e514bac1b8939e6e19c5b /libmm-glib/mm-manager.c | |
| parent | 3eb3854fcb19529b7e82f224419d177fa56c569c (diff) | |
libmm-glib,manager: simplify object creation
The G_OBJECT() casts accept NULL safely.
Diffstat (limited to 'libmm-glib/mm-manager.c')
| -rw-r--r-- | libmm-glib/mm-manager.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/libmm-glib/mm-manager.c b/libmm-glib/mm-manager.c index d294b32f..02db0682 100644 --- a/libmm-glib/mm-manager.c +++ b/libmm-glib/mm-manager.c @@ -157,10 +157,7 @@ MMManager * mm_manager_new_finish (GAsyncResult *res, GError **error) { - GDBusObjectManager *ret; - - ret = mm_gdbus_object_manager_client_new_finish (res, error); - return (ret ? MM_MANAGER (ret) : NULL); + return MM_MANAGER (mm_gdbus_object_manager_client_new_finish (res, error)); } /** @@ -222,19 +219,15 @@ mm_manager_new_sync (GDBusConnection *connection, GCancellable *cancellable, GError **error) { - GInitable *ret; - - ret = g_initable_new (MM_TYPE_MANAGER, - cancellable, - error, - "name", MM_DBUS_SERVICE, - "object-path", MM_DBUS_PATH, - "flags", flags, - "connection", connection, - "get-proxy-type-func", get_proxy_type, - NULL); - - return (ret ? MM_MANAGER (ret) : NULL); + return MM_MANAGER (g_initable_new (MM_TYPE_MANAGER, + cancellable, + error, + "name", MM_DBUS_SERVICE, + "object-path", MM_DBUS_PATH, + "flags", flags, + "connection", connection, + "get-proxy-type-func", get_proxy_type, + NULL)); } /*****************************************************************************/ |