Fix warnings that only show up when --enable-modelock is passed to
./configure.
---
src/event.c | 6 +++++-
src/framewin.c | 3 ++-
src/startup.c | 3 +++
src/window.c | 1 -
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/event.c b/src/event.c
index 46e2ea9..d395125 100644
--- a/src/event.c
+++ b/src/event.c
@@ -124,6 +124,10 @@ static void handleVisibilityNotify(XEvent *event);
static void handleShapeNotify(XEvent *event);
#endif
+#ifdef KEEP_XKB_LOCK_STATUS
+static void handleXkbIndicatorStateNotify(XEvent *event);
+#endif
+
/* called from the signal handler */
void NotifyDeadProcess(pid_t pid, unsigned char status);
@@ -1194,7 +1198,7 @@ static void handleShapeNotify(XEvent * event)
#ifdef KEEP_XKB_LOCK_STATUS
/* please help ]d if you know what to do */
-handleXkbIndicatorStateNotify(XEvent * event)
+static void handleXkbIndicatorStateNotify(XEvent * event)
{
WWindow *wwin;
WScreen *scr;
diff --git a/src/framewin.c b/src/framewin.c
index 4a8893c..5d3ec49 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -146,13 +146,14 @@ void wFrameWindowUpdateBorders(WFrameWindow * fwin, int
flags)
wCoreConfigure(fwin->left_button, 0, 0,
bsize, bsize);
}
#ifdef XKB_BUTTON_HINT
- if (fwin->language_button)
+ if (fwin->language_button) {
if (fwin->flags.hide_left_button ||
!fwin->left_button
|| fwin->flags.lbutton_dont_fit) {
wCoreConfigure(fwin->language_button, 0, 0, bsize, bsize);
} else {
wCoreConfigure(fwin->language_button, bsize, 0, bsize, bsize);
}
+ }
#endif
if (fwin->right_button) {
diff --git a/src/startup.c b/src/startup.c
index f4ae9ba..6ef3580 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -42,6 +42,9 @@
#ifdef SHAPE
#include <X11/extensions/shape.h>
#endif
+#ifdef KEEP_XKB_LOCK_STATUS
+#include <X11/XKBlib.h>
+#endif
#include "WindowMaker.h"
#include "GNUstep.h"
diff --git a/src/window.c b/src/window.c
index 41dce05..8518739 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2980,7 +2980,6 @@ static void windowLanguageClick(WCoreWindow *sender, void
*data, XEvent *event)
WWindow *wwin = data;
WFrameWindow *fwin = wwin->frame;
WScreen *scr = fwin->screen_ptr;
- XkbStateRec staterec;
int tl;
if (event->xbutton.button != Button1 && event->xbutton.button !=
Button3)
--
1.7.0.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
