gnome-bluetooth r578 - trunk/common

[hadess svn gnome org]

Author: hadess
Date: Wed Apr  8 14:50:39 2009
New Revision: 578
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=578&view=rev

Log:
Revert previous changes, we have no way of knowing whether a Connect or Disconnect succeeded


Modified:
   trunk/common/bluetooth-client.c
   trunk/common/bluetooth-client.h

Modified: trunk/common/bluetooth-client.c
==============================================================================
--- trunk/common/bluetooth-client.c	(original)
+++ trunk/common/bluetooth-client.c	Wed Apr  8 14:50:39 2009
@@ -1333,7 +1333,6 @@
 	gpointer data;
 	/* used for disconnect */
 	GList *services;
-	gboolean disconnected;
 } ConnectData;
 
 static void connect_callback(DBusGProxy *proxy,
@@ -1341,16 +1340,14 @@
 {
 	ConnectData *conndata = user_data;
 	GError *error = NULL;
-	gboolean connected = FALSE;
 
-	if (dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_INVALID) != FALSE)
-		connected = TRUE;
+	dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_INVALID);
 
 	if (error != NULL)
 		g_error_free(error);
 
 	if (conndata->func)
-		conndata->func(connected, conndata->data);
+		conndata->func(conndata->data);
 
 	g_object_unref(proxy);
 }
@@ -1420,8 +1417,7 @@
 {
 	ConnectData *conndata = user_data;
 
-	if (dbus_g_proxy_end_call(proxy, call, NULL, G_TYPE_INVALID) != FALSE)
-		conndata->disconnected = TRUE;
+	dbus_g_proxy_end_call(proxy, call, NULL, G_TYPE_INVALID);
 
 	if (conndata->services != NULL) {
 		DBusGProxy *service;
@@ -1441,7 +1437,7 @@
 	}
 
 	if (conndata->func)
-		conndata->func(!conndata->disconnected, conndata->data);
+		conndata->func(conndata->data);
 
 	g_object_unref(proxy);
 	g_free (conndata);

Modified: trunk/common/bluetooth-client.h
==============================================================================
--- trunk/common/bluetooth-client.h	(original)
+++ trunk/common/bluetooth-client.h	Wed Apr  8 14:50:39 2009
@@ -101,7 +101,7 @@
 gboolean bluetooth_client_set_trusted(BluetoothClient *client,
 					const char *device, gboolean trusted);
 
-typedef void (*BluetoothClientConnectFunc) (gboolean connected, gpointer data);
+typedef void (*BluetoothClientConnectFunc) (gpointer data);
 
 gboolean bluetooth_client_connect_service(BluetoothClient *client,
 					  const char *device,