Skip to content

Commit c1c0820

Browse files
committed
hw/nxagent/Dialog.c: Drop unused dialog for DIALOG_DISABLE_XKB_LOCAL.
Fixes #383.
1 parent e9d088d commit c1c0820

File tree

2 files changed

+1
-31
lines changed

2 files changed

+1
-31
lines changed

nx-X11/programs/Xserver/hw/nxagent/Dialog.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -275,15 +275,6 @@ void nxagentLaunchDialog(DialogType dialogType)
275275

276276
break;
277277
}
278-
case DIALOG_DISABLE_XKB:
279-
{
280-
message = DIALOG_DISABLE_XKB_MESSAGE;
281-
type = DIALOG_DISABLE_XKB_TYPE;
282-
local = DIALOG_DISABLE_XKB_LOCAL;
283-
pid = &nxagentDisableXkbPid;
284-
285-
break;
286-
}
287278
default:
288279
{
289280
#ifdef WARNING
@@ -528,12 +519,6 @@ void nxagentTerminateDialog(DialogType type)
528519

529520
break;
530521
}
531-
case DIALOG_DISABLE_XKB:
532-
{
533-
pid = nxagentDisableXkbPid;
534-
535-
break;
536-
}
537522
default:
538523
{
539524
#ifdef WARNING

nx-X11/programs/Xserver/hw/nxagent/Dialog.h

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ typedef enum
4141
DIALOG_FAILED_RECONNECTION,
4242
DIALOG_ENABLE_DEFER_MODE,
4343
DIALOG_DISABLE_DEFER_MODE,
44-
DIALOG_DISABLE_XKB,
4544
DIALOG_LAST_TAG
4645

4746
} DialogType;
@@ -55,7 +54,6 @@ extern int nxagentEnableRandRModeDialogPid;
5554
extern int nxagentDisableRandRModeDialogPid;
5655
extern int nxagentEnableDeferModePid;
5756
extern int nxagentDisableDeferModePid;
58-
extern int nxagentDisableXkbPid;
5957

6058
extern char nxagentFailedReconnectionMessage[];
6159

@@ -74,8 +72,7 @@ extern void nxagentTerminateDialogs(void);
7472
nxagentEnableRandRModeDialogPid == 0 && \
7573
nxagentDisableRandRModeDialogPid == 0 && \
7674
nxagentEnableDeferModePid == 0 && \
77-
nxagentDisableDeferModePid == 0 && \
78-
nxagentDisableXkbPid == 0)
75+
nxagentDisableDeferModePid == 0)
7976

8077
#define DECODE_DIALOG_TYPE(type) \
8178
((type) == DIALOG_KILL_SESSION ? "DIALOG_KILL_SESSION" : \
@@ -88,7 +85,6 @@ extern void nxagentTerminateDialogs(void);
8885
(type) == DIALOG_FAILED_RECONNECTION ? "DIALOG_FAILED_RECONNECTION" : \
8986
(type) == DIALOG_ENABLE_DEFER_MODE ? "DIALOG_ENABLE_DEFER_MODE" : \
9087
(type) == DIALOG_DISABLE_DEFER_MODE ? "DIALOG_DISABLE_DEFER_MODE" : \
91-
(type) == DIALOG_DISABLE_XKB ? "DIALOG_DISABLE_XKB" : \
9288
"UNKNOWN_DIALOG")
9389

9490
/*
@@ -216,16 +212,5 @@ Ctrl+Alt+E to enable it again.\
216212

217213
#define DIALOG_DISABLE_DEFER_MODE_LOCAL 0
218214

219-
220-
#define DIALOG_DISABLE_XKB_MESSAGE \
221-
\
222-
"\
223-
Changing layout is not allowed with your current display.\
224-
"
225-
226-
#define DIALOG_DISABLE_XKB_TYPE "ok"
227-
228-
#define DIALOG_DISABLE_XKB_LOCAL 0
229-
230215
#endif /* __Dialog_H__ */
231216

0 commit comments

Comments
 (0)