* Removed some extra bindings stuff lingering around (thanks timo)

* dbus-pendingcall.c (_dbus_pending_call_new):
  s/dbus_connection_ref/_dbus_connection_ref_unlocked fixes assertion
  when we tried to take a lock on an already locked connection

4 files changed, 8 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 7e233867..cec18b75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-21  John (J5) Palmieri  <johnp@redhat.com>
+
+	* Removed some extra bindings stuff lingering around (thanks timo)
+	* dbus-pendingcall.c (_dbus_pending_call_new): 
+	s/dbus_connection_ref/_dbus_connection_ref_unlocked fixes assertion
+	when we tried to take a lock on an already locked connection
+
 2006-07-17  John (J5) Palmieri  <johnp@redhat.com>
 
 	* Released 0.90
diff --git a/README b/README
index 0eb45e3f..08ab8621 100644
--- a/README
+++ b/README
@@ -19,12 +19,6 @@ Configuration flags
 These are the dbus-specific configuration flags that can be given to
 the ./configure program.
 
-  --enable-qt             enable Qt-friendly client library (note: Qt4)
-  --enable-qt-debug       enable Qt-friendly client library, linked to debug
-                          Qt libraries
-  --enable-qt3            enable Qt3-friendly client library
-  --enable-glib           enable GLib-friendly client library
-  --enable-gtk            enable GTK-requiring executables
   --enable-tests          enable unit test code
   --enable-ansi           enable -ansi -pedantic gcc flags
   --enable-verbose-mode   support verbose debug mode
@@ -35,15 +29,9 @@ the ./configure program.
   --enable-gcov           compile with coverage profiling instrumentation (gcc only)
   --enable-abstract-sockets
                           use abstract socket namespace (linux only)
-  --enable-gcj            build gcj bindings
-  --enable-mono           build mono bindings
-  --enable-mono-docs      build mono docs
-  --enable-python         build python bindings
   --enable-selinux        build with SELinux support
   --enable-dnotify        build with dnotify support (linux only)
 
-  --with-qt-moc=<path>              moc for Qt
-  --with-qt3-moc=<path>             moc for Qt3
   --with-xml=libxml/expat           XML library to use
   --with-init-scripts=redhat        Style of init scripts to install
   --with-session-socket-dir=dirname Where to put sockets for the per-login-session message bus
diff --git a/configure.in b/configure.in
index 6087e7ff..50939b51 100644
--- a/configure.in
+++ b/configure.in
@@ -585,24 +585,6 @@ fi
 # unix:path=/foo or unix:abstract=/foo 
 AC_SUBST(DBUS_PATH_OR_ABSTRACT)
 
-#### Sort out gettext
-
-# this makes us require GLib to run autoconf, but not at runtime
-ALL_LINGUAS=""
-AM_GLIB_GNU_GETTEXT
-
-# INTLLIBS is now set
-
-# (if someone wants to go through and make internationalization 
-#  conditional with #ifdef ENABLE_NLS then go crazy and send us a patch, 
-#  but right now we won't build without gettext)
-if test "$gt_cv_have_gettext" != "yes" ; then
-  AC_MSG_ERROR([
-*** You must have either have gettext support in your C library, or use the 
-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
-])
-fi
-
 #### Sort out XML library
 
 # see what we have
@@ -1030,11 +1012,6 @@ test/data/valid-service-files/debug-shell-echo-success.service
 test/data/valid-service-files/debug-shell-echo-fail.service
 ])
 
-### FIXME it's bizarre that have_qt 
-### instead of enable_ - should fix things so that enable 
-### is always whether it's enabled, and have is always whether 
-### it was found.
-
 dnl ==========================================================================
 echo "
                     D-BUS $VERSION
@@ -1067,7 +1044,6 @@ echo "
         Building checks:          ${enable_checks}
         Building SELinux support: ${have_selinux}
         Building dnotify support: ${have_dnotify}
-        Building GTK+ tools:      ${have_gtk}
         Building X11 code:        ${enable_x11}
         Building Doxygen docs:    ${enable_doxygen_docs}
         Building XML docs:        ${enable_xml_docs}
diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
index ba5f8757..da8a3100 100644
--- a/dbus/dbus-pending-call.c
+++ b/dbus/dbus-pending-call.c
@@ -119,7 +119,7 @@ _dbus_pending_call_new (DBusConnection    *connection,
   
   pending->refcount.value = 1;
   pending->connection = connection;
-  dbus_connection_ref (pending->connection);
+  _dbus_connection_ref_unlocked (pending->connection);
 
   pending->timeout = timeout;