[glibmm] DBusConnection: Also correct the static status of the get() methods.



commit 48c7e2998078cb08ff239068006ef5de5940eb05
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Wed Dec 8 02:50:03 2010 -0500

    	DBusConnection: Also correct the static status of the get() methods.
    
    	* gio/src/dbusconnection.{ccg,hg}: As with the create*() methods, the
    	get() async methods should be static.
    	* gio/src/dbusintrospection.hg (DBusPropertyInfo): Add class docs.

 ChangeLog                    |    8 ++++++++
 gio/src/dbusconnection.ccg   |    2 ++
 gio/src/dbusconnection.hg    |   12 ++++++------
 gio/src/dbusintrospection.hg |    2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7b8e683..37494c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-12-08  José Alburquerque  <jaalburqu svn gnome org>
 
+	DBusConnection: Also correct the static status of the get() methods.
+
+	* gio/src/dbusconnection.{ccg,hg}: As with the create*() methods, the
+	get() async methods should be static.
+	* gio/src/dbusintrospection.hg (DBusPropertyInfo): Add class docs.
+
+2010-12-08  José Alburquerque  <jaalburqu svn gnome org>
+
 	giomm: Correct docs of newly added methods that throw a Glib::Error.
 
 	* gio/src/dbusconnection.hg:
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index 7a77546..18495e4 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -301,6 +301,7 @@ Glib::RefPtr<DBusConnection> DBusConnection::create_for_address_sync(
     flags));
 }
 
+//static
 void DBusConnection::get(BusType bus_type, const SlotAsyncReady& slot,
   const Glib::RefPtr<Cancellable>& cancellable)
 {
@@ -310,6 +311,7 @@ void DBusConnection::get(BusType bus_type, const SlotAsyncReady& slot,
     &SignalProxy_async_callback, slot_copy);
 }
 
+//static
 void DBusConnection::get(BusType bus_type, const SlotAsyncReady& slot)
 {
   SlotAsyncReady* slot_copy = new SlotAsyncReady(slot);
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 7504c56..e9ab2f8 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -154,23 +154,23 @@ public:
    *
    * @newin{2,28}
    */
-  void get(BusType bus_type, const SlotAsyncReady& slot,
+  static void get(BusType bus_type, const SlotAsyncReady& slot,
     const Glib::RefPtr<Cancellable>& cancellable);
   _IGNORE(g_bus_get)
 
   /** Non-cancellable version of get().
    */
-  void get(BusType bus_type, const SlotAsyncReady& slot);
+  static void get(BusType bus_type, const SlotAsyncReady& slot);
+
+  _WRAP_METHOD_DOCS_ONLY( g_bus_get_finish, errthrow)
+  /// @throw Glib::Error.
+  _WRAP_METHOD(static Glib::RefPtr<DBusConnection> get_finish(const Glib::RefPtr<AsyncResult>& res), g_bus_get_finish, errthrow)
 
   _WRAP_METHOD(static Glib::RefPtr<DBusConnection> get_sync(BusType bus_type, const Glib::RefPtr<Cancellable>& cancellable), g_bus_get_sync, errthrow)
 
   /// A Non-cancellable version of get_sync().
   static Glib::RefPtr<DBusConnection> get_sync(BusType bus_type);
 
-  _WRAP_METHOD_DOCS_ONLY( g_bus_get_finish, errthrow)
-  /// @throw Glib::Error.
-  _WRAP_METHOD(static Glib::RefPtr<DBusConnection> get_finish(const Glib::RefPtr<AsyncResult>& res), g_bus_get_finish, errthrow)
-
   _WRAP_METHOD_DOCS_ONLY(g_dbus_connection_new)
   static void create(const Glib::RefPtr<IOStream>& stream,
     const Glib::ustring& guid,
diff --git a/gio/src/dbusintrospection.hg b/gio/src/dbusintrospection.hg
index d0021b4..25223f3 100644
--- a/gio/src/dbusintrospection.hg
+++ b/gio/src/dbusintrospection.hg
@@ -74,7 +74,7 @@ class DBusSignalInfo
 public:
 };
 
-/**
+/** Stores information about a property on a D-Bus interface.
  *
  * @newin{2,28}
  */



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