1 files changed, 77 insertions, 0 deletions
diff --git a/x11-wm/jewel/files/patch-windowmanager.cc b/x11-wm/jewel/files/patch-windowmanager.cc
new file mode 100644
index 000000000000..1bb1c40cf438
--- /dev/null
+++ b/x11-wm/jewel/files/patch-windowmanager.cc
@@ -0,0 +1,77 @@
+--- windowmanager.cc.orig	2007-12-06 20:41:35.000000000 +0100
++++ windowmanager.cc	2007-12-06 20:47:01.000000000 +0100
+@@ -51,24 +51,24 @@
+ 	// Set the global window manager object to this please =)
+     	wm = this;
+ 	
+-	window_manager_name="jewel";
++	window_manager_name=(char *)"jewel";
+ 
+ 	// Make the default options equal something
+-    	opt_font = DEF_FONT;
+-	opt_fm = DEF_FM;
+-    	opt_fg = DEF_FG;
+-    	opt_fc = DEF_FC;
+-    	opt_bg = DEF_BG;
+-    	opt_bd = DEF_BD;
+-    	opt_tj = TEXT_JUSTIFY;
+-	opt_wm = WIRE_MOVE;
+-	opt_es = EDGE_SNAP;
+-	opt_newkey = DEF_NEWKEY;
+-    	opt_new1 = DEF_NEW1;
+-    	opt_new2 = DEF_NEW2;
++    	opt_font = (char *)DEF_FONT;
++	   opt_fm = (char *)DEF_FM;
++    	opt_fg = (char *)DEF_FG;
++    	opt_fc = (char *)DEF_FC;
++    	opt_bg = (char *)DEF_BG;
++    	opt_bd = (char *)DEF_BD;
++    	opt_tj = (char *)TEXT_JUSTIFY;
++	   opt_wm = (char *)WIRE_MOVE;
++	   opt_es = (char *)EDGE_SNAP;
++	   opt_newkey = (char *)DEF_NEWKEY;
++    	opt_new1 = (char *)DEF_NEW1;
++    	opt_new2 = (char *)DEF_NEW2;
+     	opt_bw = DEF_BW;
+     	opt_display=NULL;
+-	maxDesktops=MAX_DESKTOPS;
++	   maxDesktops=MAX_DESKTOPS;
+ 
+ // These macro's are nice to test values passed in 
+ // the command line arguments	
+@@ -1557,21 +1557,21 @@
+ 		// find the client in the list...
+ 		it = find(clientList->begin(), clientList->end(), c);
+ 
+-		if ( it == NULL || it == clientList->end()) {
++		if ( it == clientList->end()) {
+ 			it = clientList->begin();
+ 		}
+ 
+ 		do {
+ 			cycles++;
+-			if ( it != clientList->end() && it != NULL ) {
++			if ( it == clientList->end() ) {
++				it = clientList->begin();
++			}
++			else {
+ 				it++;
+ 				if ( it == clientList->end() ) {
+ 					it = clientList->begin();
+ 				}
+ 			}
+-			else {
+-				it = clientList->begin();
+-			}
+ 		} while (cycles < clientList->size() && (shouldSkipThisWindow((*it)->getAppWindow()) || (*it)->isIconified() || (*it)->belongsToWhichDesktop() != currentDesktop));
+ 		
+ #ifdef DEBUG
+@@ -1588,7 +1588,7 @@
+ 
+ 		// if we found a suitable "next client", raise and focus
+ 		// it; otherwise, leave focus where it is
+-		if ( cycles < clientList->size() && it != NULL && it != clientList->end() && !shouldSkipThisWindow((*it)->getAppWindow()) && !(*it)->isIconified() && (*it)->belongsToWhichDesktop() == currentDesktop && !shouldSkipThisWindow((*it)->getAppWindow())) {
++		if ( cycles < clientList->size() && !(it == clientList->end()) && !shouldSkipThisWindow((*it)->getAppWindow()) && !(*it)->isIconified() && (*it)->belongsToWhichDesktop() == currentDesktop && !shouldSkipThisWindow((*it)->getAppWindow())) {
+ 			c = *it;
+ 			c->raise();
+ 			setFocusedClient(c);