[PATCH 06/24] WindowMaker: Notifications are now not extern.

[Rodolfo kix Garcia]

>From ee76e10aff4346c23fa48bb50945d5d43fe5caed Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <k...@kix.es>
Date: Wed, 25 Jan 2012 05:00:11 +0100
Subject: [PATCH 06/24] WindowMaker: Notifications are now not extern.

The Notifications are defined now at WindowMaker.h, therefore the extern is not 
needed.
---
 src/WindowMaker.h |   29 ++++++++++++++---------------
 src/main.c        |   34 +++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index ad27c36..78c8cbf 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -455,19 +455,18 @@ extern void wAbort(Bool dumpCore);
 
 
 /****** 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;
+const char *WMNManaged;
+const char *WMNUnmanaged;
+const char *WMNChangedWorkspace;
+const char *WMNChangedState;
+const char *WMNChangedFocus;
+const char *WMNChangedStacking;
+const char *WMNChangedName;
+
+const char *WMNWorkspaceCreated;
+const char *WMNWorkspaceDestroyed;
+const char *WMNWorkspaceChanged;
+const char *WMNWorkspaceNameChanged;
+
+const char *WMNResetStacking;
 #endif
-
diff --git a/src/main.c b/src/main.c
index 073a5ab..d028045 100644
--- a/src/main.c
+++ b/src/main.c
@@ -145,23 +145,6 @@ int randr_event_base;
 
 /* special flags */
 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";
-
 /******** End Global Variables *****/
 
 static char *DisplayName = NULL;
@@ -542,6 +525,23 @@ int main(int argc, char **argv)
        WProgramState = WSTATE_NORMAL;
        WProgramSigState = 0;
 
+       /* notifications */
+       WMNManaged = "WMNManaged";
+       WMNUnmanaged = "WMNUnmanaged";
+       WMNChangedWorkspace = "WMNChangedWorkspace";
+       WMNChangedState = "WMNChangedState";
+       WMNChangedFocus = "WMNChangedFocus";
+       WMNChangedStacking = "WMNChangedStacking";
+       WMNChangedName = "WMNChangedName";
+
+       WMNWorkspaceCreated = "WMNWorkspaceCreated";
+       WMNWorkspaceDestroyed = "WMNWorkspaceDestroyed";
+       WMNWorkspaceChanged = "WMNWorkspaceChanged";
+       WMNWorkspaceNameChanged = "WMNWorkspaceNameChanged";
+
+       WMNResetStacking = "WMNResetStacking";
+
+
        /* setup common stuff for the monitor and wmaker itself */
        WMInitializeApplication("WindowMaker", &argc, argv);
 
-- 
1.7.2.3

-- 
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/

>From ee76e10aff4346c23fa48bb50945d5d43fe5caed Mon Sep 17 00:00:00 2001
From: Rodolfo García Peñas (kix) <k...@kix.es>
Date: Wed, 25 Jan 2012 05:00:11 +0100
Subject: [PATCH 06/24] WindowMaker: Notifications are now not extern.

The Notifications are defined now at WindowMaker.h, therefore the extern is not needed.
---
 src/WindowMaker.h |   29 ++++++++++++++---------------
 src/main.c        |   34 +++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index ad27c36..78c8cbf 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -455,19 +455,18 @@ extern void wAbort(Bool dumpCore);
 
 
 /****** 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;
+const char *WMNManaged;
+const char *WMNUnmanaged;
+const char *WMNChangedWorkspace;
+const char *WMNChangedState;
+const char *WMNChangedFocus;
+const char *WMNChangedStacking;
+const char *WMNChangedName;
+
+const char *WMNWorkspaceCreated;
+const char *WMNWorkspaceDestroyed;
+const char *WMNWorkspaceChanged;
+const char *WMNWorkspaceNameChanged;
+
+const char *WMNResetStacking;
 #endif
-
diff --git a/src/main.c b/src/main.c
index 073a5ab..d028045 100644
--- a/src/main.c
+++ b/src/main.c
@@ -145,23 +145,6 @@ int randr_event_base;
 
 /* special flags */
 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";
-
 /******** End Global Variables *****/
 
 static char *DisplayName = NULL;
@@ -542,6 +525,23 @@ int main(int argc, char **argv)
 	WProgramState = WSTATE_NORMAL;
 	WProgramSigState = 0;
 
+	/* notifications */
+	WMNManaged = "WMNManaged";
+	WMNUnmanaged = "WMNUnmanaged";
+	WMNChangedWorkspace = "WMNChangedWorkspace";
+	WMNChangedState = "WMNChangedState";
+	WMNChangedFocus = "WMNChangedFocus";
+	WMNChangedStacking = "WMNChangedStacking";
+	WMNChangedName = "WMNChangedName";
+
+	WMNWorkspaceCreated = "WMNWorkspaceCreated";
+	WMNWorkspaceDestroyed = "WMNWorkspaceDestroyed";
+	WMNWorkspaceChanged = "WMNWorkspaceChanged";
+	WMNWorkspaceNameChanged = "WMNWorkspaceNameChanged";
+
+	WMNResetStacking = "WMNResetStacking";
+
+
 	/* setup common stuff for the monitor and wmaker itself */
 	WMInitializeApplication("WindowMaker", &argc, argv);
 
-- 
1.7.2.3