diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2016-12-02 13:22:57 +0100 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2016-12-02 13:26:38 +0100 |
| commit | c516553417160b4ea11d52f649e2523aa03bf21b (patch) | |
| tree | 94d06c69aa28b9742ed00200440ae3aad3ee76c4 /tools | |
| parent | 45b03a50c45d3305aa9414f9e57aab0543125bb0 (diff) | |
| download | glibmm-c516553417160b4ea11d52f649e2523aa03bf21b.tar.gz | |
Gio::RemoteActionGroup: Derive from Gio::ActionGroup.
Because GRemotActionGroup requires GActionGroup:
https://developer.gnome.org/gio/stable/GRemoteActionGroup.html#GRemoteActionGroup.prerequisites
Both are interfaces. This is like Gio::LoadableIcon, which
derives from Gio::Icon because GLoadableIcon requires GIcon.
FileIcon then derives and implements LoadableIcon, but doesn't
explicitly use _IMPLEMENTS_INTERFACE(Icon).
Gio::DBus::ActionGroup: Don't derive directly from ActionGroup
(instead just derive from, and implement Gio::RemoteActionGroup),
just as FileIcon doesn't derive directly from (or implement) Icon.
We can do this now that we can break ABI.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/m4/convert_gio.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index e6f7cb46..3ff1c4bd 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -229,7 +229,7 @@ _CONVERSION(`const Glib::RefPtr<MenuModel>&',`GMenuModel*',__CONVERT_CONST_REFPT # MenuItem _CONVERSION(`GMenuItem*',`Glib::RefPtr<MenuItem>',`Glib::wrap($3)') -_CONVERSION(`const Glib::RefPtr<MenuItem>&',`GMenuItem*',__CONVERT_CONST_REFPTR_TO_P) +_CONVERSION(`const Glib::RefPtr<const MenuItem>&',`GMenuItem*',__CONVERT_CONST_REFPTR_TO_P) # Mount _CONVERSION(`GMount*',`Glib::RefPtr<Mount>',`Glib::wrap($3)') |