>From fe63c135cd0797774fc8950f7afda482ce17b92a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Sun, 18 Nov 2012 19:40:44 +0100
Subject: [PATCH] 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!
---
src/WindowMaker.h | 1 -
src/main.c | 1 -
src/screen.c | 8 ++------
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index ca89299..afc2871 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 f492ac6..b09b6ef 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 1ba325c..ecdb498 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;
--
1.7.10.4
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From fe63c135cd0797774fc8950f7afda482ce17b92a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Sun, 18 Nov 2012 19:40:44 +0100
Subject: [PATCH] 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!
---
src/WindowMaker.h | 1 -
src/main.c | 1 -
src/screen.c | 8 ++------
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h
index ca89299..afc2871 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 f492ac6..b09b6ef 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 1ba325c..ecdb498 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;
--
1.7.10.4
