rpms/bluez-gnome/F-9 bluez-gnome-0.26-handle-error.patch,NONE,1.1

[David Woodhouse]

Author: dwmw2

Update of /cvs/pkgs/rpms/bluez-gnome/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16636

Added Files:
	bluez-gnome-0.26-handle-error.patch 
Log Message:
error handling patch

bluez-gnome-0.26-handle-error.patch:

--- NEW FILE bluez-gnome-0.26-handle-error.patch ---
--- bluez-gnome-0.26/properties/input.c~	2008-02-05 12:55:17.000000000 -0800
+++ bluez-gnome-0.26/properties/input.c	2008-09-13 12:37:13.000000000 -0700
@@ -50,6 +50,7 @@ static void proxy_callback(DBusGProxy *p
 				DBusGProxyCall *call, void *user_data)
 {
 	GtkWidget *notebook = user_data;
+	GError *error = NULL;
 	GtkWidget *button;
 	GtkWidget *label;
 	DBusGProxy *client;
@@ -59,7 +60,7 @@ static void proxy_callback(DBusGProxy *p
 
 	g_object_set_data(G_OBJECT(notebook), "call", NULL);
 
-	dbus_g_proxy_end_call(proxy, call, NULL,
+	dbus_g_proxy_end_call(proxy, call, &error,
 				G_TYPE_STRING, &path, G_TYPE_INVALID);
 
 	button = g_object_get_data(G_OBJECT(notebook), "cancel");
@@ -68,6 +69,16 @@ static void proxy_callback(DBusGProxy *p
 	button = g_object_get_data(G_OBJECT(notebook), "close");
 	gtk_widget_set_sensitive(button, TRUE);
 
+	if (error) {
+		label = g_object_get_data(G_OBJECT(notebook), "label");
+		text = g_strdup_printf("<b>%s: %s</b>",
+				       _("Connection failed"),
+				       error->message);
+		gtk_label_set_markup(GTK_LABEL(label), text);
+		g_free(text);
+		goto out;
+	}
+
 	busname = dbus_g_proxy_get_bus_name(proxy);
 
 	client = dbus_g_proxy_new_for_name(connection, busname,
@@ -90,6 +101,7 @@ static void proxy_callback(DBusGProxy *p
 
 	set_trusted(adapter, address);
 
+ out:
 	g_object_unref(client);
 }