[glibmm] DBusConnection: Correct a misplaced #endif G_OS_UNIX.
- From: José Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] DBusConnection: Correct a misplaced #endif G_OS_UNIX.
- Date: Mon, 29 Apr 2013 21:42:26 +0000 (UTC)
commit db52eb9ad6cd183b7e43e9d1647abba5eca66a68
Author: José Alburquerque <jaalburquerque gmail com>
Date: Mon Apr 29 15:33:15 2013 -0400
DBusConnection: Correct a misplaced #endif G_OS_UNIX.
* gio/src/dbusconnection.hg: Move the #endif from below the
call_finish _WRAP_METHOD() to below the non-cancellable call method
declaration. It worked as it was because what was generated by
gmmmproc was an #ifdef G_OS_UINX/#endif embedded in an outer #ifdef
G_OS_UNIX/#endif but it's how it should be now.
ChangeLog | 10 ++++++++++
gio/src/dbusconnection.hg | 2 +-
2 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f090be4..e64b199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2013-04-29 José Alburquerque <jaalburquerque gmail com>
+ DBusConnection: Correct a misplaced #endif G_OS_UNIX.
+
+ * gio/src/dbusconnection.hg: Move the #endif from below the
+ call_finish _WRAP_METHOD() to below the non-cancellable call method
+ declaration. It worked as it was because what was generated by
+ gmmmproc was an #ifdef G_OS_UINX/#endif embedded in an outer #ifdef
+ G_OS_UNIX/#endif but it's how it should be now.
+
+2013-04-29 José Alburquerque <jaalburquerque gmail com>
+
Value: Remove unneeded whitespace in source files.
* glib/glibmm/value.cc:
diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg
index 36a36b6..0f8dc83 100644
--- a/gio/src/dbusconnection.hg
+++ b/gio/src/dbusconnection.hg
@@ -780,6 +780,7 @@ public:
int timeout_msec = -1,
CallFlags flags = Gio::DBus::CALL_FLAGS_NONE,
const Glib::VariantType& reply_type = Glib::VariantType());
+#endif // G_OS_UNIX
/** Finishes an operation started with call() (with a UnixFDList).
* @param res A AsyncResult obtained from the SlotAsyncReady passed to
@@ -789,7 +790,6 @@ public:
* @newin{2,34}
*/
_WRAP_METHOD(Glib::VariantContainerBase call_finish(const Glib::RefPtr<AsyncResult>& res{.},
Glib::RefPtr<UnixFDList>& out_fd_list{.>>}), g_dbus_connection_call_with_unix_fd_list_finish, errthrow, ifdef
G_OS_UNIX)
-#endif // G_OS_UNIX
_WRAP_METHOD(
Glib::VariantContainerBase call_sync(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]