diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2011-09-27 09:30:47 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-09-27 09:30:47 +0200 |
| commit | 51282fc4e9cbbf978aa8ebcdf774b502ee776a58 (patch) | |
| tree | 8796cdba8e112b25baacca353514d57ddcef377b | |
| parent | dc3a5846767fdfef18d9394106204ec3d2508191 (diff) | |
| download | glibmm-51282fc4e9cbbf978aa8ebcdf774b502ee776a58.tar.gz | |
Gio::DBus::Server: Add constructors.
* gio/src/dbusserver.[hg|ccg]: Uncomment the constructors now that bug #639478
has been fixed, though nobody has tried to use this yet.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gio/src/dbusserver.ccg | 3 | ||||
| -rw-r--r-- | gio/src/dbusserver.hg | 11 |
3 files changed, 11 insertions, 10 deletions
@@ -1,5 +1,12 @@ 2011-09-27 Murray Cumming <murrayc@murrayc.com> + Gio::DBus::Server: Add constructors. + + * gio/src/dbusserver.[hg|ccg]: Uncomment the constructors now that bug #639478 + has been fixed, though nobody has tried to use this yet. + +2011-09-27 Murray Cumming <murrayc@murrayc.com> + Regenerated .defs files. * glib/src/glib_functions.defs: diff --git a/gio/src/dbusserver.ccg b/gio/src/dbusserver.ccg index 74f3896d..1d0c45d8 100644 --- a/gio/src/dbusserver.ccg +++ b/gio/src/dbusserver.ccg @@ -27,8 +27,6 @@ namespace Gio namespace DBus { -//TODO: Uncomment when this bug is fixed: https://bugzilla.gnome.org/show_bug.cgi?id=639478 . -/* Server::Server(const std::string& address, const std::string& guid, const Glib::RefPtr<AuthObserver>& observer, @@ -80,7 +78,6 @@ Server::Server(const std::string& address, { init(); } -*/ Glib::RefPtr<Server> Server::create_sync(const std::string& address, const std::string& guid, diff --git a/gio/src/dbusserver.hg b/gio/src/dbusserver.hg index 03e5a964..7f090ca0 100644 --- a/gio/src/dbusserver.hg +++ b/gio/src/dbusserver.hg @@ -58,28 +58,25 @@ class Server : public Glib::Object, public Initable protected: -//TODO: Uncomment when this bug is resolved: https://bugzilla.gnome.org/show_bug.cgi?id=639478 -/* - DBusServer(const std::string& address, + Server(const std::string& address, const std::string& guid, const Glib::RefPtr<AuthObserver>& observer, const Glib::RefPtr<Cancellable>& cancellable, ServerFlags flags); - DBusServer(const std::string& address, + Server(const std::string& address, const std::string& guid, const Glib::RefPtr<Cancellable>& cancellable, ServerFlags flags); - DBusServer(const std::string& address, + Server(const std::string& address, const std::string& guid, const Glib::RefPtr<AuthObserver>& observer, ServerFlags flags); - DBusServer(const std::string& address, + Server(const std::string& address, const std::string& guid, ServerFlags flags); -*/ public: |