>From eef26c73389a21d6bbd3b3f7b8f9647d0114a54b Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <k...@kix.es>
Date: Wed, 25 Jan 2012 05:50:52 +0100
Subject: [PATCH 09/24] WindowMaker: WPreferences declared as global in
WindowMaker.h
WPreferences is declared as global in WindowMaker.h and therefore the externs
are not needed.
---
src/WindowMaker.h | 1 +
src/actions.c | 1 -
src/appicon.c | 1 -
src/application.c | 2 --
src/appmenu.c | 1 -
src/balloon.c | 2 --
src/client.c | 1 -
src/cycling.c | 2 --
src/defaults.c | 1 -
src/dialog.c | 2 --
src/dock.c | 1 -
src/dockedapp.c | 3 ---
src/event.c | 2 --
src/framewin.c | 2 --
src/icon.c | 2 --
src/main.c | 2 --
src/menu.c | 2 --
src/misc.c | 3 ---
src/monitor.c | 3 ---
src/moveres.c | 1 -
src/placement.c | 2 --
src/rootmenu.c | 1 -
src/screen.c | 2 --
src/stacking.c | 2 --
src/startup.c | 1 -
src/superfluous.c | 2 --
src/switchmenu.c | 3 ---
src/switchpanel.c | 2 --
src/texture.c | 2 --
src/usermenu.c | 2 --
src/wcore.c | 3 ---
src/wdefaults.c | 1 -
src/window.c | 1 -
src/winmenu.c | 2 --
src/winspector.c | 1 -
src/wmspec.c | 1 -
src/workspace.c | 1 -
37 files changed, 1 insertions(+), 63 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index a50b16f..a3f5212 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -443,6 +443,7 @@ typedef struct WPreferences {
/****** Global Variables ******/
Display *dpy;
+WPreferences wPreferences;
unsigned int ValidModMask;
char WProgramState;
char WProgramSigState;
diff --git a/src/actions.c b/src/actions.c
index c7d1c37..133879d 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -52,7 +52,6 @@
int ignore_wks_change = 0;
extern Time LastTimestamp;
extern Time LastFocusChange;
-extern WPreferences wPreferences;
extern void ProcessPendingEvents();
extern int calcIntersectionLength(int p1, int l1, int p2, int l2);
diff --git a/src/appicon.c b/src/appicon.c
index b08c8f1..f0c654a 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -54,7 +54,6 @@
/**** Global variables ****/
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
#define MOD_MASK wPreferences.modifier_mask
diff --git a/src/application.c b/src/application.c
index 8f64770..8a06859 100644
--- a/src/application.c
+++ b/src/application.c
@@ -54,8 +54,6 @@
extern XContext wAppWinContext;
extern XContext wWinContext;
-extern WPreferences wPreferences;
-
extern WDDomain *WDWindowAttributes;
/******** Local variables ********/
diff --git a/src/appmenu.c b/src/appmenu.c
index 7a1b118..2bbaafe 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -40,7 +40,6 @@
/******** Global Variables **********/
extern Time LastTimestamp;
-extern WPreferences wPreferences;
typedef struct {
short code;
diff --git a/src/balloon.c b/src/balloon.c
index a4e8aaf..2cfe8bb 100644
--- a/src/balloon.c
+++ b/src/balloon.c
@@ -43,8 +43,6 @@
#include "workspace.h"
#include "balloon.h"
-extern WPreferences wPreferences;
-
typedef struct _WBalloon {
Window window;
diff --git a/src/client.c b/src/client.c
index 6cd8dc0..9663e7f 100644
--- a/src/client.c
+++ b/src/client.c
@@ -574,7 +574,6 @@ void wClientCheckProperty(WWindow * wwin, XPropertyEvent *
event)
wAppMenuDestroy(wapp->menu);
}
if (wwin->fake_group) {
- extern WPreferences wPreferences;
WScreen *scr = wwin->screen_ptr;
WWindow *foo = scr->focused_window;
WFakeGroupLeader *fPtr =
wwin->fake_group;
diff --git a/src/cycling.c b/src/cycling.c
index 0b0dc7c..3b21884 100644
--- a/src/cycling.c
+++ b/src/cycling.c
@@ -39,8 +39,6 @@
#include "switchpanel.h"
/* Globals */
-extern WPreferences wPreferences;
-
extern WShortKey wKeyBindings[WKBD_LAST];
static void raiseWindow(WSwitchPanel * swpanel, WWindow * wwin)
diff --git a/src/defaults.c b/src/defaults.c
index dab5e64..dd35cd6 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -73,7 +73,6 @@ extern WDDomain *WDWindowMaker;
extern WDDomain *WDWindowAttributes;
extern WDDomain *WDRootMenu;
extern int wScreenCount;
-extern WPreferences wPreferences;
extern WShortKey wKeyBindings[WKBD_LAST];
typedef struct {
diff --git a/src/dialog.c b/src/dialog.c
index 904eac3..286e059 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -59,8 +59,6 @@
#include "actions.h"
#include "xinerama.h"
-extern WPreferences wPreferences;
-
static WMPoint getCenter(WScreen * scr, int width, int height)
{
return wGetPointToCenterRectInHead(scr,
wGetHeadForPointerLocation(scr), width, height);
diff --git a/src/dock.c b/src/dock.c
index 96d8c61..7c45aff 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -65,7 +65,6 @@
extern void DestroyDockAppSettingsPanel();
extern void ShowDockAppSettingsPanel(WAppIcon * aicon);
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
extern XContext wWinContext;
extern void appIconMouseDown(WObjDescriptor *desc, XEvent *event);
diff --git a/src/dockedapp.c b/src/dockedapp.c
index 944e025..d0693f2 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -37,9 +37,6 @@
#include "framewin.h"
#include "xinerama.h"
-/**** Global variables ****/
-extern WPreferences wPreferences;
-
typedef struct _AppSettingsPanel {
WMWindow *win;
WAppIcon *editedIcon;
diff --git a/src/event.c b/src/event.c
index d541521..ce3fe94 100644
--- a/src/event.c
+++ b/src/event.c
@@ -79,8 +79,6 @@ extern int wScreenCount;
extern Time LastTimestamp;
extern Time LastFocusChange;
-extern WPreferences wPreferences;
-
#define MOD_MASK wPreferences.modifier_mask
#ifdef SHAPE
diff --git a/src/framewin.c b/src/framewin.c
index f47d24e..fa6900a 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -42,8 +42,6 @@
#define DBLCLICK_TIME wPreferences.dblclick_time
-extern WPreferences wPreferences;
-
static void handleExpose(WObjDescriptor * desc, XEvent * event);
static void handleButtonExpose(WObjDescriptor * desc, XEvent * event);
diff --git a/src/icon.c b/src/icon.c
index 5660d6b..13b1c31 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -46,8 +46,6 @@
#include "wmspec.h"
/**** Global varianebles ****/
-extern WPreferences wPreferences;
-
#define MOD_MASK wPreferences.modifier_mask
extern Cursor wCursor[WCUR_LAST];
diff --git a/src/main.c b/src/main.c
index a2695bb..bd38c4b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -74,8 +74,6 @@ char *Locale = NULL;
int wScreenCount = 0;
-WPreferences wPreferences;
-
WMPropList *wDomainName;
WMPropList *wAttributeDomainName;
diff --git a/src/menu.c b/src/menu.c
index d9caa15..4a22e3a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -50,8 +50,6 @@ extern Cursor wCursor[WCUR_LAST];
extern XContext wWinContext;
-extern WPreferences wPreferences;
-
#define MOD_MASK wPreferences.modifier_mask
#define MENU_SCROLL_STEP
menuScrollParameters[(int)wPreferences.menu_scroll_speed].steps
diff --git a/src/misc.c b/src/misc.c
index 3381c2a..949713c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -47,9 +47,6 @@
#include "xutil.h"
#include "xmodifier.h"
-/**** global variables *****/
-extern WPreferences wPreferences;
-
#ifdef USECPP
static void putdef(char *line, char *name, char *value)
{
diff --git a/src/monitor.c b/src/monitor.c
index 355aba9..d6c9505 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -39,9 +39,6 @@
#include "dialog.h"
#include "funcs.h"
-/****** Global Variables ******/
-extern WPreferences wPreferences;
-
int showCrashDialog(int sig)
{
int crashAction;
diff --git a/src/moveres.c b/src/moveres.c
index d0ac651..b37dd14 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -62,7 +62,6 @@
/****** Global Variables ******/
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
/*
*----------------------------------------------------------------------
diff --git a/src/placement.c b/src/placement.c
index 4e19765..24b1ba3 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -39,8 +39,6 @@
#include "dock.h"
#include "xinerama.h"
-extern WPreferences wPreferences;
-
#define X_ORIGIN WMAX(usableArea.x1,\
wPreferences.window_place_origin.x)
diff --git a/src/rootmenu.c b/src/rootmenu.c
index cccbab8..afcfaca 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -58,7 +58,6 @@
extern char *Locale;
extern WDDomain *WDRootMenu;
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
static WMenu *readMenuPipe(WScreen * scr, char **file_name);
static WMenu *readMenuFile(WScreen * scr, char *file_name);
diff --git a/src/screen.c b/src/screen.c
index 78adc12..a989d92 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -70,8 +70,6 @@
/**** Global variables ****/
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
-
extern int wScreenCount;
#ifdef KEEP_XKB_LOCK_STATUS
diff --git a/src/stacking.c b/src/stacking.c
index 890e4d1..11875c3 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -39,8 +39,6 @@
/*** Global Variables ***/
extern XContext wStackContext;
-extern WPreferences wPreferences;
-
static void notifyStackChange(WCoreWindow * frame, char *detail)
{
WWindow *wwin = wWindowFor(frame->window);
diff --git a/src/startup.c b/src/startup.c
index d40dedd..67a81e4 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -83,7 +83,6 @@
#endif
/****** Global Variables ******/
-extern WPreferences wPreferences;
extern WDDomain *WDWindowMaker;
extern WDDomain *WDRootMenu;
extern WDDomain *WDWindowAttributes;
diff --git a/src/superfluous.c b/src/superfluous.c
index 50b60fe..99523df 100644
--- a/src/superfluous.c
+++ b/src/superfluous.c
@@ -41,8 +41,6 @@
#include "xinerama.h"
#include "stacking.h"
-extern WPreferences wPreferences;
-
#ifdef NORMAL_ICON_KABOOM
void DoKaboom(WScreen * scr, Window win, int x, int y)
{
diff --git a/src/switchmenu.c b/src/switchmenu.c
index 5a3f961..a0f1212 100644
--- a/src/switchmenu.c
+++ b/src/switchmenu.c
@@ -38,9 +38,6 @@
#include "workspace.h"
#include "framewin.h"
-/********* Global Variables *******/
-extern WPreferences wPreferences;
-
static int initialized = 0;
static void observer(void *self, WMNotification * notif);
static void wsobserver(void *self, WMNotification * notif);
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 0bceef5..94aee03 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -64,8 +64,6 @@ struct SwitchPanel {
WMColor *white;
};
-extern WPreferences wPreferences;
-
#define BORDER_SPACE 10
#define ICON_SIZE 48
#define ICON_TILE_SIZE 64
diff --git a/src/texture.c b/src/texture.c
index a18ed22..7faf0e0 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -33,8 +33,6 @@
#include "texture.h"
#include "funcs.h"
-extern WPreferences wPreferences;
-
static void bevelImage(RImage * image, int relief);
WTexSolid *wTextureMakeSolid(WScreen * scr, XColor * color)
diff --git a/src/usermenu.c b/src/usermenu.c
index 49473c8..3f0741b 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -80,8 +80,6 @@
#define MAX_SHORTCUT_LENGTH 32
/*** var ***/
-extern WPreferences wPreferences;
-
typedef struct {
WScreen *screen;
WShortKey *key;
diff --git a/src/wcore.c b/src/wcore.c
index 854c573..164e0d5 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -29,9 +29,6 @@
#include "WindowMaker.h"
#include "wcore.h"
-/****** Global Variables ******/
-extern WPreferences wPreferences;
-
/* cursors */
extern Cursor wCursor[WCUR_LAST];
diff --git a/src/wdefaults.c b/src/wdefaults.c
index eba2573..103e178 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -43,7 +43,6 @@
#include "icon.h"
/* Global stuff */
-extern WPreferences wPreferences;
extern WMPropList *wAttributeDomainName;
extern WDDomain *WDWindowAttributes;
diff --git a/src/window.c b/src/window.c
index 31035b6..a2aa136 100644
--- a/src/window.c
+++ b/src/window.c
@@ -77,7 +77,6 @@ extern Bool wShapeSupported;
extern XContext wWinContext;
/* protocol atoms */
-extern WPreferences wPreferences;
extern Time LastTimestamp;
/* superfluous... */
diff --git a/src/winmenu.c b/src/winmenu.c
index 843f4c5..d278dbf 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -70,8 +70,6 @@ extern Time LastTimestamp;
extern WShortKey wKeyBindings[WKBD_LAST];
-extern WPreferences wPreferences;
-
static void updateOptionsMenu(WMenu * menu, WWindow * wwin);
static void execWindowOptionCommand(WMenu * menu, WMenuEntry * entry)
diff --git a/src/winspector.c b/src/winspector.c
index adaf8b7..a847e33 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -119,7 +119,6 @@ typedef struct InspectorPanel {
extern Cursor wCursor[WCUR_LAST];
extern WDDomain *WDWindowAttributes;
-extern WPreferences wPreferences;
static InspectorPanel *panelList = NULL;
static WMPropList *ANoTitlebar = NULL;
diff --git a/src/wmspec.c b/src/wmspec.c
index 9dac4f4..7623354 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -53,7 +53,6 @@
/* Global variables */
extern Time LastTimestamp;
-extern WPreferences wPreferences;
/* Root Window Properties */
static Atom net_supported;
diff --git a/src/workspace.c b/src/workspace.c
index dc53d03..f9e89bf 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -53,7 +53,6 @@
#define WORKSPACE_NAME_DISPLAY_PADDING 32
extern int ignore_wks_change;
-extern WPreferences wPreferences;
extern XContext wVEdgeContext;
extern void ProcessPendingEvents();
--
1.7.2.3
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From eef26c73389a21d6bbd3b3f7b8f9647d0114a54b Mon Sep 17 00:00:00 2001
From: Rodolfo GarcÃa Peñas (kix) <k...@kix.es>
Date: Wed, 25 Jan 2012 05:50:52 +0100
Subject: [PATCH 09/24] WindowMaker: WPreferences declared as global in WindowMaker.h
WPreferences is declared as global in WindowMaker.h and therefore the externs are not needed.
---
src/WindowMaker.h | 1 +
src/actions.c | 1 -
src/appicon.c | 1 -
src/application.c | 2 --
src/appmenu.c | 1 -
src/balloon.c | 2 --
src/client.c | 1 -
src/cycling.c | 2 --
src/defaults.c | 1 -
src/dialog.c | 2 --
src/dock.c | 1 -
src/dockedapp.c | 3 ---
src/event.c | 2 --
src/framewin.c | 2 --
src/icon.c | 2 --
src/main.c | 2 --
src/menu.c | 2 --
src/misc.c | 3 ---
src/monitor.c | 3 ---
src/moveres.c | 1 -
src/placement.c | 2 --
src/rootmenu.c | 1 -
src/screen.c | 2 --
src/stacking.c | 2 --
src/startup.c | 1 -
src/superfluous.c | 2 --
src/switchmenu.c | 3 ---
src/switchpanel.c | 2 --
src/texture.c | 2 --
src/usermenu.c | 2 --
src/wcore.c | 3 ---
src/wdefaults.c | 1 -
src/window.c | 1 -
src/winmenu.c | 2 --
src/winspector.c | 1 -
src/wmspec.c | 1 -
src/workspace.c | 1 -
37 files changed, 1 insertions(+), 63 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index a50b16f..a3f5212 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -443,6 +443,7 @@ typedef struct WPreferences {
/****** Global Variables ******/
Display *dpy;
+WPreferences wPreferences;
unsigned int ValidModMask;
char WProgramState;
char WProgramSigState;
diff --git a/src/actions.c b/src/actions.c
index c7d1c37..133879d 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -52,7 +52,6 @@
int ignore_wks_change = 0;
extern Time LastTimestamp;
extern Time LastFocusChange;
-extern WPreferences wPreferences;
extern void ProcessPendingEvents();
extern int calcIntersectionLength(int p1, int l1, int p2, int l2);
diff --git a/src/appicon.c b/src/appicon.c
index b08c8f1..f0c654a 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -54,7 +54,6 @@
/**** Global variables ****/
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
#define MOD_MASK wPreferences.modifier_mask
diff --git a/src/application.c b/src/application.c
index 8f64770..8a06859 100644
--- a/src/application.c
+++ b/src/application.c
@@ -54,8 +54,6 @@
extern XContext wAppWinContext;
extern XContext wWinContext;
-extern WPreferences wPreferences;
-
extern WDDomain *WDWindowAttributes;
/******** Local variables ********/
diff --git a/src/appmenu.c b/src/appmenu.c
index 7a1b118..2bbaafe 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -40,7 +40,6 @@
/******** Global Variables **********/
extern Time LastTimestamp;
-extern WPreferences wPreferences;
typedef struct {
short code;
diff --git a/src/balloon.c b/src/balloon.c
index a4e8aaf..2cfe8bb 100644
--- a/src/balloon.c
+++ b/src/balloon.c
@@ -43,8 +43,6 @@
#include "workspace.h"
#include "balloon.h"
-extern WPreferences wPreferences;
-
typedef struct _WBalloon {
Window window;
diff --git a/src/client.c b/src/client.c
index 6cd8dc0..9663e7f 100644
--- a/src/client.c
+++ b/src/client.c
@@ -574,7 +574,6 @@ void wClientCheckProperty(WWindow * wwin, XPropertyEvent * event)
wAppMenuDestroy(wapp->menu);
}
if (wwin->fake_group) {
- extern WPreferences wPreferences;
WScreen *scr = wwin->screen_ptr;
WWindow *foo = scr->focused_window;
WFakeGroupLeader *fPtr = wwin->fake_group;
diff --git a/src/cycling.c b/src/cycling.c
index 0b0dc7c..3b21884 100644
--- a/src/cycling.c
+++ b/src/cycling.c
@@ -39,8 +39,6 @@
#include "switchpanel.h"
/* Globals */
-extern WPreferences wPreferences;
-
extern WShortKey wKeyBindings[WKBD_LAST];
static void raiseWindow(WSwitchPanel * swpanel, WWindow * wwin)
diff --git a/src/defaults.c b/src/defaults.c
index dab5e64..dd35cd6 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -73,7 +73,6 @@ extern WDDomain *WDWindowMaker;
extern WDDomain *WDWindowAttributes;
extern WDDomain *WDRootMenu;
extern int wScreenCount;
-extern WPreferences wPreferences;
extern WShortKey wKeyBindings[WKBD_LAST];
typedef struct {
diff --git a/src/dialog.c b/src/dialog.c
index 904eac3..286e059 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -59,8 +59,6 @@
#include "actions.h"
#include "xinerama.h"
-extern WPreferences wPreferences;
-
static WMPoint getCenter(WScreen * scr, int width, int height)
{
return wGetPointToCenterRectInHead(scr, wGetHeadForPointerLocation(scr), width, height);
diff --git a/src/dock.c b/src/dock.c
index 96d8c61..7c45aff 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -65,7 +65,6 @@
extern void DestroyDockAppSettingsPanel();
extern void ShowDockAppSettingsPanel(WAppIcon * aicon);
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
extern XContext wWinContext;
extern void appIconMouseDown(WObjDescriptor *desc, XEvent *event);
diff --git a/src/dockedapp.c b/src/dockedapp.c
index 944e025..d0693f2 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -37,9 +37,6 @@
#include "framewin.h"
#include "xinerama.h"
-/**** Global variables ****/
-extern WPreferences wPreferences;
-
typedef struct _AppSettingsPanel {
WMWindow *win;
WAppIcon *editedIcon;
diff --git a/src/event.c b/src/event.c
index d541521..ce3fe94 100644
--- a/src/event.c
+++ b/src/event.c
@@ -79,8 +79,6 @@ extern int wScreenCount;
extern Time LastTimestamp;
extern Time LastFocusChange;
-extern WPreferences wPreferences;
-
#define MOD_MASK wPreferences.modifier_mask
#ifdef SHAPE
diff --git a/src/framewin.c b/src/framewin.c
index f47d24e..fa6900a 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -42,8 +42,6 @@
#define DBLCLICK_TIME wPreferences.dblclick_time
-extern WPreferences wPreferences;
-
static void handleExpose(WObjDescriptor * desc, XEvent * event);
static void handleButtonExpose(WObjDescriptor * desc, XEvent * event);
diff --git a/src/icon.c b/src/icon.c
index 5660d6b..13b1c31 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -46,8 +46,6 @@
#include "wmspec.h"
/**** Global varianebles ****/
-extern WPreferences wPreferences;
-
#define MOD_MASK wPreferences.modifier_mask
extern Cursor wCursor[WCUR_LAST];
diff --git a/src/main.c b/src/main.c
index a2695bb..bd38c4b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -74,8 +74,6 @@ char *Locale = NULL;
int wScreenCount = 0;
-WPreferences wPreferences;
-
WMPropList *wDomainName;
WMPropList *wAttributeDomainName;
diff --git a/src/menu.c b/src/menu.c
index d9caa15..4a22e3a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -50,8 +50,6 @@ extern Cursor wCursor[WCUR_LAST];
extern XContext wWinContext;
-extern WPreferences wPreferences;
-
#define MOD_MASK wPreferences.modifier_mask
#define MENU_SCROLL_STEP menuScrollParameters[(int)wPreferences.menu_scroll_speed].steps
diff --git a/src/misc.c b/src/misc.c
index 3381c2a..949713c 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -47,9 +47,6 @@
#include "xutil.h"
#include "xmodifier.h"
-/**** global variables *****/
-extern WPreferences wPreferences;
-
#ifdef USECPP
static void putdef(char *line, char *name, char *value)
{
diff --git a/src/monitor.c b/src/monitor.c
index 355aba9..d6c9505 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -39,9 +39,6 @@
#include "dialog.h"
#include "funcs.h"
-/****** Global Variables ******/
-extern WPreferences wPreferences;
-
int showCrashDialog(int sig)
{
int crashAction;
diff --git a/src/moveres.c b/src/moveres.c
index d0ac651..b37dd14 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -62,7 +62,6 @@
/****** Global Variables ******/
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
/*
*----------------------------------------------------------------------
diff --git a/src/placement.c b/src/placement.c
index 4e19765..24b1ba3 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -39,8 +39,6 @@
#include "dock.h"
#include "xinerama.h"
-extern WPreferences wPreferences;
-
#define X_ORIGIN WMAX(usableArea.x1,\
wPreferences.window_place_origin.x)
diff --git a/src/rootmenu.c b/src/rootmenu.c
index cccbab8..afcfaca 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -58,7 +58,6 @@
extern char *Locale;
extern WDDomain *WDRootMenu;
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
static WMenu *readMenuPipe(WScreen * scr, char **file_name);
static WMenu *readMenuFile(WScreen * scr, char *file_name);
diff --git a/src/screen.c b/src/screen.c
index 78adc12..a989d92 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -70,8 +70,6 @@
/**** Global variables ****/
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
-
extern int wScreenCount;
#ifdef KEEP_XKB_LOCK_STATUS
diff --git a/src/stacking.c b/src/stacking.c
index 890e4d1..11875c3 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -39,8 +39,6 @@
/*** Global Variables ***/
extern XContext wStackContext;
-extern WPreferences wPreferences;
-
static void notifyStackChange(WCoreWindow * frame, char *detail)
{
WWindow *wwin = wWindowFor(frame->window);
diff --git a/src/startup.c b/src/startup.c
index d40dedd..67a81e4 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -83,7 +83,6 @@
#endif
/****** Global Variables ******/
-extern WPreferences wPreferences;
extern WDDomain *WDWindowMaker;
extern WDDomain *WDRootMenu;
extern WDDomain *WDWindowAttributes;
diff --git a/src/superfluous.c b/src/superfluous.c
index 50b60fe..99523df 100644
--- a/src/superfluous.c
+++ b/src/superfluous.c
@@ -41,8 +41,6 @@
#include "xinerama.h"
#include "stacking.h"
-extern WPreferences wPreferences;
-
#ifdef NORMAL_ICON_KABOOM
void DoKaboom(WScreen * scr, Window win, int x, int y)
{
diff --git a/src/switchmenu.c b/src/switchmenu.c
index 5a3f961..a0f1212 100644
--- a/src/switchmenu.c
+++ b/src/switchmenu.c
@@ -38,9 +38,6 @@
#include "workspace.h"
#include "framewin.h"
-/********* Global Variables *******/
-extern WPreferences wPreferences;
-
static int initialized = 0;
static void observer(void *self, WMNotification * notif);
static void wsobserver(void *self, WMNotification * notif);
diff --git a/src/switchpanel.c b/src/switchpanel.c
index 0bceef5..94aee03 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -64,8 +64,6 @@ struct SwitchPanel {
WMColor *white;
};
-extern WPreferences wPreferences;
-
#define BORDER_SPACE 10
#define ICON_SIZE 48
#define ICON_TILE_SIZE 64
diff --git a/src/texture.c b/src/texture.c
index a18ed22..7faf0e0 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -33,8 +33,6 @@
#include "texture.h"
#include "funcs.h"
-extern WPreferences wPreferences;
-
static void bevelImage(RImage * image, int relief);
WTexSolid *wTextureMakeSolid(WScreen * scr, XColor * color)
diff --git a/src/usermenu.c b/src/usermenu.c
index 49473c8..3f0741b 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -80,8 +80,6 @@
#define MAX_SHORTCUT_LENGTH 32
/*** var ***/
-extern WPreferences wPreferences;
-
typedef struct {
WScreen *screen;
WShortKey *key;
diff --git a/src/wcore.c b/src/wcore.c
index 854c573..164e0d5 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -29,9 +29,6 @@
#include "WindowMaker.h"
#include "wcore.h"
-/****** Global Variables ******/
-extern WPreferences wPreferences;
-
/* cursors */
extern Cursor wCursor[WCUR_LAST];
diff --git a/src/wdefaults.c b/src/wdefaults.c
index eba2573..103e178 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -43,7 +43,6 @@
#include "icon.h"
/* Global stuff */
-extern WPreferences wPreferences;
extern WMPropList *wAttributeDomainName;
extern WDDomain *WDWindowAttributes;
diff --git a/src/window.c b/src/window.c
index 31035b6..a2aa136 100644
--- a/src/window.c
+++ b/src/window.c
@@ -77,7 +77,6 @@ extern Bool wShapeSupported;
extern XContext wWinContext;
/* protocol atoms */
-extern WPreferences wPreferences;
extern Time LastTimestamp;
/* superfluous... */
diff --git a/src/winmenu.c b/src/winmenu.c
index 843f4c5..d278dbf 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -70,8 +70,6 @@ extern Time LastTimestamp;
extern WShortKey wKeyBindings[WKBD_LAST];
-extern WPreferences wPreferences;
-
static void updateOptionsMenu(WMenu * menu, WWindow * wwin);
static void execWindowOptionCommand(WMenu * menu, WMenuEntry * entry)
diff --git a/src/winspector.c b/src/winspector.c
index adaf8b7..a847e33 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -119,7 +119,6 @@ typedef struct InspectorPanel {
extern Cursor wCursor[WCUR_LAST];
extern WDDomain *WDWindowAttributes;
-extern WPreferences wPreferences;
static InspectorPanel *panelList = NULL;
static WMPropList *ANoTitlebar = NULL;
diff --git a/src/wmspec.c b/src/wmspec.c
index 9dac4f4..7623354 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -53,7 +53,6 @@
/* Global variables */
extern Time LastTimestamp;
-extern WPreferences wPreferences;
/* Root Window Properties */
static Atom net_supported;
diff --git a/src/workspace.c b/src/workspace.c
index dc53d03..f9e89bf 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -53,7 +53,6 @@
#define WORKSPACE_NAME_DISPLAY_PADDING 32
extern int ignore_wks_change;
-extern WPreferences wPreferences;
extern XContext wVEdgeContext;
extern void ProcessPendingEvents();
--
1.7.2.3
