This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
discards c7a91d7750c2b1acc160f7b5d22fcf0b7936516e (commit)
discards c994b65f14ad2ab872f5c1b91119d78885743cfc (commit)
via f33c89e369de347fece7a40b86ff74a2dd3dc3a6 (commit)
via b323800c02b0a06bfeac3a769ec30599935f3227 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (c7a91d7750c2b1acc160f7b5d22fcf0b7936516e)
N -- N -- N (f33c89e369de347fece7a40b86ff74a2dd3dc3a6)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/f33c89e369de347fece7a40b86ff74a2dd3dc3a6
commit f33c89e369de347fece7a40b86ff74a2dd3dc3a6
Author: David Maciejak <[email protected]>
Date: Thu Jun 5 11:23:51 2014 +0700
WPrefs: add expert option to disable switch panel
This patch is adding a checkbox option in the expert panel
to let the user enable/disable switching panel.
diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c
index e939df03..8cf5d6d9 100644
--- a/WPrefs.app/Expert.c
+++ b/WPrefs.app/Expert.c
@@ -2,6 +2,7 @@
*
* WPrefs - Window Maker Preferences Program
*
+ * Copyright (c) 2014 Window Maker Team
* Copyright (c) 1998-2003 Alfredo K. Kojima
*
* This program is free software; you can redistribute it and/or modify
@@ -31,6 +32,7 @@ static const struct {
enum {
OPTION_WMAKER,
+ OPTION_WMAKER_ARRAY,
OPTION_USERDEF
} class;
@@ -65,6 +67,9 @@ static const struct {
{ N_("Ignore minimized windows when cycling."),
/* default: */ False, OPTION_WMAKER, "CycleIgnoreMinimized" },
+ { N_("Show switch panel when cycling windows."),
+ /* default: */ True, OPTION_WMAKER_ARRAY, "SwitchPanelImages" },
+
{ N_("Show workspace title on Clip."),
/* default: */ True, OPTION_WMAKER, "ShowClipTitle" },
@@ -96,7 +101,7 @@ typedef struct _Panel {
#define ICON_FILE "expert"
-static void createPanel(Panel * p)
+static void createPanel(Panel *p)
{
_Panel *panel = (_Panel *) p;
WMScrollView *sv;
@@ -134,6 +139,14 @@ static void createPanel(Panel * p)
state = expert_options[i].def_state;
break;
+ case OPTION_WMAKER_ARRAY: {
+ char *str =
GetStringForKey(expert_options[i].op_name);
+ state = expert_options[i].def_state;
+ if (str && strcasecmp(str, "None") == 0)
+ state = False;
+ }
+ break;
+
case OPTION_USERDEF:
state = WMGetUDBoolForKey(udb,
expert_options[i].op_name);
break;
@@ -141,7 +154,7 @@ static void createPanel(Panel * p)
default:
#ifdef DEBUG
wwarning("export_options[%d].class = %d, this should
not happenn",
- i, expert_options[i].class);
+ i, expert_options[i].class);
#endif
state = expert_options[i].def_state;
break;
@@ -154,7 +167,7 @@ static void createPanel(Panel * p)
WMRealizeWidget(panel->box);
}
-static void storeDefaults(_Panel * panel)
+static void storeDefaults(_Panel *panel)
{
WMUserDefaults *udb = WMGetStandardUserDefaults();
int i;
@@ -165,6 +178,17 @@ static void storeDefaults(_Panel * panel)
SetBoolForKey(WMGetButtonSelected(panel->swi[i]),
expert_options[i].op_name);
break;
+ case OPTION_WMAKER_ARRAY:
+ if (WMGetButtonSelected(panel->swi[i])) {
+ /* check if the array was not manually modified
*/
+ char *str =
GetStringForKey(expert_options[i].op_name);
+ if (str && strcasecmp(str, "None") == 0)
+
RemoveObjectForKey(expert_options[i].op_name);
+ }
+ else
+ SetStringForKey("None",
expert_options[i].op_name);
+ break;
+
case OPTION_USERDEF:
WMSetUDBoolForKey(udb,
WMGetButtonSelected(panel->swi[i]), expert_options[i].op_name);
break;
http://repo.or.cz/w/wmaker-crm.git/commit/b323800c02b0a06bfeac3a769ec30599935f3227
commit b323800c02b0a06bfeac3a769ec30599935f3227
Author: Doug Torrance <[email protected]>
Date: Tue Jun 3 07:52:29 2014 -0600
Add checkpatch.pl to distribution tarball.
This patch includes checkpatch.pl in the EXTRA_DIST variable in Makefile.am
so
that it is included when a tarball is built using "make dist".
diff --git a/Makefile.am b/Makefile.am
index 3309718d..b92e0dde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N INSTALL
INSTALL-WMAKER README.definable-cursor
The-perfect-Window-Maker-patch.txt README COPYING.WTFPL autogen.sh -
email-clients.txt
+ email-clients.txt checkpatch.pl
if USE_LCOV
coverage-reset:
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/Expert.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
