diff --git a/backend/Makefile b/backend/Makefile index 48a1c66..342604f 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -263,7 +263,7 @@ dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a ipp: ipp.o ../cups/$(LIBCUPS) libbackend.a echo Linking $@... - $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) + $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS) $(SERVERLIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ $(RM) http $(LN) ipp http diff --git a/backend/ipp.c b/backend/ipp.c index 482d6f7..f37caee 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -152,6 +152,70 @@ static char tmpfilename[1024] = ""; static char mandatory_attrs[1024] = ""; /* cupsMandatory value */ +#if HAVE_DBUS +#include + +static DBusConnection *dbus_connection = NULL; + +static int +init_dbus (void) +{ + DBusConnection *connection; + DBusError error; + + if (dbus_connection && + !dbus_connection_get_is_connected (dbus_connection)) { + dbus_connection_unref (dbus_connection); + dbus_connection = NULL; + } + + dbus_error_init (&error); + connection = dbus_bus_get (getuid () ? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error); + if (connection == NULL) { + dbus_error_free (&error); + return -1; + } + + dbus_connection = connection; + return 0; +} + +int +dbus_broadcast_queued_remote (const char *printer_uri, + ipp_status_t status, + unsigned int local_job_id, + unsigned int remote_job_id, + const char *username, + const char *printer_name) +{ + DBusMessage *message; + DBusMessageIter iter; + const char *errstr; + + if (!dbus_connection || !dbus_connection_get_is_connected (dbus_connection)) { + if (init_dbus () || !dbus_connection) + return -1; + } + + errstr = ippErrorString (status); + message = dbus_message_new_signal ("/com/redhat/PrinterSpooler", + "com.redhat.PrinterSpooler", + "JobQueuedRemote"); + dbus_message_iter_init_append (message, &iter); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_uri); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &errstr); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &local_job_id); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_UINT32, &remote_job_id); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &username); + dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &printer_name); + + dbus_connection_send (dbus_connection, message, NULL); + dbus_connection_flush (dbus_connection); + dbus_message_unref (message); + + return 0; +} +#endif /* HAVE_DBUS */ /* * Local functions... @@ -1755,6 +1819,15 @@ main(int argc, /* I - Number of command-line args */ fprintf(stderr, "DEBUG: Print job accepted - job ID %d.\n", job_id); } +#if HAVE_DBUS + dbus_broadcast_queued_remote (argv[0], + ipp_status, + atoi (argv[1]), + job_id, + argv[2], + getenv ("PRINTER")); +#endif /* HAVE_DBUS */ + ippDelete(response); if (job_canceled) diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c index d2c6361..d42f855 100644 --- a/scheduler/subscriptions.c +++ b/scheduler/subscriptions.c @@ -1294,13 +1294,13 @@ cupsd_send_dbus(cupsd_eventmask_t event,/* I - Event to send */ what = "PrinterAdded"; else if (event & CUPSD_EVENT_PRINTER_DELETED) what = "PrinterRemoved"; - else if (event & CUPSD_EVENT_PRINTER_CHANGED) - what = "QueueChanged"; else if (event & CUPSD_EVENT_JOB_CREATED) what = "JobQueuedLocal"; else if ((event & CUPSD_EVENT_JOB_STATE) && job && job->state_value == IPP_JOB_PROCESSING) what = "JobStartedLocal"; + else if (event & (CUPSD_EVENT_PRINTER_CHANGED|CUPSD_EVENT_JOB_STATE_CHANGED|CUPSD_EVENT_PRINTER_STATE_CHANGED)) + what = "QueueChanged"; else return; @@ -1336,7 +1336,7 @@ cupsd_send_dbus(cupsd_eventmask_t event,/* I - Event to send */ dbus_message_append_iter_init(message, &iter); if (dest) dbus_message_iter_append_string(&iter, dest->name); - if (job) + if (job && strcmp (what, "QueueChanged") != 0) { dbus_message_iter_append_uint32(&iter, job->id); dbus_message_iter_append_string(&iter, job->username); -- 2.23.0