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
via 4dadc83a4c3adbf0d94f98133a10e5232f7c3873 (commit)
via ad2b5f0ec97fc061a49c07deef0f9a6ad1f4e384 (commit)
via 1003f89dc03cd248f37ae2718eb8643c8fe0a451 (commit)
via 6b1b6bc02e709b2e9725f9fc015cb0c0eae624d6 (commit)
via a01c1fcb799181bce8abb859d2d64b4a88e57a26 (commit)
via 85cef4e2d94a420deceeb896287e31d70a229c91 (commit)
from 5a16cb8e020063f1c199ca0d930f04ceb5d506ff (commit)
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/4dadc83a4c3adbf0d94f98133a10e5232f7c3873
commit 4dadc83a4c3adbf0d94f98133a10e5232f7c3873
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 16:18:06 2013 +0200
wmaker: Added 'static' attribute to local variables
This code is probably never compiled, but that's not a reason to
leave it incorrect.
diff --git a/src/xdnd.c b/src/xdnd.c
index 48891d1..2434790 100644
--- a/src/xdnd.c
+++ b/src/xdnd.c
@@ -20,23 +20,23 @@
#define XDND_VERSION 3L
-Atom _XA_XdndAware;
-Atom _XA_XdndEnter;
-Atom _XA_XdndLeave;
-Atom _XA_XdndDrop;
-Atom _XA_XdndPosition;
-Atom _XA_XdndStatus;
-Atom _XA_XdndActionCopy;
-Atom _XA_XdndSelection;
-Atom _XA_XdndFinished;
-Atom _XA_WINDOWMAKER_XDNDEXCHANGE;
+static Atom _XA_XdndAware;
+static Atom _XA_XdndEnter;
+static Atom _XA_XdndLeave;
+static Atom _XA_XdndDrop;
+static Atom _XA_XdndPosition;
+static Atom _XA_XdndStatus;
+static Atom _XA_XdndActionCopy;
+static Atom _XA_XdndSelection;
+static Atom _XA_XdndFinished;
+static Atom _XA_WINDOWMAKER_XDNDEXCHANGE;
/*
Atom _XA_MOTIF_DRAG_RECEIVER_INFO;
Atom _XA_MOTIF_DRAG_AND_DROP_MESSAGE;
*/
-Atom atom_support;
+static Atom atom_support;
void wXDNDInitializeAtoms()
{
http://repo.or.cz/w/wmaker-crm.git/commit/ad2b5f0ec97fc061a49c07deef0f9a6ad1f4e384
commit ad2b5f0ec97fc061a49c07deef0f9a6ad1f4e384
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 16:18:05 2013 +0200
wmaker: Fixed compilation of XDND support
The XDND support is not enabled by default, and not simple to
enable (does not use the appropriate configure flag method).
With previous global namespace related patches, this file not being
enabled a change was missed. Now at least it compiles, although it
is still an experimental feature.
diff --git a/src/xdnd.c b/src/xdnd.c
index bbf6250..48891d1 100644
--- a/src/xdnd.c
+++ b/src/xdnd.c
@@ -213,7 +213,7 @@ Bool acceptXDND(Window window)
}
}
}
- if (icon_pos < 0 && (dock =
scr->workspaces[w_global.workspace.current]->clip) != NULL) {
+ if (icon_pos < 0 && (dock =
w_global.workspace.array[w_global.workspace.current]->clip) != NULL) {
for (i = 0; i < dock->max_icons; i++) {
if (dock->icon_array[i]
&& dock->icon_array[i]->icon->core->window ==
window) {
http://repo.or.cz/w/wmaker-crm.git/commit/1003f89dc03cd248f37ae2718eb8643c8fe0a451
commit 1003f89dc03cd248f37ae2718eb8643c8fe0a451
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 16:18:04 2013 +0200
WPrefs: Fixed duplicate 'const' keyword
(as reported by LLVM / clang)
diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c
index 6d74409..9683d37 100644
--- a/WPrefs.app/WPrefs.c
+++ b/WPrefs.app/WPrefs.c
@@ -915,7 +915,7 @@ void SetIntegerForKey(int value, const char *defaultName)
WMReleasePropList(object);
}
-void SetStringForKey(const char *value, const const char *defaultName)
+void SetStringForKey(const char *value, const char *defaultName)
{
WMPropList *object;
http://repo.or.cz/w/wmaker-crm.git/commit/6b1b6bc02e709b2e9725f9fc015cb0c0eae624d6
commit 6b1b6bc02e709b2e9725f9fc015cb0c0eae624d6
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 16:18:03 2013 +0200
WPrefs: Grouped config key and user display icon in a single struct
Instead of defining 2 separate data arrays, use a array of struct
to make it less bug prone (no dependancy on order of elements).
Took opportunity to de-CamelCase the variable name;
Took opportunity to add appropriate const qualifier.
diff --git a/WPrefs.app/Docks.c b/WPrefs.app/Docks.c
index 62c5ee2..a109b70 100644
--- a/WPrefs.app/Docks.c
+++ b/WPrefs.app/Docks.c
@@ -59,8 +59,15 @@ static const struct {
static char *autoDelayPresetValues[5] = { "0", "100", "250", "600", "1000" };
-static char *dockDisablingKeys[3] = { "DisableDock", "DisableClip",
"DisableDrawers" };
-static char *dockFiles[3] = { "dock", "clip", "drawer" };
+
+static const struct {
+ const char *disable_key;
+ const char *icon_file;
+} dock_config[] = {
+ { "DisableDock", "dock" },
+ { "DisableClip", "clip" },
+ { "DisableDrawers", "drawer" }
+};
static void showData(_Panel *panel);
static void storeData(_Panel *panel);
@@ -228,7 +235,7 @@ static void createPanel(Panel *p)
WMResizeWidget(panel->docksB[i], 56, 56);
WMMoveWidget(panel->docksB[i], 30, 20 + 62 * i);
WMSetButtonImagePosition(panel->docksB[i], WIPImageOnly);
- CreateImages(scr, rc, xis, dockFiles[i], &icon1, &icon2);
+ CreateImages(scr, rc, xis, dock_config[i].icon_file, &icon1,
&icon2);
if (icon2) {
WMSetButtonImage(panel->docksB[i], icon2);
WMReleasePixmap(icon2);
@@ -275,7 +282,7 @@ static void storeData(_Panel *panel)
}
for (i = 0; i < 3; i++)
{
- SetBoolForKey(!WMGetButtonSelected(panel->docksB[i]),
dockDisablingKeys[i]);
+ SetBoolForKey(!WMGetButtonSelected(panel->docksB[i]),
dock_config[i].disable_key);
}
}
@@ -291,7 +298,7 @@ static void showData(_Panel *panel)
}
for (i = 0; i < 3; i++)
{
- WMSetButtonSelected(panel->docksB[i],
!GetBoolForKey(dockDisablingKeys[i]));
+ WMSetButtonSelected(panel->docksB[i],
!GetBoolForKey(dock_config[i].disable_key));
}
}
http://repo.or.cz/w/wmaker-crm.git/commit/a01c1fcb799181bce8abb859d2d64b4a88e57a26
commit a01c1fcb799181bce8abb859d2d64b4a88e57a26
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 16:18:02 2013 +0200
WPrefs: Grouped config key and user display string in a single struct
Instead of defining 2 separate data arrays, use a array of struct
to make it less bug prone (no dependancy on order of elements).
Took opportunity to de-CamelCase the variable name;
Took opportunity to add appropriate const qualifier.
diff --git a/WPrefs.app/Docks.c b/WPrefs.app/Docks.c
index bff8739..62c5ee2 100644
--- a/WPrefs.app/Docks.c
+++ b/WPrefs.app/Docks.c
@@ -47,8 +47,17 @@ typedef struct _Panel {
#define DELAY_ICON "timer%i"
#define DELAY_ICON_S "timer%is"
-static char *autoDelayStrings[4];
-static char *autoDelayKeys[4] = { "ClipAutoexpandDelay",
"ClipAutocollapseDelay", "ClipAutoraiseDelay", "ClipAutolowerDelay" };
+static const struct {
+ const char *key;
+ const char *string;
+} auto_delay[] = {
+ { "ClipAutoexpandDelay", N_("Delay before auto-expansion") },
+ { "ClipAutocollapseDelay", N_("Delay before auto-collapsing") },
+ { "ClipAutoraiseDelay", N_("Delay before auto-raise") },
+ { "ClipAutolowerDelay", N_("Delay before auto-lowering") }
+};
+
+
static char *autoDelayPresetValues[5] = { "0", "100", "250", "600", "1000" };
static char *dockDisablingKeys[3] = { "DisableDock", "DisableClip",
"DisableDrawers" };
static char *dockFiles[3] = { "dock", "clip", "drawer" };
@@ -165,7 +174,7 @@ static void createPanel(Panel *p)
panel->autoDelayL[i + k * 2] =
WMCreateLabel(panel->autoDelayF[k]);
WMResizeWidget(panel->autoDelayL[i + k * 2], 165, 20);
WMMoveWidget(panel->autoDelayL[i + k * 2], 10, 27 + 40
* i);
- WMSetLabelText(panel->autoDelayL[i + k * 2],
autoDelayStrings[i + k * 2]);
+ WMSetLabelText(panel->autoDelayL[i + k * 2],
_(auto_delay[i + k * 2].string));
WMSetLabelTextAlignment(panel->autoDelayL[i + k * 2],
WARight);
for (j = 0; j < 5; j++)
@@ -262,7 +271,7 @@ static void storeData(_Panel *panel)
int i;
for (i = 0; i < 4; i++)
{
- SetStringForKey(WMGetTextFieldText(panel->autoDelayT[i]),
autoDelayKeys[i]);
+ SetStringForKey(WMGetTextFieldText(panel->autoDelayT[i]),
auto_delay[i].key);
}
for (i = 0; i < 3; i++)
{
@@ -276,7 +285,7 @@ static void showData(_Panel *panel)
int i;
for (i = 0; i < 4; i++)
{
- value = GetStringForKey(autoDelayKeys[i]);
+ value = GetStringForKey(auto_delay[i].key);
WMSetTextFieldText(panel->autoDelayT[i], value);
adjustButtonSelectionBasedOnValue(panel, i, value);
}
@@ -290,11 +299,6 @@ Panel *InitDocks(WMScreen *scr, WMWidget *parent)
{
_Panel *panel;
- autoDelayStrings[0] = _("Delay before auto-expansion");
- autoDelayStrings[1] = _("Delay before auto-collapsing");
- autoDelayStrings[2] = _("Delay before auto-raise");
- autoDelayStrings[3] = _("Delay before auto-lowering");
-
panel = wmalloc(sizeof(_Panel));
memset(panel, 0, sizeof(_Panel));
http://repo.or.cz/w/wmaker-crm.git/commit/85cef4e2d94a420deceeb896287e31d70a229c91
commit 85cef4e2d94a420deceeb896287e31d70a229c91
Author: Christophe CURIS <[email protected]>
Date: Sat Oct 12 16:18:01 2013 +0200
util: Fixed possible off-by-one issue when generating filename
(as reported by LLVM / clang)
diff --git a/util/setstyle.c b/util/setstyle.c
index 7f99b6f..80b9e1d 100644
--- a/util/setstyle.c
+++ b/util/setstyle.c
@@ -440,7 +440,7 @@ int main(int argc, char **argv)
perror(file);
return 1;
}
- strncat(buf, "/style", sizeof(buf) - strlen(buf));
+ strncat(buf, "/style", sizeof(buf) - strlen(buf) - 1);
if (stat(buf, &st) != 0 || !S_ISREG(st.st_mode)) { /*
maybe symlink too? */
printf("%s: %s: style file not found or not a filen",
__progname, buf);
-----------------------------------------------------------------------
Summary of changes:
WPrefs.app/Docks.c | 41 ++++++++++++++++++++++++++---------------
WPrefs.app/WPrefs.c | 2 +-
src/xdnd.c | 24 ++++++++++++------------
util/setstyle.c | 2 +-
4 files changed, 40 insertions(+), 29 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].
