This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 5fcf15f0d5705cda9117da674b55d2bbbc4b3f62 (commit)
via 60a4121a92b75ad26597ffe07387d5398aa87579 (commit)
via 91529ff1a7f979a8d80a39936a2b35498e6cfe9c (commit)
via 496cb58ceaca6e631b070a0a899c5c957b3b6e60 (commit)
via 74cd836e48c51ef5b27f4a3d7727683ccfcdd112 (commit)
via 3803ae6493d3e43dba074ae7e6fe8c3ac30c5f4e (commit)
from 401a37d924dbd995694f0dba23c3861206aab8c9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/5fcf15f0d5705cda9117da674b55d2bbbc4b3f62
commit 5fcf15f0d5705cda9117da674b55d2bbbc4b3f62
Author: Christophe CURIS <[email protected]>
Date: Sun Jun 30 16:02:39 2013 +0200
wmaker: Changed global constant declaration to use appropriate type
The original type was not as safe as it looked like to be, and led
to more memory usage than necessary.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 69923c1..21e6ff1 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -455,18 +455,19 @@ extern char WProgramState;
extern char WProgramSigState;
/****** Notifications ******/
-extern const char *WMNManaged;
-extern const char *WMNUnmanaged;
-extern const char *WMNChangedWorkspace;
-extern const char *WMNChangedState;
-extern const char *WMNChangedFocus;
-extern const char *WMNChangedStacking;
-extern const char *WMNChangedName;
-
-extern const char *WMNWorkspaceCreated;
-extern const char *WMNWorkspaceDestroyed;
-extern const char *WMNWorkspaceChanged;
-extern const char *WMNWorkspaceNameChanged;
-
-extern const char *WMNResetStacking;
+extern const char WMNManaged[];
+extern const char WMNUnmanaged[];
+extern const char WMNChangedWorkspace[];
+extern const char WMNChangedState[];
+extern const char WMNChangedFocus[];
+extern const char WMNChangedStacking[];
+extern const char WMNChangedName[];
+
+extern const char WMNWorkspaceCreated[];
+extern const char WMNWorkspaceDestroyed[];
+extern const char WMNWorkspaceChanged[];
+extern const char WMNWorkspaceNameChanged[];
+
+extern const char WMNResetStacking[];
+
#endif
diff --git a/src/main.c b/src/main.c
index 199033e..69a68e2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -150,20 +150,20 @@ char WProgramState = WSTATE_NORMAL;
char WDelayedActionSet = 0;
/* notifications */
-const char *WMNManaged = "WMNManaged";
-const char *WMNUnmanaged = "WMNUnmanaged";
-const char *WMNChangedWorkspace = "WMNChangedWorkspace";
-const char *WMNChangedState = "WMNChangedState";
-const char *WMNChangedFocus = "WMNChangedFocus";
-const char *WMNChangedStacking = "WMNChangedStacking";
-const char *WMNChangedName = "WMNChangedName";
-
-const char *WMNWorkspaceCreated = "WMNWorkspaceCreated";
-const char *WMNWorkspaceDestroyed = "WMNWorkspaceDestroyed";
-const char *WMNWorkspaceChanged = "WMNWorkspaceChanged";
-const char *WMNWorkspaceNameChanged = "WMNWorkspaceNameChanged";
-
-const char *WMNResetStacking = "WMNResetStacking";
+const char WMNManaged[] = "WMNManaged";
+const char WMNUnmanaged[] = "WMNUnmanaged";
+const char WMNChangedWorkspace[] = "WMNChangedWorkspace";
+const char WMNChangedState[] = "WMNChangedState";
+const char WMNChangedFocus[] = "WMNChangedFocus";
+const char WMNChangedStacking[] = "WMNChangedStacking";
+const char WMNChangedName[] = "WMNChangedName";
+
+const char WMNWorkspaceCreated[] = "WMNWorkspaceCreated";
+const char WMNWorkspaceDestroyed[] = "WMNWorkspaceDestroyed";
+const char WMNWorkspaceChanged[] = "WMNWorkspaceChanged";
+const char WMNWorkspaceNameChanged[] = "WMNWorkspaceNameChanged";
+
+const char WMNResetStacking[] = "WMNResetStacking";
/******** End Global Variables *****/
http://repo.or.cz/w/wmaker-crm.git/commit/60a4121a92b75ad26597ffe07387d5398aa87579
commit 60a4121a92b75ad26597ffe07387d5398aa87579
Author: Christophe CURIS <[email protected]>
Date: Sun Jun 30 16:02:37 2013 +0200
wmaker: Moved function prototype to the appropriate header
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/src/appicon.c b/src/appicon.c
index dbe7ae5..e7ccb34 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -68,7 +68,6 @@ extern XContext wWinContext;
#define MOD_MASK wPreferences.modifier_mask
#define ICON_SIZE wPreferences.icon_size
-void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
static void iconDblClick(WObjDescriptor * desc, XEvent * event);
static void iconExpose(WObjDescriptor * desc, XEvent * event);
static void wApplicationSaveIconPathFor(const char *iconPath, const char
*wm_instance, const char *wm_class);
diff --git a/src/appicon.h b/src/appicon.h
index 6ed9053..f6e1ae6 100644
--- a/src/appicon.h
+++ b/src/appicon.h
@@ -84,4 +84,7 @@ void unpaint_app_icon(WApplication *wapp);
void wApplicationExtractDirPackIcon(WScreen *scr, const char *path, const char
*wm_instance,
const char *wm_class);
WAppIcon *wAppIconFor(Window window);
+
+void appIconMouseDown(WObjDescriptor * desc, XEvent * event);
+
#endif
diff --git a/src/dock.c b/src/dock.c
index 8bd72c2..69bebde 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -68,7 +68,6 @@
/**** Global variables ****/
extern Cursor wCursor[WCUR_LAST];
extern XContext wWinContext;
-extern void appIconMouseDown(WObjDescriptor *desc, XEvent *event);
#define MOD_MASK wPreferences.modifier_mask
#define ICON_SIZE wPreferences.icon_size
http://repo.or.cz/w/wmaker-crm.git/commit/91529ff1a7f979a8d80a39936a2b35498e6cfe9c
commit 91529ff1a7f979a8d80a39936a2b35498e6cfe9c
Author: Christophe CURIS <[email protected]>
Date: Sun Jun 30 16:02:38 2013 +0200
wmaker: Replaced local declaration of system function by proper header call
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/src/appicon.c b/src/appicon.c
index 41e52e7..dbe7ae5 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -25,6 +25,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <stdlib.h>
+#include <libgen.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
@@ -556,7 +557,6 @@ static void killCallback(WMenu * menu, WMenuEntry * entry)
WFakeGroupLeader *fPtr;
char *buffer;
char *shortname;
- char *basename(const char *shortname);
if (!WCHECK_STATE(WSTATE_NORMAL))
return;
diff --git a/src/dock.c b/src/dock.c
index 3c3c150..8bd72c2 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -26,6 +26,7 @@
#include <X11/Xutil.h>
#include <stdio.h>
#include <stdlib.h>
+#include <libgen.h>
#include <string.h>
#include <strings.h>
#include <unistd.h>
@@ -208,7 +209,6 @@ static void killCallback(WMenu *menu, WMenuEntry *entry)
WAppIcon *icon;
WFakeGroupLeader *fPtr;
char *buffer, *shortname, **argv;
- char *basename(const char *shortname);
int argc;
if (!WCHECK_STATE(WSTATE_NORMAL))
http://repo.or.cz/w/wmaker-crm.git/commit/496cb58ceaca6e631b070a0a899c5c957b3b6e60
commit 496cb58ceaca6e631b070a0a899c5c957b3b6e60
Author: Christophe CURIS <[email protected]>
Date: Sun Jun 30 16:02:36 2013 +0200
wmaker: Moved function prototype to the appropriate header
It is bad practice to define the prototype of an external function
inside a source file that wants to use it.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/src/event.c b/src/event.c
index 495d2b4..95b437b 100644
--- a/src/event.c
+++ b/src/event.c
@@ -141,9 +141,6 @@ static void handleShapeNotify(XEvent *event);
static void handleXkbIndicatorStateNotify(XEvent *event);
#endif
-/* called from the signal handler */
-void NotifyDeadProcess(pid_t pid, unsigned char status);
-
/* real dead process handler */
static void handleDeadProcess(void *foo);
diff --git a/src/event.h b/src/event.h
index 7208b6e..780f04e 100644
--- a/src/event.h
+++ b/src/event.h
@@ -36,4 +36,7 @@ void ProcessPendingEvents(void);
WMagicNumber wAddDeathHandler(pid_t pid, WDeathHandler *callback, void *cdata);
Bool IsDoubleClick(WScreen *scr, XEvent *event);
+/* called from the signal handler */
+void NotifyDeadProcess(pid_t pid, unsigned char status);
+
#endif /* WMEVENT_H */
diff --git a/src/startup.c b/src/startup.c
index 5f994f8..5f906c7 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -138,8 +138,6 @@ extern Cursor wCursor[WCUR_LAST];
extern char WDelayedActionSet;
#endif
-extern void NotifyDeadProcess(pid_t pid, unsigned char status);
-
/***** Local *****/
static WScreen **wScreen = NULL;
static unsigned int _NumLockMask = 0;
http://repo.or.cz/w/wmaker-crm.git/commit/74cd836e48c51ef5b27f4a3d7727683ccfcdd112
commit 74cd836e48c51ef5b27f4a3d7727683ccfcdd112
Author: Christophe CURIS <[email protected]>
Date: Sun Jun 30 16:02:35 2013 +0200
wmaker: Replaced local 'extern' definition of wPreferences by proper header
usage
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index 23ea046..69923c1 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -297,7 +297,7 @@ typedef struct WCoord {
int x, y;
} WCoord;
-typedef struct WPreferences {
+extern struct WPreferences {
char *pixmap_path; /* : separated list of paths to find
pixmaps */
char *icon_path; /* : separated list of paths to find
icons */
WMArray *fallbackWMs; /* fallback window manager list */
@@ -446,7 +446,7 @@ typedef struct WPreferences {
#endif
unsigned int restarting:2;
} flags; /* internal flags */
-} WPreferences;
+} wPreferences;
/****** Global Variables ******/
extern Display *dpy;
diff --git a/src/actions.c b/src/actions.c
index e492419..b4eda5f 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -55,7 +55,6 @@
int ignore_wks_change = 0;
extern Time LastTimestamp;
extern Time LastFocusChange;
-extern WPreferences wPreferences;
extern Atom _XA_WM_TAKE_FOCUS;
static void find_Maximus_geometry(WWindow *wwin, WArea usableArea, int *new_x,
int *new_y,
diff --git a/src/appicon.c b/src/appicon.c
index e1fada1..41e52e7 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -61,7 +61,6 @@
/**** Global variables ****/
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
extern WDDomain *WDWindowAttributes;
extern XContext wWinContext;
diff --git a/src/appmenu.c b/src/appmenu.c
index 343797b..539f056 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -39,7 +39,6 @@
/******** Global Variables **********/
extern Atom _XA_WINDOWMAKER_MENU;
extern Time LastTimestamp;
-extern WPreferences wPreferences;
typedef struct {
short code;
diff --git a/src/balloon.c b/src/balloon.c
index af7ceed..e2c294a 100644
--- a/src/balloon.c
+++ b/src/balloon.c
@@ -43,7 +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 060ec59..0c4126f 100644
--- a/src/client.c
+++ b/src/client.c
@@ -577,7 +577,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 3414ae2..4955e3f 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 601eb54..02f01a3 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -76,7 +76,6 @@ extern WDDomain *WDWindowMaker;
extern WDDomain *WDWindowAttributes;
extern WDDomain *WDRootMenu;
extern int wScreenCount;
-extern WPreferences wPreferences;
extern WShortKey wKeyBindings[WKBD_LAST];
typedef struct _WDefaultEntry WDefaultEntry;
@@ -3065,7 +3064,7 @@ static int setSwPOptions(WScreen * scr, WDefaultEntry *
entry, void *tdata, void
char *path;
RImage *bgimage;
int cwidth, cheight;
- WPreferences *prefs = foo;
+ struct WPreferences *prefs = foo;
if (!WMIsPLArray(array) || WMGetPropListItemCount(array) == 0) {
if (prefs->swtileImage)
@@ -3182,7 +3181,7 @@ static int setModifierKeyLabels(WScreen * scr,
WDefaultEntry * entry, void *tdat
{
WMPropList *array = tdata;
int i;
- WPreferences *prefs = foo;
+ struct WPreferences *prefs = foo;
if (!WMIsPLArray(array) || WMGetPropListItemCount(array) != 7) {
wwarning(_("Value for option "%s" must be an array of 7
strings"), entry->key);
diff --git a/src/dialog.c b/src/dialog.c
index bef0985..c36d9fa 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -60,7 +60,6 @@
#include "actions.h"
#include "xinerama.h"
-extern WPreferences wPreferences;
static WMPoint getCenter(WScreen * scr, int width, int height)
{
diff --git a/src/dock.c b/src/dock.c
index 3f44b44..3c3c150 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -66,7 +66,6 @@
/**** Global variables ****/
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 0ef180f..b24f127 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -39,8 +39,6 @@
#include "framewin.h"
#include "xinerama.h"
-/**** Global variables ****/
-extern WPreferences wPreferences;
static void updateCommand(WAppIcon * icon, char *command)
{
diff --git a/src/event.c b/src/event.c
index c6951bb..495d2b4 100644
--- a/src/event.c
+++ b/src/event.c
@@ -87,8 +87,6 @@ extern int wScreenCount;
extern Time LastTimestamp;
extern Time LastFocusChange;
-extern WPreferences wPreferences;
-
#define MOD_MASK wPreferences.modifier_mask
extern Atom _XA_WM_COLORMAP_NOTIFY;
diff --git a/src/framewin.c b/src/framewin.c
index db0d988..9157295 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -45,7 +45,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 0472d7a..3e06585 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -49,7 +49,6 @@
#include "winmenu.h"
/**** Global varianebles ****/
-extern WPreferences wPreferences;
#define MOD_MASK wPreferences.modifier_mask
#define CACHE_ICON_PATH "/Library/WindowMaker/CachedPixmaps"
diff --git a/src/main.c b/src/main.c
index 36ae499..199033e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -82,7 +82,7 @@ char *Locale = NULL;
int wScreenCount = 0;
-WPreferences wPreferences;
+struct WPreferences wPreferences;
WShortKey wKeyBindings[WKBD_LAST];
@@ -599,7 +599,7 @@ int main(int argc, char **argv)
/* setup common stuff for the monitor and wmaker itself */
WMInitializeApplication("WindowMaker", &argc, argv);
- memset(&wPreferences, 0, sizeof(WPreferences));
+ memset(&wPreferences, 0, sizeof(wPreferences));
wPreferences.fallbackWMs = WMCreateArray(8);
alt = getenv("WINDOWMAKER_ALT_WM");
diff --git a/src/menu.c b/src/menu.c
index 75a2db5..0ececa7 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -51,8 +51,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 4c4eaca..27a6ab2 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -50,8 +50,7 @@
#include "xutil.h"
#include "xmodifier.h"
-/**** global variables *****/
-extern WPreferences wPreferences;
+
#define ICON_SIZE wPreferences.icon_size
/**** Local prototypes *****/
diff --git a/src/monitor.c b/src/monitor.c
index d33372d..c023b30 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -39,8 +39,6 @@
#include "dialog.h"
#include "main.h"
-/****** Global Variables ******/
-extern WPreferences wPreferences;
static int showCrashDialog(int sig)
{
diff --git a/src/moveres.c b/src/moveres.c
index 3984906..26b8cf9 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 a445ec1..59f137d 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -39,7 +39,6 @@
#include "xinerama.h"
#include "placement.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 5d971b6..64939f7 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -63,7 +63,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 *readPLMenuPipe(WScreen * scr, char **file_name);
diff --git a/src/screen.c b/src/screen.c
index 90b5445..a5cb5fb 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -71,7 +71,6 @@
/**** Global variables ****/
extern Cursor wCursor[WCUR_LAST];
-extern WPreferences wPreferences;
extern Atom _XA_WINDOWMAKER_STATE;
extern Atom _XA_WINDOWMAKER_NOTICEBOARD;
diff --git a/src/stacking.c b/src/stacking.c
index f28e5b3..4a77340 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -38,8 +38,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 0175e7c..5f994f8 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -85,7 +85,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 0c95ed4..e33e6eb 100644
--- a/src/superfluous.c
+++ b/src/superfluous.c
@@ -49,7 +49,6 @@
#define BOUNCE_DAMP 0.6
#define URGENT_BOUNCE_DELAY 3000
-extern WPreferences wPreferences;
void DoKaboom(WScreen * scr, Window win, int x, int y)
{
diff --git a/src/switchmenu.c b/src/switchmenu.c
index 227b7fa..191063d 100644
--- a/src/switchmenu.c
+++ b/src/switchmenu.c
@@ -44,9 +44,6 @@
((w)->wm_gnustep_attr->window_level == WMMainMenuWindowLevel ||
(w)->wm_gnustep_attr->window_level == WMSubmenuWindowLevel))
-/********* 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 f616bfa..f305d41 100644
--- a/src/switchpanel.c
+++ b/src/switchpanel.c
@@ -66,8 +66,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 aaa10fb..a401fce 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -34,7 +34,6 @@
#include "window.h"
#include "misc.h"
-extern WPreferences wPreferences;
static void bevelImage(RImage * image, int relief);
static RImage * get_texture_image(WScreen *scr, const char *pixmap_file);
diff --git a/src/usermenu.c b/src/usermenu.c
index e688a33..d3f6fcc 100644
--- a/src/usermenu.c
+++ b/src/usermenu.c
@@ -79,8 +79,6 @@
#define MAX_SHORTCUT_LENGTH 32
-/*** var ***/
-extern WPreferences wPreferences;
typedef struct {
WScreen *screen;
diff --git a/src/wcore.c b/src/wcore.c
index a2aff96..3e77fbf 100644
--- a/src/wcore.c
+++ b/src/wcore.c
@@ -30,8 +30,6 @@
#include "wcore.h"
/****** Global Variables ******/
-extern WPreferences wPreferences;
-
/* cursors */
extern Cursor wCursor[WCUR_LAST];
extern XContext wWinContext;
diff --git a/src/wdefaults.c b/src/wdefaults.c
index 93ef0e3..09cf2c5 100644
--- a/src/wdefaults.c
+++ b/src/wdefaults.c
@@ -48,7 +48,6 @@
if (mask) mask->flag = 1;}
/* Global stuff */
-extern WPreferences wPreferences;
extern WDDomain *WDWindowAttributes;
/* Local stuff */
diff --git a/src/window.c b/src/window.c
index 795216d..a5de8a9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -86,7 +86,6 @@ extern XContext wWinContext;
extern Atom _XA_WM_DELETE_WINDOW;
extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
extern Atom _XA_WINDOWMAKER_STATE;
-extern WPreferences wPreferences;
extern Time LastTimestamp;
/***** Local Stuff *****/
diff --git a/src/winmenu.c b/src/winmenu.c
index 07735d2..a8a7bb8 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -75,7 +75,6 @@ extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW;
extern WShortKey wKeyBindings[WKBD_LAST];
-extern WPreferences wPreferences;
static void updateOptionsMenu(WMenu * menu, WWindow * wwin);
diff --git a/src/winspector.c b/src/winspector.c
index 13f4799..fedc013 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -116,7 +116,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 149eab1..e71265b 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -53,7 +53,6 @@
/* Global variables */
extern Atom _XA_WM_DELETE_WINDOW;
extern Time LastTimestamp;
-extern WPreferences wPreferences;
/* Root Window Properties */
static Atom net_supported;
diff --git a/src/workspace.c b/src/workspace.c
index e425676..bb75d6b 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -60,7 +60,6 @@
#define WORKSPACE_NAME_DISPLAY_PADDING 32
extern int ignore_wks_change;
-extern WPreferences wPreferences;
extern XContext wVEdgeContext;
extern WShortKey wKeyBindings[WKBD_LAST];
http://repo.or.cz/w/wmaker-crm.git/commit/3803ae6493d3e43dba074ae7e6fe8c3ac30c5f4e
commit 3803ae6493d3e43dba074ae7e6fe8c3ac30c5f4e
Author: Christophe CURIS <[email protected]>
Date: Sun Jun 30 16:02:34 2013 +0200
wmaker: Replaced local 'extern' definition by proper header include
It is dangerous to define an extern variable locally because the
compiler is not able to ensure proper type definition, but including
the header that defines it allows a safer situation.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/src/xmodifier.c b/src/xmodifier.c
index 30f5a88..e114f65 100644
--- a/src/xmodifier.c
+++ b/src/xmodifier.c
@@ -36,9 +36,9 @@ Perpetrator: Sudish Joseph <[email protected]>, Sept.
1997. */
#include <X11/XKBlib.h>
#include <WINGs/WUtil.h>
+#include "WindowMaker.h"
#include "xmodifier.h"
-extern Display *dpy;
/************************************************************************/
/* keymap handling */
-----------------------------------------------------------------------
Summary of changes:
src/WindowMaker.h | 33 +++++++++++++++++----------------
src/actions.c | 1 -
src/appicon.c | 4 +---
src/appicon.h | 3 +++
src/appmenu.c | 1 -
src/balloon.c | 1 -
src/client.c | 1 -
src/cycling.c | 2 --
src/defaults.c | 5 ++---
src/dialog.c | 1 -
src/dock.c | 4 +---
src/dockedapp.c | 2 --
src/event.c | 5 -----
src/event.h | 3 +++
src/framewin.c | 1 -
src/icon.c | 1 -
src/main.c | 28 ++++++++++++++--------------
src/menu.c | 2 --
src/misc.c | 3 +--
src/monitor.c | 2 --
src/moveres.c | 1 -
src/placement.c | 1 -
src/rootmenu.c | 1 -
src/screen.c | 1 -
src/stacking.c | 2 --
src/startup.c | 3 ---
src/superfluous.c | 1 -
src/switchmenu.c | 3 ---
src/switchpanel.c | 2 --
src/texture.c | 1 -
src/usermenu.c | 2 --
src/wcore.c | 2 --
src/wdefaults.c | 1 -
src/window.c | 1 -
src/winmenu.c | 1 -
src/winspector.c | 1 -
src/wmspec.c | 1 -
src/workspace.c | 1 -
src/xmodifier.c | 2 +-
39 files changed, 43 insertions(+), 88 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
