aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-10-11 22:48:35 (GMT)
committerrathnor <rathnor>2004-10-11 22:48:35 (GMT)
commit9fbf1ab395ec8253cf942e04145501b11a6e35f5 (patch)
tree7bcfecb23e539c975faaae3918406a012bf802f7
parent16d6ee7152ef3577fb02fb010606ff9f1638adf2 (diff)
downloadfluxbox-9fbf1ab395ec8253cf942e04145501b11a6e35f5.zip
fluxbox-9fbf1ab395ec8253cf942e04145501b11a6e35f5.tar.bz2
fix mainWarnDisplaySet -> mainWarnDisplayEnv
-rw-r--r--ChangeLog3
-rw-r--r--nls/fluxbox-nls.hh94
-rw-r--r--src/main.cc4
3 files changed, 52 insertions, 49 deletions
diff --git a/ChangeLog b/ChangeLog
index 4985db3..28dcb94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.11 2Changes for 0.9.11
3*04/10/11:
4 * Fix a bad nls string name - it ended with Set, but was a string (Simon)
5 main.cc
3*04/10/10: 6*04/10/10:
4 * Fix for a minor fbrun - problem (Mathias) 7 * Fix for a minor fbrun - problem (Mathias)
5 FbRun.cc 8 FbRun.cc
diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh
index f3ee428..d4e7469 100644
--- a/nls/fluxbox-nls.hh
+++ b/nls/fluxbox-nls.hh
@@ -1,4 +1,4 @@
1// This file generated by nlsinfo -H -N FBNLS ../src ../util, on Mon Oct 11 00:43:45 2004 1// This file generated by nlsinfo -H -N FBNLS ../src ../util, on Mon Jun 21 00:15:24 2004
2 2
3#ifndef FLUXBOX_NLS_HH 3#ifndef FLUXBOX_NLS_HH
4#define FLUXBOX_NLS_HH 4#define FLUXBOX_NLS_HH
@@ -58,17 +58,17 @@ enum {
58 ConfigmenuFocusLast = 7, 58 ConfigmenuFocusLast = 7,
59 ConfigmenuFocusModel = 8, 59 ConfigmenuFocusModel = 8,
60 ConfigmenuFocusNew = 9, 60 ConfigmenuFocusNew = 9,
61 ConfigmenuFocusedAlpha = 10, 61 ConfigmenuFullMax = 10,
62 ConfigmenuForcePseudoTrans = 11, 62 ConfigmenuImageDithering = 11,
63 ConfigmenuFullMax = 12, 63 ConfigmenuOpaqueMove = 12,
64 ConfigmenuImageDithering = 13, 64 ConfigmenuSemiSloppyFocus = 13,
65 ConfigmenuMenuAlpha = 14, 65 ConfigmenuSloppyFocus = 14,
66 ConfigmenuOpaqueMove = 15, 66 ConfigmenuWorkspaceWarping = 15,
67 ConfigmenuSemiSloppyFocus = 16, 67 ConfigmenuForcePseudoTrans = 16,
68 ConfigmenuSloppyFocus = 17, 68 ConfigmenuMenuAlpha = 17,
69 ConfigmenuTransparency = 18, 69 ConfigmenuTransparency = 18,
70 ConfigmenuUnfocusedAlpha = 19, 70 ConfigmenuFocusedAlpha = 19,
71 ConfigmenuWorkspaceWarping = 20, 71 ConfigmenuUnfocusedAlpha = 20,
72 72
73 EwmhSet = 5, 73 EwmhSet = 5,
74 EwmhOutOfMemoryClientList = 1, 74 EwmhOutOfMemoryClientList = 1,
@@ -115,15 +115,7 @@ enum {
115 KeysBadMerge = 2, 115 KeysBadMerge = 2,
116 KeysInvalidKeyMod = 3, 116 KeysInvalidKeyMod = 3,
117 117
118 LayerSet = 10, 118 MenuSet = 10,
119 LayerAboveDock = 1,
120 LayerBottom = 2,
121 LayerDesktop = 3,
122 LayerDock = 4,
123 LayerNormal = 5,
124 LayerTop = 6,
125
126 MenuSet = 11,
127 MenuConfiguration = 1, 119 MenuConfiguration = 1,
128 MenuDefaultRootMenu = 2, 120 MenuDefaultRootMenu = 2,
129 MenuExit = 3, 121 MenuExit = 3,
@@ -135,7 +127,7 @@ enum {
135 MenuRestart = 9, 127 MenuRestart = 9,
136 Menuxterm = 10, 128 Menuxterm = 10,
137 129
138 RememberSet = 12, 130 RememberSet = 11,
139 RememberDecorations = 1, 131 RememberDecorations = 1,
140 RememberDimensions = 2, 132 RememberDimensions = 2,
141 RememberJumpToWorkspace = 3, 133 RememberJumpToWorkspace = 3,
@@ -148,7 +140,7 @@ enum {
148 RememberUnknown = 10, 140 RememberUnknown = 10,
149 RememberWorkspace = 11, 141 RememberWorkspace = 11,
150 142
151 ScreenSet = 13, 143 ScreenSet = 12,
152 ScreenAnotherWMRunning = 1, 144 ScreenAnotherWMRunning = 1,
153 ScreenGeometryFormat = 2, 145 ScreenGeometryFormat = 2,
154 ScreenGeometryLength = 3, 146 ScreenGeometryLength = 3,
@@ -156,7 +148,7 @@ enum {
156 ScreenPositionFormat = 5, 148 ScreenPositionFormat = 5,
157 ScreenPositionLength = 6, 149 ScreenPositionLength = 6,
158 150
159 SlitSet = 14, 151 SlitSet = 13,
160 SlitClientsMenu = 1, 152 SlitClientsMenu = 1,
161 SlitCycleDown = 2, 153 SlitCycleDown = 2,
162 SlitCycleUp = 3, 154 SlitCycleUp = 3,
@@ -166,28 +158,28 @@ enum {
166 SlitPlacement = 7, 158 SlitPlacement = 7,
167 SlitSlit = 8, 159 SlitSlit = 8,
168 160
169 ToolbarSet = 15, 161 ToolbarSet = 14,
170 ToolbarClock12 = 1, 162 ToolbarEditWkspcName = 1,
171 ToolbarClock24 = 2, 163 ToolbarIconbarMode = 2,
172 ToolbarClockEditFormat = 3, 164 ToolbarIconbarModeAllWindows = 3,
173 ToolbarEditWkspcName = 4, 165 ToolbarIconbarModeIcons = 4,
174 ToolbarIconbarMode = 5, 166 ToolbarIconbarModeNone = 5,
175 ToolbarIconbarModeAllWindows = 6, 167 ToolbarIconbarModeWorkspace = 6,
176 ToolbarIconbarModeIcons = 7, 168 ToolbarIconbarModeWorkspaceIcons = 7,
177 ToolbarIconbarModeNone = 8, 169 ToolbarLayer = 8,
178 ToolbarIconbarModeWorkspace = 9, 170 ToolbarOnHead = 9,
179 ToolbarIconbarModeWorkspaceIcons = 10, 171 ToolbarPlacement = 10,
180 ToolbarLayer = 11, 172 ToolbarToolbar = 11,
181 ToolbarOnHead = 12, 173 ToolbarWidthPercent = 12,
182 ToolbarPlacement = 13, 174 ToolbarClock24 = 13,
183 ToolbarShowIcons = 14, 175 ToolbarClock12 = 14,
184 ToolbarToolbar = 15, 176 ToolbarClockEditFormat = 15,
185 ToolbarWidthPercent = 16, 177 ToolbarShowIcons = 16,
186 178
187 WindowSet = 16, 179 WindowSet = 15,
188 WindowUnnamed = 1, 180 WindowUnnamed = 1,
189 181
190 WindowmenuSet = 17, 182 WindowmenuSet = 16,
191 WindowmenuClose = 1, 183 WindowmenuClose = 1,
192 WindowmenuIconify = 2, 184 WindowmenuIconify = 2,
193 WindowmenuLayer = 3, 185 WindowmenuLayer = 3,
@@ -198,18 +190,18 @@ enum {
198 WindowmenuShade = 8, 190 WindowmenuShade = 8,
199 WindowmenuStick = 9, 191 WindowmenuStick = 9,
200 192
201 WorkspaceSet = 18, 193 WorkspaceSet = 17,
202 WorkspaceDefaultNameFormat = 1, 194 WorkspaceDefaultNameFormat = 1,
203 WorkspaceMenuTitle = 2, 195 WorkspaceMenuTitle = 2,
204 WorkspaceNewWorkspace = 3, 196 WorkspaceNewWorkspace = 3,
205 WorkspaceRemoveLast = 4, 197 WorkspaceRemoveLast = 4,
206 198
207 bsetrootSet = 19, 199 bsetrootSet = 18,
208 bsetrootMustSpecify = 1, 200 bsetrootMustSpecify = 1,
209 bsetrootNoPixmapAtoms = 2, 201 bsetrootNoPixmapAtoms = 2,
210 bsetrootUsage = 3, 202 bsetrootUsage = 3,
211 203
212 mainSet = 20, 204 mainSet = 19,
213 mainDISPLAYRequiresArg = 1, 205 mainDISPLAYRequiresArg = 1,
214 mainErrorBadAlloc = 2, 206 mainErrorBadAlloc = 2,
215 mainErrorBadCast = 3, 207 mainErrorBadCast = 3,
@@ -222,7 +214,15 @@ enum {
222 mainLoggingTo = 10, 214 mainLoggingTo = 10,
223 mainRCRequiresArg = 11, 215 mainRCRequiresArg = 11,
224 mainUsage = 12, 216 mainUsage = 12,
225 mainWarnDisplaySet = 13, 217 mainWarnDisplayEnv = 13,
218
219 LayerSet = 20,
220 LayerAboveDock = 1,
221 LayerBottom = 2,
222 LayerDesktop = 3,
223 LayerDock = 4,
224 LayerNormal = 5,
225 LayerTop = 6,
226 226
227 dummy_not_used = 0 // just for the end 227 dummy_not_used = 0 // just for the end
228 228
diff --git a/src/main.cc b/src/main.cc
index 3c9dc7f..b7fb949 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: main.cc,v 1.31 2004/08/31 15:26:39 rathnor Exp $ 23// $Id: main.cc,v 1.32 2004/10/11 22:48:35 rathnor Exp $
24 24
25#include "fluxbox.hh" 25#include "fluxbox.hh"
26#include "version.h" 26#include "version.h"
@@ -187,7 +187,7 @@ int main(int argc, char **argv) {
187 session_display = argv[i]; 187 session_display = argv[i];
188 std::string display_env = "DISPLAY=" + session_display; 188 std::string display_env = "DISPLAY=" + session_display;
189 if (putenv(const_cast<char *>(display_env.c_str()))) { 189 if (putenv(const_cast<char *>(display_env.c_str()))) {
190 cerr<<_FBTEXT(main, WarnDisplaySet, 190 cerr<<_FBTEXT(main, WarnDisplayEnv,
191 "warning: couldn't set environment variable 'DISPLAY'", 191 "warning: couldn't set environment variable 'DISPLAY'",
192 "")<<endl; 192 "")<<endl;
193 perror("putenv()"); 193 perror("putenv()");