diff options
author | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-10-23 19:08:34 -0400 |
---|---|---|
committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2011-10-23 19:11:11 -0400 |
commit | 621b90ea15f53685054410a7835faadc51ab96d9 (patch) | |
tree | 48e2e3c3052b185f7c5b556c2307831e012ccfa7 /gio | |
parent | 353c3dc9f70cccc3cbe90686cd9c5e42112999a7 (diff) | |
download | glibmm-621b90ea15f53685054410a7835faadc51ab96d9.tar.gz |
Gio::DBus::Connection: Temporarily remove newly added call() methods.
* gio/src/dbusconnection.{ccg,hg}: Remove the newly added call()
methods with a UnixFDList parameter until the call_finish() method
with a UnixFDList parameter is added also.
* gio/src/credentials.hg:
* gio/src/dbusmessage.ccg:
* gio/src/dbusmessage.hg: Typos.
Diffstat (limited to 'gio')
-rw-r--r-- | gio/src/credentials.hg | 2 | ||||
-rw-r--r-- | gio/src/dbusconnection.ccg | 4 | ||||
-rw-r--r-- | gio/src/dbusconnection.hg | 6 | ||||
-rw-r--r-- | gio/src/dbusmessage.ccg | 2 | ||||
-rw-r--r-- | gio/src/dbusmessage.hg | 1 |
5 files changed, 13 insertions, 2 deletions
diff --git a/gio/src/credentials.hg b/gio/src/credentials.hg index ee0ca975..bb35d984 100644 --- a/gio/src/credentials.hg +++ b/gio/src/credentials.hg @@ -66,7 +66,7 @@ public: _WRAP_METHOD(void set_native(CredentialsType native_type, gpointer native), g_credentials_set_native) _WRAP_METHOD(bool is_same_user(const Glib::RefPtr<const Credentials>& other_credentials), g_credentials_is_same_user, errthrow) - _WRAP_METHOD(uid_t get_unix_user(), g_credentials_get_unix_user, errthrow, ifdef G_OS_UNX) + _WRAP_METHOD(uid_t get_unix_user(), g_credentials_get_unix_user, errthrow, ifdef G_OS_UNIX) _WRAP_METHOD(bool set_unix_user(uid_t uid), g_credentials_set_unix_user, errthrow, ifdef G_OS_UNIX) }; diff --git a/gio/src/dbusconnection.ccg b/gio/src/dbusconnection.ccg index 67f3157b..cb05bca7 100644 --- a/gio/src/dbusconnection.ccg +++ b/gio/src/dbusconnection.ccg @@ -752,6 +752,9 @@ Glib::VariantContainerBase Connection::call_sync( return Glib::VariantContainerBase(gvariant, false); //Dont' take an extra reference. } +//TODO: Re-add the following two methods when the call_finish() method with a +//UnixFDList exists. +#if 0 #ifdef G_OS_LINUX // With a UnixFDList. void Connection::call( @@ -806,6 +809,7 @@ void Connection::call( 0, &SignalProxy_async_callback, slot_copy); } #endif // G_OS_LINUX +#endif // 0 void Connection::emit_signal( const Glib::ustring& object_path, diff --git a/gio/src/dbusconnection.hg b/gio/src/dbusconnection.hg index 600ab69d..dc0d74e2 100644 --- a/gio/src/dbusconnection.hg +++ b/gio/src/dbusconnection.hg @@ -751,6 +751,9 @@ public: const Glib::VariantType& reply_type = Glib::VariantType() ); +// TODO: Re-add the following two methods when the call_finish() method with a +// UnixFDList is wrapped. +#if 0 #ifdef G_OS_LINUX /** Like call() but also takes a GUnixFDList object. * This method is only available on UNIX. @@ -800,6 +803,7 @@ public: const Glib::VariantType& reply_type = Glib::VariantType() ); #endif // G_OS_LINUX +#endif // 0 ///** Finishes an operation started with call() (with a UnixFDList). //* @param res A AsyncResult obtained from the SlotAsyncReady passed to @@ -810,7 +814,7 @@ public: //*/ //TODO: _WRAP_METHOD(Glib::VariantContainerBase call_with_unix_fd_finish(const Glib::RefPtr<AsyncResult>& res{.}, Glib::RefPtr<UnixFDList>& out_fd_list{.?}), g_dbus_connection_call_with_unix_fd_list_finish, errthrow) - /* + /* TODO: _WRAP_METHOD( Glib::VariantContainerBase call_sync( const Glib::ustring& object_path{.}, diff --git a/gio/src/dbusmessage.ccg b/gio/src/dbusmessage.ccg index 8e43a3a2..ea701aef 100644 --- a/gio/src/dbusmessage.ccg +++ b/gio/src/dbusmessage.ccg @@ -18,6 +18,7 @@ */ #include <gio/gio.h> + #ifdef G_OS_UNIX #include <giomm/unixfdlist.h> #endif //G_OS_UNIX @@ -62,4 +63,5 @@ void Message::unset_unix_fd_list() #endif //G_OS_UNIX } //namespace DBus + } // namespace Gio diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg index 7f00f283..4e5c5b15 100644 --- a/gio/src/dbusmessage.hg +++ b/gio/src/dbusmessage.hg @@ -20,6 +20,7 @@ #include <glibmm/object.h> #include <glibmm/variant.h> #include <glibmm/utility.h> + #ifdef G_OS_UNIX # include <giomm/unixfdlist.h> #endif |