From: Arun Persaud <arun@nubati.net>
Date: Wed, 29 Feb 2012 06:00:27 +0000 (-0800)
Subject: Merge branch 'master' into v4.6.x
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=6874e8f6f6ce49db1d5e1dc7d507533c88cc473d;hp=665c4ef0f9740c9d8cdc7d52ff838b54605c66ab;p=xboard.git

Merge branch 'master' into v4.6.x
---

diff --git a/Makefile.am b/Makefile.am
index 50cf922..f8eb910 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,7 +146,7 @@ dist_bitmaps_DATA = \
 ### directory and files for pixmaps
 
 pixmapsdir = $(datadir)/games/xboard/pixmaps/textures
-dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm
+dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm pixmaps/cross32.xpm pixmaps/cross48.xpm pixmaps/board32.xpm pixmaps/board48.xpm
 
 ### directory and files for sound files
 
@@ -197,7 +197,7 @@ endif
 uninstall-mime-database:
 if ENABLE_UPDATE_MIMEDB	
 	-if test -z "$(DESTDIR)" -a -n "$(XDG_MIME)" -a -n "$(XDG_DESKTOP_MENU)" -a -n "$(XDG_ICON_RESOURCE)" ; then \
-		$(XDG-MIME) uninstall --mode system --novendor xboard.xml;\
+		$(XDG_MIME) uninstall --mode system --novendor xboard.xml;\
 		$(XDG_DESKTOP_MENU) uninstall --mode system --novendor xboard-pgn-viewer.desktop;\
 		$(XDG_DESKTOP_MENU) uninstall --mode system --novendor xboard-fen-viewer.desktop;\
 		$(XDG_DESKTOP_MENU) uninstall --mode system --novendor xboard-tourney.desktop;\
diff --git a/xboard.c b/xboard.c
index 84e0aec..deed56f 100644
--- a/xboard.c
+++ b/xboard.c
@@ -444,6 +444,10 @@ void SaveSettingsProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)
 void SaveOnExitProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void InfoProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void ManProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
+void GuideProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
+void HomePageProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
+void NewsPageProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
+void BugReportProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void HintProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void BookProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void AboutGameProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
@@ -786,6 +790,11 @@ MenuItem helpMenu[] = {
     {N_("Info XBoard"),     "Info XBoard", InfoProc},
     {N_("Man XBoard   F1"), "Man XBoard", ManProc},
     {"----", NULL, NothingProc},
+    {N_("XBoard Home Page"), "Home Page", HomePageProc},
+    {N_("On-line User Guide"), "User Guide", GuideProc},
+    {N_("Development News"), "News Page", NewsPageProc},
+    {N_("e-Mail Report Bug"), "Bug Report", BugReportProc},
+    {"----", NULL, NothingProc},
     {N_("About XBoard"), "About XBoard", AboutProc},
     {NULL, NULL, NULL}
 };
@@ -6661,9 +6670,33 @@ BookProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 }
 
 void
+BugReportProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
+{
+    system("xdg-open mailto:bug-xboard@gnu.org");
+}
+
+void
+GuideProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
+{
+    system("xdg-open http://www.gnu.org/software/xboard/user_guide/UserGuide.html");
+}
+
+void
+HomePageProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
+{
+    system("xdg-open http://www.gnu.org/software/xboard/");
+}
+
+void
+NewsPageProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
+{
+    system("xdg-open http://www.gnu.org/software/xboard/whats_new/portal.html");
+}
+
+void
 AboutProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
 {
-    char buf[MSG_SIZ];
+    char buf[2 * MSG_SIZ];
 #if ZIPPY
     char *zippy = _(" (with Zippy code)");
 #else
diff --git a/xboard.conf.in b/xboard.conf.in
index ab1ec3d..12851e9 100644
--- a/xboard.conf.in
+++ b/xboard.conf.in
@@ -32,6 +32,7 @@
 -recentEngines 4
 -gameListW 500
 -gameListH 300
+-stickyWindows false
 ;
 ; Behavior
 ;