From 9aa5ca29ae29b1ab26e5c0299ab161beee9680b3 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Tue, 15 May 2007 02:32:49 +0000
Subject: [PATCH] updates for the build system. always set Openbox on the
 support window

---
 Makefile.am                              | 35 ++++++++++++------------
 data/gnome-wm-properties/openbox.desktop |  2 +-
 openbox/openbox.c                        |  2 +-
 openbox/screen.c                         |  4 +--
 openbox/screen.h                         |  2 +-
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 80737053..16fef2b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gnome-panel-control/gnome-panel-control
 
-bin_SCRIPTS = \
+nodist_bin_SCRIPTS = \
 	data/xsession/openbox-session \
 	data/xsession/openbox-gnome-session \
 	data/xsession/openbox-kde-session
@@ -375,7 +375,6 @@ data/xsession/openbox-gnome.desktop: \
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $< >$@
-	@chmod a+x $@
 
 data/xsession/openbox-kde.desktop: \
 		$(srcdir)/data/xsession/openbox-kde.desktop.in
@@ -383,7 +382,6 @@ data/xsession/openbox-kde.desktop: \
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $< >$@
-	@chmod a+x $@
 
 data/xsession/openbox.desktop: \
 		$(srcdir)/data/xsession/openbox.desktop.in
@@ -391,7 +389,6 @@ data/xsession/openbox.desktop: \
 	@mkdir data 2>/dev/null || true
 	@mkdir data/xsession 2>/dev/null || true
 	@$(edit) $< >$@
-	@chmod a+x $@
 
 data/xsession/openbox-gnome-session: \
 		$(srcdir)/data/xsession/openbox-gnome-session.in
@@ -440,21 +437,12 @@ doc/openbox-kde-session.1: $(srcdir)/doc/openbox-kde-session.1.sgml
 dist_gnomewmfiles_DATA = \
 	data/gnome-wm-properties/openbox.desktop
 
-dist_xsessions_DATA = \
+nodist_xsessions_DATA = \
 	data/xsession/openbox.desktop \
 	data/xsession/openbox-gnome.desktop \
 	data/xsession/openbox-kde.desktop
 
 dist_noinst_DATA = \
-	debian/changelog.in \
-	debian/compat \
-	debian/conffiles \
-	debian/control \
-	debian/copyright \
-	debian/menu \
-	debian/postinst \
-	debian/postrm \
-	debian/rules \
 	version.h.in \
 	data/rc.xsd \
 	data/menu.xsd \
@@ -465,6 +453,10 @@ dist_noinst_DATA = \
 	data/xsession/openbox-session.in \
 	data/xsession/openbox-gnome-session.in \
 	data/xsession/openbox-kde-session.in \
+	doc/openbox.1.sgml \
+	doc/openbox-session.1.sgml \
+	doc/openbox-gnome-session.1.sgml \
+	doc/openbox-kde-session.1.sgml \
 	render/obrender-3.0.pc.in \
 	parser/obparser-3.0.pc.in \
 	tools/themeupdate/themeupdate.py \
@@ -489,6 +481,8 @@ dist_doc_DATA = \
 	COMPLIANCE \
 	README \
 	AUTHORS \
+	CHANGELOG \
+	COPYING \
 	data/rc.xsd \
 	data/menu.xsd \
 	data/themerc.xsd \
@@ -501,10 +495,17 @@ dist_man_MANS = \
 	doc/openbox-kde-session.1
 
 EXTRA_DIST = \
+	debian/changelog.in \
+	debian/compat \
+	debian/conffiles \
+	debian/control \
+	debian/copyright \
+	debian/menu \
+	debian/postinst \
+	debian/postrm \
+	debian/rules \
 	config.rpath \
-	mkinstalldirs \
-	CHANGELOG \
-	COPYING
+	mkinstalldirs
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc
diff --git a/data/gnome-wm-properties/openbox.desktop b/data/gnome-wm-properties/openbox.desktop
index 96418613..eee0dd60 100644
--- a/data/gnome-wm-properties/openbox.desktop
+++ b/data/gnome-wm-properties/openbox.desktop
@@ -3,7 +3,7 @@ Name=Openbox
 Exec=openbox
 
 # name we put on the WM spec check window
-X-GNOME-WMName=openbox
+X-GNOME-WMName=Openbox
 
 # our config tool
 ConfigExec=obconf
diff --git a/openbox/openbox.c b/openbox/openbox.c
index ee3911d9..78b53223 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -212,7 +212,7 @@ gint main(gint argc, gchar **argv)
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
 
-    if (screen_annex(program_name)) { /* it will be ours! */
+    if (screen_annex()) { /* it will be ours! */
         do {
             modkeys_startup(reconfigure);
 
diff --git a/openbox/screen.c b/openbox/screen.c
index d71c9eaa..eff8674b 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -153,7 +153,7 @@ static gboolean replace_wm()
     return TRUE;
 }
 
-gboolean screen_annex(const gchar *program_name)
+gboolean screen_annex()
 {
     XSetWindowAttributes attrib;
     pid_t pid;
@@ -203,7 +203,7 @@ gboolean screen_annex(const gchar *program_name)
                net_supporting_wm_check, window, screen_support_win);
 
     /* set properties on the supporting window */
-    PROP_SETS(screen_support_win, net_wm_name, program_name);
+    PROP_SETS(screen_support_win, net_wm_name, "Openbox");
     PROP_SET32(screen_support_win, net_supporting_wm_check,
                window, screen_support_win);
 
diff --git a/openbox/screen.h b/openbox/screen.h
index a694f663..bd96ab20 100644
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -53,7 +53,7 @@ extern DesktopLayout screen_desktop_layout;
 extern gchar **screen_desktop_names;
 
 /*! Take over the screen, set the basic hints on it claming it as ours */
-gboolean screen_annex(const gchar *program_name);
+gboolean screen_annex();
 
 /*! Once the screen is ours, set up its initial state */
 void screen_startup(gboolean reconfig);
-- 
2.39.2