Final sync-up with cups.org trunk repository

[thirdparty/cups.git] / scheduler / colorman.c

diff --git a/scheduler/colorman.c b/scheduler/colorman.c
index 53cd03d8a5580320166d86c157da2bfacaa49740..8aa5913f99fce7278b6e18334f7125198795972b 100644 (file)
--- a/scheduler/colorman.c
+++ b/scheduler/colorman.c
@@ -40,6 +40,25 @@
  *
  * Contents:
  *
+ *   cupsdRegisterColor()         - Register vendor color profiles in a PPD
+ *                                  file.
+ *   cupsdStartColor()            - Initialize color management.
+ *   cupsdStopColor()             - Shutdown color management.
+ *   cupsdUnregisterColor()       - Unregister vendor color profiles in a PPD
+ *                                  file.
+ *   apple_init_profile()         - Initialize a color profile.
+ *   apple_register_profiles()    - Register color profiles for a printer.
+ *   apple_unregister_profiles()   - Remove color profiles for the specified
+ *                                  printer.
+ *   colord_create_device()       - Create a device and register profiles.
+ *   colord_create_profile()      - Create a color profile for a printer.
+ *   colord_delete_device()       - Delete a device
+ *   colord_device_add_profile()   - Assign a profile to a device.
+ *   colord_dict_add_strings()    - Add two strings to a dictionary.
+ *   colord_find_device()         - Finds a device
+ *   colord_get_qualifier_format() - Get the qualifier format.
+ *   colord_register_printer()    - Register profiles for a printer.
+ *   colord_unregister_printer()   - Unregister profiles for a printer.
  */
 
 /*
@@ -307,7 +326,7 @@ apple_init_profile(
   * Fill in the profile data...
   */
 
- if (iccfile)
+ if (iccfile && *iccfile)
  {
     url = CFURLCreateFromFileSystemRepresentation(kCFAllocatorDefault,
                                                  (const UInt8 *)iccfile,
@@ -497,7 +516,7 @@ apple_register_profiles(
 
         if (_cupsFileCheck(iccfile, _CUPS_FILE_CHECK_FILE, !RunUser,
                           cupsdLogFCMessage, p))
-         continue;
+         iccfile[0] = '\0';
 
        cupsArraySave(ppd->sorted_attrs);
 
@@ -1128,14 +1147,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);