From: Simon McVittie <smcv@collabora.com>
Date: Wed, 21 Jun 2017 15:25:01 +0000 (+0100)
Subject: bus_driver_send_ack_reply: Make available to other modules
X-Git-Tag: dbus-1.11.14~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93e1cf572c99f3c9ec029b95e12bffb443a9e0e4;p=thirdparty%2Fdbus.git

bus_driver_send_ack_reply: Make available to other modules

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101567
---

diff --git a/bus/driver.c b/bus/driver.c
index 964a943c3..cd0a714df 100644
--- a/bus/driver.c
+++ b/bus/driver.c
@@ -966,11 +966,11 @@ bus_driver_handle_activate_service (DBusConnection *connection,
   return retval;
 }
 
-static dbus_bool_t
-send_ack_reply (DBusConnection *connection,
-                BusTransaction *transaction,
-                DBusMessage    *message,
-                DBusError      *error)
+dbus_bool_t
+bus_driver_send_ack_reply (DBusConnection *connection,
+                           BusTransaction *transaction,
+                           DBusMessage    *message,
+                           DBusError      *error)
 {
   DBusMessage *reply;
 
@@ -1266,8 +1266,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection,
         }
     }
 
-  if (!send_ack_reply (connection, transaction,
-                       message, error))
+  if (!bus_driver_send_ack_reply (connection, transaction, message, error))
     goto out;
 
   retval = TRUE;
@@ -1354,8 +1353,7 @@ bus_driver_handle_add_match (DBusConnection *connection,
       goto failed;
     }
 
-  if (!send_ack_reply (connection, transaction,
-                       message, error))
+  if (!bus_driver_send_ack_reply (connection, transaction, message, error))
     {
       bus_matchmaker_remove_rule (matchmaker, rule);
       goto failed;
@@ -1405,8 +1403,7 @@ bus_driver_handle_remove_match (DBusConnection *connection,
   /* Send the ack before we remove the rule, since the ack is undone
    * on transaction cancel, but rule removal isn't.
    */
-  if (!send_ack_reply (connection, transaction,
-                       message, error))
+  if (!bus_driver_send_ack_reply (connection, transaction, message, error))
     goto failed;
 
   matchmaker = bus_connection_get_matchmaker (connection);
@@ -2249,7 +2246,7 @@ bus_driver_handle_become_monitor (DBusConnection *connection,
   /* Send the ack before we remove the rule, since the ack is undone
    * on transaction cancel, but becoming a monitor isn't.
    */
-  if (!send_ack_reply (connection, transaction, message, error))
+  if (!bus_driver_send_ack_reply (connection, transaction, message, error))
     goto out;
 
   if (!bus_connection_be_monitor (connection, transaction, &rules, error))
@@ -2337,7 +2334,7 @@ bus_driver_handle_ping (DBusConnection *connection,
                         DBusMessage *message,
                         DBusError *error)
 {
-  return send_ack_reply (connection, transaction, message, error);
+  return bus_driver_send_ack_reply (connection, transaction, message, error);
 }
 
 static dbus_bool_t bus_driver_handle_get (DBusConnection *connection,
diff --git a/bus/driver.h b/bus/driver.h
index 36a1db912..ac1289da4 100644
--- a/bus/driver.h
+++ b/bus/driver.h
@@ -62,5 +62,9 @@ BusDriverFound bus_driver_get_conn_helper (DBusConnection  *connection,
                                            const char     **name_p,
                                            DBusConnection **peer_conn_p,
                                            DBusError       *error);
+dbus_bool_t bus_driver_send_ack_reply     (DBusConnection  *connection,
+                                           BusTransaction  *transaction,
+                                           DBusMessage     *message,
+                                           DBusError       *error);
 
 #endif /* BUS_DRIVER_H */