aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-09-14 16:39:16 (GMT)
committerfluxgen <fluxgen>2002-09-14 16:39:16 (GMT)
commit6d8b1e0656e56946a15574c5f04152f99430ad6b (patch)
tree88937187340a6911009e8dacfdf0e692c5cf4f75
parentafd7e5a6b7043812e472994dd2f49941094ee080 (diff)
downloadfluxbox_paul-6d8b1e0656e56946a15574c5f04152f99430ad6b.zip
fluxbox_paul-6d8b1e0656e56946a15574c5f04152f99430ad6b.tar.bz2
new color handling
-rw-r--r--src/Theme.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index d7d24ed..39a329d 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -41,7 +41,7 @@
41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 41// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
42// DEALINGS IN THE SOFTWARE. 42// DEALINGS IN THE SOFTWARE.
43 43
44// $Id: Theme.cc,v 1.26 2002/08/24 19:06:06 fluxgen Exp $ 44// $Id: Theme.cc,v 1.27 2002/09/14 16:39:16 fluxgen Exp $
45 45
46#ifndef _GNU_SOURCE 46#ifndef _GNU_SOURCE
47#define _GNU_SOURCE 47#define _GNU_SOURCE
@@ -851,11 +851,8 @@ bool Theme::readDatabaseColor(char *rname, char *rclass, FbTk::Color *color,
851 851
852 if (XrmGetResource(m_database, rname, rclass, &value_type, 852 if (XrmGetResource(m_database, rname, rclass, &value_type,
853 &value)) { 853 &value)) {
854 m_imagecontrol->parseColor(color, value.addr); 854 color->setFromString(value.addr, m_screennum);
855 } else { 855 } else {
856 // parsing with no color string just deallocates the color, if it has
857 // been previously allocated
858 m_imagecontrol->parseColor(color);
859 color->setPixel(default_pixel); 856 color->setPixel(default_pixel);
860 return false; 857 return false;
861 } 858 }