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

Rename obprop to obxprop (Fixes bug #4419)

Browse source 
Avoids collision with openbabel.
This commit is contained in:
Dana Jansens 2009-12-21 09:59:28 -05:00
parent 1fb198410e
commit 6d8b7bd5f7
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -51,7 +51,7 @@ po/remove-potcdate.sed
render/obrender-3.0.pc render/obrender-3.0.pc
tools/gnome-panel-control/gnome-panel-control tools/gnome-panel-control/gnome-panel-control
tools/gdm-control/gdm-control tools/gdm-control/gdm-control
tools/obprop/obprop tools/obxprop/obxprop
version.h version.h
.libs .libs
.deps .deps

12
Makefile.am
View file

@ -33,7 +33,7 @@ bin_PROGRAMS = \
openbox/openbox \ openbox/openbox \
tools/gdm-control/gdm-control \ tools/gdm-control/gdm-control \
tools/gnome-panel-control/gnome-panel-control \ tools/gnome-panel-control/gnome-panel-control \
tools/obprop/obprop tools/obxprop/obxprop
dist_secretbin_SCRIPTS = \ dist_secretbin_SCRIPTS = \
tools/xdg-autostart/xdg-autostart tools/xdg-autostart/xdg-autostart
@ -289,16 +289,16 @@ tools_gnome_panel_control_gnome_panel_control_LDADD = \
tools_gnome_panel_control_gnome_panel_control_SOURCES = \ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
tools/gnome-panel-control/gnome-panel-control.c tools/gnome-panel-control/gnome-panel-control.c
## obprop ## ## obxprop ##
tools_obprop_obprop_CPPFLAGS = \ tools_obxprop_obxprop_CPPFLAGS = \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
$(X_CFLAGS) $(X_CFLAGS)
tools_obprop_obprop_LDADD = \ tools_obxprop_obxprop_LDADD = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(X_LIBS) $(X_LIBS)
tools_obprop_obprop_SOURCES = \ tools_obxprop_obxprop_SOURCES = \
tools/obprop/obprop.c tools/obxprop/obxprop.c
## gdm-control ## ## gdm-control ##

8
data/rc.xml
View file

@ -646,10 +646,10 @@
# this is an example with comments through out. use these to make your # this is an example with comments through out. use these to make your
# own rules, but without the comments of course. # own rules, but without the comments of course.
<application name="the window's _OB_NAME property (see obprop)" <application name="the window's _OB_NAME property (see obxprop)"
class="the window's _OB_CLASS property (see obprop)" class="the window's _OB_CLASS property (see obxprop)"
role="the window's _OB_ROLE property (see obprop)" role="the window's _OB_ROLE property (see obxprop)"
type="the window's _NET_WM_WINDOW_TYPE (see obprob).. type="the window's _NET_WM_WINDOW_TYPE (see obxprob)..
(if unspecified, then it is 'dialog' for child windows)"> (if unspecified, then it is 'dialog' for child windows)">
# the name or the class can be set, or both. this is used to match # the name or the class can be set, or both. this is used to match
# windows when they appear. role can optionally be set as well, to # windows when they appear. role can optionally be set as well, to

0
tools/obprop/Makefile → tools/obxprop/Makefile
View file

2
tools/obprop/obprop.c → tools/obxprop/obxprop.c
View file

@ -12,7 +12,7 @@ gint fail(const gchar *s) {
else else
fprintf fprintf
(stderr, (stderr,
"Usage: obprop [OPTIONS]\n\n" "Usage: obxprop [OPTIONS]\n\n"
"Options:\n" "Options:\n"
" --help Display this help and exit\n" " --help Display this help and exit\n"
" --display DISPLAY Connect to this X display\n" " --display DISPLAY Connect to this X display\n"