← Back to branch summary

~ubuntu-branches/ubuntu/wily/cups/wily

« back to all changes in this revision

Viewing changes to scheduler/colorman.c

  • Committer: Package Import Robot
  • Author(s): Till Kamppeter
  • Date: 2013-09-24 22:15:01 UTC
  • mfrom: (99.1.28 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130924221501-115ywce51xe7hhok
https://launchpad.net/bugs/1157972
https://launchpad.net/bugs/1229766
https://launchpad.net/bugs/1157972
* debian/patches/cups-1.6.4-changes.patch: Merged latest fixes from upstream,
  taken from CUPS 1.6.4, as there is no public repository of CUPS any more
  and due to Apple policies the next 1.7.x release, 1.7.0 final, happens
  only with the next release of Mac OS X. Fixes:
   - Removed some duplicate page size definitions for some ISO sizes that were
     causing problems
   - The IPP backend did not add the "last-document" attribute
   - Added a SyncOnClose directive to cups-files.conf to force cupsd to
     call fsync before closing any configuration/state files it writes
     (LP: #1157972, Red Hat bug #984883).
   - Added USB quirk rule for Lexmark E238
   - Closed server connections were still not always detected
   - The libusb-based USB backend now loads its list of quirks from files
     in /usr/share/cups/usb instead of using a hardcoded table, this
     makes spotting and fixing USB problems much easier.
   - The scheduler did not properly register ICC color profiles with
     colord
* debian/patches/usb-backend-more-quirk-rules.patch,
  debian/patches/handle-server-terminating-connection.patch,
  debian/patches/colord-add-profile-fix.patch: Removed, included upstream.
* debian/patches/pidfile.patch,
  debian/patches/rootbackends-worldreadable.patch,
  debian/patches/airprint-support.patch,
  debian/patches/do-not-broadcast-with-hostnames.patch,
  debian/patches/mention-rfc2911-in-ipptoolfile-for-clarity.patch,
  debian/patches/add-ipp-backend-of-cups-1.4.patch,
  debian/patches/confdirperms.patch,
  debian/patches/show-compile-command-lines.patch,
  debian/patches/log-debug-history-nearly-unlimited.patch: Refreshed with
  quilt.
* debian/local/apparmor-profile: Silenced AppArmor noise in syslog
  (LP: #1229766).
* debian/local/cupsd-sync-files-on-close.patch: Activate CUPS daemon
  syncing files when closing, so that config files (like printers.conf)
  do not mysteriously disappear (LP: #1157972, Red Hat bug #984883).
* debian/cups-server-common.install: Install /usr/share/cups/usb/ with the
  USB backend quirk rules file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scheduler/colorman.c
103
103
#  define COLORD_KIND_PRINTER   "printer"
104
104
                                        /* printing output device */
105
105
 
106
 
#  define COLORD_DBUS_MSG_PARM(p,x,m)   dbus_message_new_method_call(\
107
 
                                        "org.freedesktop.ColorManager", (p),\
108
 
                                        "org.freedesktop.ColorManager" x, (m))
109
 
                                        /* Macro to make new colord messages */
110
 
#  define COLORD_DBUS_MSG(p,m)  COLORD_DBUS_MSG_PARM(p,"",m)
111
 
                                        /* Macro to make new colord messages */
112
 
 
113
 
#  define COLORD_DBUS_PATH      "/org/freedesktop/ColorManager"
 
106
#  define COLORD_DBUS_SERVICE           "org.freedesktop.ColorManager"
 
107
#  define COLORD_DBUS_INTERFACE         "org.freedesktop.ColorManager"
 
108
#  define COLORD_DBUS_INTERFACE_DEVICE  "org.freedesktop.ColorManager.Device"
 
109
#  define COLORD_DBUS_PATH              "/org/freedesktop/ColorManager"
114
110
                                        /* Path for color management system */
115
111
#  define COLORD_DBUS_TIMEOUT   5000    /* Timeout for connecting to colord in ms */
116
112
#endif /* __APPLE__ */
942
938
  snprintf(device_id, sizeof(device_id), "cups-%s", p->name);
943
939
  device_path = device_id;
944
940
 
945
 
  message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "CreateDevice");
 
941
  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
 
942
                                         COLORD_DBUS_PATH,
 
943
                                         COLORD_DBUS_INTERFACE,
 
944
                                         "CreateDevice");
946
945
 
947
946
  dbus_message_iter_init_append(message, &args);
948
947
  dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &device_path);
1051
1050
  * Create the profile...
1052
1051
  */
1053
1052
 
1054
 
  message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "CreateProfile");
 
1053
  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
 
1054
                                         COLORD_DBUS_PATH,
 
1055
                                         COLORD_DBUS_INTERFACE,
 
1056
                                         "CreateProfile");
1055
1057
 
1056
1058
  idstrlen = strlen(printer_name) + 1 + strlen(qualifier) + 1;
1057
1059
  if ((idstr = malloc(idstrlen)) == NULL)
1147
1149
  * Delete the device...
1148
1150
  */
1149
1151
 
1150
 
  message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "DeleteDevice");
 
1152
  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
 
1153
                                         COLORD_DBUS_PATH,
 
1154
                                         COLORD_DBUS_INTERFACE,
 
1155
                                         "DeleteDevice");
1151
1156
 
1152
1157
  dbus_message_iter_init_append(message, &args);
1153
1158
  dbus_message_iter_append_basic(&args, DBUS_TYPE_OBJECT_PATH, &device_path);
1199
1204
  DBusError     error;                  /* D-Bus error */
1200
1205
 
1201
1206
 
1202
 
  message = COLORD_DBUS_MSG_PARM(device_path, ".Device", "AddProfile");
 
1207
  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
 
1208
                                         device_path,
 
1209
                                         COLORD_DBUS_INTERFACE_DEVICE,
 
1210
                                         "AddProfile");
1203
1211
 
1204
1212
  dbus_message_iter_init_append(message, &args);
1205
1213
  dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &relation);
1269
1277
  char          *device_path = NULL;    /* Device object path */
1270
1278
 
1271
1279
 
1272
 
  message = COLORD_DBUS_MSG(COLORD_DBUS_PATH, "FindDeviceById");
 
1280
  message = dbus_message_new_method_call(COLORD_DBUS_SERVICE,
 
1281
                                         COLORD_DBUS_PATH,
 
1282
                                         COLORD_DBUS_INTERFACE,
 
1283
                                         "FindDeviceById");
1273
1284
 
1274
1285
  dbus_message_iter_init_append(message, &args);
1275
1286
  dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &device_id);