[glibmm] DBusConnection: call*() methods: Re-order bus_name parameter.
- From: JosĂŠ Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] DBusConnection: call*() methods: Re-order bus_name parameter.
- Date: Tue, 11 Jan 2011 21:33:08 +0000 (UTC)
commit a441a4c48ee637d93d1716038b201f43f9e217eb
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Tue Jan 11 16:32:16 2011 -0500
DBusConnection: call*() methods: Re-order bus_name parameter.
* gio/src/dbusconnection.{ccg,hg} (call*): Place the bus_name
parameter before the timeout_msec parameter to make it easier to
specifiy a bus name without having to set a timeout value.
* gio/src/dbusaddress.hg (get_for_bus_sync): Correct declarations to
return std::string instead of Glib::ustring in accordance with the
last commit.
ChangeLog | 12 ++++++++++++
gio/src/dbusaddress.hg | 4 ++--
gio/src/dbusconnection.ccg | 8 ++++----
gio/src/dbusconnection.hg | 8 ++++----
4 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 83dfff5..edc2775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2011-01-11 José Alburquerque <jaalburqu svn gnome org>
+ DBusConnection: call*() methods: Re-order bus_name parameter.
+
+ * gio/src/dbusconnection.{ccg,hg} (call*): Place the bus_name
+ parameter before the timeout_msec parameter to make it easier to
+ specifiy a bus name without having to set a timeout value.
+
+ * gio/src/dbusaddress.hg (get_for_bus_sync): Correct declarations to
+ return std::string instead of Glib::ustring in accordance with the
+ last commit.
+
+2011-01-11 José Alburquerque <jaalburqu svn gnome org>
+
DBus: Use std::string for addresses since they could be a file path.
* gio/src/dbusaddress.{ccg,hg}:
diff --git a/gio/src/dbusaddress.hg b/gio/src/dbusaddress.hg
index 5918a59..d552a74 100644
--- a/gio/src/dbusaddress.hg
+++ b/gio/src/dbusaddress.hg
@@ -156,11 +156,11 @@ Glib::RefPtr<IOStream> get_stream_sync(const std::string& address);
* @newin{2,28}
* @ingroup DBus
*/
-Glib::ustring get_for_bus_sync(BusType bus_type,
+std::string get_for_bus_sync(BusType bus_type,
const Glib::RefPtr<Cancellable>& cancellable);
/// A non-cancellable get_for_bus_sync().
-Glib::ustring get_for_bus_sync(BusType bus_type);
+std::string get_for_bus_sync(BusType bus_type);
} // namespace Address
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 55103fe..6073215 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -825,8 +825,8 @@ void DBusConnection::call(
const Glib::VariantBase& parameters,
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
- int timeout_msec,
const Glib::ustring& bus_name,
+ int timeout_msec,
DBusCallFlags flags,
const Glib::VariantType& reply_type
)
@@ -850,8 +850,8 @@ void DBusConnection::call(
const Glib::ustring& method_name,
const Glib::VariantBase& parameters,
const SlotAsyncReady& slot,
- int timeout_msec,
const Glib::ustring& bus_name,
+ int timeout_msec,
DBusCallFlags flags,
const Glib::VariantType& reply_type
)
@@ -888,8 +888,8 @@ void DBusConnection::call_sync(
const Glib::ustring& method_name,
const Glib::VariantBase& parameters,
const Glib::RefPtr<Cancellable>& cancellable,
- int timeout_msec,
const Glib::ustring& bus_name,
+ int timeout_msec,
DBusCallFlags flags,
const Glib::VariantType& reply_type
)
@@ -916,8 +916,8 @@ void DBusConnection::call_sync(
const Glib::ustring& interface_name,
const Glib::ustring& method_name,
const Glib::VariantBase& parameters,
- int timeout_msec,
const Glib::ustring& bus_name,
+ int timeout_msec,
DBusCallFlags flags,
const Glib::VariantType& reply_type
)
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 709d1a4..01770e0 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -649,8 +649,8 @@ public:
const Glib::VariantBase& parameters,
const SlotAsyncReady& slot,
const Glib::RefPtr<Cancellable>& cancellable,
- int timeout_msec = -1,
const Glib::ustring& bus_name = Glib::ustring(),
+ int timeout_msec = -1,
DBusCallFlags flags = Gio::DBUS_CALL_FLAGS_NONE,
const Glib::VariantType& reply_type = Glib::VariantType()
);
@@ -663,8 +663,8 @@ public:
const Glib::ustring& method_name,
const Glib::VariantBase& parameters,
const SlotAsyncReady& slot,
- int timeout_msec = -1,
const Glib::ustring& bus_name = Glib::ustring(),
+ int timeout_msec = -1,
DBusCallFlags flags = Gio::DBUS_CALL_FLAGS_NONE,
const Glib::VariantType& reply_type = Glib::VariantType()
);
@@ -723,8 +723,8 @@ public:
const Glib::ustring& method_name,
const Glib::VariantBase& parameters,
const Glib::RefPtr<Cancellable>& cancellable,
- int timeout_msec = -1,
const Glib::ustring& bus_name = Glib::ustring(),
+ int timeout_msec = -1,
DBusCallFlags flags = Gio::DBUS_CALL_FLAGS_NONE,
const Glib::VariantType& reply_type = Glib::VariantType()
);
@@ -737,8 +737,8 @@ public:
const Glib::ustring& interface_name,
const Glib::ustring& method_name,
const Glib::VariantBase& parameters,
- int timeout_msec = -1,
const Glib::ustring& bus_name = Glib::ustring(),
+ int timeout_msec = -1,
DBusCallFlags flags = Gio::DBUS_CALL_FLAGS_NONE,
const Glib::VariantType& reply_type = Glib::VariantType()
);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]