From 6d8b7bd5f7ede1803c1259f5c1b760e5dbf4dbe3 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 21 Dec 2009 09:59:28 -0500
Subject: [PATCH] Rename obprop to obxprop (Fixes bug #4419)

Avoids collision with openbabel.
---
 .gitignore                                   |  2 +-
 Makefile.am                                  | 12 ++++++------
 data/rc.xml                                  |  8 ++++----
 tools/{obprop => obxprop}/Makefile           |  0
 tools/{obprop/obprop.c => obxprop/obxprop.c} |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename tools/{obprop => obxprop}/Makefile (100%)
 rename tools/{obprop/obprop.c => obxprop/obxprop.c} (99%)

diff --git a/.gitignore b/.gitignore
index e1e0e419..907abb9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,7 @@ po/remove-potcdate.sed
 render/obrender-3.0.pc
 tools/gnome-panel-control/gnome-panel-control
 tools/gdm-control/gdm-control
-tools/obprop/obprop
+tools/obxprop/obxprop
 version.h
 .libs
 .deps
diff --git a/Makefile.am b/Makefile.am
index 4b3e0b50..60c22321 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ bin_PROGRAMS = \
 	openbox/openbox \
 	tools/gdm-control/gdm-control \
 	tools/gnome-panel-control/gnome-panel-control \
-	tools/obprop/obprop
+	tools/obxprop/obxprop
 
 dist_secretbin_SCRIPTS = \
 	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.c
 
-## obprop ##
+## obxprop ##
 
-tools_obprop_obprop_CPPFLAGS = \
+tools_obxprop_obxprop_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(X_CFLAGS)
-tools_obprop_obprop_LDADD = \
+tools_obxprop_obxprop_LDADD = \
 	$(GLIB_LIBS) \
 	$(X_LIBS)
-tools_obprop_obprop_SOURCES = \
-	tools/obprop/obprop.c
+tools_obxprop_obxprop_SOURCES = \
+	tools/obxprop/obxprop.c
 
 ## gdm-control ##
 
diff --git a/data/rc.xml b/data/rc.xml
index d7a31bda..eaf3df7f 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -646,10 +646,10 @@
   # this is an example with comments through out. use these to make your
   # own rules, but without the comments of course.
 
-  <application name="the window's _OB_NAME property (see obprop)"
-              class="the window's _OB_CLASS property (see obprop)"
-               role="the window's _OB_ROLE property (see obprop)"
-               type="the window's _NET_WM_WINDOW_TYPE (see obprob)..
+  <application name="the window's _OB_NAME property (see obxprop)"
+              class="the window's _OB_CLASS property (see obxprop)"
+               role="the window's _OB_ROLE property (see obxprop)"
+               type="the window's _NET_WM_WINDOW_TYPE (see obxprob)..
                       (if unspecified, then it is 'dialog' for child windows)">
   # 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
diff --git a/tools/obprop/Makefile b/tools/obxprop/Makefile
similarity index 100%
rename from tools/obprop/Makefile
rename to tools/obxprop/Makefile
diff --git a/tools/obprop/obprop.c b/tools/obxprop/obxprop.c
similarity index 99%
rename from tools/obprop/obprop.c
rename to tools/obxprop/obxprop.c
index e288d7cb..26851544 100644
--- a/tools/obprop/obprop.c
+++ b/tools/obxprop/obxprop.c
@@ -12,7 +12,7 @@ gint fail(const gchar *s) {
     else
         fprintf
             (stderr,
-             "Usage: obprop [OPTIONS]\n\n"
+             "Usage: obxprop [OPTIONS]\n\n"
              "Options:\n"
              "    --help              Display this help and exit\n"
              "    --display DISPLAY   Connect to this X display\n"
-- 
2.45.2