From: Rodolfo García Peñas (kix) <kix@kix.es>
Date: Sun, 18 Nov 2012 22:07:46 +0000 (+0100)
Subject: create_stdcmap is never used
X-Git-Tag: wmaker-0.95.4~18
X-Git-Url: https://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/4111f336d03ce344ca4b2828b8c370b484c85341

create_stdcmap is never used

The create_stdcmap variable is never set, so can be removed.

This patch don't update the translation .po files!
---

diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index ca89299f..afc28710 100644
--- a/src/WindowMaker.h
+++ b/src/WindowMaker.h
@@ -439,7 +439,6 @@ typedef struct WPreferences {
         unsigned int noupdates:1;      /* don't require ~/GNUstep (-static) */
         unsigned int noautolaunch:1;   /* don't autolaunch apps */
         unsigned int norestore:1;      /* don't restore session */
-        unsigned int create_stdcmap:1; /* create std colormap */
 #ifndef HAVE_INOTIFY
 	unsigned int nopolling:1;      /* don't poll the defaults database for changes */
 #endif
diff --git a/src/main.c b/src/main.c
index f492ac6e..b09b6ef7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -498,7 +498,6 @@ static void print_help(void)
 
 	puts(_(" --locale locale	locale to use"));
 
-	puts(_(" --create-stdcmap	create the standard colormap hint in PseudoColor visuals"));
 	puts(_(" --visual-id visualid	visual id of visual to use"));
 	puts(_(" --static		do not update or save configurations"));
 #ifndef HAVE_INOTIFY
diff --git a/src/screen.c b/src/screen.c
index 1ba325c9..ecdb4983 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -596,12 +596,8 @@ WScreen *wScreenInit(int screen_number)
 	if (rattr.colors_per_channel < 2)
 		rattr.colors_per_channel = 2;
 
-	/* will only be accounted for in PseudoColor */
-	if (wPreferences.flags.create_stdcmap) {
-		rattr.standard_colormap_mode = RCreateStdColormap;
-	} else {
-		rattr.standard_colormap_mode = RUseStdColormap;
-	}
+	/* Use standard colormap */
+	rattr.standard_colormap_mode = RUseStdColormap;
 
 	if (getWVisualID(screen_number) >= 0) {
 		rattr.flags |= RC_VisualID;