[glibmm] giomm: DBusServer: Corrected parameter order of constructor.



commit ccdda220e2afe8b02d5d610d422844a7d2e62ca8
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Mon Sep 13 14:54:58 2010 -0400

    	giomm: DBusServer: Corrected parameter order of constructor.
    
    	* gio/src/dbusserver.{ccg,hg}: Reordered the parameters of the
    	constructor and create() method so that the flag is the last optional
    	parameter.

 ChangeLog              |    8 ++++++++
 gio/src/dbusserver.ccg |   13 ++++++-------
 gio/src/dbusserver.hg  |   10 +++++-----
 3 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 957458f..5fb92b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-13  José Alburquerque  <jaalburqu svn gnome org>
 
+	giomm: DBusServer: Corrected parameter order of constructor.
+
+	* gio/src/dbusserver.{ccg,hg}: Reordered the parameters of the
+	constructor and create() method so that the flag is the last optional
+	parameter.
+
+2010-09-13  José Alburquerque  <jaalburqu svn gnome org>
+
 	giomm: Add various unwrapped methods.
 
 	* gio/src/gio_methods.defs: Regenerated.
diff --git a/gio/src/dbusserver.ccg b/gio/src/dbusserver.ccg
index 722ffc0..aee3b39 100644
--- a/gio/src/dbusserver.ccg
+++ b/gio/src/dbusserver.ccg
@@ -24,9 +24,9 @@
 namespace Gio
 {
 
-DBusServer::DBusServer(const Glib::ustring& address, DBusServerFlags flags,
+DBusServer::DBusServer(const Glib::ustring& address,
   const Glib::ustring& guid, const Glib::RefPtr<DBusAuthObserver>& observer,
-  const Glib::RefPtr<Cancellable>& cancellable)
+  const Glib::RefPtr<Cancellable>& cancellable, DBusServerFlags flags)
   : _CONSTRUCT("address",
     (address.empty() ? static_cast<char*>(0) : address.c_str()),
     "flags", static_cast<GDBusServerFlags>(flags),
@@ -37,12 +37,11 @@ DBusServer::DBusServer(const Glib::ustring& address, DBusServerFlags flags,
 }
 
 Glib::RefPtr<DBusServer> DBusServer::create(const Glib::ustring& address,
-  DBusServerFlags flags, const Glib::ustring& guid,
-  const Glib::RefPtr<DBusAuthObserver>& observer,
-  const Glib::RefPtr<Cancellable>& cancellable)
+  const Glib::ustring& guid, const Glib::RefPtr<DBusAuthObserver>& observer,
+  const Glib::RefPtr<Cancellable>& cancellable, DBusServerFlags flags)
 {
-  return Glib::RefPtr<DBusServer>(new DBusServer(address, flags, guid,
-    observer, cancellable));
+  return Glib::RefPtr<DBusServer>(new DBusServer(address, guid, observer,
+    cancellable, flags));
 }
 
 } // namespace Gio
diff --git a/gio/src/dbusserver.hg b/gio/src/dbusserver.hg
index 05d4e05..57161e7 100644
--- a/gio/src/dbusserver.hg
+++ b/gio/src/dbusserver.hg
@@ -45,16 +45,16 @@ class DBusServer : public Glib::Object, public Initable
   _IMPLEMENTS_INTERFACE(Initable)
 
 protected:
-  DBusServer(const Glib::ustring& address, DBusServerFlags flags,
+  DBusServer(const Glib::ustring& address,
     const Glib::ustring& guid, const Glib::RefPtr<DBusAuthObserver>& observer,
-    const Glib::RefPtr<Cancellable>& cancellable);
+    const Glib::RefPtr<Cancellable>& cancellable, DBusServerFlags flags);
 
 public:
   _WRAP_METHOD_DOCS_ONLY(g_dbus_server_new_sync)
   static Glib::RefPtr<DBusServer> create(const Glib::ustring& address,
-    DBusServerFlags flags, const Glib::ustring& guid,
-    const Glib::RefPtr<DBusAuthObserver>& observer,
-    const Glib::RefPtr<Cancellable>& cancellable);
+    const Glib::ustring& guid, const Glib::RefPtr<DBusAuthObserver>& observer,
+    const Glib::RefPtr<Cancellable>& cancellable = Glib::RefPtr<Cancellable>(),
+    DBusServerFlags flags = Gio::DBUS_SERVER_FLAGS_NONE);
 
   _WRAP_METHOD(void start(), g_dbus_server_start)
   _WRAP_METHOD(void stop(), g_dbus_server_stop)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]