From 8fa7029473111bdf9cd15c16ab9dd6106590a213 Mon Sep 17 00:00:00 2001 From: mike Date: Tue, 19 Feb 2013 23:45:08 +0000 Subject: [PATCH] Fix a regression introduced by the fix for STR #4232 (STR #4276) git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10867 7a7537e8-13f0-0310-91df-b6672ffda945 --- CHANGES-1.6.txt | 2 +- scheduler/colorman.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt index f32d4aa602..884c533972 100644 --- a/CHANGES-1.6.txt +++ b/CHANGES-1.6.txt @@ -26,7 +26,7 @@ CHANGES IN CUPS V1.6.2 - Fixed a problem with local Kerberos authentication (STR #4140) - Coverity scan: fixed some minor issues (STR #4242) - The scheduler did not remove color profiles after deleting a printer - (STR #4232) + (STR #4232, STR #4276) - The CUPS library did not always detect a timed out connection to the server which could cause temporary loss of printing from applications (STR #4187) diff --git a/scheduler/colorman.c b/scheduler/colorman.c index 53cd03d8a5..a5838503d6 100644 --- a/scheduler/colorman.c +++ b/scheduler/colorman.c @@ -1128,14 +1128,14 @@ colord_delete_device( message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "DeleteDevice"); dbus_message_iter_init_append(message, &args); - dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_id); + dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_path); /* * Send the DeleteDevice request synchronously... */ dbus_error_init(&error); - cupsdLogMessage(CUPSD_LOG_DEBUG, "Calling DeleteDevice(%s)", device_id); + cupsdLogMessage(CUPSD_LOG_DEBUG, "Calling DeleteDevice(%s)", device_path); reply = dbus_connection_send_with_reply_and_block(colord_con, message, COLORD_DBUS_TIMEOUT, &error); -- 2.47.2