summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--dbus/dbus-bus.c13
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d9bf6aa7..fbba11a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-09-30 Havoc Pennington <hp@redhat.com>
+ * dbus/dbus-bus.c (dbus_bus_get_private, dbus_bus_get)
+ (internal_bus_get): fix screwy code formatting. whoever committed
+ that was not paying attention!
+
+2006-09-30 Havoc Pennington <hp@redhat.com>
+
* configure.in (LT_CURRENT, LT_AGE): increment current and age to
reflect addition of interfaces.
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c
index eb6b3ab3..a2336786 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -338,7 +338,8 @@ _dbus_bus_check_connection_and_unref_unlocked (DBusConnection *connection)
static DBusConnection *
internal_bus_get (DBusBusType type,
- DBusError *error, dbus_bool_t private)
+ dbus_bool_t private,
+ DBusError *error)
{
const char *address;
DBusConnection *connection;
@@ -453,8 +454,9 @@ internal_bus_get (DBusBusType type,
*/
DBusConnection *
dbus_bus_get (DBusBusType type,
- DBusError *error) {
- return internal_bus_get(type, error, FALSE);
+ DBusError *error)
+{
+ return internal_bus_get (type, FALSE, error);
}
/**
@@ -469,8 +471,9 @@ dbus_bus_get (DBusBusType type,
*/
DBusConnection *
dbus_bus_get_private (DBusBusType type,
- DBusError *error) {
- return internal_bus_get(type, error, TRUE);
+ DBusError *error)
+{
+ return internal_bus_get (type, TRUE, error);
}
/**