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.c | |
| 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.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Dialog.c | 25 |
1 files changed, 0 insertions, 25 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 |