Transplanted from git://repo.or.cz/wmaker-crm.git commit 3f6ae395cee075f0e075830b597cb87ae3d5f77d (transplanted from d58ab202df60c2429cc1e8577e19710b706d2afa)
src/defaults.c | 4 ++++ src/main.c | 4 ++++ src/wconfig.h.in | 2 +- util/getstyle.c | 4 ++++ util/wmsetbg.c | 4 ++++ 5 files changed, 17 insertions(+), 1 deletions(-)
# HG changeset patch # User Martin Dietze <[email protected]> # Date 1251101403 -7200 # Branch wm_0_92 # Node ID 633e562f084948880162f7a4d4c2aa5ae08bcb59 # Parent 4c84324ebe07cec4a2d6d817f2f24257de693740 Add GLOBAL_DEFAULTS_SUBDIR and fix a syntax error in wmlib/Makefile.am Transplanted from git://repo.or.cz/wmaker-crm.git commit 3f6ae395cee075f0e075830b597cb87ae3d5f77d (transplanted from d58ab202df60c2429cc1e8577e19710b706d2afa) diff --git a/src/defaults.c b/src/defaults.c --- a/src/defaults.c +++ b/src/defaults.c @@ -70,6 +70,10 @@ +#ifndef GLOBAL_DEFAULTS_SUBDIR +#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker" +#endif + /***** Global *****/ extern WDDomain *WDWindowMaker; diff --git a/src/main.c b/src/main.c --- a/src/main.c +++ b/src/main.c @@ -53,6 +53,10 @@ #include <WINGs/WUtil.h> +#ifndef GLOBAL_DEFAULTS_SUBDIR +#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker" +#endif + /****** Global Variables ******/ /* general info */ diff --git a/src/wconfig.h.in b/src/wconfig.h.in --- a/src/wconfig.h.in +++ b/src/wconfig.h.in @@ -453,7 +453,7 @@ #define HRESIZE_THRESHOLD 3 -#define MAX_WORKSPACENAME_WIDTH 32 +#define MAX_WORKSPACENAME_WIDTH 64 #define MAX_WINDOWLIST_WIDTH 160 /* max width of window title in * window list */ diff --git a/util/getstyle.c b/util/getstyle.c --- a/util/getstyle.c +++ b/util/getstyle.c @@ -41,6 +41,10 @@ #include "../src/wconfig.h" +#ifndef GLOBAL_DEFAULTS_SUBDIR +#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker" +#endif + /* table of style related options */ static char *options[] = { "TitleJustify", diff --git a/util/wmsetbg.c b/util/wmsetbg.c --- a/util/wmsetbg.c +++ b/util/wmsetbg.c @@ -54,6 +54,10 @@ #include "../src/wconfig.h" +#ifndef GLOBAL_DEFAULTS_SUBDIR +#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker" +#endif + #include <WINGs/WINGs.h> #include <wraster.h>
