From 7020b573764bb86551d329e867c2e87172424c9b Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Sun, 1 Oct 2006 17:21:03 +0000
Subject: 2006-10-01  Havoc Pennington  <hp@redhat.com>

	* test/test-service.c (path_message_func): remove broken extra
	unref that was hidden by the bugs in dbus-connection.c/dbus-bus.c

	* test/test-shell-service.c (path_message_func): same fix

	* dbus/dbus-connection.c
	(_dbus_connection_get_dispatch_status_unlocked): break up the
	function a little for clarity and fix the notification of
	dbus-bus.c to not require dispatch to be complete

	* dbus/dbus-connection.c (dbus_connection_unref): improve the
	warning when you try to finalize an open connection.
---
 test/test-service.c       | 11 +++++------
 test/test-shell-service.c |  1 -
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/test-service.c b/test/test-service.c
index 0dbece08..bd2a4638 100644
--- a/test/test-service.c
+++ b/test/test-service.c
@@ -3,7 +3,7 @@
 
 static DBusLoop *loop;
 static dbus_bool_t already_quit = FALSE;
-static dbus_bool_t hello_from_self_reply_recived = FALSE;
+static dbus_bool_t hello_from_self_reply_received = FALSE;
 
 static void
 quit (void)
@@ -54,7 +54,7 @@ check_hello_from_self_reply (DBusPendingCall *pcall,
   if (type == DBUS_MESSAGE_TYPE_METHOD_RETURN)
     {
       const char *s;
-      printf ("Reply from HelloFromSelf recived\n");
+      printf ("Reply from HelloFromSelf received\n");
      
       if (!dbus_message_get_args (echo_message,
                               &error,
@@ -108,9 +108,9 @@ check_hello_from_self_reply (DBusPendingCall *pcall,
       dbus_error_free (&error);
     }
   else
-     _dbus_assert_not_reached ("Unexpected message recived\n");
+     _dbus_assert_not_reached ("Unexpected message received\n");
 
-  hello_from_self_reply_recived = TRUE;
+  hello_from_self_reply_received = TRUE;
   
   dbus_message_unref (reply);
   dbus_message_unref (echo_message);
@@ -243,7 +243,6 @@ path_message_func (DBusConnection  *connection,
                                         "org.freedesktop.TestSuite",
                                         "Exit"))
     {
-      dbus_connection_unref (connection);
       quit ();
       return DBUS_HANDLER_RESULT_HANDLED;
     }
@@ -286,7 +285,7 @@ path_message_func (DBusConnection  *connection,
                                         "HelloFromSelf"))
     {
         DBusMessage *reply;
-        printf ("Recived the HelloFromSelf message\n");
+        printf ("Received the HelloFromSelf message\n");
         
         reply = dbus_message_new_method_return (message);
         if (reply == NULL)
diff --git a/test/test-shell-service.c b/test/test-shell-service.c
index 08ed2077..21801c7b 100644
--- a/test/test-shell-service.c
+++ b/test/test-shell-service.c
@@ -85,7 +85,6 @@ path_message_func (DBusConnection  *connection,
                                         "org.freedesktop.TestSuite",
                                         "Exit"))
     {
-      dbus_connection_unref (connection);
       quit ();
       return DBUS_HANDLER_RESULT_HANDLED;
     }
-- 
cgit