diff options
| author | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-01-11 16:32:16 -0500 |
|---|---|---|
| committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-01-11 16:32:16 -0500 |
| commit | a441a4c48ee637d93d1716038b201f43f9e217eb (patch) | |
| tree | 1e3e613c07a65165f29d34893726fa100c75239d /gio/src/dbusaddress.hg | |
| parent | f21203af936533c60780569df8c055b8e8640ac5 (diff) | |
| download | glibmm-a441a4c48ee637d93d1716038b201f43f9e217eb.tar.gz | |
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.
Diffstat (limited to 'gio/src/dbusaddress.hg')
| -rw-r--r-- | gio/src/dbusaddress.hg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gio/src/dbusaddress.hg b/gio/src/dbusaddress.hg index 5918a599..d552a740 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 |