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 28162d769d4f37ede1f3f3facdd4ded0d2be1c52 (commit)
via f2585dc1f74796628739efde5c61081c2b8c1b35 (commit)
via a568686b39a1f7a5745afbf4d53378a489ee2d73 (commit)
from 0173fe896dd3d89904b6cc540b8e32e93b3693c1 (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/28162d769d4f37ede1f3f3facdd4ded0d2be1c52
commit 28162d769d4f37ede1f3f3facdd4ded0d2be1c52
Author: Kamil Rytarowski <n...@gmx.com>
Date: Sat Feb 18 17:54:06 2012 +0100
Change behavior of the GNUStep dockapp
Make it launch WPrefs instead of displaying GNUstep information.
GNUstep information under a dockbutton is unneeded and it's commonly
replaced
by WPrefs. This also is giving one extra space for another dockapp.
diff --git a/WindowMaker/Defaults/WMState.in b/WindowMaker/Defaults/WMState.in
index bdcef36..aefcfdf 100644
--- a/WindowMaker/Defaults/WMState.in
+++ b/WindowMaker/Defaults/WMState.in
@@ -2,12 +2,12 @@
Dock = {
Applications = (
{
- Command = "-";
+ Command = "#wprefs#";
Name = Logo.WMDock;
AutoLaunch = No;
Forced = No;
Position = "0,0";
- DropCommand = "wmsetbg -u -t %d";
+ Lock = Yes;
},
{
Command = xterm;
@@ -15,14 +15,6 @@
AutoLaunch = No;
Forced = No;
Position = "0,1";
- },
- {
- Command = "#wprefs#";
- Name = groupLeader.WPrefs;
- AutoLaunch = No;
- Forced = No;
- Position = "0,2";
- Lock = Yes;
}
);
Position = "-64,0";
http://repo.or.cz/w/wmaker-crm.git/commit/f2585dc1f74796628739efde5c61081c2b8c1b35
commit f2585dc1f74796628739efde5c61081c2b8c1b35
Author: Rodolfo GarcÃa Peñas (kix) <k...@kix.es>
Date: Sat Feb 18 12:10:22 2012 +0100
utils: Include the SHEXEC in the wm-oldmenu2new script
The script wm-oldmenu2new can now convert the SHEXEC lines.
Requested-by: Doug Barton <do...@freebsd.org>
diff --git a/util/wm-oldmenu2new b/util/wm-oldmenu2new
index 6cdc7c2..5ac8015 100755
--- a/util/wm-oldmenu2new
+++ b/util/wm-oldmenu2new
@@ -129,6 +129,7 @@ perl - $T <<-'EOF' > $T-p
for (@foo2) {
s/^(s*)"([^"]*)"ss*END/1),/;
s/^(s*)"([^"]*)"ss*EXECss*(.*)$/1($vn1"2",$vn1EXEC,$vn1"3"$vn1),/;
+
s/^(s*)"([^"]*)"ss*SHEXECss*(.*)$/1($vn1"2",$vn1SHEXEC,$vn1"3"$vn1),/;
push @foo,split "n";
}
@foo2=();
@@ -146,6 +147,7 @@
s/^(s*)"([^"]*)"ss*OPEN_MENUss*(.*)$/1($vn1"2",$vn1OPEN_MENU,$vn1" for (@foo) {
s/^(s*)([^ ]*)ss*END/1),/;
s/^(s*)([^
]*)ss*EXECss*(.*)$/1($vn1"2",$vn1EXEC,$vn1"3"$vn1),/;
+ s/^(s*)([^
]*)ss*SHEXECss*(.*)$/1($vn1"2",$vn1SHEXEC,$vn1"3"$vn1),/;
push @foo2,split "n";
}
@foo=();
http://repo.or.cz/w/wmaker-crm.git/commit/a568686b39a1f7a5745afbf4d53378a489ee2d73
commit a568686b39a1f7a5745afbf4d53378a489ee2d73
Author: Carlos R. Mafra <crma...@gmail.com>
Date: Sat Feb 18 00:10:48 2012 +0000
WINGs: Do not call exit()
WMCreateFont() was calling exit() if it could not create the
font, and was trying too hard not to return NULL.
Just return NULL if the font could not be created instead of exit()ing
and let callers decide what to do upon failure.
Thanks to Christian <ch...@computersalat.de> for reporting this.
diff --git a/WINGs/wfont.c b/WINGs/wfont.c
index 245cdcc..62dd7d3 100644
--- a/WINGs/wfont.c
+++ b/WINGs/wfont.c
@@ -144,17 +144,9 @@ WMFont *WMCreateFont(WMScreen * scrPtr, char *fontName)
font->font = XftFontOpenName(display, scrPtr->screen, fname);
if (!font->font) {
- printf("Font named %s doesn't exist.n", fname);
- printf("Please check your system configuration.n");
- printf("Will try default font %s.n", DEFAULT_FONT);
- font->font = XftFontOpenName(display, scrPtr->screen,
DEFAULT_FONT);
- if (!font->font) {
- printf("Unrecoverable font error! I must die!n");
- wfree(font);
- wfree(fname);
- exit(1);
- } else
- printf("Default font loading succeded.n");
+ wfree(font);
+ wfree(fname);
+ return NULL;
}
font->height = font->font->ascent + font->font->descent;
-----------------------------------------------------------------------
Summary of changes:
WINGs/wfont.c | 14 +++-----------
WindowMaker/Defaults/WMState.in | 12 ++----------
util/wm-oldmenu2new | 2 ++
3 files changed, 7 insertions(+), 21 deletions(-)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
