[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10867 - in trunk: . scheduler
From:       cups-dev () easysw ! com
Date:       2013-02-19 23:45:09
Message-ID: 11637-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2013-02-19 15:45:08 -0800 (Tue, 19 Feb 2013)
New Revision: 10867
Log:
Fix a regression introduced by the fix for STR #4232 (STR #4276)


Modified:
   trunk/CHANGES-1.6.txt
   trunk/scheduler/colorman.c

Modified: trunk/CHANGES-1.6.txt
===================================================================
--- trunk/CHANGES-1.6.txt	2013-02-19 23:33:08 UTC (rev 10866)
+++ trunk/CHANGES-1.6.txt	2013-02-19 23:45:08 UTC (rev 10867)
@@ -26,7 +26,7 @@
 	- 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)

Modified: trunk/scheduler/colorman.c
===================================================================
--- trunk/scheduler/colorman.c	2013-02-19 23:33:08 UTC (rev 10866)
+++ trunk/scheduler/colorman.c	2013-02-19 23:45:08 UTC (rev 10867)
@@ -1128,14 +1128,14 @@
   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);

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit
[prev in list] [next in list] [prev in thread] [next in thread]