diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-04-21 16:14:27 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-21 16:14:27 +0200 |
| commit | 22b6ac728ea33642d9f6e3c2240bfd29c7956fb0 (patch) | |
| tree | 2fb5a3299ae5622b9a368ea7aa556ad04cda4fac /nx-X11/programs/Xserver/hw/nxagent/Dialog.h | |
| parent | 61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2 (diff) | |
| parent | 0f67af9d785254e394dd773fc9f34da2557a1983 (diff) | |
| download | nx-libs-22b6ac728ea33642d9f6e3c2240bfd29c7956fb0.tar.gz nx-libs-22b6ac728ea33642d9f6e3c2240bfd29c7956fb0.tar.bz2 nx-libs-22b6ac728ea33642d9f6e3c2240bfd29c7956fb0.zip | |
Merge branch 'sunweaver-pr/nxagent-dialog-fixes' into 3.6.x
Attributes GH PR #436: https://github.com/ArcticaProject/nx-libs/pull/436
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Dialog.h')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Dialog.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.h b/nx-X11/programs/Xserver/hw/nxagent/Dialog.h index 8c345d8a7..133dee242 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.h @@ -41,7 +41,6 @@ typedef enum DIALOG_FAILED_RECONNECTION, DIALOG_ENABLE_DEFER_MODE, DIALOG_DISABLE_DEFER_MODE, - DIALOG_DISABLE_XKB, DIALOG_LAST_TAG } DialogType; @@ -55,7 +54,6 @@ extern int nxagentEnableRandRModeDialogPid; extern int nxagentDisableRandRModeDialogPid; extern int nxagentEnableDeferModePid; extern int nxagentDisableDeferModePid; -extern int nxagentDisableXkbPid; extern char nxagentFailedReconnectionMessage[]; @@ -74,8 +72,7 @@ extern void nxagentTerminateDialogs(void); nxagentEnableRandRModeDialogPid == 0 && \ nxagentDisableRandRModeDialogPid == 0 && \ nxagentEnableDeferModePid == 0 && \ - nxagentDisableDeferModePid == 0 && \ - nxagentDisableXkbPid == 0) + nxagentDisableDeferModePid == 0) #define DECODE_DIALOG_TYPE(type) \ ((type) == DIALOG_KILL_SESSION ? "DIALOG_KILL_SESSION" : \ @@ -88,7 +85,6 @@ extern void nxagentTerminateDialogs(void); (type) == DIALOG_FAILED_RECONNECTION ? "DIALOG_FAILED_RECONNECTION" : \ (type) == DIALOG_ENABLE_DEFER_MODE ? "DIALOG_ENABLE_DEFER_MODE" : \ (type) == DIALOG_DISABLE_DEFER_MODE ? "DIALOG_DISABLE_DEFER_MODE" : \ - (type) == DIALOG_DISABLE_XKB ? "DIALOG_DISABLE_XKB" : \ "UNKNOWN_DIALOG") /* @@ -216,16 +212,5 @@ Ctrl+Alt+E to enable it again.\ #define DIALOG_DISABLE_DEFER_MODE_LOCAL 0 - -#define DIALOG_DISABLE_XKB_MESSAGE \ -\ -"\ -Changing layout is not allowed with your current display.\ -" - -#define DIALOG_DISABLE_XKB_TYPE "ok" - -#define DIALOG_DISABLE_XKB_LOCAL 0 - #endif /* __Dialog_H__ */ |