diff options
Diffstat (limited to 'src/core/meta-pad-action-mapper.c')
| -rw-r--r-- | src/core/meta-pad-action-mapper.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/core/meta-pad-action-mapper.c b/src/core/meta-pad-action-mapper.c index 1a9408e6e..44a4bc482 100644 --- a/src/core/meta-pad-action-mapper.c +++ b/src/core/meta-pad-action-mapper.c @@ -73,6 +73,16 @@ struct _MetaPadActionMapper G_DEFINE_TYPE (MetaPadActionMapper, meta_pad_action_mapper, G_TYPE_OBJECT) +static MetaDisplay * +display_from_mapper (MetaPadActionMapper *mapper) +{ + MetaBackend *backend = + meta_monitor_manager_get_backend (mapper->monitor_manager); + MetaContext *context = meta_backend_get_context (backend); + + return meta_context_get_display (context); +} + static void meta_pad_action_mapper_finalize (GObject *object) { @@ -436,7 +446,7 @@ meta_pad_action_mapper_cycle_tablet_output (MetaPadActionMapper *mapper, } g_settings_set_strv (info->settings, "output", edid); - meta_display_show_tablet_mapping_notification (meta_get_display (), + meta_display_show_tablet_mapping_notification (display_from_mapper (mapper), device, pretty_name); } @@ -558,7 +568,7 @@ meta_pad_action_mapper_handle_button (MetaPadActionMapper *mapper, if (wacom_device) pretty_name = libwacom_get_name (wacom_device); #endif - meta_display_notify_pad_group_switch (meta_get_display (), pad, + meta_display_notify_pad_group_switch (display_from_mapper (mapper), pad, pretty_name, group, mode, n_modes); info->group_modes[group] = mode; } @@ -573,7 +583,7 @@ meta_pad_action_mapper_handle_button (MetaPadActionMapper *mapper, return TRUE; case G_DESKTOP_PAD_BUTTON_ACTION_HELP: if (is_press) - meta_display_request_pad_osd (meta_get_display (), pad, FALSE); + meta_display_request_pad_osd (display_from_mapper (mapper), pad, FALSE); return TRUE; case G_DESKTOP_PAD_BUTTON_ACTION_KEYBINDING: settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON, |