diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2011-03-24 10:35:07 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-03-24 10:35:07 +0100 |
| commit | c8196377dbf2e018483f016698f5d53c9ad8a4fd (patch) | |
| tree | f5220fe19d6c239116314c627283e0d239ef2f44 | |
| parent | fbbcc7d545ba7f04cdcbfc81a8108d304045eb48 (diff) | |
| download | glibmm-c8196377dbf2e018483f016698f5d53c9ad8a4fd.tar.gz | |
Minor comment changes.
| -rw-r--r-- | gio/src/dbusmessage.hg | 9 | ||||
| -rw-r--r-- | gio/src/dbusserver.ccg | 2 | ||||
| -rw-r--r-- | gio/src/emblemedicon.hg | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/gio/src/dbusmessage.hg b/gio/src/dbusmessage.hg index 2c5972af..fe6c8cc8 100644 --- a/gio/src/dbusmessage.hg +++ b/gio/src/dbusmessage.hg @@ -58,7 +58,12 @@ public: // Note that we can't use _WRAP_CTOR() and _WRAP_CREATE() because the C functions do more than just call g_object_new(): // See http://bugzilla.gnome.org/show_bug.cgi?id=624977 - // TODO: Should these parameters be ustring or std::string? + + // See here about whether the parameters should be ustring or std::string: + // http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names + // They are generally UTF-8 that can only contain the ASCII subset, + // so ustring still seems preferrable to std::string, which generally implies an unknown endoding for us. + _WRAP_METHOD(static Glib::RefPtr<Message> create_signal(const Glib::ustring& path, const Glib::ustring& interface, const Glib::ustring& signal), g_dbus_message_new_signal) _WRAP_METHOD(static Glib::RefPtr<Message> create_method_call(const Glib::ustring& name, const Glib::ustring& path, const Glib::ustring& interface, const Glib::ustring& method), g_dbus_message_new_method_call) _WRAP_METHOD(static Glib::RefPtr<Message> create_method_reply(const Glib::RefPtr<Message>& method_call_message), g_dbus_message_new_method_reply) @@ -118,7 +123,7 @@ public: _WRAP_METHOD(guint32 get_num_unix_fds() const, g_dbus_message_get_num_unix_fds) _WRAP_METHOD(void set_num_unix_fds(guint32 value), g_dbus_message_set_num_unix_fds) - //TODO: _WRAP_METHOD(guchar* get_header_fields() const, g_dbus_message_get_header_fields) + //TODO: _WRAP_METHOD(std::vector<whattypeshallweuse>) get_header_fields() const, g_dbus_message_get_header_fields) /** Gets a header field on the message. The header is returned in @a value. * @param value Location in which to store the header. diff --git a/gio/src/dbusserver.ccg b/gio/src/dbusserver.ccg index 0aea4888..74f3896d 100644 --- a/gio/src/dbusserver.ccg +++ b/gio/src/dbusserver.ccg @@ -27,7 +27,7 @@ namespace Gio namespace DBus { -//TODO: Uncomment when bug #639478 is resolved. +//TODO: Uncomment when this bug is fixed: https://bugzilla.gnome.org/show_bug.cgi?id=639478 . /* Server::Server(const std::string& address, const std::string& guid, diff --git a/gio/src/emblemedicon.hg b/gio/src/emblemedicon.hg index de0033bf..86e0d989 100644 --- a/gio/src/emblemedicon.hg +++ b/gio/src/emblemedicon.hg @@ -80,10 +80,13 @@ public: _WRAP_METHOD(Glib::RefPtr<Icon> get_icon(), g_emblemed_icon_get_icon) _WRAP_METHOD(Glib::RefPtr<const Icon> get_icon() const, g_emblemed_icon_get_icon, constversion) + #m4 _CONVERSION(`GList*',`Glib::ListHandle<Glib::RefPtr<Emblem> >',`$2($3, Glib::OWNERSHIP_NONE)') _WRAP_METHOD(Glib::ListHandle<Glib::RefPtr<Emblem> > get_emblems(), g_emblemed_icon_get_emblems) - // TODO: need constversion? - //_WRAP_METHOD(Glib::ListHandle<Glib::RefPtr<const Emblem> > get_emblems() const, g_emblemed_icon_get_emblems, constversion) + +//TODO: #m4 _CONVERSION(`GList*',`Glib::ListHandle<Glib::RefPtr<const Emblem> >',`$2($3, Glib::OWNERSHIP_NONE)') +// _WRAP_METHOD(Glib::ListHandle<Glib::RefPtr<const Emblem> > get_emblems() const, g_emblemed_icon_get_emblems, constversion) + _WRAP_METHOD(void add_emblem(const Glib::RefPtr<Emblem>& emblem), g_emblemed_icon_add_emblem) }; |