Just random things I noticed while reading the code...
Signed-off-by: Carlos R. Mafra <[email protected]>
---
src/dock.c | 27 ++++-----------------------
1 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/src/dock.c b/src/dock.c
index bf3f078..0928320 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -1151,8 +1151,6 @@ void wClipIconPaint(WAppIcon * aicon)
if(wPreferences.show_clip_title)
WMDrawString(scr->wmscreen, win, color, scr->clip_title_font,
tx, ty, ws_name, length);
- /*WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, 4,
- 2, ws_name, length); */
tx = (ICON_SIZE / 2 - WMWidthOfString(scr->clip_title_font, ws_number,
nlength)) / 2;
@@ -1560,9 +1558,7 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
WMRetainPropList(dock_state);
/* restore position */
-
value = WMGetFromPLDictionary(dock_state, dPosition);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("Position");
@@ -1604,11 +1600,9 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore lowered/raised state */
-
dock->lowered = 0;
value = WMGetFromPLDictionary(dock_state, dLowered);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("Lowered");
@@ -1620,11 +1614,9 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore collapsed state */
-
dock->collapsed = 0;
value = WMGetFromPLDictionary(dock_state, dCollapsed);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("Collapsed");
@@ -1636,9 +1628,7 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore auto-collapsed state */
-
value = WMGetFromPLDictionary(dock_state, dAutoCollapse);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("AutoCollapse");
@@ -1651,32 +1641,26 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
}
/* restore auto-raise/lower state */
-
value = WMGetFromPLDictionary(dock_state, dAutoRaiseLower);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("AutoRaiseLower");
} else {
- if (strcasecmp(WMGetFromPLString(value), "YES") == 0) {
+ if (strcasecmp(WMGetFromPLString(value), "YES") == 0)
dock->auto_raise_lower = 1;
- }
}
}
/* restore attract icons state */
-
dock->attract_icons = 0;
value = WMGetFromPLDictionary(dock_state, dAutoAttractIcons);
-
if (value) {
if (!WMIsPLString(value)) {
COMPLAIN("AutoAttractIcons");
} else {
- if (strcasecmp(WMGetFromPLString(value), "YES") == 0) {
+ if (strcasecmp(WMGetFromPLString(value), "YES") == 0)
dock->attract_icons = 1;
- }
}
}
@@ -1700,17 +1684,14 @@ WDock *wDockRestoreState(WScreen * scr, WMPropList *
dock_state, int type)
apps = WMGetFromPLDictionary(dock_state, tmp);
WMReleasePropList(tmp);
- if (!apps) {
+ if (!apps)
apps = WMGetFromPLDictionary(dock_state, dApplications);
- }
}
- if (!apps) {
+ if (!apps)
goto finish;
- }
count = WMGetPropListItemCount(apps);
-
if (count == 0)
goto finish;
--
1.7.3.4
--
To unsubscribe, send mail to [email protected].
