From: Christophe CURIS <christophe.cu...@free.fr> just re-indentation to follow the style around. --- src/WindowMaker.h | 4 ++-- src/defaults.c | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/WindowMaker.h b/src/WindowMaker.h index 43dc83e..ce0a86c 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -393,7 +393,7 @@ extern struct WPreferences { char sticky_icons; /* If miniwindows will be onmipresent */ char dont_confirm_kill; /* do not confirm Kill application */ char disable_miniwindows; - char disable_workspace_pager; + char disable_workspace_pager; char dont_blink; /* do not blink icon selection */ @@ -457,7 +457,7 @@ extern struct WPreferences { RImage *swtileImage; RImage *swbackImage[9]; - union WTexture *wsmbackTexture; + union WTexture *wsmbackTexture; int show_clip_title; diff --git a/src/defaults.c b/src/defaults.c index f0d0067..b1b5050 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -351,9 +351,9 @@ WDefaultEntry staticOptionList[] = { {"ClipMergedInDock", "NO", NULL, NULL, getBool, setClipMergedInDock, NULL, NULL}, {"DisableMiniwindows", "NO", NULL, - &wPreferences.disable_miniwindows, getBool, NULL, NULL, NULL}, - {"DisableWorkspacePager", "NO", NULL, - &wPreferences.disable_workspace_pager, getBool, NULL, NULL, NULL} + &wPreferences.disable_miniwindows, getBool, NULL, NULL, NULL}, + {"DisableWorkspacePager", "NO", NULL, + &wPreferences.disable_workspace_pager, getBool, NULL, NULL, NULL} }; #define NUM2STRING_(x) #x @@ -603,8 +603,8 @@ WDefaultEntry optionList[] = { NULL, getColor, setFrameFocusedBorderColor, NULL, NULL}, {"FrameSelectedBorderColor", "white", NULL, NULL, getColor, setFrameSelectedBorderColor, NULL, NULL}, - {"WorkspaceMapBack", "(solid, black)", NULL, - NULL, getTexture, setWorkspaceMapBackground, NULL, NULL}, + {"WorkspaceMapBack", "(solid, black)", NULL, + NULL, getTexture, setWorkspaceMapBackground, NULL, NULL}, /* keybindings */ @@ -666,8 +666,8 @@ WDefaultEntry optionList[] = { NULL, getKeybind, setKeyGrab, NULL, NULL}, {"SelectKey", "None", (void *)WKBD_SELECT, NULL, getKeybind, setKeyGrab, NULL, NULL}, - {"WorkspaceMapKey", "None", (void *)WKBD_WORKSPACEMAP, - NULL, getKeybind, setKeyGrab, NULL, NULL}, + {"WorkspaceMapKey", "None", (void *)WKBD_WORKSPACEMAP, + NULL, getKeybind, setKeyGrab, NULL, NULL}, {"FocusNextKey", "None", (void *)WKBD_FOCUSNEXT, NULL, getKeybind, setKeyGrab, NULL, NULL}, {"FocusPrevKey", "None", (void *)WKBD_FOCUSPREV, @@ -3253,18 +3253,18 @@ static int updateUsableArea(WScreen * scr, WDefaultEntry * entry, void *bar, voi static int setWorkspaceMapBackground(WScreen *scr, WDefaultEntry *entry, void *tdata, void *foo) { - WTexture **texture = tdata; + WTexture **texture = tdata; - /* Parameter not used, but tell the compiler that it is ok */ - (void) entry; - (void) foo; + /* Parameter not used, but tell the compiler that it is ok */ + (void) entry; + (void) foo; + + if (wPreferences.wsmbackTexture) + wTextureDestroy(scr, wPreferences.wsmbackTexture); - if (wPreferences.wsmbackTexture) { - wTextureDestroy(scr, wPreferences.wsmbackTexture); - } - wPreferences.wsmbackTexture = *texture; + wPreferences.wsmbackTexture = *texture; - return REFRESH_WINDOW_TEXTURES; + return REFRESH_WINDOW_TEXTURES; } static int setMenuStyle(WScreen * scr, WDefaultEntry * entry, void *tdata, void *foo) -- 2.1.3 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.