Blame 0002-Actually-read-the-CreateDevice-reply.patch
|
Bastien Nocera |
385d00 |
From b29e1cb433454391da92720c3ff87373d9d60500 Mon Sep 17 00:00:00 2001
|
|
Bastien Nocera |
385d00 |
From: Bastien Nocera <hadess@hadess.net>
|
|
Bastien Nocera |
385d00 |
Date: Tue, 11 Aug 2009 12:24:58 +0100
|
|
Bastien Nocera |
385d00 |
Subject: [PATCH 2/2] Actually read the CreateDevice reply
|
|
Bastien Nocera |
385d00 |
|
|
Bastien Nocera |
385d00 |
Fixes aborts when the printer isn't a known device.
|
|
Bastien Nocera |
385d00 |
---
|
|
Bastien Nocera |
385d00 |
cups/main.c | 6 +++---
|
|
Bastien Nocera |
385d00 |
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
Bastien Nocera |
385d00 |
|
|
Bastien Nocera |
385d00 |
diff --git a/cups/main.c b/cups/main.c
|
|
Bastien Nocera |
385d00 |
index 9c24734..ba9864f 100644
|
|
Bastien Nocera |
385d00 |
--- a/cups/main.c
|
|
Bastien Nocera |
385d00 |
+++ b/cups/main.c
|
|
Bastien Nocera |
385d00 |
@@ -371,9 +371,9 @@ static void remote_device_found(const char *adapter, const char *bdaddr, const c
|
|
Bastien Nocera |
385d00 |
|
|
Bastien Nocera |
385d00 |
if (!reply)
|
|
Bastien Nocera |
385d00 |
return;
|
|
Bastien Nocera |
385d00 |
- } else {
|
|
Bastien Nocera |
385d00 |
- if (dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID) == FALSE)
|
|
Bastien Nocera |
385d00 |
- return;
|
|
Bastien Nocera |
385d00 |
+ }
|
|
Bastien Nocera |
385d00 |
+ if (dbus_message_get_args(reply, NULL, DBUS_TYPE_OBJECT_PATH, &object_path, DBUS_TYPE_INVALID) == FALSE) {
|
|
Bastien Nocera |
385d00 |
+ return;
|
|
Bastien Nocera |
385d00 |
}
|
|
Bastien Nocera |
385d00 |
|
|
Bastien Nocera |
385d00 |
id = device_get_ieee1284_id(adapter, object_path);
|
|
Bastien Nocera |
385d00 |
--
|
|
Bastien Nocera |
385d00 |
1.6.2.5
|
|
Bastien Nocera |
385d00 |
|