[glibmm] DBusConnectionInvocation: Use refreturn on get methods.



commit 480daa14dd9902d009eae89e35898ed02b7aacf8
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jan 7 14:12:38 2011 +0100

    DBusConnectionInvocation: Use refreturn on get methods.
    
    * gio/src/dbusmethodinvocation.hg: This seems to be necessary, though it does
    not fix bug #637587.

 ChangeLog                       |    7 +++++++
 gio/src/dbusmethodinvocation.hg |   10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fe936f0..b7d41be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-01-07  Murray Cumming  <murrayc murrayc com>
 
+	DBusConnectionInvocation: Use refreturn on get methods.
+
+	* gio/src/dbusmethodinvocation.hg: This seems to be necessary, though it does 
+	not fix bug #637587.
+
+2011-01-07  Murray Cumming  <murrayc murrayc com>
+
 	DBusConnection: Use _ suffixes on member variables.
 
 	* gio/src/dbusconnection.[hg|ccg]: Use a _ suffix on member variables to 
diff --git a/gio/src/dbusmethodinvocation.hg b/gio/src/dbusmethodinvocation.hg
index 319f9e3..f97e494 100644
--- a/gio/src/dbusmethodinvocation.hg
+++ b/gio/src/dbusmethodinvocation.hg
@@ -54,13 +54,13 @@ public:
 
 #m4 _CONVERSION(`const GDBusMethodInfo*', `Glib::RefPtr<const DBusMethodInfo>', `Glib::wrap(const_cast<GDBusMethodInfo*>($3))')
   // The C API only returns a const GDBusMethodInfo.
-  _WRAP_METHOD(Glib::RefPtr<const DBusMethodInfo> get_method_info() const, g_dbus_method_invocation_get_method_info)
+  _WRAP_METHOD(Glib::RefPtr<const DBusMethodInfo> get_method_info() const, g_dbus_method_invocation_get_method_info, refreturn)
 
-  _WRAP_METHOD(Glib::RefPtr<DBusConnection> get_connection(), g_dbus_method_invocation_get_connection)
-  _WRAP_METHOD(Glib::RefPtr<const DBusConnection> get_connection() const, g_dbus_method_invocation_get_connection, constversion)
+  _WRAP_METHOD(Glib::RefPtr<DBusConnection> get_connection(), g_dbus_method_invocation_get_connection, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const DBusConnection> get_connection() const, g_dbus_method_invocation_get_connection, refreturn, constversion)
 
-  _WRAP_METHOD(Glib::RefPtr<DBusMessage> get_message(), g_dbus_method_invocation_get_message)
-  _WRAP_METHOD(Glib::RefPtr<const DBusMessage> get_message() const, g_dbus_method_invocation_get_message, constversion)
+  _WRAP_METHOD(Glib::RefPtr<DBusMessage> get_message(), g_dbus_method_invocation_get_message, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const DBusMessage> get_message() const, g_dbus_method_invocation_get_message, refreturn, constversion)
 
   /** Gets the parameters of the method invocation.
    *



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