nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates for the build system. always set Openbox on the support window

Browse source
This commit is contained in:
Dana Jansens 2007-05-15 02:32:49 +00:00
parent b74cff0302
commit 9aa5ca29ae
5 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Makefile.am
View file

@ -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

2
data/gnome-wm-properties/openbox.desktop
View file

@ -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

2
openbox/openbox.c
View file

@ -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);

4
openbox/screen.c
View file

@ -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);

2
openbox/screen.h
View file

@ -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);