app: Tweak transaction DBus helper function

Take an RPMOSTreeSysroot object instead of a GDBusConnection in rpmostree_transaction_get_response_sync(). Makes the API slightly more convenient.
coreos · Aug 5, 2015 · 4de915f · 4de915f
1 parent 3678134
commit 4de915f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/src/app/rpmostree-builtin-rebase.c b/src/app/rpmostree-builtin-rebase.c
@@ -72,7 +72,6 @@ rpmostree_builtin_rebase (int             argc,
   glnx_unref_object RPMOSTreeSysroot *sysroot_proxy = NULL;
   g_autofree char *transaction_object_path = NULL;
   g_autoptr (GVariant) variant_args = NULL;
-  GDBusConnection *connection;
 
   if (!rpmostree_option_context_parse (context,
                                        option_entries,
@@ -100,9 +99,7 @@ rpmostree_builtin_rebase (int             argc,
                                       error))
     goto out;
 
-  connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (sysroot_proxy));
-
-  if (!rpmostree_transaction_get_response_sync (connection,
+  if (!rpmostree_transaction_get_response_sync (sysroot_proxy,
                                                 transaction_object_path,
                                                 cancellable,
                                                 error))

diff --git a/src/app/rpmostree-builtin-rollback.c b/src/app/rpmostree-builtin-rollback.c
@@ -50,7 +50,6 @@ rpmostree_builtin_rollback (int             argc,
   glnx_unref_object RPMOSTreeOS *os_proxy = NULL;
   glnx_unref_object RPMOSTreeSysroot *sysroot_proxy = NULL;
   g_autofree char *transaction_object_path = NULL;
-  GDBusConnection *connection;
 
   if (!rpmostree_option_context_parse (context,
                                        option_entries,
@@ -71,9 +70,7 @@ rpmostree_builtin_rollback (int             argc,
                                         error))
     goto out;
 
-  connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (sysroot_proxy));
-
-  if (!rpmostree_transaction_get_response_sync (connection,
+  if (!rpmostree_transaction_get_response_sync (sysroot_proxy,
                                                 transaction_object_path,
                                                 cancellable,
                                                 error))

diff --git a/src/app/rpmostree-builtin-upgrade.c b/src/app/rpmostree-builtin-upgrade.c
@@ -79,7 +79,6 @@ rpmostree_builtin_upgrade (int             argc,
   glnx_unref_object RPMOSTreeSysroot *sysroot_proxy = NULL;
   g_autofree char *transaction_object_path = NULL;
   g_autoptr (GVariant) default_deployment = NULL;
-  GDBusConnection *connection;
 
   if (!rpmostree_option_context_parse (context,
                                        option_entries,
@@ -117,9 +116,7 @@ rpmostree_builtin_upgrade (int             argc,
         goto out;
     }
 
-  connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (sysroot_proxy));
-
-  if (!rpmostree_transaction_get_response_sync (connection,
+  if (!rpmostree_transaction_get_response_sync (sysroot_proxy,
                                                 transaction_object_path,
                                                 cancellable,
                                                 error))

diff --git a/src/app/rpmostree-dbus-helpers.c b/src/app/rpmostree-dbus-helpers.c
@@ -493,11 +493,12 @@ cancelled_handler (GCancellable *cancellable,
 
 
 gboolean
-rpmostree_transaction_get_response_sync (GDBusConnection *connection,
+rpmostree_transaction_get_response_sync (RPMOSTreeSysroot *sysroot_proxy,
                                          const gchar *object_path,
                                          GCancellable *cancellable,
                                          GError **error)
 {
+  GDBusConnection *connection;
   glnx_unref_object GDBusObjectManager *object_manager = NULL;
   glnx_unref_object RPMOSTreeTransaction *transaction = NULL;
 
@@ -509,6 +510,8 @@ rpmostree_transaction_get_response_sync (GDBusConnection *connection,
   gulong signal_handler = 0;
   gboolean success = FALSE;
 
+  connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (sysroot_proxy));
+
   if (g_dbus_connection_get_unique_name (connection) != NULL)
     bus_name = BUS_NAME;
 

diff --git a/src/app/rpmostree-dbus-helpers.h b/src/app/rpmostree-dbus-helpers.h
@@ -47,7 +47,7 @@ rpmostree_load_os_proxy                      (RPMOSTreeSysroot *sysroot_proxy,
                                               GError **error);
 
 gboolean
-rpmostree_transaction_get_response_sync      (GDBusConnection *out_connection,
+rpmostree_transaction_get_response_sync      (RPMOSTreeSysroot *sysroot_proxy,
                                               const gchar *object_path,
                                               GCancellable *cancellable,
                                               GError **error);