1 files changed, 11 insertions, 11 deletions

diff --git a/common/config_file.c b/common/config_file.c
index 126838f..77c3feb 100644
--- a/common/config_file.c
+++ b/common/config_file.c
@@ -515,7 +515,7 @@ static EImageType toImageType(const char *str, EImageType def)
         if(0==memcmp(str, "rings", 5))
             return IMG_BORDERED_RINGS;
         if(0==memcmp(str, "squarerings", 11))
-            return IMG_STQUARE_RINGS;
+            return IMG_SQUARE_RINGS;
         if(0==memcmp(str, "file", 4))
             return IMG_FILE;
     }
@@ -1528,7 +1528,7 @@ static void checkConfig(Options *opts)
         opts->coloredTbarMo=true;
 
     if(opts->round<ROUND_SLIGHT)
-        opts->square|=STQUARE_POPUP_MENUS|STQUARE_TOOLTIPS;
+        opts->square|=SQUARE_POPUP_MENUS|SQUARE_TOOLTIPS;
 #endif
 
     if(opts->bgndOpacity<0 || opts->bgndOpacity>100)
@@ -1554,7 +1554,7 @@ static void checkConfig(Options *opts)
     opts->activeTabAppearance=MODIFY_AGUA(opts->activeTabAppearance);
     opts->menuitemAppearance=MODIFY_AGUA(opts->menuitemAppearance);
 
-    if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&STQUARE_PROGRESS)))
+    if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&SQUARE_PROGRESS)))
         opts->borderProgress=true;
 
     opts->titlebarAppearance=MODIFY_AGUA(opts->titlebarAppearance);
@@ -1724,18 +1724,18 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts)
             if(opts->version<MAKE_VERSION(1, 4))
             {
                 opts->square=
-                    (readBoolEntry(cfg, "squareLvSelection", def->square&STQUARE_LISTVIEW_SELECTION) ? STQUARE_LISTVIEW_SELECTION : STQUARE_NONE)+
-                    (readBoolEntry(cfg, "squareScrollViews", def->square&STQUARE_SCROLLVIEW) ? STQUARE_SCROLLVIEW : STQUARE_NONE)+
-                    (readBoolEntry(cfg, "squareProgress", def->square&STQUARE_PROGRESS) ? STQUARE_PROGRESS : STQUARE_NONE)+
-                    (readBoolEntry(cfg, "squareEntry", def->square&STQUARE_ENTRY)? STQUARE_ENTRY : STQUARE_NONE);
+                    (readBoolEntry(cfg, "squareLvSelection", def->square&SQUARE_LISTVIEW_SELECTION) ? SQUARE_LISTVIEW_SELECTION : SQUARE_NONE)+
+                    (readBoolEntry(cfg, "squareScrollViews", def->square&SQUARE_SCROLLVIEW) ? SQUARE_SCROLLVIEW : SQUARE_NONE)+
+                    (readBoolEntry(cfg, "squareProgress", def->square&SQUARE_PROGRESS) ? SQUARE_PROGRESS : SQUARE_NONE)+
+                    (readBoolEntry(cfg, "squareEntry", def->square&SQUARE_ENTRY)? SQUARE_ENTRY : SQUARE_NONE);
             }
             else
                 CFG_READ_INT(square)
 
             if(opts->version<MAKE_VERSION(1, 6))
-                opts->square|=STQUARE_TOOLTIPS;
+                opts->square|=SQUARE_TOOLTIPS;
             if(opts->version<MAKE_VERSION3(1, 6, 1))
-                opts->square|=STQUARE_POPUP_MENUS;
+                opts->square|=SQUARE_POPUP_MENUS;
             if(opts->version<MAKE_VERSION(1, 2))
                 def->crSize=CR_SMALL_SIZE;
             if(opts->version<MAKE_VERSION(1, 0))
@@ -2459,7 +2459,7 @@ static void defaultSettings(Options *opts)
     opts->boldProgress=true;
     opts->coloredTbarMo=false;
     opts->borderSelection=false;
-    opts->square=STQUARE_POPUP_MENUS;
+    opts->square=SQUARE_POPUP_MENUS;
     opts->stripedSbar=false;
     opts->windowDrag=WM_DRAG_NONE;
     opts->shadePopupMenu=false;
@@ -2960,7 +2960,7 @@ static const char * toStr(EImageType lv)
             return "plainrings";
         case IMG_BORDERED_RINGS:
             return "rings";
-        case IMG_STQUARE_RINGS:
+        case IMG_SQUARE_RINGS:
             return "squarerings";
         case IMG_FILE:
             return "file";