diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2011-02-24 11:33:21 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-02-24 11:33:21 +0100 |
| commit | 055b060e47d262bc52cc64a7a9cb539b6243859a (patch) | |
| tree | 5e43966844000dbbd2d57d499268ec48311f2e40 /examples | |
| parent | 9670cf533be1ad717df6974e800cc3b3a419b780 (diff) | |
| download | glibmm-055b060e47d262bc52cc64a7a9cb539b6243859a.tar.gz | |
Move Gio::DBusError to Gio::Dbus::DBusError.
* tools/m4/base.m4: Added a SECTION_H_GERROR_PRIVATE section.
* tools/m4/gerror.m4: Import the SECTION_H_GERROR_PRIVATE section.
* gio/src/dbuserror.hg: Put this back into the DBus namespace.
Push a custom friend declaration into the SECTION_H_GERROR_PRIVATE section,
because the standard generated friend declaration would not specify the
correct one.
This still does not rename DBusError to DBus::Error, but this is a step on
the way.
* examples/dbus/busserver.cc: Adapated.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/dbus/busserver.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/dbus/busserver.cc b/examples/dbus/busserver.cc index 534a70b8..8d87e4f0 100644 --- a/examples/dbus/busserver.cc +++ b/examples/dbus/busserver.cc @@ -100,7 +100,7 @@ static void on_method_call(const Glib::RefPtr<Gio::DBus::Connection>& connection if(!curr_alarm.assign_from_iso8601(time_str)) { // If setting alarm was not successful, return an error. - Gio::DBusError error(Gio::DBusError::INVALID_ARGS, + Gio::DBus::DBusError error(Gio::DBus::DBusError::INVALID_ARGS, "Alarm string is not in ISO8601 format."); invocation->return_gerror(error); } @@ -144,7 +144,7 @@ static void on_method_call(const Glib::RefPtr<Gio::DBus::Connection>& connection else { // Non-existent method on the interface. - Gio::DBusError error(Gio::DBusError::UNKNOWN_METHOD, + Gio::DBus::DBusError error(Gio::DBus::DBusError::UNKNOWN_METHOD, "Method does not exist."); invocation->return_gerror(error); } @@ -174,7 +174,7 @@ void on_get_property(Glib::VariantBase& property, } else { - throw Gio::DBusError(Gio::DBusError::FAILED, "Unknown property name."); + throw Gio::DBus::DBusError(Gio::DBus::DBusError::FAILED, "Unknown property name."); } } |