diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-11-14 12:54:13 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2014-11-14 12:54:13 +0100 |
| commit | 05cc3d31e9b0bd17af43629452b955d0fece0ddf (patch) | |
| tree | dae56e47d7e5daa36c35b08c082691583c213bd1 /tools/m4/convert_gio.m4 | |
| parent | 8cd77c559fba8a894392db612280af35639e9457 (diff) | |
| download | glibmm-05cc3d31e9b0bd17af43629452b955d0fece0ddf.tar.gz | |
Add Gio::Resource
* gio/src/resource.[hg|ccg]: Add class Resource, enum ResourceFlags and
enum ResourceLookupFlags.
* glib/src/bytes.hg: Mention Resource in a comment.
* tools/m4/convert_gio.m4: Add conversions for GResource, GResourceFlags and
GResourceLookupFlags. Bug #739206.
Diffstat (limited to 'tools/m4/convert_gio.m4')
| -rw-r--r-- | tools/m4/convert_gio.m4 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index 58d2a652..3d170668 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -35,6 +35,8 @@ _CONV_ENUM(G,MountUnmountFlags) _CONV_ENUM(G,OutputStreamSpliceFlags) _CONV_ENUM(G,PasswordSave) _CONV_ENUM(G,ResolverRecordType) +_CONV_ENUM(G,ResourceFlags) +_CONV_ENUM(G,ResourceLookupFlags) _CONV_ENUM(G,SettingsBindFlags) _CONV_ENUM(G,SocketClientEvent) _CONV_ENUM(G,SocketFamily) @@ -252,6 +254,9 @@ _CONVERSION(`GProxy*',`Glib::RefPtr<Proxy>',`Glib::wrap($3)') _CONVERSION(`const Glib::RefPtr<const ProxyAddress>&',`GProxyAddress*',__CONVERT_CONST_REFPTR_TO_P) +#Resource +_CONVERSION(`GResource*',`Glib::RefPtr<Resource>',`Glib::wrap($3)') + #Settings _CONVERSION(`GSettings*',`Glib::RefPtr<Settings>',`Glib::wrap($3)') _CONVERSION(`const Glib::StringArrayHandle&',`const gchar*-const*',`($3).data()') |