The following shows the diffstat and patchsets between
2f28de5..542c0a9^
----------------------------------------------------------------
commit 542c0a98bbbdf505ceae8e3821938e9bb4fd5688
Merge: 2f28de5 05bdfa3
Author: Thomas Adam <[email protected]>
Date: Sun Jan 4 02:42:31 2015 +0000
Merge branch 'branch-2_6'
commit 05bdfa386f55c3359e2a90ef6ef523b95c8a3462
Merge: 2f2ebb3 f47416b
Author: Thomas Adam <[email protected]>
Date: Sat Nov 15 11:14:11 2014 +0000
Merge remote-tracking branch 'cvs/branch-2_6' into branch-2_6
commit f47416b792a0b2997d8656afe3a21c95403dd50f
Author: domivogt <domivogt>
Date: Fri Nov 14 21:29:27 2014 +0000
* NEWS.
---
NEWS | 3 +++
1 file changed, 3 insertions(+)
diff --git a/NEWS b/NEWS
index 52a5aec..c2f42c2 100644
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,9 @@ Changes in stable release 2.6.6 (not released yet)
- When an attempt to reparent a client window (i.e. decorate
it) fails, fvwm no longer throws away all events but only the
events for that window.
+ - The ChangeButton command of FvwmButtons used to strip
+ whitespace from the beginning and end of button titles and
+ image paths. This is no longer done.
-------------------------------------------------------------------
Changes in stable release 2.6.5 (20-Apr-2012)
commit 45ed05bfe9ab20c0f2007e35534efada5b5ce54d
Author: domivogt <domivogt>
Date: Fri Nov 14 21:28:21 2014 +0000
Do not strip whitespace from dynamiv FvwmButtons title and image path.
---
modules/ChangeLog | 5 +++++
modules/FvwmButtons/dynamic.c | 23 ++++++++++++-----------
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/modules/ChangeLog b/modules/ChangeLog
index b7609d7..0a0d8d5 100644
--- a/modules/ChangeLog
+++ b/modules/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-14 Dominik Vogt <dominik(dot)vogt(at)gmx(dot)de>
+
+ * FvwmButtons/dynamic.c (parse_message_line): Do not strip whitespace
+ from synamic button title or image path.
+
2014-09-20 Dominik Vogt <dominik(dot)vogt(at)gmx(dot)de>
* FvwmWharf/FvwmWharf.c (swallow):
diff --git a/modules/FvwmButtons/dynamic.c b/modules/FvwmButtons/dynamic.c
index 9c75e7d..e05c518 100644
--- a/modules/FvwmButtons/dynamic.c
+++ b/modules/FvwmButtons/dynamic.c
@@ -290,21 +290,24 @@ void parse_message_line(char *line)
if (b->flags.b_Title)
free(b->title);
b->flags.b_Title = 1;
- CopyString(&b->title, value);
+ b->title = value;
+ value = NULL;
break;
case 2:
/* ActiveTitle */
if (b->flags.b_ActiveTitle)
free(b->activeTitle);
b->flags.b_ActiveTitle = 1;
- CopyString(&b->activeTitle, value);
+ b->title = value;
+ value = NULL;
break;
case 4:
/* PressTitle */
if (b->flags.b_PressTitle)
free(b->pressTitle);
b->flags.b_PressTitle = 1;
- CopyString(&b->pressTitle, value);
+ b->title = value;
+ value = NULL;
break;
default:
if (
@@ -327,8 +330,8 @@ void parse_message_line(char *line)
Dpy, b->icon);
}
b->flags.b_Icon = 1;
- CopyString(
- &b->icon_file, value);
+ b->icon_file = value;
+ value = NULL;
b->icon = icon;
break;
case 3: /* ActiveIcon */
@@ -340,9 +343,8 @@ void parse_message_line(char *line)
b->activeicon);
}
b->flags.b_ActiveIcon = 1;
- CopyString(
- &b->active_icon_file,
- value);
+ b->active_icon_file = value;
+ value = NULL;
b->activeicon = icon;
break;
case 5: /* PressIcon */
@@ -354,9 +356,8 @@ void parse_message_line(char *line)
b->pressicon);
}
b->flags.b_PressIcon = 1;
- CopyString(
- &b->press_icon_file,
- value);
+ b->press_icon_file = value;
+ value = NULL;
b->pressicon = icon;
break;
}
----------------------------------------------------------------
Diffstat:
----------------------------------------------------------------
legacy/NEWS | 3 +++
modules/ChangeLog | 5 +++++
modules/MvwmButtons/dynamic.c | 23 ++++++++++++-----------
3 files changed, 20 insertions(+), 11 deletions(-)
----------------------------------------------------------------
