[glibmm] Gio::DBusConnection: Callbacks: Return all Glib::Errors to caller.

[José Alburquerque <jaalburqu src gnome org>]

commit 12d4db63479077d08badbb73bc79f4087d23695f
Author: José Alburquerque <jaalburqu svn gnome org>
Date:   Fri Jan 7 14:19:27 2011 -0500

    Gio::DBusConnection: Callbacks: Return all Glib::Errors to caller.
    
    	* gio/src/dbusconnection.ccg: Have to previously modified callbacks
    	that deal with getting/setting properties return all Glib::Errors
    	and not just Gio::DBusError types.
    
    	Bug #637587 (Yannick Guesnet)

 ChangeLog                  |   10 ++++++++++
 gio/src/dbusconnection.ccg |    4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 183ac04..9e493eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-07  José Alburquerque  <jaalburqu svn gnome org>
 
+	Gio::DBusConnection: Callbacks: Return all Glib::Errors to caller.
+
+	* gio/src/dbusconnection.ccg: Have to previously modified callbacks
+	that deal with getting/setting properties return all Glib::Errors
+	and not just Gio::DBusError types.
+
+	Bug #637587 (Yannick Guesnet)
+
+2011-01-07  José Alburquerque  <jaalburqu svn gnome org>
+
 	DBusConnection: Callbacks:  Return DBusError exceptions to caller.
 
 	* gio/src/dbusconnection.ccg: Modify the callbacks that deal with
diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg
index c0305b5..2400e1e 100644
--- a/gio/src/dbusconnection.ccg
+++ b/gio/src/dbusconnection.ccg
@@ -126,7 +126,7 @@ static GVariant* DBusInterfaceVTable_GetProperty_giomm_callback(
       Glib::ustring(interface_name), Glib::ustring(property_name));
     return result.gobj_copy();
   }
-  catch(const Gio::DBusError& ex)
+  catch(const Glib::Error& ex)
   {
     *error = const_cast<GError*>(ex.gobj());
   }
@@ -156,7 +156,7 @@ static gboolean DBusInterfaceVTable_SetProperty_giomm_callback(
       Glib::ustring(interface_name), Glib::ustring(property_name),
       Glib::VariantBase(value, true)));
   }
-  catch(const Gio::DBusError& ex)
+  catch(const Glib::Error& ex)
   {
     *error = const_cast<GError*>(ex.gobj());
   }