From c516553417160b4ea11d52f649e2523aa03bf21b Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Fri, 2 Dec 2016 13:22:57 +0100 Subject: 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. --- tools/m4/convert_gio.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') 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&',`GMenuModel*',__CONVERT_CONST_REFPT # MenuItem _CONVERSION(`GMenuItem*',`Glib::RefPtr',`Glib::wrap($3)') -_CONVERSION(`const Glib::RefPtr&',`GMenuItem*',__CONVERT_CONST_REFPTR_TO_P) +_CONVERSION(`const Glib::RefPtr&',`GMenuItem*',__CONVERT_CONST_REFPTR_TO_P) # Mount _CONVERSION(`GMount*',`Glib::RefPtr',`Glib::wrap($3)') -- cgit v1.2.1