Fix the shortcut for closing fullscreen windows

This commit is contained in:
Pierre Pronchery 2018-10-20 16:12:55 +02:00
parent fd13b5b703
commit 2ff8f5e7b3

View File

@ -71,11 +71,11 @@ static char const * _authors[] =
NULL NULL
}; };
#ifdef EMBEDDED
static const DesktopAccel _mixer_accel[] = static const DesktopAccel _mixer_accel[] =
{ {
{ G_CALLBACK(on_file_close), GDK_CONTROL_MASK, GDK_KEY_W }, { G_CALLBACK(on_file_close), GDK_CONTROL_MASK, GDK_KEY_W },
{ G_CALLBACK(on_file_properties), GDK_MOD1_MASK, GDK_KEY_Return }, { G_CALLBACK(on_file_properties), GDK_MOD1_MASK, GDK_KEY_Return },
#ifdef EMBEDDED
{ G_CALLBACK(on_view_all), GDK_CONTROL_MASK, GDK_KEY_A }, { G_CALLBACK(on_view_all), GDK_CONTROL_MASK, GDK_KEY_A },
# ifdef AUDIO_MIXER_DEVINFO # ifdef AUDIO_MIXER_DEVINFO
{ G_CALLBACK(on_view_outputs), GDK_CONTROL_MASK, GDK_KEY_O }, { G_CALLBACK(on_view_outputs), GDK_CONTROL_MASK, GDK_KEY_O },
@ -86,9 +86,9 @@ static const DesktopAccel _mixer_accel[] =
{ G_CALLBACK(on_view_mix), GDK_CONTROL_MASK, GDK_KEY_X }, { G_CALLBACK(on_view_mix), GDK_CONTROL_MASK, GDK_KEY_X },
{ G_CALLBACK(on_view_modem), GDK_CONTROL_MASK, GDK_KEY_M }, { G_CALLBACK(on_view_modem), GDK_CONTROL_MASK, GDK_KEY_M },
# endif # endif
#endif /* EMBEDDED */
{ NULL, 0, 0 } { NULL, 0, 0 }
}; };
#endif /* EMBEDDED */
#ifndef EMBEDDED #ifndef EMBEDDED
static const DesktopMenu _mixer_menu_file[] = static const DesktopMenu _mixer_menu_file[] =
@ -275,9 +275,8 @@ MixerWindow * mixerwindow_new(char const * device, MixerLayout layout,
} }
else else
mixer->menubar = NULL; mixer->menubar = NULL;
#else
desktop_accel_create(_mixer_accel, mixer, accel);
#endif #endif
desktop_accel_create(_mixer_accel, mixer, accel);
/* toolbar */ /* toolbar */
if(embedded == FALSE) if(embedded == FALSE)
{ {