diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-08 12:21:20 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-21 15:45:39 +0200 |
| commit | 522e743f64ba29be98fe3f44596d7a7ed57f6aca (patch) | |
| tree | 4a46460c65d37830268899071a7452809633ae76 | |
| parent | 61d5cd0b75acc0ca3bfe2b6addc052c4aae8e6f2 (diff) | |
| download | nx-libs-522e743f64ba29be98fe3f44596d7a7ed57f6aca.tar.gz nx-libs-522e743f64ba29be98fe3f44596d7a7ed57f6aca.tar.bz2 nx-libs-522e743f64ba29be98fe3f44596d7a7ed57f6aca.zip | |
hw/nxagent/Dialog.c: Drop unused dialog for DIALOG_DISABLE_XKB_LOCAL.
Fixes ArcticaProject/nx-libs#383.
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 25 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Dialog.h | 17 |
2 files changed, 1 insertions, 41 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c index da448a1cd..b7852a0ac 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Dialog.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Dialog.c @@ -63,7 +63,6 @@ int nxagentEnableRandRModeDialogPid = 0; int nxagentDisableRandRModeDialogPid = 0; int nxagentEnableDeferModePid = 0; int nxagentDisableDeferModePid = 0; -int nxagentDisableXkbPid = 0; static int nxagentFailedReconnectionDialogPid = 0; @@ -159,15 +158,6 @@ void nxagentResetDialog(int pid) nxagentDisableDeferModePid = 0; } - else if (pid == nxagentDisableXkbPid) - { - #ifdef TEST - fprintf(stderr, "nxagentResetDialog: Resetting disable XKB dialog pid [%d].\n", - nxagentDisableXkbPid); - #endif - - nxagentDisableXkbPid = 0; - } } void nxagentLaunchDialog(DialogType dialogType) @@ -273,15 +263,6 @@ void nxagentLaunchDialog(DialogType dialogType) break; } - case DIALOG_DISABLE_XKB: - { - message = DIALOG_DISABLE_XKB_MESSAGE; - type = DIALOG_DISABLE_XKB_TYPE; - local = DIALOG_DISABLE_XKB_LOCAL; - pid = &nxagentDisableXkbPid; - - break; - } default: { #ifdef WARNING @@ -521,12 +502,6 @@ void nxagentTerminateDialog(DialogType type) break; } - case DIALOG_DISABLE_XKB: - { - pid = nxagentDisableXkbPid; - - break; - } default: { #ifdef WARNING 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__ */ |