summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Alburquerque <jaalburqu@svn.gnome.org>2011-10-11 12:09:34 -0400
committerJosé Alburquerque <jaalburqu@svn.gnome.org>2011-10-11 12:11:20 -0400
commit378b8d7476d7eb3ab059ff6f5c4f2aa98fffe02b (patch)
treeb6e8e7612d8ba183a0b31540c8a35d048aea498b
parentd6305e213cca1dbc97cf09fb3afb4b04ddc814f5 (diff)
downloadglibmm-378b8d7476d7eb3ab059ff6f5c4f2aa98fffe02b.tar.gz
ApplicationCommandLine: Add the get_platform_data() method.
* gio/src/applicationcommandline.hg:
-rw-r--r--ChangeLog6
-rw-r--r--gio/src/applicationcommandline.hg10
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b865081..68dd5739 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-11 José Alburquerque <jaalburqu@svn.gnome.org>
+
+ ApplicationCommandLine: Add the get_platform_data() method.
+
+ * gio/src/applicationcommandline.hg:
+
2011-10-10 José Alburquerque <jaalburqu@svn.gnome.org>
gmmproc: _WRAP_METHOD: Allow return types to have commas.
diff --git a/gio/src/applicationcommandline.hg b/gio/src/applicationcommandline.hg
index 785e02e8..58d11397 100644
--- a/gio/src/applicationcommandline.hg
+++ b/gio/src/applicationcommandline.hg
@@ -46,13 +46,9 @@ public:
_WRAP_METHOD(std::string getenv(const Glib::ustring& name) const, g_application_command_line_getenv)
_WRAP_METHOD(bool is_remote() const, g_application_command_line_get_is_remote)
-
- //TODO: gmmproc cannot parse the function declaration because the return type
- //has a comma (see Function::on_wrap_method()'s call to
- //string_split_commas()). Bug #661401 fixes that:
- //https://bugzilla.gnome.org/show_bug.cgi?id=661401
-//#m4 _CONVERSION(`GVariant*',`Glib::Variant< std::map<Glib::ustring, Glib::VariantBase> >',`$2($3)')
- //_WRAP_METHOD(Glib::Variant< std::map<Glib::ustring, Glib::VariantBase> > get_platform_data() const, g_application_command_line_get_platform_data)
+
+#m4 _CONVERSION(`GVariant*',`Glib::Variant< std::map<Glib::ustring, Glib::VariantBase> >',`$2($3)')
+ _WRAP_METHOD(Glib::Variant< std::map<Glib::ustring, Glib::VariantBase> > get_platform_data() const, g_application_command_line_get_platform_data)
_WRAP_METHOD(void set_exit_status(int exit_status), g_application_command_line_set_exit_status)
_WRAP_METHOD(int get_exit_status() const, g_application_command_line_get_exit_status)