[svn-upgrade] Integrating new upstream version, ion3 (20070506)

[ion3.git] / de / style.c

diff --git a/de/style.c b/de/style.c
index b4493373e49b3e237726da77d1b0fd6e4cacd46f..2e61bf260367a918072f1e69a1722e8cca563984 100644 (file)
--- a/de/style.c
+++ b/de/style.c
@@ -3,10 +3,7 @@
  *
  * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
 #include <string.h>
@@ -176,7 +173,7 @@ void destyle_deinit(DEStyle *style)
     if(style->extra_cgrps!=NULL)
         free(style->extra_cgrps);
     
-    extl_unref_table(style->data_table);
+    extl_unref_table(style->extras_table);
     
     XFreeGC(ioncore_g.dpy, style->normal_gc);
     
@@ -195,7 +192,7 @@ void destyle_deinit(DEStyle *style)
 }
 
 
-static void dump_style(DEStyle *style)
+void destyle_dump(DEStyle *style)
 {
     /* Allow the style still be used but get if off the list. */
     UNLINK_ITEM(styles, style, next, prev);
@@ -241,7 +238,7 @@ bool destyle_init(DEStyle *style, WRootWin *rootwin, const char *name)
     style->n_extra_cgrps=0;
     style->extra_cgrps=NULL;
     
-    style->data_table=extl_table_none();
+    style->extras_table=extl_table_none();
     
     create_normal_gc(style, rootwin);
     
@@ -251,7 +248,7 @@ bool destyle_init(DEStyle *style, WRootWin *rootwin, const char *name)
 }
 
 
-static DEStyle *do_create_style(WRootWin *rootwin, const char *name)
+DEStyle *de_create_style(WRootWin *rootwin, const char *name)
 {
     DEStyle *style=ALLOC(DEStyle);
     if(style!=NULL){
@@ -264,33 +261,12 @@ static DEStyle *do_create_style(WRootWin *rootwin, const char *name)
 }
 
 
-DEStyle *de_create_style(WRootWin *rootwin, const char *name)
+void destyle_add(DEStyle *style)
 {
-    DEStyle *oldstyle, *style;
-    uint score;
-    
-    style=do_create_style(rootwin, name);
-    
-    if(style==NULL)
-        return NULL;
-    
-    for(oldstyle=styles; oldstyle!=NULL; oldstyle=oldstyle->next){
-        if(oldstyle->rootwin!=rootwin)
-            continue;
-        if(gr_stylespec_equals(&oldstyle->spec, &style->spec))
-            break;
-    }
-    
-    if(oldstyle!=NULL && !oldstyle->is_fallback)
-        dump_style(oldstyle);
-    
     LINK_ITEM_FIRST(styles, style, next, prev);
-    
-    return style;
 }
 
 
-
 /*EXTL_DOC
  * Clear all styles from drawing engine memory.
  */
@@ -301,7 +277,7 @@ void de_reset()
     for(style=styles; style!=NULL; style=next){
         next=style->next;
         if(!style->is_fallback)
-            dump_style(style);
+            destyle_dump(style);
     }
 }
 
@@ -315,7 +291,7 @@ void de_deinit_styles()
             warn(TR("Style is still in use [%d] but the module "
                     "is being unloaded!"), style->usecount);
         }
-        dump_style(style);
+        destyle_dump(style);
     }
 }