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

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index f32d4aa602c395664ed1b9929cc3f3dbe651b632..884c533972ef919727e1a70e9d9d09635371dc11 100644 (file)
--- 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 53cd03d8a5580320166d86c157da2bfacaa49740..a5838503d6c1e650dd3140991e451312714c08b4 100644 (file)
--- 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);