[glibmm] Gio::DBus::Server: Add constructors.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Gio::DBus::Server: Add constructors.
- Date: Tue, 27 Sep 2011 07:30:55 +0000 (UTC)
commit 51282fc4e9cbbf978aa8ebcdf774b502ee776a58
Author: Murray Cumming <murrayc murrayc com>
Date: Tue Sep 27 09:30:47 2011 +0200
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.
ChangeLog | 7 +++++++
gio/src/dbusserver.ccg | 3 ---
gio/src/dbusserver.hg | 11 ++++-------
3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a4ebf3a..9d4814a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 74f3896..1d0c45d 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 03e5a96..7f090ca 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:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]