Print Indicator

Merge lp:~dobey/indicator-printers/cpp-refactor into lp:indicator-printers

cpp-refactor
Merge into trunk.16.10

Proposed by dobey on 2017-01-04

Status:	Rejected
Rejected by:	dobey on 2017-01-13
Proposed branch:	lp:~dobey/indicator-printers/cpp-refactor
Merge into:	lp:indicator-printers
Diff against target:	5377 lines (+3048/-2007) 57 files modified .bzrignore (+2/-0) AUTHORS (+0/-2) CMakeLists.txt (+54/-0) COPYING (+674/-0) Makefile.am (+0/-6) Makefile.am.coverage (+0/-48) autogen.sh (+0/-9) cmake/GdbusCodegen.cmake (+36/-0) configure.ac (+0/-105) data/CMakeLists.txt (+64/-0) data/Makefile.am (+0/-55) data/com.canonical.indicator.printers (+20/-0) data/indicator-printers.desktop.in (+0/-8) data/upstart/Makefile.am (+0/-17) data/upstart/indicator-printers.desktop.in (+0/-9) debian/control (+17/-20) debian/copyright (+1/-2) debian/rules (+1/-16) debian/watch (+0/-2) m4/gcov.m4 (+0/-86) po/CMakeLists.txt (+12/-0) po/POTFILES.in (+0/-6) src/CMakeLists.txt (+62/-0) src/actions-live.cpp (+104/-0) src/actions-live.h (+54/-0) src/actions.cpp (+73/-0) src/actions.h (+57/-0) src/client.h (+56/-0) src/cups-client.cpp (+328/-0) src/cups-client.h (+65/-0) src/exporter.cpp (+158/-0) src/exporter.h (+60/-0) src/indicator-menu-item.c (+0/-404) src/indicator-menu-item.h (+0/-82) src/indicator-printers-menu.c (+0/-339) src/indicator-printers-menu.h (+0/-77) src/indicator-printers-service.c (+0/-206) src/indicator-printers.c (+0/-311) src/indicator-printers.h (+0/-70) src/job.h (+50/-0) src/main.cpp (+60/-0) src/menu.cpp (+291/-0) src/menu.h (+57/-0) src/printer.h (+44/-0) src/spawn-printer-settings.c (+0/-35) src/spawn-printer-settings.h (+0/-11) src/utils.cpp (+37/-0) src/utils.h (+32/-0) test/Makefile.am (+0/-29) test/mock-cups-notifier.c (+0/-52) tests/CMakeLists.txt (+26/-0) tests/actions-mock.h (+36/-0) tests/client-mock.h (+54/-0) tests/glib-fixture.h (+220/-0) tests/test_exporter.cpp (+110/-0) tests/test_menu.cpp (+100/-0) tests/test_utils.cpp (+33/-0)
To merge this branch:	bzr merge lp:~dobey/indicator-printers/cpp-refactor
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2017-01-11
Charles Kerr (community)		2017-01-04	Approve on 2017-01-11
Review via email: mp+314115@code.launchpad.net

Commit message

Update printing indicator to work under Unity 8 with new design.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-04:

FAILED: Continuous integration, rev:112
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/3/
Executed test runs:
FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1307/console
FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1314/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/3/rebuild

review: Needs Fixing (continuous-integration)

lp:~dobey/indicator-printers/cpp-refactor updated on 2017-01-04

113. By dobey on 2017-01-04: Fix control file.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-04:

FAILED: Continuous integration, rev:113
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1308/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1315
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1093/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1093/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1093/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1093/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1093/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1093/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/4/rebuild

review: Needs Fixing (continuous-integration)

lp:~dobey/indicator-printers/cpp-refactor updated on 2017-01-04

114. By dobey on 2017-01-04: Add missing dbus dep.
115. By dobey on 2017-01-04: Specify unisgned in exporter test comparison.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-04:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/5/rebuild

review: Approve (continuous-integration)

lp:~dobey/indicator-printers/cpp-refactor updated on 2017-01-05

116. By dobey on 2017-01-05: Add missing pragma to utils.h
117. By dobey on 2017-01-05: Remove more obsolete code.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-05:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/6/rebuild

review: Approve (continuous-integration)

lp:~dobey/indicator-printers/cpp-refactor updated on 2017-01-06

118. By dobey on 2017-01-06: It's 2017 now.
Also Lars is not upstream contact any more.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-06:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/7/rebuild

review: Approve (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) wrote on 2017-01-09:

Looking good. Comments inline, mostly minor, also a NF or two

review: Needs Fixing

lp:~dobey/indicator-printers/cpp-refactor updated on 2017-01-10

119. By dobey on 2017-01-10: Fixes from review.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-10:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/8/rebuild

review: Approve (continuous-integration)

Revision history for this message

dobey (dobey) wrote on 2017-01-10:

Download full text (5.7 KiB)

On Mon, 2017-01-09 at 20:19 +0000, Charles Kerr wrote:
> Since we're dealing with autogenerated code in this repo (from gdbus-
> codegen), it would be better to set these arguments in another
> variable and including it for human-written code.
>
> That way we won't break on warnings out of our control in the future
> if we want to increase the warnings (or if the compilers increase
> them automatically).

I think the extra variables and managing the generated sources
separately is a bit complicated for this here. Since the generated code
is always C, and the hand-written code is C++, I just made the split
there and only specify the extra warnings for C++ code, as we should
not be writing any pure C. This simplifies the cmake a decent bit.

> > + //url_dispatch_send(url.c_str(), nullptr, nullptr);
> NF: Probably should do something here?

I've left this commented for the MVP as it's still not entirely clear
if we need to actually open any URLs from the indicator yet, and I
didn't want to add the dependency, only to remove it in another branch
or two. We still need some clarification from design on what various
bits are supposed to actually do.

> If g_getenv() somehow returns NULL, then g_strsplit() will also
> return NULL, causing desktop_names[0] to be a nullptr dereference.
>
> NF in datetime as well :P

I don't think this is an issue since the code is checking if the result
of g_getenv() is nullptr before trying to g_strsplit. So I've left it
as-is.

> > +void LiveActions::open_settings_app()
> Is this used at all? I thought Design didn't want a Settings option
> in the print indicator
>
> If that's the case do we need Actions

I think we need some clarification from design on what we really need
to do here, but I suspect there will indeed be some room for
simplification here, once we get the clarity we need.

> > + void cancel_subscription()
> looks like this isn't called from production code.
>
> * If it's not needed, let's remove it
>
> * If it only needs to be called for shutdown cleanup, e.g. from
> CupsClient::Impl::~Impl(), let's make private and remove
> cancel_subscription() from Client base
>
> * If client code should be using it now, let's keep it public and add
> the client calls.

Just wrote this in a way that makes sense to me as a library API, based
on what the existing code was doing. We might be able to simplify, but
I left this as-is for now, in case we need to use it from higher level,
pending more clarity on design.

> This seems like the only place where renew_subscription() is called
>
> IMO renew_subscription should be private to CupsClient::Impl and not
> in the Client API
>
> Actually it might be best if Client didn't have any of the three
> subscription methods, is there any downside to CupsClient::Impl
> creating a subscription automatically in the ctor instead of when the
> bus is acquired?

Possibly room for fair bit of privitization here. See previous comment.
Maybe can clean up after clarification on bits of design.

> (bikeshed) slightly cleaner to use a uniform initializer for these?

Probably would be. Just didn't bother writing the ctors for the
structs, for "simplicity" at the moment.

> t...

On Mon, 2017-01-09 at 20:19 +0000, Charles Kerr wrote:
> Since we're dealing with autogenerated code in this repo (from gdbus-
> codegen), it would be better to set these arguments in another
> variable and including it for human-written code.
> 
> That way we won't break on warnings out of our control in the future
> if we want to increase the warnings (or if the compilers increase
> them automatically).

> > +    //url_dispatch_send(url.c_str(), nullptr, nullptr);
> NF: Probably should do something here?

> If g_getenv() somehow returns NULL, then g_strsplit() will also
> return NULL, causing desktop_names[0] to be a nullptr dereference.
> 
> NF in datetime as well :P

I don't think this is an issue since the code is checking if the result
of g_getenv() is nullptr before trying to g_strsplit. So I've left it
as-is.

> > +void LiveActions::open_settings_app()
> Is this used at all? I thought Design didn't want a Settings option
> in the print indicator
> 
> If that's the case do we need Actions

I think we need some clarification from design on what we really need
to do here, but I suspect there will indeed be some room for
simplification here, once we get the clarity we need.

> > +    void cancel_subscription()
> looks like this isn't called from production code.
> 
> * If it's not needed, let's remove it
> 
> * If it only needs to be called for shutdown cleanup, e.g. from
> CupsClient::Impl::~Impl(), let's make private and remove
> cancel_subscription() from Client base
> 
> * If client code should be using it now, let's keep it public and add
> the client calls.

> This seems like the only place where renew_subscription() is called
> 
> IMO renew_subscription should be private to CupsClient::Impl and not
> in the Client API
> 
> Actually it might be best if Client didn't have any of the three
> subscription methods, is there any downside to CupsClient::Impl
> creating a subscription automatically in the ctor instead of when the
> bus is acquired?

Possibly room for fair bit of privitization here. See previous comment.
Maybe can clean up after clarification on bits of design.

> (bikeshed) slightly cleaner to use a uniform initializer for these?

Probably would be. Just didn't bother writing the ctors for the
structs, for "simplicity" at the moment.

> the remove() + append() will always bump changed jobs to the bottom
> of the section.
> 
> Is this a Design feature, or for code expediency?

For expedience/simplicity at the moment. The design in the printing
document is to sort by time, but we don't have any time to sort by, and
I didn't want to implement any other sorting yet, only to have to do it
differently if design decides something different than I do.

> This is a pretty handy way to update menuitems for new Job info.
> 
> Generally I hate my old code when I look at it, but apparently this
> is from m_visible_transfers, so I guess I should be happy for once :)

It works for now, but I don't think it works well for case where we
have to sort things in multiple sections. We'll need something better
for handling those cases, but for MVP, it's serving its purpose. :)

> > +    std::string SNAP_PATH{get_snap_path()};
> > +    return SNAP_PATH + path;
> This is a twisty way to write this.

Was a wart from how I wrote it in click scope where we kept it as a
static. Decided not to do that here, so I could write tests for it,
since a static would cause weirdness in trying to write tests.

> Tests are very lacking, esp. wrt cups.
> 
> Since indicator-printers had no meaningful tests before, this
> technically doesn't move us backwards. But still, it's a lot of new
> code that doesn't have corresponding new tests.
> 
> I'm not saying that I need exhaustive testing in order to sign off on
> this, but I would like to at least inch the indicators forward to
> better tests with each landing.

Agree wrt cups. Unfortunately, libcups is an ancient plain C API, and
cups daemon is meant to run on a privileged port requiring root, so
even faking it with a python http server script is quite hard to do.
This needs some more investigation, but I tried to keep the unit tests
coverage as high as possible while writing the code. Unfortunately
there's some annoyance there too, as gcov/lcov lies a bit, particularly
when testing code from a static library, since the linker only pulls in
the object files which are actually used in the test binary, when
linking statically.

I've been poking around bit by bit on-line to try and find some way to
do integration testing with cups, and it seems it's possible to
reasonably create a null printer for testing, at least in autopkgtests,
but still needs more research before those can be written (like, I have
no idea how to actually test indicators in that manner at all yet).

I'm not sure how much more coverage gmenuharness would give us here,
but probably need to add some testing with it. The hard part there will
be again trying to test the cups side of things.

Revision history for this message

Charles Kerr (charlesk) wrote on 2017-01-10:

Thanks for the other fixes.

>> If that's the case do we need Actions
>
> I think we need some clarification from design on what we really need
> to do here, but I suspect there will indeed be some room for
> simplification here, once we get the clarity we need.

I'm unsure what you're advocating here, do you want to land as-is
or put on hold until after we talk to Design?

It seems pointless to land Actions and LiveActions if none of the
actions are ever used.

>> Actually it might be best if Client didn't have any of the three
>> subscription methods, is there any downside to CupsClient::Impl
>> creating a subscription automatically in the ctor instead of when the
>> bus is acquired?
>
> Possibly room for fair bit of privitization here. See previous comment.
> Maybe can clean up after clarification on bits of design.

I don't see what Design has to do with removing implementation
details from Client's public methods.

review: Needs Information

lp:~dobey/indicator-printers/cpp-refactor updated on 2017-01-10

120. By dobey on 2017-01-10: Add gcovr to build-depends.
121. By dobey on 2017-01-10: Fix libexcdir replacement.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-10:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/9/rebuild

review: Approve (continuous-integration)

Revision history for this message

dobey (dobey) wrote on 2017-01-10:

On Tue, 2017-01-10 at 21:18 +0000, Charles Kerr wrote:
> Review: Needs Information
>
> Thanks for the other fixes.
>
> >
> > >
> > > If that's the case do we need Actions
> > I think we need some clarification from design on what we really
> > need
> > to do here, but I suspect there will indeed be some room for
> > simplification here, once we get the clarity we need.
> I'm unsure what you're advocating here, do you want to land as-is
> or put on hold until after we talk to Design?

Either is fine with me. There's currently no way to configure printers
under Unity8 or actually print anything from any Unity8 apps (I'm not
sure if stuff in libertine or u7 apps as snaps work either, but again
no way to configure a printer, so catch 22), so I don't think there's a
major need to land this. But I would prefer to avoid having the branch
get much larger than it is.

> It seems pointless to land Actions and LiveActions if none of the
> actions are ever used.

Indeed. The design is to have pause/resume sort of actions in the menu,
which I presume would require Actions, even if the don't open external
apps or such. But my understanding of how that works in indicators is
still fairly limited.

> >
> > >
> > > Actually it might be best if Client didn't have any of the three
> > > subscription methods, is there any downside to CupsClient::Impl
> > > creating a subscription automatically in the ctor instead of when
> > > the
> > > bus is acquired?
> > Possibly room for fair bit of privitization here. See previous
> > comment.
> > Maybe can clean up after clarification on bits of design.
> I don't see what Design has to do with removing implementation
> details from Client's public methods.

Well if the result of the design means we need to change stuff around
and actually call them, it wouldn't make sense to make them private,
and then go have to make them public again either. Having them public
makes it easier to write integration tests for the code. And really,
it's a private static library, so "public" is only just so here.

On Tue, 2017-01-10 at 21:18 +0000, Charles Kerr wrote:
> Review: Needs Information
> 
> Thanks for the other fixes.
> 
> > 
> > > 
> > > If that's the case do we need Actions
> > I think we need some clarification from design on what we really
> > need
> > to do here, but I suspect there will indeed be some room for
> > simplification here, once we get the clarity we need.
> I'm unsure what you're advocating here, do you want to land as-is
> or put on hold until after we talk to Design?

> It seems pointless to land Actions and LiveActions if none of the
> actions are ever used.

> > 
> > > 
> > > Actually it might be best if Client didn't have any of the three
> > > subscription methods, is there any downside to CupsClient::Impl
> > > creating a subscription automatically in the ctor instead of when
> > > the
> > > bus is acquired?
> > Possibly room for fair bit of privitization here. See previous
> > comment.
> > Maybe can clean up after clarification on bits of design.
> I don't see what Design has to do with removing implementation
> details from Client's public methods.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-10:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/10/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Charles Kerr (charlesk) wrote on 2017-01-11:

OK. Agreed wrt needing Design to weigh in on actions.

Assuming there's a followup branch adding testing, e.g. cups, this branch is a good interim step.

review: Approve

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-11:

PASSED: Continuous integration, rev:121
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/11/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1344
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1351
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1129/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1129
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1129/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-printers-ci/11/rebuild

review: Approve (continuous-integration)

Unmerged revisions

121. By dobey on 2017-01-10: Fix libexcdir replacement.
120. By dobey on 2017-01-10: Add gcovr to build-depends.
119. By dobey on 2017-01-10: Fixes from review.
118. By dobey on 2017-01-06: It's 2017 now.
Also Lars is not upstream contact any more.
117. By dobey on 2017-01-05: Remove more obsolete code.
116. By dobey on 2017-01-05: Add missing pragma to utils.h
115. By dobey on 2017-01-04: Specify unisgned in exporter test comparison.
114. By dobey on 2017-01-04: Add missing dbus dep.
113. By dobey on 2017-01-04: Fix control file.
112. By dobey on 2017-01-04: Change main title to Printing to match design.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Indicator Applet Developers

dobey

 === modified file '.bzrignore'
 --- .bzrignore	2012-02-02 14:49:11 +0000
 +++ .bzrignore	2017-01-10 21:54:44 +0000
@@ -27,3 +27,5 @@
  src/*.lo
  src/cups-notifier.[ch]
++build/
++
 === removed file 'AUTHORS'
 --- AUTHORS	2012-01-11 14:29:38 +0000
 +++ AUTHORS	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
--Lars Uebernickel <lars.uebernickel@canonical.com>
--
 === added file 'CMakeLists.txt'
 --- CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ CMakeLists.txt	2017-01-10 21:54:44 +0000
@@ -0,0 +1,54 @@
++project(indicator-printers C CXX)
++cmake_minimum_required(VERSION 2.8.9)
++
++### Need to have own copy of gdbuscodegen module
++list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
++
++### Install path variables
++include (GNUInstallDirs)
++if (EXISTS "/etc/debian_version") # Workaround for libexecdir on debian
++  set (CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBDIR}")
++  set (CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
++endif ()
++set (CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
++set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
++
++### Always Be Testing
++enable_testing()
++
++### Set variables for our binary build targets
++set(SERVICE_LIB_NAME "indicator-printers")
++set(SERVICE_EXEC_NAME "indicator-printers-service")
++
++### Some default compile flags
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g -fPIC")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -g -Wextra -Wall -Werror -Werror=conversion-null -Wno-ignored-qualifiers -fPIC")
++
++### Find deps
++find_package(PkgConfig REQUIRED)
++find_package(Intltool REQUIRED)
++find_package(Threads)
++
++pkg_check_modules(SERVICE_DEPS REQUIRED
++  gio-unix-2.0>=2.36
++  glib-2.0>=2.36
++  properties-cpp
++)
++
++### Find libcups
++find_program(CUPS_CONFIG cups-config)
++execute_process(COMMAND ${CUPS_CONFIG} --cflags OUTPUT_VARIABLE CUPS_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
++execute_process(COMMAND ${CUPS_CONFIG} --libs OUTPUT_VARIABLE CUPS_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
++
++### Add sub-directories
++add_subdirectory(data)
++add_subdirectory(src)
++add_subdirectory(tests)
++
++### Enable coverage reporting
++find_package(CoverageReport)
++ENABLE_COVERAGE_REPORT(
++  TARGETS ${SERVICE_LIB_NAME} ${SERVICE_EXEC_NAME}
++  TESTS test-libindicator-printers
++  FILTER /usr/include ${CMAKE_BINARY_DIR}/*
++)
 === added file 'COPYING'
 --- COPYING	1970-01-01 00:00:00 +0000
 +++ COPYING	2017-01-10 21:54:44 +0000
@@ -0,0 +1,674 @@
++                    GNU GENERAL PUBLIC LICENSE
++                       Version 3, 29 June 2007
++
++ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++                            Preamble
++
++  The GNU General Public License is a free, copyleft license for
++software and other kinds of works.
++
++  The licenses for most software and other practical works are designed
++to take away your freedom to share and change the works.  By contrast,
++the GNU General Public License is intended to guarantee your freedom to
++share and change all versions of a program--to make sure it remains free
++software for all its users.  We, the Free Software Foundation, use the
++GNU General Public License for most of our software; it applies also to
++any other work released this way by its authors.  You can apply it to
++your programs, too.
++
++  When we speak of free software, we are referring to freedom, not
++price.  Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++them if you wish), that you receive source code or can get it if you
++want it, that you can change the software or use pieces of it in new
++free programs, and that you know you can do these things.
++
++  To protect your rights, we need to prevent others from denying you
++these rights or asking you to surrender the rights.  Therefore, you have
++certain responsibilities if you distribute copies of the software, or if
++you modify it: responsibilities to respect the freedom of others.
++
++  For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must pass on to the recipients the same
++freedoms that you received.  You must make sure that they, too, receive
++or can get the source code.  And you must show them these terms so they
++know their rights.
++
++  Developers that use the GNU GPL protect your rights with two steps:
++(1) assert copyright on the software, and (2) offer you this License
++giving you legal permission to copy, distribute and/or modify it.
++
++  For the developers' and authors' protection, the GPL clearly explains
++that there is no warranty for this free software.  For both users' and
++authors' sake, the GPL requires that modified versions be marked as
++changed, so that their problems will not be attributed erroneously to
++authors of previous versions.
++
++  Some devices are designed to deny users access to install or run
++modified versions of the software inside them, although the manufacturer
++can do so.  This is fundamentally incompatible with the aim of
++protecting users' freedom to change the software.  The systematic
++pattern of such abuse occurs in the area of products for individuals to
++use, which is precisely where it is most unacceptable.  Therefore, we
++have designed this version of the GPL to prohibit the practice for those
++products.  If such problems arise substantially in other domains, we
++stand ready to extend this provision to those domains in future versions
++of the GPL, as needed to protect the freedom of users.
++
++  Finally, every program is threatened constantly by software patents.
++States should not allow patents to restrict development and use of
++software on general-purpose computers, but in those that do, we wish to
++avoid the special danger that patents applied to a free program could
++make it effectively proprietary.  To prevent this, the GPL assures that
++patents cannot be used to render the program non-free.
++
++  The precise terms and conditions for copying, distribution and
++modification follow.
++
++                       TERMS AND CONDITIONS
++
++  0. Definitions.
++
++  "This License" refers to version 3 of the GNU General Public License.
++
++  "Copyright" also means copyright-like laws that apply to other kinds of
++works, such as semiconductor masks.
++
++  "The Program" refers to any copyrightable work licensed under this
++License.  Each licensee is addressed as "you".  "Licensees" and
++"recipients" may be individuals or organizations.
++
++  To "modify" a work means to copy from or adapt all or part of the work
++in a fashion requiring copyright permission, other than the making of an
++exact copy.  The resulting work is called a "modified version" of the
++earlier work or a work "based on" the earlier work.
++
++  A "covered work" means either the unmodified Program or a work based
++on the Program.
++
++  To "propagate" a work means to do anything with it that, without
++permission, would make you directly or secondarily liable for
++infringement under applicable copyright law, except executing it on a
++computer or modifying a private copy.  Propagation includes copying,
++distribution (with or without modification), making available to the
++public, and in some countries other activities as well.
++
++  To "convey" a work means any kind of propagation that enables other
++parties to make or receive copies.  Mere interaction with a user through
++a computer network, with no transfer of a copy, is not conveying.
++
++  An interactive user interface displays "Appropriate Legal Notices"
++to the extent that it includes a convenient and prominently visible
++feature that (1) displays an appropriate copyright notice, and (2)
++tells the user that there is no warranty for the work (except to the
++extent that warranties are provided), that licensees may convey the
++work under this License, and how to view a copy of this License.  If
++the interface presents a list of user commands or options, such as a
++menu, a prominent item in the list meets this criterion.
++
++  1. Source Code.
++
++  The "source code" for a work means the preferred form of the work
++for making modifications to it.  "Object code" means any non-source
++form of a work.
++
++  A "Standard Interface" means an interface that either is an official
++standard defined by a recognized standards body, or, in the case of
++interfaces specified for a particular programming language, one that
++is widely used among developers working in that language.
++
++  The "System Libraries" of an executable work include anything, other
++than the work as a whole, that (a) is included in the normal form of
++packaging a Major Component, but which is not part of that Major
++Component, and (b) serves only to enable use of the work with that
++Major Component, or to implement a Standard Interface for which an
++implementation is available to the public in source code form.  A
++"Major Component", in this context, means a major essential component
++(kernel, window system, and so on) of the specific operating system
++(if any) on which the executable work runs, or a compiler used to
++produce the work, or an object code interpreter used to run it.
++
++  The "Corresponding Source" for a work in object code form means all
++the source code needed to generate, install, and (for an executable
++work) run the object code and to modify the work, including scripts to
++control those activities.  However, it does not include the work's
++System Libraries, or general-purpose tools or generally available free
++programs which are used unmodified in performing those activities but
++which are not part of the work.  For example, Corresponding Source
++includes interface definition files associated with source files for
++the work, and the source code for shared libraries and dynamically
++linked subprograms that the work is specifically designed to require,
++such as by intimate data communication or control flow between those
++subprograms and other parts of the work.
++
++  The Corresponding Source need not include anything that users
++can regenerate automatically from other parts of the Corresponding
++Source.
++
++  The Corresponding Source for a work in source code form is that
++same work.
++
++  2. Basic Permissions.
++
++  All rights granted under this License are granted for the term of
++copyright on the Program, and are irrevocable provided the stated
++conditions are met.  This License explicitly affirms your unlimited
++permission to run the unmodified Program.  The output from running a
++covered work is covered by this License only if the output, given its
++content, constitutes a covered work.  This License acknowledges your
++rights of fair use or other equivalent, as provided by copyright law.
++
++  You may make, run and propagate covered works that you do not
++convey, without conditions so long as your license otherwise remains
++in force.  You may convey covered works to others for the sole purpose
++of having them make modifications exclusively for you, or provide you
++with facilities for running those works, provided that you comply with
++the terms of this License in conveying all material for which you do
++not control copyright.  Those thus making or running the covered works
++for you must do so exclusively on your behalf, under your direction
++and control, on terms that prohibit them from making any copies of
++your copyrighted material outside their relationship with you.
++
++  Conveying under any other circumstances is permitted solely under
++the conditions stated below.  Sublicensing is not allowed; section 10
++makes it unnecessary.
++
++  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
++
++  No covered work shall be deemed part of an effective technological
++measure under any applicable law fulfilling obligations under article
++11 of the WIPO copyright treaty adopted on 20 December 1996, or
++similar laws prohibiting or restricting circumvention of such
++measures.
++
++  When you convey a covered work, you waive any legal power to forbid
++circumvention of technological measures to the extent such circumvention
++is effected by exercising rights under this License with respect to
++the covered work, and you disclaim any intention to limit operation or
++modification of the work as a means of enforcing, against the work's
++users, your or third parties' legal rights to forbid circumvention of
++technological measures.
++
++  4. Conveying Verbatim Copies.
++
++  You may convey verbatim copies of the Program's source code as you
++receive it, in any medium, provided that you conspicuously and
++appropriately publish on each copy an appropriate copyright notice;
++keep intact all notices stating that this License and any
++non-permissive terms added in accord with section 7 apply to the code;
++keep intact all notices of the absence of any warranty; and give all
++recipients a copy of this License along with the Program.
++
++  You may charge any price or no price for each copy that you convey,
++and you may offer support or warranty protection for a fee.
++
++  5. Conveying Modified Source Versions.
++
++  You may convey a work based on the Program, or the modifications to
++produce it from the Program, in the form of source code under the
++terms of section 4, provided that you also meet all of these conditions:
++
++    a) The work must carry prominent notices stating that you modified
++    it, and giving a relevant date.
++
++    b) The work must carry prominent notices stating that it is
++    released under this License and any conditions added under section
++    7.  This requirement modifies the requirement in section 4 to
++    "keep intact all notices".
++
++    c) You must license the entire work, as a whole, under this
++    License to anyone who comes into possession of a copy.  This
++    License will therefore apply, along with any applicable section 7
++    additional terms, to the whole of the work, and all its parts,
++    regardless of how they are packaged.  This License gives no
++    permission to license the work in any other way, but it does not
++    invalidate such permission if you have separately received it.
++
++    d) If the work has interactive user interfaces, each must display
++    Appropriate Legal Notices; however, if the Program has interactive
++    interfaces that do not display Appropriate Legal Notices, your
++    work need not make them do so.
++
++  A compilation of a covered work with other separate and independent
++works, which are not by their nature extensions of the covered work,
++and which are not combined with it such as to form a larger program,
++in or on a volume of a storage or distribution medium, is called an
++"aggregate" if the compilation and its resulting copyright are not
++used to limit the access or legal rights of the compilation's users
++beyond what the individual works permit.  Inclusion of a covered work
++in an aggregate does not cause this License to apply to the other
++parts of the aggregate.
++
++  6. Conveying Non-Source Forms.
++
++  You may convey a covered work in object code form under the terms
++of sections 4 and 5, provided that you also convey the
++machine-readable Corresponding Source under the terms of this License,
++in one of these ways:
++
++    a) Convey the object code in, or embodied in, a physical product
++    (including a physical distribution medium), accompanied by the
++    Corresponding Source fixed on a durable physical medium
++    customarily used for software interchange.
++
++    b) Convey the object code in, or embodied in, a physical product
++    (including a physical distribution medium), accompanied by a
++    written offer, valid for at least three years and valid for as
++    long as you offer spare parts or customer support for that product
++    model, to give anyone who possesses the object code either (1) a
++    copy of the Corresponding Source for all the software in the
++    product that is covered by this License, on a durable physical
++    medium customarily used for software interchange, for a price no
++    more than your reasonable cost of physically performing this
++    conveying of source, or (2) access to copy the
++    Corresponding Source from a network server at no charge.
++
++    c) Convey individual copies of the object code with a copy of the
++    written offer to provide the Corresponding Source.  This
++    alternative is allowed only occasionally and noncommercially, and
++    only if you received the object code with such an offer, in accord
++    with subsection 6b.
++
++    d) Convey the object code by offering access from a designated
++    place (gratis or for a charge), and offer equivalent access to the
++    Corresponding Source in the same way through the same place at no
++    further charge.  You need not require recipients to copy the
++    Corresponding Source along with the object code.  If the place to
++    copy the object code is a network server, the Corresponding Source
++    may be on a different server (operated by you or a third party)
++    that supports equivalent copying facilities, provided you maintain
++    clear directions next to the object code saying where to find the
++    Corresponding Source.  Regardless of what server hosts the
++    Corresponding Source, you remain obligated to ensure that it is
++    available for as long as needed to satisfy these requirements.
++
++    e) Convey the object code using peer-to-peer transmission, provided
++    you inform other peers where the object code and Corresponding
++    Source of the work are being offered to the general public at no
++    charge under subsection 6d.
++
++  A separable portion of the object code, whose source code is excluded
++from the Corresponding Source as a System Library, need not be
++included in conveying the object code work.
++
++  A "User Product" is either (1) a "consumer product", which means any
++tangible personal property which is normally used for personal, family,
++or household purposes, or (2) anything designed or sold for incorporation
++into a dwelling.  In determining whether a product is a consumer product,
++doubtful cases shall be resolved in favor of coverage.  For a particular
++product received by a particular user, "normally used" refers to a
++typical or common use of that class of product, regardless of the status
++of the particular user or of the way in which the particular user
++actually uses, or expects or is expected to use, the product.  A product
++is a consumer product regardless of whether the product has substantial
++commercial, industrial or non-consumer uses, unless such uses represent
++the only significant mode of use of the product.
++
++  "Installation Information" for a User Product means any methods,
++procedures, authorization keys, or other information required to install
++and execute modified versions of a covered work in that User Product from
++a modified version of its Corresponding Source.  The information must
++suffice to ensure that the continued functioning of the modified object
++code is in no case prevented or interfered with solely because
++modification has been made.
++
++  If you convey an object code work under this section in, or with, or
++specifically for use in, a User Product, and the conveying occurs as
++part of a transaction in which the right of possession and use of the
++User Product is transferred to the recipient in perpetuity or for a
++fixed term (regardless of how the transaction is characterized), the
++Corresponding Source conveyed under this section must be accompanied
++by the Installation Information.  But this requirement does not apply
++if neither you nor any third party retains the ability to install
++modified object code on the User Product (for example, the work has
++been installed in ROM).
++
++  The requirement to provide Installation Information does not include a
++requirement to continue to provide support service, warranty, or updates
++for a work that has been modified or installed by the recipient, or for
++the User Product in which it has been modified or installed.  Access to a
++network may be denied when the modification itself materially and
++adversely affects the operation of the network or violates the rules and
++protocols for communication across the network.
++
++  Corresponding Source conveyed, and Installation Information provided,
++in accord with this section must be in a format that is publicly
++documented (and with an implementation available to the public in
++source code form), and must require no special password or key for
++unpacking, reading or copying.
++
++  7. Additional Terms.
++
++  "Additional permissions" are terms that supplement the terms of this
++License by making exceptions from one or more of its conditions.
++Additional permissions that are applicable to the entire Program shall
++be treated as though they were included in this License, to the extent
++that they are valid under applicable law.  If additional permissions
++apply only to part of the Program, that part may be used separately
++under those permissions, but the entire Program remains governed by
++this License without regard to the additional permissions.
++
++  When you convey a copy of a covered work, you may at your option
++remove any additional permissions from that copy, or from any part of
++it.  (Additional permissions may be written to require their own
++removal in certain cases when you modify the work.)  You may place
++additional permissions on material, added by you to a covered work,
++for which you have or can give appropriate copyright permission.
++
++  Notwithstanding any other provision of this License, for material you
++add to a covered work, you may (if authorized by the copyright holders of
++that material) supplement the terms of this License with terms:
++
++    a) Disclaiming warranty or limiting liability differently from the
++    terms of sections 15 and 16 of this License; or
++
++    b) Requiring preservation of specified reasonable legal notices or
++    author attributions in that material or in the Appropriate Legal
++    Notices displayed by works containing it; or
++
++    c) Prohibiting misrepresentation of the origin of that material, or
++    requiring that modified versions of such material be marked in
++    reasonable ways as different from the original version; or
++
++    d) Limiting the use for publicity purposes of names of licensors or
++    authors of the material; or
++
++    e) Declining to grant rights under trademark law for use of some
++    trade names, trademarks, or service marks; or
++
++    f) Requiring indemnification of licensors and authors of that
++    material by anyone who conveys the material (or modified versions of
++    it) with contractual assumptions of liability to the recipient, for
++    any liability that these contractual assumptions directly impose on
++    those licensors and authors.
++
++  All other non-permissive additional terms are considered "further
++restrictions" within the meaning of section 10.  If the Program as you
++received it, or any part of it, contains a notice stating that it is
++governed by this License along with a term that is a further
++restriction, you may remove that term.  If a license document contains
++a further restriction but permits relicensing or conveying under this
++License, you may add to a covered work material governed by the terms
++of that license document, provided that the further restriction does
++not survive such relicensing or conveying.
++
++  If you add terms to a covered work in accord with this section, you
++must place, in the relevant source files, a statement of the
++additional terms that apply to those files, or a notice indicating
++where to find the applicable terms.
++
++  Additional terms, permissive or non-permissive, may be stated in the
++form of a separately written license, or stated as exceptions;
++the above requirements apply either way.
++
++  8. Termination.
++
++  You may not propagate or modify a covered work except as expressly
++provided under this License.  Any attempt otherwise to propagate or
++modify it is void, and will automatically terminate your rights under
++this License (including any patent licenses granted under the third
++paragraph of section 11).
++
++  However, if you cease all violation of this License, then your
++license from a particular copyright holder is reinstated (a)
++provisionally, unless and until the copyright holder explicitly and
++finally terminates your license, and (b) permanently, if the copyright
++holder fails to notify you of the violation by some reasonable means
++prior to 60 days after the cessation.
++
++  Moreover, your license from a particular copyright holder is
++reinstated permanently if the copyright holder notifies you of the
++violation by some reasonable means, this is the first time you have
++received notice of violation of this License (for any work) from that
++copyright holder, and you cure the violation prior to 30 days after
++your receipt of the notice.
++
++  Termination of your rights under this section does not terminate the
++licenses of parties who have received copies or rights from you under
++this License.  If your rights have been terminated and not permanently
++reinstated, you do not qualify to receive new licenses for the same
++material under section 10.
++
++  9. Acceptance Not Required for Having Copies.
++
++  You are not required to accept this License in order to receive or
++run a copy of the Program.  Ancillary propagation of a covered work
++occurring solely as a consequence of using peer-to-peer transmission
++to receive a copy likewise does not require acceptance.  However,
++nothing other than this License grants you permission to propagate or
++modify any covered work.  These actions infringe copyright if you do
++not accept this License.  Therefore, by modifying or propagating a
++covered work, you indicate your acceptance of this License to do so.
++
++  10. Automatic Licensing of Downstream Recipients.
++
++  Each time you convey a covered work, the recipient automatically
++receives a license from the original licensors, to run, modify and
++propagate that work, subject to this License.  You are not responsible
++for enforcing compliance by third parties with this License.
++
++  An "entity transaction" is a transaction transferring control of an
++organization, or substantially all assets of one, or subdividing an
++organization, or merging organizations.  If propagation of a covered
++work results from an entity transaction, each party to that
++transaction who receives a copy of the work also receives whatever
++licenses to the work the party's predecessor in interest had or could
++give under the previous paragraph, plus a right to possession of the
++Corresponding Source of the work from the predecessor in interest, if
++the predecessor has it or can get it with reasonable efforts.
++
++  You may not impose any further restrictions on the exercise of the
++rights granted or affirmed under this License.  For example, you may
++not impose a license fee, royalty, or other charge for exercise of
++rights granted under this License, and you may not initiate litigation
++(including a cross-claim or counterclaim in a lawsuit) alleging that
++any patent claim is infringed by making, using, selling, offering for
++sale, or importing the Program or any portion of it.
++
++  11. Patents.
++
++  A "contributor" is a copyright holder who authorizes use under this
++License of the Program or a work on which the Program is based.  The
++work thus licensed is called the contributor's "contributor version".
++
++  A contributor's "essential patent claims" are all patent claims
++owned or controlled by the contributor, whether already acquired or
++hereafter acquired, that would be infringed by some manner, permitted
++by this License, of making, using, or selling its contributor version,
++but do not include claims that would be infringed only as a
++consequence of further modification of the contributor version.  For
++purposes of this definition, "control" includes the right to grant
++patent sublicenses in a manner consistent with the requirements of
++this License.
++
++  Each contributor grants you a non-exclusive, worldwide, royalty-free
++patent license under the contributor's essential patent claims, to
++make, use, sell, offer for sale, import and otherwise run, modify and
++propagate the contents of its contributor version.
++
++  In the following three paragraphs, a "patent license" is any express
++agreement or commitment, however denominated, not to enforce a patent
++(such as an express permission to practice a patent or covenant not to
++sue for patent infringement).  To "grant" such a patent license to a
++party means to make such an agreement or commitment not to enforce a
++patent against the party.
++
++  If you convey a covered work, knowingly relying on a patent license,
++and the Corresponding Source of the work is not available for anyone
++to copy, free of charge and under the terms of this License, through a
++publicly available network server or other readily accessible means,
++then you must either (1) cause the Corresponding Source to be so
++available, or (2) arrange to deprive yourself of the benefit of the
++patent license for this particular work, or (3) arrange, in a manner
++consistent with the requirements of this License, to extend the patent
++license to downstream recipients.  "Knowingly relying" means you have
++actual knowledge that, but for the patent license, your conveying the
++covered work in a country, or your recipient's use of the covered work
++in a country, would infringe one or more identifiable patents in that
++country that you have reason to believe are valid.
++
++  If, pursuant to or in connection with a single transaction or
++arrangement, you convey, or propagate by procuring conveyance of, a
++covered work, and grant a patent license to some of the parties
++receiving the covered work authorizing them to use, propagate, modify
++or convey a specific copy of the covered work, then the patent license
++you grant is automatically extended to all recipients of the covered
++work and works based on it.
++
++  A patent license is "discriminatory" if it does not include within
++the scope of its coverage, prohibits the exercise of, or is
++conditioned on the non-exercise of one or more of the rights that are
++specifically granted under this License.  You may not convey a covered
++work if you are a party to an arrangement with a third party that is
++in the business of distributing software, under which you make payment
++to the third party based on the extent of your activity of conveying
++the work, and under which the third party grants, to any of the
++parties who would receive the covered work from you, a discriminatory
++patent license (a) in connection with copies of the covered work
++conveyed by you (or copies made from those copies), or (b) primarily
++for and in connection with specific products or compilations that
++contain the covered work, unless you entered into that arrangement,
++or that patent license was granted, prior to 28 March 2007.
++
++  Nothing in this License shall be construed as excluding or limiting
++any implied license or other defenses to infringement that may
++otherwise be available to you under applicable patent law.
++
++  12. No Surrender of Others' Freedom.
++
++  If conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License.  If you cannot convey a
++covered work so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you may
++not convey it at all.  For example, if you agree to terms that obligate you
++to collect a royalty for further conveying from those to whom you convey
++the Program, the only way you could satisfy both those terms and this
++License would be to refrain entirely from conveying the Program.
++
++  13. Use with the GNU Affero General Public License.
++
++  Notwithstanding any other provision of this License, you have
++permission to link or combine any covered work with a work licensed
++under version 3 of the GNU Affero General Public License into a single
++combined work, and to convey the resulting work.  The terms of this
++License will continue to apply to the part which is the covered work,
++but the special requirements of the GNU Affero General Public License,
++section 13, concerning interaction through a network will apply to the
++combination as such.
++
++  14. Revised Versions of this License.
++
++  The Free Software Foundation may publish revised and/or new versions of
++the GNU General Public License from time to time.  Such new versions will
++be similar in spirit to the present version, but may differ in detail to
++address new problems or concerns.
++
++  Each version is given a distinguishing version number.  If the
++Program specifies that a certain numbered version of the GNU General
++Public License "or any later version" applies to it, you have the
++option of following the terms and conditions either of that numbered
++version or of any later version published by the Free Software
++Foundation.  If the Program does not specify a version number of the
++GNU General Public License, you may choose any version ever published
++by the Free Software Foundation.
++
++  If the Program specifies that a proxy can decide which future
++versions of the GNU General Public License can be used, that proxy's
++public statement of acceptance of a version permanently authorizes you
++to choose that version for the Program.
++
++  Later license versions may give you additional or different
++permissions.  However, no additional obligations are imposed on any
++author or copyright holder as a result of your choosing to follow a
++later version.
++
++  15. Disclaimer of Warranty.
++
++  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
++APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
++HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
++OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
++THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
++PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
++IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
++ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
++
++  16. Limitation of Liability.
++
++  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
++THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
++GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
++USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
++DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
++PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
++EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
++SUCH DAMAGES.
++
++  17. Interpretation of Sections 15 and 16.
++
++  If the disclaimer of warranty and limitation of liability provided
++above cannot be given local legal effect according to their terms,
++reviewing courts shall apply local law that most closely approximates
++an absolute waiver of all civil liability in connection with the
++Program, unless a warranty or assumption of liability accompanies a
++copy of the Program in return for a fee.
++
++                     END OF TERMS AND CONDITIONS
++
++            How to Apply These Terms to Your New Programs
++
++  If you develop a new program, and you want it to be of the greatest
++possible use to the public, the best way to achieve this is to make it
++free software which everyone can redistribute and change under these terms.
++
++  To do so, attach the following notices to the program.  It is safest
++to attach them to the start of each source file to most effectively
++state the exclusion of warranty; and each file should have at least
++the "copyright" line and a pointer to where the full notice is found.
++
++    <one line to give the program's name and a brief idea of what it does.>
++    Copyright (C) <year>  <name of author>
++
++    This program is free software: you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation, either version 3 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++Also add information on how to contact you by electronic and paper mail.
++
++  If the program does terminal interaction, make it output a short
++notice like this when it starts in an interactive mode:
++
++    <program>  Copyright (C) <year>  <name of author>
++    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
++    This is free software, and you are welcome to redistribute it
++    under certain conditions; type `show c' for details.
++
++The hypothetical commands `show w' and `show c' should show the appropriate
++parts of the General Public License.  Of course, your program's commands
++might be different; for a GUI interface, you would use an "about box".
++
++  You should also get your employer (if you work as a programmer) or school,
++if any, to sign a "copyright disclaimer" for the program, if necessary.
++For more information on this, and how to apply and follow the GNU GPL, see
++<http://www.gnu.org/licenses/>.
++
++  The GNU General Public License does not permit incorporating your program
++into proprietary programs.  If your program is a subroutine library, you
++may consider it more useful to permit linking proprietary applications with
++the library.  If this is what you want to do, use the GNU Lesser General
++Public License instead of this License.  But first, please read
++<http://www.gnu.org/philosophy/why-not-lgpl.html>.
 === removed file 'ChangeLog'
 === removed file 'Makefile.am'
 --- Makefile.am	2012-03-27 22:12:02 +0000
 +++ Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
--
--SUBDIRS = src data test po
--
--DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
--
--include $(top_srcdir)/Makefile.am.coverage
 === removed file 'Makefile.am.coverage'
 --- Makefile.am.coverage	2012-03-27 22:12:02 +0000
 +++ Makefile.am.coverage	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
--
--# Coverage targets
--
--.PHONY: clean-gcno clean-gcda \
--	coverage-html generate-coverage-html clean-coverage-html \
--	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
--
--clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
--
--if HAVE_GCOV
--
--clean-gcno:
--	@echo Removing old coverage instrumentation
--	-find -name '*.gcno' -print | xargs -r rm
--
--clean-gcda:
--	@echo Removing old coverage results
--	-find -name '*.gcda' -print | xargs -r rm
--
--coverage-html: clean-gcda
--	-$(MAKE) $(AM_MAKEFLAGS) -k check
--	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
--
--generate-coverage-html:
--	@echo Collecting coverage data
--	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
--	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
--
--clean-coverage-html: clean-gcda
--	-$(LCOV) --directory $(top_builddir) -z
--	-rm -rf coverage.info coveragereport
--
--if HAVE_GCOVR
--
--coverage-gcovr: clean-gcda
--	-$(MAKE) $(AM_MAKEFLAGS) -k check
--	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
--
--generate-coverage-gcovr:
--	@echo Generating coverage GCOVR report
--	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
--
--clean-coverage-gcovr: clean-gcda
--	-rm -rf $(top_builddir)/coverage.xml
--
--endif # HAVE_GCOVR
--
--endif # HAVE_GCOV
 === removed file 'NEWS'
 === removed file 'autogen.sh'
 --- autogen.sh	2012-01-11 14:29:38 +0000
 +++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
--#!/bin/sh
--
--which gnome-autogen.sh || {
--    echo "Could not find 'gnome-autgen.sh'. Is gnome-common installed?"
--    exit 1
--}
--
--. gnome-autogen.sh
--
 === added directory 'cmake'
 === added file 'cmake/GdbusCodegen.cmake'
 --- cmake/GdbusCodegen.cmake	1970-01-01 00:00:00 +0000
 +++ cmake/GdbusCodegen.cmake	2017-01-10 21:54:44 +0000
@@ -0,0 +1,36 @@
++cmake_minimum_required(VERSION 2.6)
++if(POLICY CMP0011)
++  cmake_policy(SET CMP0011 NEW)
++endif(POLICY CMP0011)
++
++find_program(GDBUS_CODEGEN NAMES gdbus-codegen DOC "gdbus-codegen executable")
++if(NOT GDBUS_CODEGEN)
++  message(FATAL_ERROR "Excutable gdbus-codegen not found")
++endif()
++
++macro(add_gdbus_codegen outfiles name prefix service_xml)
++  add_custom_command(
++    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.h" "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
++    COMMAND "${GDBUS_CODEGEN}"
++        --interface-prefix "${prefix}"
++        --generate-c-code "${name}"
++        "${service_xml}"
++    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++    DEPENDS ${ARGN} "${service_xml}"
++  )
++  list(APPEND ${outfiles} "${CMAKE_CURRENT_BINARY_DIR}/${name}.c")
++endmacro(add_gdbus_codegen)
++
++macro(add_gdbus_codegen_with_namespace outfiles name prefix namespace service_xml)
++  add_custom_command(
++    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.h" "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
++    COMMAND "${GDBUS_CODEGEN}"
++        --interface-prefix "${prefix}"
++        --generate-c-code "${name}"
++        --c-namespace "${namespace}"
++        "${service_xml}"
++    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
++    DEPENDS ${ARGN} "${service_xml}"
++  )
++  list(APPEND ${outfiles} "${CMAKE_CURRENT_BINARY_DIR}/${name}.c")
++endmacro(add_gdbus_codegen_with_namespace)
 === removed file 'configure.ac'
 --- configure.ac	2016-07-19 15:43:40 +0000
 +++ configure.ac	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
--
--AC_INIT(indicator-printers, 0.1.6)
--
--AC_PREREQ(2.53)
--AM_INIT_AUTOMAKE([])
--
--AC_PROG_CC
--AC_PROG_INSTALL
--AC_PROG_LIBTOOL
--AM_PROG_CC_C_O
--AM_SILENT_RULES([yes])
--AC_CONFIG_MACRO_DIR([m4])
--
--AC_DEFUN([AC_DEFINE_PATH], [
--	test "x$prefix" = xNONE && prefix="$ac_default_prefix"
--	test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--	ac_define_path=`eval echo [$]$2`
--	ac_define_path=`eval echo [$]ac_define_path`
--	$1="$ac_define_path"
--	AC_SUBST($1)
--	ifelse($3, ,
--		AC_DEFINE_UNQUOTED($1, "$ac_define_path"),
--		AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3))
--])
--
--IT_PROG_INTLTOOL([0.35.0])
--GETTEXT_PACKAGE=indicator-printers
--AC_SUBST(GETTEXT_PACKAGE)
--AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
--AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
--AM_GLIB_GNU_GETTEXT
--
--AC_CONFIG_HEADER(config.h)
--AC_CONFIG_FILES([
--    Makefile
--    src/Makefile
--    data/Makefile
--    data/upstart/Makefile
--    test/Makefile
--    po/Makefile.in
--])
--
--PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= 3.0
--                          indicator3-0.4 >= 0.2
--                          dbusmenu-gtk3-0.4 >= 0.2)
--PKG_CHECK_MODULES(SERVICE, gtk+-3.0 >= 3.0
--                           indicator3-0.4 >= 0.2
--                           dbusmenu-glib-0.4 >= 0.2)
--
--AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
--if test "x$CUPS_CONFIG" = "xno"; then
--    AC_MSG_ERROR([could not find cups-config])
--fi
--AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([could not find cups.h]))
--CUPS_CFLAGS+=`$CUPS_CONFIG --cflags`
--CUPS_LIBS+=`$CUPS_CONFIG --libs`
--SERVICE_CFLAGS="$SERVICE_CFLAGS $CUPS_CFLAGS"
--SERVICE_LIBS="$SERVICE_LIBS $CUPS_LIBS"
--
--SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
--AC_SUBST(SYSTEMD_USERDIR)
--
--with_localinstall="no"
--AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall],
--                                           [install all files locally (for distcheck)]),
--              with_localinstall=$enableval,
--              with_localinstall=no)
--
--if test "x$with_localinstall" = "xyes"; then
--	INDICATORDIR="${libdir}/indicators/2/"
--	INDICATORICONSDIR="${datadir}/libindicate/icons/"
--else
--	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
--	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
--fi
--AC_SUBST(INDICATORDIR)
--AC_SUBST(INDICATORICONSDIR)
--
--###########################
--# DBus Service Info
--###########################
--
--if test "x$with_localinstall" = "xyes"; then
--	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
--else
--	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
--fi
--AC_SUBST(DBUSSERVICEDIR)
--
--###########################
--# gcov coverage reporting
--###########################
--
--m4_include([m4/gcov.m4])
--AC_TDD_GCOV
--AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
--AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
--AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
--AC_SUBST(COVERAGE_CFLAGS)
--AC_SUBST(COVERAGE_LDFLAGS)
--
--AC_SUBST(AM_CFLAGS, "-Wall")
--
--AC_OUTPUT
--
 === added file 'data/CMakeLists.txt'
 --- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ data/CMakeLists.txt	2017-01-10 21:54:44 +0000
@@ -0,0 +1,64 @@
++##
++##  Systemd Unit File
++##
++
++# where to install
++# Uncomment when we drop Vivid
++# pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)
++set (SYSTEMD_USER_DIR "/usr/lib/systemd/user")
++message (STATUS "${SYSTEMD_USER_DIR} is the systemd user unit file install dir")
++
++set (SYSTEMD_USER_NAME "${CMAKE_PROJECT_NAME}.service")
++set (SYSTEMD_USER_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SYSTEMD_USER_NAME}")
++set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in")
++
++# build it
++set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
++configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
++
++# install it
++install (FILES "${SYSTEMD_USER_FILE}"
++         DESTINATION "${SYSTEMD_USER_DIR}")
++
++##
++##  Upstart systemd override Job File
++##
++
++set (UPSTART_SYSTEMD_OVERRIDE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/systemd-session/upstart")
++message (STATUS "${UPSTART_SYSTEMD_OVERRIDE_DIR} is the Upstart override Job File for systemd dir")
++
++install (FILES "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.override"
++         DESTINATION "${UPSTART_SYSTEMD_OVERRIDE_DIR}")
++
++##
++##  Upstart Job File
++##
++
++# where to install
++set (UPSTART_JOB_DIR "${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions")
++message (STATUS "${UPSTART_JOB_DIR} is the Upstart Job File install dir")
++
++set (UPSTART_JOB_NAME "${CMAKE_PROJECT_NAME}.conf")
++set (UPSTART_JOB_FILE "${CMAKE_CURRENT_BINARY_DIR}/${UPSTART_JOB_NAME}")
++set (UPSTART_JOB_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${UPSTART_JOB_NAME}.in")
++
++# build it
++configure_file ("${UPSTART_JOB_FILE_IN}" "${UPSTART_JOB_FILE}")
++
++# install it
++install (FILES "${UPSTART_JOB_FILE}"
++         DESTINATION "${UPSTART_JOB_DIR}")
++
++##
++##  Unity Indicator File
++##
++
++# where to install
++set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
++message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
++
++set (UNITY_INDICATOR_NAME "com.canonical.indicator.printers")
++set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
++
++install (FILES "${UNITY_INDICATOR_FILE}"
++         DESTINATION "${UNITY_INDICATOR_DIR}")
 === removed file 'data/Makefile.am'
 --- data/Makefile.am	2016-07-19 15:43:40 +0000
 +++ data/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
--
--BUILT_SOURCES=
--CLEANFILES=
--EXTRA_DIST=
--
--SUBDIRS = upstart
--
--#
--# the systemd unit file
--#
--
--systemddir = $(SYSTEMD_USERDIR)
--systemd_DATA = indicator-printers.service
--systemd_in = $(systemd_DATA:.service=.service.in)
--$(systemd_DATA): $(systemd_in)
--	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
--BUILT_SOURCES += $(systemd_DATA)
--EXTRA_DIST += $(systemd_in)
--CLEANFILES += $(systemd_DATA)
--
--#
--# the systemd upstart override
--#
--
--upstart_overridedir = $(datadir)/upstart/systemd-session/upstart
--upstart_override_DATA = indicator-printers.override
--EXTRA_DIST += $(upstart_override_DATA)
--
--#
--# the upstart job file
--#
--
--upstart_jobsdir = $(datadir)/upstart/sessions
--upstart_jobs_DATA = indicator-printers.conf
--upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in)
--$(upstart_jobs_DATA): $(upstart_jobs_in)
--	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
--BUILT_SOURCES += $(upstart_jobs_DATA)
--CLEANFILES += $(upstart_jobs_DATA)
--EXTRA_DIST += $(upstart_jobs_in)
--
--#
--# the xdg autostart job file
--#
--
--xdg_autostartdir = /etc/xdg/autostart
--xdg_autostart_DATA = indicator-printers.desktop
--xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
--$(xdg_autostart_DATA): $(xdg_autostart_in)
--	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
--BUILT_SOURCES += $(xdg_autostart_DATA)
--CLEANFILES += $(xdg_autostart_DATA)
--EXTRA_DIST += $(xdg_autostart_in)
--
--
 === added file 'data/com.canonical.indicator.printers'
 --- data/com.canonical.indicator.printers	1970-01-01 00:00:00 +0000
 +++ data/com.canonical.indicator.printers	2017-01-10 21:54:44 +0000
@@ -0,0 +1,20 @@
++[Indicator Service]
++Name=indicator-printers
++ObjectPath=/com/canonical/indicator/printers
++Position=90
++
++[desktop]
++ObjectPath=/com/canonical/indicator/printers/menu
++
++[desktop_greeter]
++ObjectPath=/com/canonical/indicator/printers/menu
++
++[desktop_lockscreen]
++ObjectPath=/com/canonical/indicator/printers/menu
++
++[phone]
++ObjectPath=/com/canonical/indicator/printers/menu
++
++[phone_greeter]
++ObjectPath=/com/canonical/indicator/printers/menu
++
 === removed file 'data/indicator-printers.desktop.in'
 --- data/indicator-printers.desktop.in	2014-02-20 16:08:19 +0000
 +++ data/indicator-printers.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
--[Desktop Entry]
--Type=Application
--Name=Indicator Printers
--Exec=@pkglibexecdir@/indicator-printers-service
--OnlyShowIn=Unity;
--NoDisplay=true
--StartupNotify=false
--Terminal=false
 === removed directory 'data/upstart'
 === removed file 'data/upstart/Makefile.am'
 --- data/upstart/Makefile.am	2014-02-20 16:06:20 +0000
 +++ data/upstart/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
--BUILT_SOURCES=
--CLEANFILES=
--EXTRA_DIST=
--
--#
--# the upstart xdg autostart override
--#
--
--xdg_autostartdir = $(datadir)/upstart/xdg/autostart
--xdg_autostart_DATA = indicator-printers.desktop
--xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
--$(xdg_autostart_DATA): $(xdg_autostart_in)
--	$(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
--BUILT_SOURCES += $(xdg_autostart_DATA)
--CLEANFILES += $(xdg_autostart_DATA)
--EXTRA_DIST += $(xdg_autostart_in)
--
 === removed file 'data/upstart/indicator-printers.desktop.in'
 --- data/upstart/indicator-printers.desktop.in	2014-02-20 16:08:19 +0000
 +++ data/upstart/indicator-printers.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
--[Desktop Entry]
--Type=Application
--Name=Indicator Printers
--Exec=@pkglibexecdir@/indicator-printers-service
--OnlyShowIn=Unity;
--NoDisplay=true
--StartupNotify=false
--Terminal=false
--Hidden=true
 === modified file 'debian/control'
 --- debian/control	2016-11-24 23:20:47 +0000
 +++ debian/control	2017-01-10 21:54:44 +0000
@@ -2,26 +2,24 @@
  Section: gnome
  Priority: extra
  Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
--XSBC-Original-Maintainer: Lars Uebernickel <lars.uebernickel@canonical.com>
--Build-Depends: debhelper (>= 9),
--               autotools-dev,
--               dh-autoreconf,
--               gnome-common,
--               python,
--               libglib2.0-dev (>= 2.43.2),
--               libgtk-3-dev,
--               libdbusmenu-glib-dev (>= 0.5.90),
--               libdbusmenu-gtk3-dev (>= 0.5.90),
--               libindicator3-dev (>= 0.3.91),
--               libcups2-dev,
--               systemd,
--Standards-Version: 3.9.2
++Build-Depends:
++ cmake,
++ cmake-extras (>= 0.10),
++ debhelper (>= 9),
++ dbus,
++ dh-translations,
++ gcovr,
++ googletest | google-mock,
++ intltool,
++ lcov,
++ libcups2-dev,
++ libglib2.0-dev (>= 2.35.4),
++ libproperties-cpp-dev,
++ systemd,
++Standards-Version: 3.9.6
  Homepage: https://launchpad.net/indicator-printers
--# If you aren't a member of ~indicator-applet-developers but need to upload
--# packaging changes, just go ahead.  ~indicator-applet-developers will notice
--# and sync up the code again.
--Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/indicator-printers/trunk.13.04
--Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/indicator-printers/trunk.13.04/files
++Vcs-Bzr: lp:indicator-printers
++X-Ubuntu-Use-Langpack: yes
  Package: indicator-printers
  Architecture: any
@@ -30,7 +28,6 @@
           cups (>= 1.5),
           indicator-common,
  Recommends: indicator-applet (>= 0.2) | indicator-renderer,
--            system-config-printer,
  Description: indicator showing active print jobs
   This indicator is designed to let you view and control active print jobs.
+  .
 === modified file 'debian/copyright'
 --- debian/copyright	2012-02-16 16:23:19 +0000
 +++ debian/copyright	2017-01-10 21:54:44 +0000
@@ -1,10 +1,9 @@
  Format: http://dep.debian.net/deps/dep5/
  Upstream-Name: indicator-printers
--Upstream-Contact: Lars Uebernickel <lars.uebernickel@canonical.com>
  Source: https://launchpad.net/indicator-printers
  Files: *
--Copyright: 2012 Canonical Ltd
++Copyright: 2012, 2016-2017 Canonical Ltd
  License: GPL-3
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 === modified file 'debian/rules'
 --- debian/rules	2012-11-20 15:32:37 +0000
 +++ debian/rules	2017-01-10 21:54:44 +0000
@@ -1,22 +1,7 @@
  #!/usr/bin/make -f
--
--
--CFLAGS += -Wno-error=deprecated-declarations
  LDFLAGS += -Wl,-z,defs -Wl,--as-needed
  export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
  %:
--	dh $@ --with autoreconf
--
--override_dh_autoreconf:
--	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
--
--override_dh_auto_configure:
--	dh_auto_configure -- \
--		--disable-static
--
--override_dh_install:
--	find debian/indicator-printers -name \*.la -delete
--	find debian/indicator-printers -name \*.a -delete
--	dh_install --fail-missing
++	dh $@ --parallel --buildsystem cmake --fail-missing
 === removed file 'debian/watch'
 --- debian/watch	2012-02-16 16:23:19 +0000
 +++ debian/watch	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
--version=3
--https://launchpad.net/indicator-printers/+download .*/indicator-printers-([0-9.]+)\.tar\.gz
 === removed directory 'm4'
 === removed file 'm4/gcov.m4'
 --- m4/gcov.m4	2012-03-27 22:12:02 +0000
 +++ m4/gcov.m4	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
--# Checks for existence of coverage tools:
--#  * gcov
--#  * lcov
--#  * genhtml
--#  * gcovr
--#
--# Sets ac_cv_check_gcov to yes if tooling is present
--# and reports the executables to the variables LCOV, GCOVR and GENHTML.
--AC_DEFUN([AC_TDD_GCOV],
--[
--  AC_ARG_ENABLE(gcov,
--  AS_HELP_STRING([--enable-gcov],
--		 [enable coverage testing with gcov]),
--  [use_gcov=$enableval], [use_gcov=no])
--
--  if test "x$use_gcov" = "xyes"; then
--  # we need gcc:
--  if test "$GCC" != "yes"; then
--    AC_MSG_ERROR([GCC is required for --enable-gcov])
--  fi
--
--  # Check if ccache is being used
--  AC_CHECK_PROG(SHTOOL, shtool, shtool)
--  case `$SHTOOL path $CC` in
--    *ccache*[)] gcc_ccache=yes;;
--    *[)] gcc_ccache=no;;
--  esac
--
--  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
--    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
--  fi
--
--  lcov_version_list="1.6 1.7 1.8 1.9"
--  AC_CHECK_PROG(LCOV, lcov, lcov)
--  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
--
--  if test "$LCOV"; then
--    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
--      glib_cv_lcov_version=invalid
--      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
--      for lcov_check_version in $lcov_version_list; do
--        if test "$lcov_version" = "$lcov_check_version"; then
--          glib_cv_lcov_version="$lcov_check_version (ok)"
--        fi
--      done
--    ])
--  else
--    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
--    AC_MSG_ERROR([$lcov_msg])
--  fi
--
--  case $glib_cv_lcov_version in
--    ""|invalid[)]
--      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
--      AC_MSG_ERROR([$lcov_msg])
--      LCOV="exit 0;"
--      ;;
--  esac
--
--  if test -z "$GENHTML"; then
--    AC_MSG_ERROR([Could not find genhtml from the lcov package])
--  fi
--
--  ac_cv_check_gcov=yes
--  ac_cv_check_lcov=yes
--
--  # Remove all optimization flags from CFLAGS
--  changequote({,})
--  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
--  changequote([,])
--
--  # Add the special gcc flags
--  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
--  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"
--  COVERAGE_LDFLAGS="-lgcov"
--
--  # Check availability of gcovr
--  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
--  if test -z "$GCOVR"; then
--    ac_cv_check_gcovr=no
--  else
--    ac_cv_check_gcovr=yes
--  fi
--
--fi
--]) # AC_TDD_GCOV
 === added file 'po/CMakeLists.txt'
 --- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ po/CMakeLists.txt	2017-01-10 21:54:44 +0000
@@ -0,0 +1,12 @@
++find_package(Intltool REQUIRED)
++
++intltool_update_potfile(
++    KEYWORDS "_" "_:1,2" "N_" "N_:1,2"
++    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
++    COPYRIGHT_HOLDER "Canonical Ltd."
++)
++
++intltool_install_translations(
++    ALL
++    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
++)
 === removed file 'po/POTFILES.in'
 --- po/POTFILES.in	2012-02-16 16:25:33 +0000
 +++ po/POTFILES.in	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
--[encoding: UTF-8]
--src/indicator-menu-item.c
--src/indicator-printers.c
--src/indicator-printers-menu.c
--src/indicator-printers-service.c
--src/indicator-printer-state-notifier.c
 === added file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ src/CMakeLists.txt	2017-01-10 21:54:44 +0000
@@ -0,0 +1,62 @@
++add_definitions(
++  -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
++  -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LOCALEDIR}\"
++  -DG_LOG_DOMAIN=\"${CMAKE_PROJECT_NAME}\"
++)
++
++include_directories(
++  ${CMAKE_CURRENT_SOURCE_DIR}
++  ${CMAKE_CURRENT_BINARY_DIR}
++  ${SERVICE_DEPS_INCLUDE_DIRS}
++)
++link_directories(
++  ${SERVICE_DEPS_LIBRARY_DIRS}
++)
++
++include (GdbusCodegen)
++add_gdbus_codegen(SERVICE_GENERATED_SOURCES cups-cupsd-notifier
++                  org.cups.cupsd
++                  ${CMAKE_CURRENT_SOURCE_DIR}/org.cups.cupsd.Notifier.xml)
++
++add_library(${SERVICE_LIB_NAME} STATIC
++  actions-live.cpp
++  actions-live.h
++  actions.cpp
++  actions.h
++  client.h
++  cups-client.cpp
++  cups-client.h
++  exporter.cpp
++  exporter.h
++  menu.cpp
++  menu.h
++  job.h
++  printer.h
++  utils.cpp
++  utils.h
++  ${SERVICE_GENERATED_SOURCES}
++)
++
++target_link_libraries(${SERVICE_LIB_NAME}
++  ${SERVICE_DEPS_LIBRARIES}
++  ${CUPS_LIBS}
++)
++
++
++add_executable(${SERVICE_EXEC_NAME}
++  main.cpp
++)
++
++target_link_libraries(${SERVICE_EXEC_NAME}
++  ${SERVICE_LIB_NAME}
++  ${SERVICE_DEPS_LIBRARIES}
++  ${CUPS_LIBS}
++
++  ${CMAKE_THREAD_LIBS_INIT}
++)
++
++install(
++  TARGETS ${SERVICE_EXEC_NAME}
++  RUNTIME
++  DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}
++)
 === added file 'src/actions-live.cpp'
 --- src/actions-live.cpp	1970-01-01 00:00:00 +0000
 +++ src/actions-live.cpp	2017-01-10 21:54:44 +0000
@@ -0,0 +1,104 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "actions-live.h"
++
++//#include <url-dispatcher.h>
++
++#include <glib.h>
++
++#include <sstream>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++/***
++****
++***/
++
++LiveActions::LiveActions():
++    Actions()
++{
++}
++
++void LiveActions::execute_command(const std::string& cmdstr)
++{
++    const auto cmd = cmdstr.c_str();
++    g_debug("Issuing command '%s'", cmd);
++
++    GError* error = nullptr;
++    if (!g_spawn_command_line_async(cmd, &error))
++    {
++        g_warning("Unable to start \"%s\": %s", cmd, error->message);
++        g_error_free(error);
++    }
++}
++
++void LiveActions::dispatch_url(const std::string& url)
++{
++    g_debug("Dispatching url '%s'", url.c_str());
++    //url_dispatch_send(url.c_str(), nullptr, nullptr);
++}
++
++/***
++****
++***/
++
++LiveActions::Desktop LiveActions::get_desktop()
++{
++    static bool cached = false;
++    static LiveActions::Desktop result = LiveActions::OTHER;
++
++    if (cached) {
++        return result;
++    }
++
++    // check for unity8
++    if (g_getenv ("MIR_SOCKET") != nullptr) {
++        result = LiveActions::UNITY8;
++     } else {
++        const gchar *xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
++        if (xdg_current_desktop != NULL) {
++            gchar **desktop_names = g_strsplit (xdg_current_desktop, ":", 0);
++            for (size_t i = 0; desktop_names[i]; ++i) {
++                if (!g_strcmp0 (desktop_names[i], "Unity")) {
++                    result = LiveActions::UNITY7;
++                    break;
++                }
++            }
++            g_strfreev (desktop_names);
++        }
++    }
++    cached = true;
++    return result;
++}
++
++void LiveActions::open_settings_app()
++{
++    switch(get_desktop()) {
++    case LiveActions::UNITY8:
++        dispatch_url("settings:///system/printers");
++        break;
++    default:
++        execute_command("system-config-printer");
++    }
++}
++
++
++} // namespace printers
++} // namespace indicator
++} // namespace unity
 === added file 'src/actions-live.h'
 --- src/actions-live.h	1970-01-01 00:00:00 +0000
 +++ src/actions-live.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,54 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include "actions.h"
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++/**
++ * \brief Production implementation of the Actions interface.
++ *
++ * Open a URL or launch a command for an action.
++ *
++ * @see MockActions
++ */
++class LiveActions: public Actions
++{
++public:
++    enum Desktop {
++        OTHER = 0,
++        UNITY7,
++        UNITY8,
++    };
++
++    explicit LiveActions();
++    virtual ~LiveActions() =default;
++
++    void open_settings_app() override;
++
++protected:
++    virtual Desktop get_desktop();
++    virtual void execute_command(const std::string& command);
++    virtual void dispatch_url(const std::string& url);
++};
++
++} // namespace printers
++} // namespace indicator
++} // namespace unity
 === added file 'src/actions.cpp'
 --- src/actions.cpp	1970-01-01 00:00:00 +0000
 +++ src/actions.cpp	2017-01-10 21:54:44 +0000
@@ -0,0 +1,73 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "actions.h"
++
++#include <glib.h>
++#include <gio/gio.h>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++/***
++****
++***/
++
++namespace
++{
++
++GVariant* create_default_header_state()
++{
++    GVariantBuilder b;
++    g_variant_builder_init(&b, G_VARIANT_TYPE_VARDICT);
++    g_variant_builder_add(&b, "{sv}", "accessible-desc", g_variant_new_string("accessible-desc"));
++    g_variant_builder_add(&b, "{sv}", "label", g_variant_new_string("label"));
++    g_variant_builder_add(&b, "{sv}", "title", g_variant_new_string("title"));
++    g_variant_builder_add(&b, "{sv}", "visible", g_variant_new_boolean(true));
++    return g_variant_builder_end(&b);
++}
++
++} // unnamed namespace
++
++/***
++****
++***/
++
++Actions::Actions():
++    m_actions(g_simple_action_group_new())
++{
++    // add the header actions
++    auto v = create_default_header_state();
++    auto a = g_simple_action_new_stateful("printers", nullptr, v);
++    g_action_map_add_action(G_ACTION_MAP(m_actions), G_ACTION(a));
++    g_object_unref(a);
++}
++
++Actions::~Actions()
++{
++    g_clear_object(&m_actions);
++}
++
++GActionGroup* Actions::action_group()
++{
++    return G_ACTION_GROUP(m_actions);
++}
++
++
++} // namespace printers
++} // namespace indicator
++} // namespace unity
 === added file 'src/actions.h'
 --- src/actions.h	1970-01-01 00:00:00 +0000
 +++ src/actions.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,57 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include <memory> // shared_ptr
++#include <string>
++
++#include <gio/gio.h> // GSimpleActionGroup
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++/**
++ * \brief Interface for all the actions that can be activated by users.
++ *
++ * This is a simple C++ wrapper around our GActionGroup that gets exported
++ * onto the bus. Subclasses implement the actual code that should be run
++ * when a particular action is triggered.
++ */
++class Actions
++{
++public:
++
++    virtual void open_settings_app() = 0;
++
++    GActionGroup* action_group();
++
++protected:
++    explicit Actions();
++    virtual ~Actions();
++
++private:
++    GSimpleActionGroup* m_actions = nullptr;
++
++    // we've got raw pointers in here, so disable copying
++    Actions(const Actions&) = delete;
++    Actions& operator=(const Actions&) = delete;
++};
++
++} // namespace printers
++} // namespace indicator
++} // namespace unity
 === added file 'src/client.h'
 --- src/client.h	1970-01-01 00:00:00 +0000
 +++ src/client.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,56 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include "job.h"
++#include "printer.h"
++
++#include <core/signal.h>
++
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++    class Client {
++    public:
++        explicit Client() = default;
++        virtual ~Client() = default;
++
++        // Signals corresponding to printers
++        virtual core::Signal<const Printer&>& printer_state_changed() = 0;
++
++        // Signals corresponding to jobs
++        virtual core::Signal<const Job&>& job_state_changed() = 0;
++
++        // Methods to manage notification monitoring
++        virtual void create_subscription() = 0;
++        virtual void renew_subscription() = 0;
++        virtual void cancel_subscription() = 0;
++
++        // To iniitalize the indicator with current jobs
++        virtual void refresh() = 0;
++
++    private:
++        // disable copying
++        Client(const Client&) = delete;
++        Client& operator=(const Client&) = delete;
++    };
++
++} // printers
++} // indicators
++} // unity
 === added file 'src/cups-client.cpp'
 --- src/cups-client.cpp	1970-01-01 00:00:00 +0000
 +++ src/cups-client.cpp	2017-01-10 21:54:44 +0000
@@ -0,0 +1,328 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "cups-client.h"
++#include "cups-cupsd-notifier.h"
++
++#include <cups/cups.h>
++
++#include <stdexcept>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++#define NOTIFY_LEASE_DURATION (24 * 60 * 60)
++
++
++class CupsClient::Impl {
++public:
++    Impl()
++    {
++        GError *error = nullptr;
++
++        m_notifier_proxy = notifier_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
++                                                           G_DBUS_PROXY_FLAGS_NONE,
++                                                           nullptr,
++                                                           CUPS_DBUS_PATH,
++                                                           nullptr,
++                                                           &error);
++
++        if (error != nullptr) {
++            std::string msg{"Error creating cups notifier proxy: "};
++            throw std::runtime_error(msg + error->message);
++            g_clear_error(&error);
++        }
++
++        g_object_connect(m_notifier_proxy,
++                         "signal::job-created", on_job_changed, this,
++                         "signal::job-state", on_job_changed, this,
++                         "signal::job-completed", on_job_changed, this,
++                         "signal::printer-state-changed", on_printer_state_changed, this,
++                         nullptr);
++    }
++
++    ~Impl()
++    {
++        if (m_notifier_proxy != nullptr) {
++            g_signal_handlers_disconnect_by_data(m_notifier_proxy, this);
++            g_clear_object(&m_notifier_proxy);
++        }
++
++        // Cancel the subscription from cups, so its notifier can exit.
++        cancel_subscription();
++    }
++
++    // Signals to propagate
++    core::Signal<const Printer&>& printer_state_changed()
++    {
++        return m_printer_state_changed;
++    }
++
++    core::Signal<const Job&>& job_state_changed()
++    {
++        return m_job_state_changed;
++    }
++
++    void create_subscription()
++    {
++        ipp_t *req;
++        ipp_t *resp;
++        ipp_attribute_t *attr;
++
++        req = ippNewRequest (IPP_CREATE_PRINTER_SUBSCRIPTION);
++        ippAddString (req, IPP_TAG_OPERATION, IPP_TAG_URI,
++                      "printer-uri", NULL, "/");
++        ippAddString (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
++                      "notify-events", NULL, "all");
++        ippAddString (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
++                      "notify-recipient-uri", NULL, "dbus://");
++        ippAddInteger (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
++                       "notify-lease-duration", NOTIFY_LEASE_DURATION);
++
++        resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/");
++        if (!resp || cupsLastError() != IPP_OK) {
++            g_warning ("Error subscribing to CUPS notifications: %s\n",
++                       cupsLastErrorString ());
++            return;
++        }
++
++        attr = ippFindAttribute (resp, "notify-subscription-id", IPP_TAG_INTEGER);
++        if (attr) {
++            m_subscription_id = ippGetInteger (attr, 0);
++        } else {
++            g_warning ("ipp-create-printer-subscription response doesn't contain "
++                       "subscription id.\n");
++        }
++        ippDelete (resp);
++
++        // Set up to renew the subscription a minute before it expires
++        g_timeout_add_seconds(NOTIFY_LEASE_DURATION - 60,
++                              on_subscription_timeout,
++                              this);
++    }
++
++    void renew_subscription()
++    {
++        ipp_t *req;
++        ipp_t *resp;
++
++        req = ippNewRequest (IPP_RENEW_SUBSCRIPTION);
++        ippAddInteger (req, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
++                       "notify-subscription-id", m_subscription_id);
++        ippAddString (req, IPP_TAG_OPERATION, IPP_TAG_URI,
++                      "printer-uri", NULL, "/");
++        ippAddString (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
++                      "notify-recipient-uri", NULL, "dbus://");
++        ippAddInteger (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
++                       "notify-lease-duration", NOTIFY_LEASE_DURATION);
++
++        resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/");
++        if (!resp || cupsLastError() != IPP_OK) {
++            g_warning ("Error renewing CUPS subscription %d: %s\n",
++                       m_subscription_id, cupsLastErrorString ());
++            create_subscription();
++        }
++
++        ippDelete (resp);
++    }
++
++    void cancel_subscription()
++    {
++        ipp_t *req;
++        ipp_t *resp;
++
++        if (m_subscription_id <= 0) {
++            return;
++        }
++
++        req = ippNewRequest (IPP_CANCEL_SUBSCRIPTION);
++        ippAddString (req, IPP_TAG_OPERATION, IPP_TAG_URI,
++                      "printer-uri", NULL, "/");
++        ippAddInteger (req, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
++                       "notify-subscription-id", m_subscription_id);
++
++        resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/");
++        if (!resp || cupsLastError() != IPP_OK) {
++            g_warning ("Error unsubscribing to CUPS notifications: %s\n",
++                       cupsLastErrorString ());
++            return;
++        }
++
++        ippDelete (resp);
++    }
++
++    void refresh()
++    {
++        int num_dests;
++        cups_dest_t* dests;
++
++        num_dests = cupsGetDests(&dests);
++        for (int i = 0; i < num_dests; i++) {
++            auto printer = get_printer_info(dests[i].name);
++
++            cups_job_t* jobs;
++            const auto num_jobs = cupsGetJobs(&jobs, dests[i].name,
++                                              true, CUPS_WHICHJOBS_ACTIVE);
++            for (int j = 0; j < num_jobs; j++) {
++                Job job;
++                job.id = jobs[j].id;
++                job.state = static_cast<Job::State>(jobs[j].state);
++                job.name = jobs[j].title;
++
++                job.printer = printer;
++
++                m_job_state_changed(job);
++            }
++            cupsFreeJobs(num_jobs, jobs);
++        }
++        cupsFreeDests(num_dests, dests);
++    }
++
++private:
++    // Method to get Printer object from the name
++    Printer get_printer_info(const std::string& name)
++    {
++        int num_dests;
++        cups_dest_t* dests;
++        cups_dest_t* our_dest;
++        Printer printer;
++        printer.name = name;
++
++        num_dests = cupsGetDests(&dests);
++        our_dest = cupsGetDest(name.c_str(), nullptr,
++                               num_dests, dests);
++
++        // Get the printer's description
++        auto description = cupsGetOption("printer-info",
++                                         our_dest->num_options,
++                                         our_dest->options);
++        if (description != nullptr) {
++            printer.description = description;
++        }
++
++        cupsFreeDests(num_dests, dests);
++        return printer;
++    }
++
++    static gboolean on_subscription_timeout(gpointer gthis)
++    {
++        static_cast<Impl*>(gthis)->renew_subscription();
++        return G_SOURCE_CONTINUE;
++    }
++
++    static void on_job_changed (Notifier*,
++            const char* printer_text,
++            const char* printer_uri,
++            const char *printer_name,
++            unsigned int printer_state,
++            const char *printer_state_reasons,
++            bool printer_is_accepting_jobs,
++            unsigned int job_id,
++            unsigned int job_state,
++            const char *job_state_reasons,
++            const char *job_name,
++            unsigned int job_impressions_completed,
++            gpointer gthis)
++    {
++        auto self = static_cast<Impl*>(gthis);
++
++        auto printer = self->get_printer_info(printer_name);
++        printer.state = static_cast<Printer::State>(printer_state);
++        printer.text = printer_text;
++        printer.uri = printer_uri;
++        printer.state_reasons = printer_state_reasons;
++        printer.accepting_jobs = printer_is_accepting_jobs;
++
++        Job job;
++        job.printer = printer;
++        job.state = static_cast<Job::State>(job_state);
++        job.id = job_id;
++        job.name = job_name;
++        job.state_reasons = job_state_reasons;
++        job.impressions_completed = job_impressions_completed;
++
++        self->m_job_state_changed(job);
++    }
++
++    static void on_printer_state_changed(Notifier*,
++                                         const char* text,
++                                         const char* uri,
++                                         const char* name,
++                                         unsigned int state,
++                                         const char* state_reasons,
++                                         bool is_accepting_jobs,
++                                         gpointer gthis)
++    {
++        auto self = static_cast<Impl*>(gthis);
++
++        auto printer = self->get_printer_info(name);
++        printer.state = static_cast<Printer::State>(state);
++        printer.text = text;
++        printer.uri = uri;
++        printer.state_reasons = state_reasons;
++        printer.accepting_jobs = is_accepting_jobs;
++        self->m_printer_state_changed(printer);
++    }
++
++    int m_subscription_id = 0;
++    Notifier* m_notifier_proxy = nullptr;
++    core::Signal<const Printer&> m_printer_state_changed;
++    core::Signal<const Job&> m_job_state_changed;
++};
++
++CupsClient::CupsClient() :
++    p(new Impl())
++{
++}
++
++CupsClient::~CupsClient()
++{
++}
++
++core::Signal<const Printer&>& CupsClient::printer_state_changed()
++{
++    return p->printer_state_changed();
++}
++
++core::Signal<const Job&>& CupsClient::job_state_changed()
++{
++    return p->job_state_changed();
++}
++
++void CupsClient::create_subscription()
++{
++    p->create_subscription();
++}
++
++void CupsClient::renew_subscription()
++{
++    p->renew_subscription();
++}
++
++void CupsClient::cancel_subscription()
++{
++    p->cancel_subscription();
++}
++
++void CupsClient::refresh()
++{
++    p->refresh();
++}
++
++} // printers
++} // indicators
++} // unity
 === added file 'src/cups-client.h'
 --- src/cups-client.h	1970-01-01 00:00:00 +0000
 +++ src/cups-client.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,65 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include "client.h"
++#include "job.h"
++#include "printer.h"
++
++#include <core/signal.h>
++
++#include <memory>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++#define CUPS_DBUS_NAME "org.cups.cupsd.Notifier"
++#define CUPS_DBUS_PATH "/org/cups/cupsd/Notifier"
++#define CUPS_DBUS_INTERFACE "org.cups.cupsd.Notifier"
++
++    class CupsClient : public Client {
++    public:
++        CupsClient();
++        virtual ~CupsClient();
++
++        // Signals corresponding to printers
++        core::Signal<const Printer&>& printer_state_changed() override;
++
++        // Signals corresponding to jobs
++        core::Signal<const Job&>& job_state_changed() override;
++
++        // Methods to manage notification monitoring
++        virtual void create_subscription() override;
++        virtual void renew_subscription() override;
++        virtual void cancel_subscription() override;
++
++        // To initialize the indicator with current jobs
++        virtual void refresh() override;
++
++    private:
++        class Impl;
++        std::unique_ptr<Impl> p;
++
++        // disable copying
++        CupsClient(const CupsClient&) = delete;
++        CupsClient& operator=(const CupsClient&) = delete;
++    };
++
++} // printers
++} // indicators
++} // unity
 === added file 'src/exporter.cpp'
 --- src/exporter.cpp	1970-01-01 00:00:00 +0000
 +++ src/exporter.cpp	2017-01-10 21:54:44 +0000
@@ -0,0 +1,158 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "exporter.h"
++
++#include <core/signal.h>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++class Exporter::Impl
++{
++public:
++
++    Impl()
++    {
++    }
++
++    ~Impl()
++    {
++        if (m_bus != nullptr) {
++            if (m_exported_menu_id) {
++                g_dbus_connection_unexport_menu_model(m_bus, m_exported_menu_id);
++            }
++
++            if (m_exported_actions_id) {
++                g_dbus_connection_unexport_action_group(m_bus,
++                                                        m_exported_actions_id);
++            }
++        }
++
++        if (m_own_id) {
++            g_bus_unown_name(m_own_id);
++        }
++
++        g_clear_object(&m_bus);
++    }
++
++    core::Signal<> name_lost;
++
++    void publish(const std::shared_ptr<Actions>& actions,
++                 const std::shared_ptr<Client>& client)
++    {
++        m_actions = actions;
++        m_client = client;
++        m_menu.reset(new Menu(m_actions, m_client));
++        m_own_id = g_bus_own_name(G_BUS_TYPE_SESSION,
++                                  INDICATOR_BUS_NAME,
++                                  G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT,
++                                  on_bus_acquired,
++                                  nullptr,
++                                  on_name_lost,
++                                  this,
++                                  nullptr);
++    }
++
++private:
++    static void on_bus_acquired(GDBusConnection* connection,
++                                const gchar* name,
++                                gpointer gthis)
++    {
++        g_debug("bus acquired: %s", name);
++        static_cast<Impl*>(gthis)->on_bus_acquired(connection, name);
++    }
++
++    void on_bus_acquired(GDBusConnection* bus, const gchar* /*name*/)
++    {
++        m_bus = static_cast<GDBusConnection*>(g_object_ref(G_OBJECT(bus)));
++
++        // export the actions
++        GError * error = nullptr;
++        const auto id = g_dbus_connection_export_action_group(m_bus,
++                                                              INDICATOR_BUS_PATH,
++                                                              m_actions->action_group(),
++                                                              &error);
++        if (id)
++        {
++            m_exported_actions_id = id;
++        }
++        else
++        {
++            g_warning("cannot export action group: %s", error->message);
++            g_clear_error(&error);
++        }
++
++        // export the menus
++        const auto path = std::string(INDICATOR_BUS_PATH) + "/menu";
++        m_exported_menu_id = g_dbus_connection_export_menu_model(m_bus,
++                                                                 path.c_str(),
++                                                                 m_menu->menu_model(),
++                                                                 &error);
++        if (error != nullptr) {
++            g_warning("cannot export menu: %s", error->message);
++            g_clear_error(&error);
++        }
++
++        m_client->create_subscription();
++        m_client->refresh();
++    }
++
++    static void on_name_lost(GDBusConnection*, const gchar* name,
++                             gpointer gthis)
++    {
++        g_debug("name lost: %s", name);
++        static_cast<Impl*>(gthis)->name_lost();
++    }
++
++
++    guint m_exported_menu_id = 0;
++    guint m_own_id = 0;
++    guint m_exported_actions_id = 0;
++    GDBusConnection* m_bus = nullptr;
++    std::shared_ptr<Actions> m_actions;
++    std::shared_ptr<Client> m_client;
++    std::shared_ptr<Menu> m_menu;
++};
++
++
++
++Exporter::Exporter():
++    p(new Impl())
++{
++}
++
++
++Exporter::~Exporter()
++{
++}
++
++core::Signal<>& Exporter::name_lost()
++{
++    return p->name_lost;
++}
++
++void Exporter::publish(const std::shared_ptr<Actions>& actions,
++                       const std::shared_ptr<Client>& client)
++{
++    p->publish(actions, client);
++}
++
++
++} // namespace printers
++} // namespace indicator
++} // namespace unity
 === added file 'src/exporter.h'
 --- src/exporter.h	1970-01-01 00:00:00 +0000
 +++ src/exporter.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,60 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include "actions.h"
++#include "client.h"
++#include "menu.h"
++
++#include <core/signal.h>
++
++#include <memory> // std::shared_ptr
++#include <vector>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++#define INDICATOR_BUS_NAME "com.canonical.indicator.printers"
++#define INDICATOR_BUS_PATH "/com/canonical/indicator/printers"
++
++/**
++ * \brief Exports actions and menu to DBus.
++ */
++class Exporter
++{
++public:
++    Exporter();
++    virtual ~Exporter();
++
++    core::Signal<>& name_lost();
++
++    void publish(const std::shared_ptr<Actions>& actions,
++                 const std::shared_ptr<Client>& client);
++
++private:
++    class Impl;
++    std::unique_ptr<Impl> p;
++
++    // disable copying
++    Exporter(const Exporter&) = delete;
++    Exporter& operator=(const Exporter&) = delete;
++};
++
++} // namespace printers
++} // namespace indicator
++} // namespace unity
 === removed file 'src/indicator-menu-item.c'
 --- src/indicator-menu-item.c	2012-02-12 15:10:07 +0000
 +++ src/indicator-menu-item.c	1970-01-01 00:00:00 +0000
@@ -1,404 +0,0 @@
--/*
-- * Copyright 2012 Canonical Ltd.
-- *
-- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "indicator-menu-item.h"
--
--#include <math.h>
--
--
--G_DEFINE_TYPE (IndicatorMenuItem, indicator_menu_item, GTK_TYPE_MENU_ITEM)
--
--
--struct _IndicatorMenuItemPrivate
--{
--    GtkImage *image;
--    GtkWidget *label;
--    GtkWidget *right_label;
--    gboolean right_is_lozenge;
--};
--
--
--enum {
--    PROP_0,
--    PROP_ICON,
--    PROP_ICON_NAME,
--    PROP_LABEL,
--    PROP_RIGHT,
--    PROP_RIGHT_IS_LOZENGE,
--    N_PROPERTIES
--};
--
--static GParamSpec *properties[N_PROPERTIES];
--
--
--static gint
--gtk_widget_get_font_size (GtkWidget *widget)
--{
--    const PangoFontDescription *font;
--
--    font = gtk_style_context_get_font (gtk_widget_get_style_context (widget),
--                                       gtk_widget_get_state_flags (widget));
--
--    return pango_font_description_get_size (font) / PANGO_SCALE;
--}
--
--static void
--cairo_lozenge (cairo_t *cr, double x, double y, double w, double h)
--{
--    double radius = MIN (w / 2.0, h / 2.0);
--    double x1 = x + w - radius;
--    double x2 = x + radius;
--    double y1 = y + radius;
--    double y2 = y + h - radius;
--
--    cairo_move_to (cr, x+radius, y);
--    cairo_arc (cr, x1, y1, radius, M_PI * 1.5, M_PI * 2);
--    cairo_arc (cr, x1, y2, radius, 0,          M_PI * 0.5);
--    cairo_arc (cr, x2, y2, radius, M_PI * 0.5, M_PI);
--    cairo_arc (cr, x2, y1, radius, M_PI,       M_PI * 1.5);
--}
--
--static gboolean
--detail_label_draw (GtkWidget *widget,
--                   cairo_t *cr,
--                   gpointer data)
--{
--    GtkAllocation allocation;
--    double x, y, w, h;
--    GdkRGBA color;
--    PangoLayout *layout;
--    PangoRectangle layout_extents;
--    gboolean is_lozenge = *(gboolean *)data;
--    gint font_size = gtk_widget_get_font_size (widget);
--
--    /* let the label handle the drawing if it's not a lozenge */
--    if (!is_lozenge)
--        return FALSE;
--
--    layout = gtk_label_get_layout (GTK_LABEL(widget));
--    pango_layout_get_extents (layout, NULL, &layout_extents);
--    pango_extents_to_pixels (&layout_extents, NULL);
--
--    gtk_widget_get_allocation (widget, &allocation);
--    x = -font_size / 2.0;
--    y = 1;
--    w = allocation.width;
--    h = MIN (allocation.height, layout_extents.height + 4);
--
--    if (layout_extents.width == 0)
--        return TRUE;
--
--    gtk_style_context_get_color (gtk_widget_get_style_context (widget),
--                                 gtk_widget_get_state_flags (widget),
--                                 &color);
--    gdk_cairo_set_source_rgba (cr, &color);
--
--    cairo_set_line_width (cr, 1.0);
--    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
--    cairo_lozenge (cr, x - font_size / 2.0, y, w + font_size, h);
--
--    x += (w - layout_extents.width) / 2.0;
--    y += (h - layout_extents.height) / 2.0;
--    cairo_move_to (cr, floor (x), floor (y));
--    pango_cairo_layout_path (cr, layout);
--    cairo_fill (cr);
--
--    return TRUE;
--}
--
--
--static void
--indicator_menu_item_get_property (GObject    *object,
--                                  guint       property_id,
--                                  GValue     *value,
--                                  GParamSpec *pspec)
--{
--    IndicatorMenuItem *self = INDICATOR_MENU_ITEM (object);
--
--    switch (property_id)
--    {
--        case PROP_ICON:
--            g_value_set_object (value, indicator_menu_item_get_icon (self));
--            break;
--
--        case PROP_ICON_NAME:
--            g_value_set_string (value, indicator_menu_item_get_icon_name (self));
--            break;
--
--        case PROP_LABEL:
--            g_value_set_string (value, gtk_label_get_label (GTK_LABEL (self->priv->label)));
--            break;
--
--        case PROP_RIGHT:
--            g_value_set_string (value, gtk_label_get_label (GTK_LABEL (self->priv->right_label)));
--            break;
--
--        case PROP_RIGHT_IS_LOZENGE:
--            g_value_set_boolean (value, self->priv->right_is_lozenge);
--            break;
--
--        default:
--            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
--    }
--}
--
--
--static void
--indicator_menu_item_set_property (GObject      *object,
--                                  guint         property_id,
--                                  const GValue *value,
--                                  GParamSpec   *pspec)
--{
--    switch (property_id)
--    {
--        case PROP_ICON:
--            indicator_menu_item_set_icon (INDICATOR_MENU_ITEM (object),
--                                          g_value_get_object (value));
--            break;
--
--        case PROP_ICON_NAME:
--            indicator_menu_item_set_icon_name (INDICATOR_MENU_ITEM (object),
--                                               g_value_get_string (value));
--            break;
--
--        case PROP_LABEL:
--            indicator_menu_item_set_label (INDICATOR_MENU_ITEM (object),
--                                           g_value_get_string (value));
--            break;
--
--        case PROP_RIGHT:
--            indicator_menu_item_set_right (INDICATOR_MENU_ITEM (object),
--                                           g_value_get_string (value));
--            break;
--
--        case PROP_RIGHT_IS_LOZENGE:
--            indicator_menu_item_set_right_is_lozenge (INDICATOR_MENU_ITEM (object),
--                                                      g_value_get_boolean (value));
--            break;
--
--
--        default:
--            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
--    }
--}
--
--
--static void
--indicator_menu_item_dispose (GObject *object)
--{
--    IndicatorMenuItem *self = INDICATOR_MENU_ITEM (object);
--
--    g_clear_object (&self->priv->image);
--    g_clear_object (&self->priv->label);
--    g_clear_object (&self->priv->right_label);
--
--    G_OBJECT_CLASS (indicator_menu_item_parent_class)->dispose (object);
--}
--
--
--static void
--indicator_menu_item_class_init (IndicatorMenuItemClass *klass)
--{
--    GObjectClass *object_class = G_OBJECT_CLASS (klass);
--
--    g_type_class_add_private (klass, sizeof (IndicatorMenuItemPrivate));
--
--    object_class->get_property = indicator_menu_item_get_property;
--    object_class->set_property = indicator_menu_item_set_property;
--    object_class->dispose = indicator_menu_item_dispose;
--
--    properties[PROP_ICON] = g_param_spec_object ("icon",
--                                                 "Icon",
--                                                 "Icon for this menu item",
--                                                 GDK_TYPE_PIXBUF,
--                                                 G_PARAM_READWRITE);
--
--    properties[PROP_ICON_NAME] = g_param_spec_string ("icon-name",
--                                                      "Icon name",
--                                                      "Name of the themed icon",
--                                                      "",
--                                                      G_PARAM_READWRITE);
--
--    properties[PROP_LABEL] = g_param_spec_string ("label",
--                                                  "Label",
--                                                  "The text for the main label",
--                                                  "",
--                                                  G_PARAM_READWRITE);
--
--    properties[PROP_RIGHT] = g_param_spec_string ("right",
--                                                  "Right",
--                                                  "The text on the right side of the menu item",
--                                                  "",
--                                                  G_PARAM_READWRITE);
--
--    properties[PROP_RIGHT_IS_LOZENGE] = g_param_spec_boolean ("right-is-lozenge",
--                                                              "Right is a lozenge",
--                                                              "Whether the right label is displayed as a lonzenge",
--                                                              FALSE,
--                                                              G_PARAM_READWRITE);
--
--    g_object_class_install_properties (object_class, N_PROPERTIES, properties);
--}
--
--
--static void
--indicator_menu_item_init (IndicatorMenuItem *self)
--{
--    IndicatorMenuItemPrivate *priv;
--    gint spacing;
--    GtkWidget *hbox;
--
--    priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
--                                        INDICATOR_TYPE_MENU_ITEM,
--                                        IndicatorMenuItemPrivate);
--    self->priv = priv;
--
--    gtk_widget_style_get (GTK_WIDGET (self),
--                          "toggle-spacing", &spacing,
--                          NULL);
--
--    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, spacing);
--
--    priv->image = g_object_new (GTK_TYPE_IMAGE, NULL);
--    g_object_ref_sink (priv->image);
--    gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (priv->image), FALSE, FALSE, 0);
--
--    priv->label = g_object_new (GTK_TYPE_LABEL,
--                                "xalign", 0.0,
--                                NULL);
--    g_object_ref_sink (priv->label);
--    gtk_box_pack_start (GTK_BOX (hbox), priv->label, TRUE, TRUE, 0);
--
--    priv->right_label = g_object_new (GTK_TYPE_LABEL,
--                                      "xalign", 1.0,
--                                      "width-chars", 2,
--                                      NULL);
--    gtk_style_context_add_class (gtk_widget_get_style_context (priv->right_label),
--                                 "accelerator");
--    g_signal_connect (priv->right_label,
--                      "draw",
--                      G_CALLBACK (detail_label_draw),
--                      &priv->right_is_lozenge);
--    g_object_ref_sink (priv->right_label);
--    gtk_box_pack_start (GTK_BOX (hbox),
--                        priv->right_label,
--                        FALSE,
--                        FALSE,
--                        gtk_widget_get_font_size (priv->right_label) / 2.0 + 1);
--
--    gtk_container_add (GTK_CONTAINER (self), hbox);
--
--    priv->right_is_lozenge = FALSE;
--}
--
--
--IndicatorMenuItem *
--indicator_menu_item_new (void)
--{
--    return g_object_new (INDICATOR_TYPE_MENU_ITEM, NULL);
--}
--
--
--const gchar *
--indicator_menu_item_get_label (IndicatorMenuItem *self)
--{
--    return gtk_label_get_label (GTK_LABEL (self->priv->label));
--}
--
--
--void
--indicator_menu_item_set_label (IndicatorMenuItem *self,
--                               const gchar *text)
--{
--    gtk_label_set_label (GTK_LABEL (self->priv->label), text);
--    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_LABEL]);
--}
--
--
--const gchar *
--indicator_menu_item_get_right (IndicatorMenuItem *self)
--{
--    return gtk_label_get_label (GTK_LABEL (self->priv->right_label));
--}
--
--
--void
--indicator_menu_item_set_right (IndicatorMenuItem *self,
--                               const gchar *text)
--{
--    gtk_label_set_label (GTK_LABEL (self->priv->right_label), text);
--    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_RIGHT]);
--}
--
--
--gboolean
--indicator_menu_item_get_right_is_lozenge (IndicatorMenuItem *self)
--{
--    return self->priv->right_is_lozenge;
--}
--
--
--void
--indicator_menu_item_set_right_is_lozenge (IndicatorMenuItem *self,
--                                          gboolean is_lozenge)
--{
--    self->priv->right_is_lozenge = is_lozenge;
--    gtk_widget_queue_draw (self->priv->right_label);
--    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_RIGHT_IS_LOZENGE]);
--}
--
--
--GdkPixbuf *
--indicator_menu_item_get_icon (IndicatorMenuItem *self)
--{
--    if (gtk_image_get_storage_type (self->priv->image) == GTK_IMAGE_PIXBUF)
--        return gtk_image_get_pixbuf (self->priv->image);
--    else
--        return NULL;
--}
--
--
--void
--indicator_menu_item_set_icon (IndicatorMenuItem *self,
--                              GdkPixbuf *icon)
--{
--    gtk_image_set_from_pixbuf (self->priv->image, icon);
--    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ICON]);
--}
--
--
--const gchar *
--indicator_menu_item_get_icon_name (IndicatorMenuItem *self)
--{
--    const gchar *name = NULL;
--
--    if (gtk_image_get_storage_type (self->priv->image) == GTK_IMAGE_ICON_NAME)
--        gtk_image_get_icon_name (self->priv->image, &name, NULL);
--
--    return name;
--}
--
--
--void
--indicator_menu_item_set_icon_name (IndicatorMenuItem *self,
--                                   const gchar *name)
--{
--    gtk_image_set_from_icon_name (self->priv->image, name, GTK_ICON_SIZE_MENU);
--    g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ICON_NAME]);
--}
--
 === removed file 'src/indicator-menu-item.h'
 --- src/indicator-menu-item.h	2012-02-12 13:20:44 +0000
 +++ src/indicator-menu-item.h	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
--/*
-- * Copyright 2012 Canonical Ltd.
-- *
-- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef INDICATOR_MENU_ITEM_H
--#define INDICATOR_MENU_ITEM_H
--
--#include <gtk/gtk.h>
--
--G_BEGIN_DECLS
--
--#define INDICATOR_TYPE_MENU_ITEM indicator_menu_item_get_type()
--
--#define INDICATOR_MENU_ITEM(obj) \
--  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
--  INDICATOR_TYPE_MENU_ITEM, IndicatorMenuItem))
--
--#define INDICATOR_MENU_ITEM_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_CAST ((klass), \
--  INDICATOR_TYPE_MENU_ITEM, IndicatorMenuItemClass))
--
--#define INDICATOR_IS_MENU_ITEM(obj) \
--  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
--  INDICATOR_TYPE_MENU_ITEM))
--
--#define INDICATOR_IS_MENU_ITEM_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
--  INDICATOR_TYPE_MENU_ITEM))
--
--#define INDICATOR_MENU_ITEM_GET_CLASS(obj) \
--  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
--  INDICATOR_TYPE_MENU_ITEM, IndicatorMenuItemClass))
--
--typedef struct _IndicatorMenuItem IndicatorMenuItem;
--typedef struct _IndicatorMenuItemClass IndicatorMenuItemClass;
--typedef struct _IndicatorMenuItemPrivate IndicatorMenuItemPrivate;
--
--struct _IndicatorMenuItem
--{
--    GtkMenuItem parent;
--    IndicatorMenuItemPrivate *priv;
--};
--
--struct _IndicatorMenuItemClass
--{
--    GtkMenuItemClass parent_class;
--};
--
--GType indicator_menu_item_get_type (void) G_GNUC_CONST;
--
--IndicatorMenuItem *indicator_menu_item_new (void);
--
--const gchar * indicator_menu_item_get_label (IndicatorMenuItem *self);
--void indicator_menu_item_set_label (IndicatorMenuItem *self, const gchar *text);
--const gchar * indicator_menu_item_get_right (IndicatorMenuItem *self);
--void indicator_menu_item_set_right (IndicatorMenuItem *self, const gchar *text);
--
--gboolean indicator_menu_item_get_right_is_lozenge (IndicatorMenuItem *self);
--void indicator_menu_item_set_right_is_lozenge (IndicatorMenuItem *self, gboolean is_lozenge);
--const gchar * indicator_menu_item_get_icon_name (IndicatorMenuItem *self);
--void indicator_menu_item_set_icon (IndicatorMenuItem *self, GdkPixbuf *icon);
--GdkPixbuf * indicator_menu_item_get_icon (IndicatorMenuItem *self);
--void indicator_menu_item_set_icon_name (IndicatorMenuItem *self, const gchar *name);
--
--G_END_DECLS
--
--#endif
--
 === removed file 'src/indicator-printers-menu.c'
 --- src/indicator-printers-menu.c	2012-03-03 10:40:46 +0000
 +++ src/indicator-printers-menu.c	1970-01-01 00:00:00 +0000
@@ -1,339 +0,0 @@
--/*
-- * Copyright 2012 Canonical Ltd.
-- *
-- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "indicator-printers-menu.h"
--
--#include <glib/gi18n.h>
--
--#include <cups/cups.h>
--
--#include "spawn-printer-settings.h"
--
--
--G_DEFINE_TYPE (IndicatorPrintersMenu, indicator_printers_menu, G_TYPE_OBJECT)
--
--
--struct _IndicatorPrintersMenuPrivate
--{
--    DbusmenuMenuitem *root;
--    GHashTable *printers;    /* printer name -> dbusmenuitem */
--    CupsNotifier *cups_notifier;
--};
--
--
--enum {
--    PROP_0,
--    PROP_CUPS_NOTIFIER,
--    NUM_PROPERTIES
--};
--
--GParamSpec *properties[NUM_PROPERTIES];
--
--
--static void
--dispose (GObject *object)
--{
--    IndicatorPrintersMenu *self = INDICATOR_PRINTERS_MENU (object);
--
--    if (self->priv->printers) {
--        g_hash_table_unref (self->priv->printers);
--        self->priv->printers = NULL;
--    }
--
--    g_clear_object (&self->priv->root);
--    g_clear_object (&self->priv->cups_notifier);
--
--    G_OBJECT_CLASS (indicator_printers_menu_parent_class)->dispose (object);
--}
--
--
--void
--set_property (GObject        *object,
--              guint           property_id,
--              const GValue   *value,
--              GParamSpec     *pspec)
--{
--    IndicatorPrintersMenu *self = INDICATOR_PRINTERS_MENU (object);
--
--    switch (property_id) {
--        case PROP_CUPS_NOTIFIER:
--            indicator_printers_menu_set_cups_notifier (self,
--                                                       g_value_get_object (value));
--            break;
--
--        default:
--            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
--    }
--}
--
--
--void
--get_property (GObject        *object,
--              guint           property_id,
--              GValue         *value,
--              GParamSpec     *pspec)
--{
--    IndicatorPrintersMenu *self = INDICATOR_PRINTERS_MENU (object);
--
--    switch (property_id) {
--        case PROP_CUPS_NOTIFIER:
--            g_value_set_object (value,
--                                indicator_printers_menu_get_cups_notifier (self));
--            break;
--
--        default:
--            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
--    }
--}
--
--
--static void
--indicator_printers_menu_class_init (IndicatorPrintersMenuClass *klass)
--{
--    GObjectClass *object_class = G_OBJECT_CLASS (klass);
--
--    g_type_class_add_private (klass, sizeof (IndicatorPrintersMenuPrivate));
--
--    object_class->dispose = dispose;
--    object_class->get_property = get_property;
--    object_class->set_property = set_property;
--
--    properties[PROP_CUPS_NOTIFIER] = g_param_spec_object ("cups-notifier",
--                                                          "Cups Notifier",
--                                                          "A cups notifier object",
--                                                          CUPS_TYPE_NOTIFIER,
--                                                          G_PARAM_READWRITE);
--
--    g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
--}
--
--
--static void
--on_printer_item_activated (DbusmenuMenuitem *menuitem,
--                           guint timestamp,
--                           gpointer user_data)
--{
--    const gchar *printer = user_data;
--    spawn_printer_settings_with_args ("--show-jobs %s", printer);
--}
--
--
--static void
--update_indicator_visibility (IndicatorPrintersMenu *self)
--{
--    GList *it;
--    gboolean is_visible = FALSE;
--
--    for (it = dbusmenu_menuitem_get_children (self->priv->root);
--         it;
--         it = g_list_next (it))
--    {
--        DbusmenuMenuitem *child = it->data;
--        if ((is_visible = dbusmenu_menuitem_property_get_bool (child, "visible")))
--            break;
--    }
--
--    dbusmenu_menuitem_property_set_bool (self->priv->root, "visible", is_visible);
--}
--
--
--static void
--update_printer_menuitem (IndicatorPrintersMenu *self,
--                         const char *printer,
--                         int state)
--{
--    DbusmenuMenuitem *item;
--    int njobs;
--    cups_job_t *jobs;
--
--    njobs = cupsGetJobs (&jobs, printer, 1, CUPS_WHICHJOBS_ACTIVE);
--    cupsFreeJobs (njobs, jobs);
--
--    if (njobs < 0) {
--        g_warning ("printer '%s' does not exist\n", printer);
--        return;
--    }
--
--    item = g_hash_table_lookup (self->priv->printers, printer);
--
--    if (!item) {
--        item = dbusmenu_menuitem_new ();
--        dbusmenu_menuitem_property_set (item, "type", "indicator-item");
--        dbusmenu_menuitem_property_set (item, "indicator-icon-name", "printer");
--        dbusmenu_menuitem_property_set (item, "indicator-label", printer);
--        g_signal_connect_data (item, "item-activated",
--                               G_CALLBACK (on_printer_item_activated),
--                               g_strdup (printer), (GClosureNotify) g_free, 0);
--
--        dbusmenu_menuitem_child_append(self->priv->root, item);
--        g_hash_table_insert (self->priv->printers, g_strdup (printer), item);
--    }
--
--    if (njobs == 0) {
--        dbusmenu_menuitem_property_set_bool (item, "visible", FALSE);
--        update_indicator_visibility (self);
--        return;
--    }
--
--    /* there are jobs for this printer. Make sure the indicator and the menu
--     * item for that printer are shown */
--    dbusmenu_menuitem_property_set_bool (self->priv->root, "visible", TRUE);
--    dbusmenu_menuitem_property_set_bool (item, "visible", TRUE);
--
--    switch (state) {
--        case IPP_PRINTER_STOPPED:
--            dbusmenu_menuitem_property_set (item, "indicator-right", _("Paused"));
--            dbusmenu_menuitem_property_set_bool (item, "indicator-right-is-lozenge", FALSE);
--            break;
--
--        case IPP_PRINTER_PROCESSING: {
--            gchar *jobstr = g_strdup_printf ("%d", njobs);
--            dbusmenu_menuitem_property_set (item, "indicator-right", jobstr);
--            dbusmenu_menuitem_property_set_bool (item, "indicator-right-is-lozenge", TRUE);
--            g_free (jobstr);
--            break;
--        }
--    }
--}
--
--
--static void
--update_all_printer_menuitems (IndicatorPrintersMenu *self)
--{
--    int ndests, i;
--    cups_dest_t *dests;
--
--    ndests = cupsGetDests (&dests);
--    for (i = 0; i < ndests; i++) {
--        int state = atoi (cupsGetOption ("printer-state",
--                                         dests[i].num_options,
--                                         dests[i].options));
--        update_printer_menuitem (self, dests[i].name, state);
--    }
--    cupsFreeDests (ndests, dests);
--}
--
--
--static void
--update_job (CupsNotifier *cups_notifier,
--            const gchar *text,
--            const gchar *printer_uri,
--            const gchar *printer_name,
--            guint printer_state,
--            const gchar *printer_state_reasons,
--            gboolean printer_is_accepting_jobs,
--            guint job_id,
--            guint job_state,
--            const gchar *job_state_reasons,
--            const gchar *job_name,
--            guint job_impressions_completed,
--            gpointer user_data)
--{
--    IndicatorPrintersMenu *self = INDICATOR_PRINTERS_MENU (user_data);
--
--    /* CUPS doesn't send the printer's name for these events.  Update all menu
--     * items as a temporary workaround */
--    if (job_state == IPP_JOB_CANCELLED ||
--        job_state == IPP_JOB_ABORTED ||
--        job_state == IPP_JOB_COMPLETED)
--        update_all_printer_menuitems (self);
--    else
--        update_printer_menuitem (self, printer_name, printer_state);
--}
--
--
--static void
--on_printer_state_changed (CupsNotifier *object,
--                          const gchar *text,
--                          const gchar *printer_uri,
--                          const gchar *printer_name,
--                          guint printer_state,
--                          const gchar *printer_state_reasons,
--                          gboolean printer_is_accepting_jobs,
--                          gpointer user_data)
--{
--    IndicatorPrintersMenu *self = INDICATOR_PRINTERS_MENU (user_data);
--
--    update_printer_menuitem (self, printer_name, printer_state);
--}
--
--
--static void
--indicator_printers_menu_init (IndicatorPrintersMenu *self)
--{
--    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
--                                              INDICATOR_TYPE_PRINTERS_MENU,
--                                              IndicatorPrintersMenuPrivate);
--
--    self->priv->root = dbusmenu_menuitem_new ();
--    dbusmenu_menuitem_property_set_bool (self->priv->root, "visible", FALSE);
--
--    self->priv->printers = g_hash_table_new_full (g_str_hash,
--                                                  g_str_equal,
--                                                  g_free,
--                                                  g_object_unref);
--
--    /* create initial menu items */
--    update_all_printer_menuitems (self);
--}
--
--
--IndicatorPrintersMenu *
--indicator_printers_menu_new (void)
--{
--    return g_object_new (INDICATOR_TYPE_PRINTERS_MENU, NULL);
--}
--
--
--DbusmenuMenuitem *
--indicator_printers_menu_get_root (IndicatorPrintersMenu *self)
--{
--    return self->priv->root;
--}
--
--
--CupsNotifier *
--indicator_printers_menu_get_cups_notifier (IndicatorPrintersMenu *self)
--{
--    return self->priv->cups_notifier;
--}
--
--
--void
--indicator_printers_menu_set_cups_notifier (IndicatorPrintersMenu *self,
--                                           CupsNotifier *cups_notifier)
--{
--    if (self->priv->cups_notifier) {
--        g_object_disconnect (self->priv->cups_notifier,
--                             "any-signal", update_job, self,
--                             "any-signal", on_printer_state_changed, self,
--                             NULL);
--        g_clear_object (&self->priv->cups_notifier);
--    }
--
--    if (cups_notifier) {
--        self->priv->cups_notifier = g_object_ref (cups_notifier);
--        g_object_connect (self->priv->cups_notifier,
--                          "signal::job-created", update_job, self,
--                          "signal::job-state", update_job, self,
--                          "signal::job-completed", update_job, self,
--                          "signal::printer-state-changed", on_printer_state_changed, self,
--                          NULL);
--    }
--}
--
 === removed file 'src/indicator-printers-menu.h'
 --- src/indicator-printers-menu.h	2012-02-12 13:20:44 +0000
 +++ src/indicator-printers-menu.h	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
--/*
-- * Copyright 2012 Canonical Ltd.
-- *
-- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef INDICATOR_PRINTERS_MENU_H
--#define INDICATOR_PRINTERS_MENU_H
--
--#include <glib-object.h>
--#include <libdbusmenu-glib/dbusmenu-glib.h>
--
--#include "cups-notifier.h"
--
--G_BEGIN_DECLS
--
--#define INDICATOR_TYPE_PRINTERS_MENU indicator_printers_menu_get_type()
--
--#define INDICATOR_PRINTERS_MENU(obj) \
--  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
--  INDICATOR_TYPE_PRINTERS_MENU, IndicatorPrintersMenu))
--
--#define INDICATOR_PRINTERS_MENU_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_CAST ((klass), \
--  INDICATOR_TYPE_PRINTERS_MENU, IndicatorPrintersMenuClass))
--
--#define INDICATOR_IS_PRINTERS_MENU(obj) \
--  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
--  INDICATOR_TYPE_PRINTERS_MENU))
--
--#define INDICATOR_IS_PRINTERS_MENU_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
--  INDICATOR_TYPE_PRINTERS_MENU))
--
--#define INDICATOR_PRINTERS_MENU_GET_CLASS(obj) \
--  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
--  INDICATOR_TYPE_PRINTERS_MENU, IndicatorPrintersMenuClass))
--
--typedef struct _IndicatorPrintersMenu IndicatorPrintersMenu;
--typedef struct _IndicatorPrintersMenuClass IndicatorPrintersMenuClass;
--typedef struct _IndicatorPrintersMenuPrivate IndicatorPrintersMenuPrivate;
--
--struct _IndicatorPrintersMenu
--{
--  GObject parent;
--  IndicatorPrintersMenuPrivate *priv;
--};
--
--struct _IndicatorPrintersMenuClass
--{
--  GObjectClass parent_class;
--};
--
--GType indicator_printers_menu_get_type (void) G_GNUC_CONST;
--
--IndicatorPrintersMenu *indicator_printers_menu_new (void);
--DbusmenuMenuitem * indicator_printers_menu_get_root (IndicatorPrintersMenu *menu);
--CupsNotifier * indicator_printers_menu_get_cups_notifier (IndicatorPrintersMenu *self);
--void indicator_printers_menu_set_cups_notifier (IndicatorPrintersMenu *self,
--                                                CupsNotifier *cups_notifier);
--
--G_END_DECLS
--
--#endif
--
 === removed file 'src/indicator-printers-service.c'
 --- src/indicator-printers-service.c	2014-05-15 11:13:15 +0000
 +++ src/indicator-printers-service.c	1970-01-01 00:00:00 +0000
@@ -1,206 +0,0 @@
--/*
-- * Copyright 2012 Canonical Ltd.
-- *
-- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include <libindicator/indicator-service.h>
--#include <libdbusmenu-glib/dbusmenu-glib.h>
--#include <gtk/gtk.h>
--#include <cups/cups.h>
--#include "dbus-names.h"
--#include "config.h"
--
--#include "cups-notifier.h"
--#include "indicator-printers-menu.h"
--#include "indicator-printer-state-notifier.h"
--
--#define NOTIFY_LEASE_DURATION (24 * 60 * 60)
--
--
--static int
--create_subscription ()
--{
--    ipp_t *req;
--    ipp_t *resp;
--    ipp_attribute_t *attr;
--    int id = 0;
--
--    req = ippNewRequest (IPP_CREATE_PRINTER_SUBSCRIPTION);
--    ippAddString (req, IPP_TAG_OPERATION, IPP_TAG_URI,
--                  "printer-uri", NULL, "/");
--    ippAddString (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_KEYWORD,
--                  "notify-events", NULL, "all");
--    ippAddString (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
--                  "notify-recipient-uri", NULL, "dbus://");
--    ippAddInteger (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
--                   "notify-lease-duration", NOTIFY_LEASE_DURATION);
--
--    resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/");
--    if (!resp || cupsLastError() != IPP_OK) {
--        g_warning ("Error subscribing to CUPS notifications: %s\n",
--                   cupsLastErrorString ());
--        return 0;
--    }
--
--    attr = ippFindAttribute (resp, "notify-subscription-id", IPP_TAG_INTEGER);
--    if (attr)
--        id = ippGetInteger (attr, 0);
--    else
--        g_warning ("ipp-create-printer-subscription response doesn't contain "
--                   "subscription id.\n");
--
--    ippDelete (resp);
--    return id;
--}
--
--
--static gboolean
--renew_subscription (int id)
--{
--    ipp_t *req;
--    ipp_t *resp;
--
--    req = ippNewRequest (IPP_RENEW_SUBSCRIPTION);
--    ippAddInteger (req, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
--                   "notify-subscription-id", id);
--    ippAddString (req, IPP_TAG_OPERATION, IPP_TAG_URI,
--                  "printer-uri", NULL, "/");
--    ippAddString (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_URI,
--                  "notify-recipient-uri", NULL, "dbus://");
--    ippAddInteger (req, IPP_TAG_SUBSCRIPTION, IPP_TAG_INTEGER,
--                   "notify-lease-duration", NOTIFY_LEASE_DURATION);
--
--    resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/");
--    if (!resp || cupsLastError() != IPP_OK) {
--        g_warning ("Error renewing CUPS subscription %d: %s\n",
--                   id, cupsLastErrorString ());
--        return FALSE;
--    }
--
--    ippDelete (resp);
--    return TRUE;
--}
--
--
--static gboolean
--renew_subscription_timeout (gpointer userdata)
--{
--    int *subscription_id = userdata;
--
--    if (*subscription_id <= 0 || !renew_subscription (*subscription_id))
--        *subscription_id = create_subscription ();
--
--    return TRUE;
--}
--
--
--void
--cancel_subscription (int id)
--{
--    ipp_t *req;
--    ipp_t *resp;
--
--    if (id <= 0)
--        return;
--
--    req = ippNewRequest (IPP_CANCEL_SUBSCRIPTION);
--    ippAddString (req, IPP_TAG_OPERATION, IPP_TAG_URI,
--                  "printer-uri", NULL, "/");
--    ippAddInteger (req, IPP_TAG_OPERATION, IPP_TAG_INTEGER,
--                   "notify-subscription-id", id);
--
--    resp = cupsDoRequest (CUPS_HTTP_DEFAULT, req, "/");
--    if (!resp || cupsLastError() != IPP_OK) {
--        g_warning ("Error subscribing to CUPS notifications: %s\n",
--                   cupsLastErrorString ());
--        return;
--    }
--
--    ippDelete (resp);
--}
--
--static void
--name_lost (GDBusConnection *connection,
--           const gchar     *name,
--           gpointer         user_data)
--{
--    int subscription_id = GPOINTER_TO_INT (user_data);
--
--    cancel_subscription (subscription_id);
--    gtk_main_quit ();
--}
--
--int main (int argc, char *argv[])
--{
--    /* Init i18n */
--    setlocale (LC_ALL, "");
--    bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
--    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
--    textdomain (GETTEXT_PACKAGE);
--
--    DbusmenuServer *menuserver;
--    CupsNotifier *cups_notifier;
--    IndicatorPrintersMenu *menu;
--    IndicatorPrinterStateNotifier *state_notifier;
--    GError *error = NULL;
--    int subscription_id;
--
--    gtk_init (&argc, &argv);
--
--    subscription_id = create_subscription ();
--    g_timeout_add_seconds (NOTIFY_LEASE_DURATION - 60,
--                           renew_subscription_timeout,
--                           &subscription_id);
--
--    g_bus_own_name (G_BUS_TYPE_SESSION,
--                    INDICATOR_PRINTERS_DBUS_NAME,
--                    G_BUS_NAME_OWNER_FLAGS_NONE,
--                    NULL, NULL, name_lost,
--                    GINT_TO_POINTER (subscription_id), NULL);
--
--    cups_notifier = cups_notifier_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                                          0,
--                                                          NULL,
--                                                          CUPS_DBUS_PATH,
--                                                          NULL,
--                                                          &error);
--    if (error) {
--        g_warning ("Error creating cups notify handler: %s", error->message);
--        g_error_free (error);
--        return 1;
--    }
--
--    menu = g_object_new (INDICATOR_TYPE_PRINTERS_MENU,
--                         "cups-notifier", cups_notifier,
--                         NULL);
--
--    menuserver = dbusmenu_server_new (INDICATOR_PRINTERS_DBUS_OBJECT_PATH);
--    dbusmenu_server_set_root (menuserver,
--                              indicator_printers_menu_get_root (menu));
--
--    state_notifier = g_object_new (INDICATOR_TYPE_PRINTER_STATE_NOTIFIER,
--                                   "cups-notifier", cups_notifier,
--                                   NULL);
--
--    gtk_main ();
--
--    g_object_unref (menu);
--    g_object_unref (menuserver);
--    g_object_unref (state_notifier);
--    g_object_unref (cups_notifier);
--    return 0;
--}
--
 === removed file 'src/indicator-printers.c'
 --- src/indicator-printers.c	2014-02-20 22:16:42 +0000
 +++ src/indicator-printers.c	1970-01-01 00:00:00 +0000
@@ -1,311 +0,0 @@
--/*
-- * Copyright 2012 Canonical Ltd.
-- *
-- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#include "config.h"
--
--#include "indicator-printers.h"
--#include "indicator-menu-item.h"
--#include "dbus-names.h"
--
--#include <glib/gi18n-lib.h>
--#include <gtk/gtk.h>
--#include <gio/gio.h>
--
--#include <libindicator/indicator.h>
--#include <libindicator/indicator-image-helper.h>
--
--#include <libdbusmenu-gtk/menu.h>
--#include <libdbusmenu-gtk/menuitem.h>
--
--
--INDICATOR_SET_VERSION
--INDICATOR_SET_TYPE(INDICATOR_PRINTERS_TYPE)
--
--
--G_DEFINE_TYPE (IndicatorPrinters, indicator_printers, INDICATOR_OBJECT_TYPE)
--
--
--struct _IndicatorPrintersPrivate
--{
--    IndicatorObjectEntry entry;
--    guint name_watch;
--};
--
--
--static void
--dispose (GObject *object)
--{
--    IndicatorPrinters *self = INDICATOR_PRINTERS (object);
--    if (self->priv->name_watch != 0) {
--        g_bus_unwatch_name(self->priv->name_watch);
--        self->priv->name_watch = 0;
--    }
--    g_clear_object (&self->priv->entry.menu);
--    g_clear_object (&self->priv->entry.image);
--    G_OBJECT_CLASS (indicator_printers_parent_class)->dispose (object);
--}
--
--
--static GList *
--get_entries (IndicatorObject *io)
--{
--    IndicatorPrinters *self = INDICATOR_PRINTERS (io);
--    return g_list_append (NULL, &self->priv->entry);
--}
--
--
--static void
--indicator_printers_class_init (IndicatorPrintersClass *klass)
--{
--    GObjectClass *object_class = G_OBJECT_CLASS (klass);
--    IndicatorObjectClass *io_class = INDICATOR_OBJECT_CLASS (klass);
--
--    g_type_class_add_private (klass, sizeof (IndicatorPrintersPrivate));
--
--    object_class->dispose = dispose;
--
--    io_class->get_entries = get_entries;
--}
--
--
--static void
--name_vanished (GDBusConnection * con,
--                    const gchar * name,
--                    gpointer user_data)
--{
--    IndicatorPrinters *self = INDICATOR_PRINTERS (user_data);
--
--    indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE);
--}
--
--
--static GdkPixbuf *
--gdk_pixbuf_new_from_encoded_data (guchar *data,
--                                  gsize length)
--{
--    GInputStream * input;
--    GError *err = NULL;
--    GdkPixbuf *img;
--
--    input = g_memory_input_stream_new_from_data(data, length, NULL);
--    if (input == NULL)
--        return NULL;
--
--    img = gdk_pixbuf_new_from_stream(input, NULL, &err);
--    if (err) {
--        g_warning("%s", err->message);
--        g_error_free(err);
--    }
--
--    g_object_unref(input);
--    return img;
--}
--
--
--static GdkPixbuf *
--g_variant_get_image (GVariant *value)
--{
--    const gchar *strvalue = NULL;
--    gsize length = 0;
--    guchar *icondata;
--    GdkPixbuf *img;
--
--    if (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING))
--        strvalue = g_variant_get_string(value, NULL);
--
--    if (!strvalue || !*strvalue) {
--        g_warning ("%s: value does not contain a base64 encoded image",
--                   __func__);
--        return NULL;
--    }
--
--    icondata = g_base64_decode(strvalue, &length);
--    img = gdk_pixbuf_new_from_encoded_data (icondata, length);
--
--    g_free(icondata);
--    return img;
--}
--
--
--static gboolean
--properties_match (const gchar *name,
--                  const gchar *prop,
--                  GVariant *value,
--                  const GVariantType *type)
--{
--    return !g_strcmp0 (name, prop) && g_variant_is_of_type (value, type);
--}
--
--
--static void
--indicator_prop_change_cb (DbusmenuMenuitem *mi,
--                          gchar *prop,
--                          GVariant *value,
--                          gpointer user_data)
--{
--    IndicatorMenuItem *menuitem = user_data;
--
--    if (properties_match (prop, "indicator-label", value, G_VARIANT_TYPE_STRING))
--        indicator_menu_item_set_label (menuitem, g_variant_get_string (value, NULL));
--
--    else if (properties_match (prop, "indicator-right", value, G_VARIANT_TYPE_STRING))
--        indicator_menu_item_set_right (menuitem, g_variant_get_string (value, NULL));
--
--    else if (properties_match (prop, "indicator-icon-name", value, G_VARIANT_TYPE_STRING))
--        indicator_menu_item_set_icon_name (menuitem, g_variant_get_string (value, NULL));
--
--    else if (properties_match (prop, "indicator-icon", value, G_VARIANT_TYPE_STRING)) {
--        GdkPixbuf *pb = g_variant_get_image (value);
--        indicator_menu_item_set_icon (menuitem, pb);
--        g_object_unref (pb);
--    }
--
--    else if (properties_match (prop, "visible", value, G_VARIANT_TYPE_BOOLEAN))
--        gtk_widget_set_visible (GTK_WIDGET (menuitem), g_variant_get_boolean (value));
--
--    else if (properties_match (prop, "indicator-right-is-lozenge", value, G_VARIANT_TYPE_BOOLEAN))
--        indicator_menu_item_set_right_is_lozenge (menuitem, g_variant_get_boolean (value));
--}
--
--
--static void
--root_property_changed (DbusmenuMenuitem *mi,
--                       gchar *prop,
--                       GVariant *value,
--                       gpointer user_data)
--{
--    IndicatorObject *io = user_data;
--
--    if (properties_match (prop, "visible", value, G_VARIANT_TYPE_BOOLEAN))
--        indicator_object_set_visible (io, g_variant_get_boolean (value));
--}
--
--
--static gboolean
--new_indicator_item (DbusmenuMenuitem *newitem,
--                    DbusmenuMenuitem *parent,
--                    DbusmenuClient *client,
--                    gpointer user_data)
--{
--    GtkWidget *menuitem;
--    const gchar *icon_name, *text, *right_text;
--    GVariant *icon;
--    gboolean is_lozenge, visible;
--
--    icon_name = dbusmenu_menuitem_property_get (newitem, "indicator-icon-name");
--    icon = dbusmenu_menuitem_property_get_variant (newitem, "indicator-icon");
--    text = dbusmenu_menuitem_property_get (newitem, "indicator-label");
--    right_text = dbusmenu_menuitem_property_get (newitem, "indicator-right");
--    is_lozenge = dbusmenu_menuitem_property_get_bool (newitem, "indicator-right-is-lozenge");
--    visible = dbusmenu_menuitem_property_get_bool (newitem, "visible");
--
--    menuitem = g_object_new (INDICATOR_TYPE_MENU_ITEM,
--                             "icon-name", icon_name,
--                             "label", text,
--                             "right", right_text,
--                             "right-is-lozenge", is_lozenge,
--                             "visible", visible,
--                             NULL);
--    if (icon) {
--        GdkPixbuf *pb = g_variant_get_image (icon);
--        indicator_menu_item_set_icon (INDICATOR_MENU_ITEM (menuitem), pb);
--        g_object_unref (pb);
--    }
--    gtk_widget_show_all (menuitem);
--
--    dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client),
--                                    newitem,
--                                    GTK_MENU_ITEM (menuitem),
--                                    parent);
--
--    g_signal_connect(G_OBJECT(newitem),
--                     "property-changed",
--                     G_CALLBACK(indicator_prop_change_cb),
--                     menuitem);
--
--    return TRUE;
--}
--
--
--static void
--root_changed (DbusmenuClient *client,
--              DbusmenuMenuitem *newroot,
--              gpointer user_data)
--{
--    IndicatorPrinters *indicator = user_data;
--    gboolean is_visible;
--
--    if (newroot) {
--        is_visible = dbusmenu_menuitem_property_get_bool (newroot, "visible");
--        g_signal_connect (newroot, "property-changed",
--                          G_CALLBACK (root_property_changed), indicator);
--    }
--    else
--        is_visible = FALSE;
--
--    indicator_object_set_visible (INDICATOR_OBJECT (indicator), is_visible);
--}
--
--
--static void
--indicator_printers_init (IndicatorPrinters *self)
--{
--    IndicatorPrintersPrivate *priv;
--    DbusmenuGtkMenu *menu;
--    DbusmenuClient *client;
--    GtkImage *image;
--
--    priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
--                                        INDICATOR_PRINTERS_TYPE,
--                                        IndicatorPrintersPrivate);
--    self->priv = priv;
--
--    priv->name_watch = g_bus_watch_name(G_BUS_TYPE_SESSION,
--                                        INDICATOR_PRINTERS_DBUS_NAME,
--                                        G_BUS_NAME_WATCHER_FLAGS_NONE,
--                                        NULL, /* appeared */
--                                        name_vanished,
--                                        self, NULL);
--
--    menu = dbusmenu_gtkmenu_new(INDICATOR_PRINTERS_DBUS_NAME,
--                                INDICATOR_PRINTERS_DBUS_OBJECT_PATH);
--
--    client = DBUSMENU_CLIENT (dbusmenu_gtkmenu_get_client (menu));
--    dbusmenu_client_add_type_handler(client,
--                                     "indicator-item",
--                                     new_indicator_item);
--    g_signal_connect (client, "root-changed", G_CALLBACK (root_changed), self);
--
--    image = indicator_image_helper ("printer-symbolic");
--    gtk_widget_show (GTK_WIDGET (image));
--
--    priv->entry.name_hint = PACKAGE_NAME;
--    priv->entry.accessible_desc = _("Printers");
--    priv->entry.menu = GTK_MENU (g_object_ref_sink (menu));
--    priv->entry.image = g_object_ref_sink (image);
--
--    indicator_object_set_visible (INDICATOR_OBJECT (self), FALSE);
--}
--
--
--IndicatorPrinters *
--indicator_printers_new (void)
--{
--    return g_object_new (INDICATOR_PRINTERS_TYPE, NULL);
--}
--
 === removed file 'src/indicator-printers.h'
 --- src/indicator-printers.h	2012-02-03 13:39:34 +0000
 +++ src/indicator-printers.h	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
--/*
-- * Copyright 2012 Canonical Ltd.
-- *
-- * Authors: Lars Uebernickel <lars.uebernickel@canonical.com>
-- *
-- * This program is free software: you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 3, as published
-- * by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful, but
-- * WITHOUT ANY WARRANTY; without even the implied warranties of
-- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-- * PURPOSE.  See the GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef INDICATOR_PRINTERS_H
--#define INDICATOR_PRINTERS_H
--
--#include <libindicator/indicator-object.h>
--
--G_BEGIN_DECLS
--
--#define INDICATOR_PRINTERS_TYPE indicator_printers_get_type()
--
--#define INDICATOR_PRINTERS(obj) \
--  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
--  INDICATOR_PRINTERS_TYPE, IndicatorPrinters))
--
--#define INDICATOR_PRINTERS_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_CAST ((klass), \
--  INDICATOR_PRINTERS_TYPE, IndicatorPrintersClass))
--
--#define INDICATOR_IS_PRINTERS(obj) \
--  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
--  INDICATOR_PRINTERS_TYPE))
--
--#define INDICATOR_IS_PRINTERS_CLASS(klass) \
--  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
--  INDICATOR_PRINTERS_TYPE))
--
--#define INDICATOR_PRINTERS_GET_CLASS(obj) \
--  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
--  INDICATOR_PRINTERS_TYPE, IndicatorPrintersClass))
--
--typedef struct _IndicatorPrinters IndicatorPrinters;
--typedef struct _IndicatorPrintersClass IndicatorPrintersClass;
--typedef struct _IndicatorPrintersPrivate IndicatorPrintersPrivate;
--
--struct _IndicatorPrinters
--{
--  IndicatorObject parent;
--  IndicatorPrintersPrivate *priv;
--};
--
--struct _IndicatorPrintersClass
--{
--  IndicatorObjectClass parent_class;
--};
--
--GType indicator_printers_get_type (void) G_GNUC_CONST;
--
--IndicatorPrinters *indicator_printers_new (void);
--
--G_END_DECLS
--
--#endif
--
 === added file 'src/job.h'
 --- src/job.h	1970-01-01 00:00:00 +0000
 +++ src/job.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,50 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include "printer.h"
++
++#include <string>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++    struct Job {
++        // State to match ipp_jstate_t from cups.h
++        typedef enum {
++            PENDING = 3,
++            HELD,
++            PROCESSING,
++            STOPPED,
++            CANCELED,
++            ABORTED,
++            COMPLETED
++        } State;
++        State state = PENDING;
++
++        uint32_t id = 0;
++        std::string name;
++        std::string state_reasons;
++        uint32_t impressions_completed = 0;
++
++        Printer printer;
++    };
++
++} // printers
++} // indicators
++} // unity
 === added file 'src/main.cpp'
 --- src/main.cpp	1970-01-01 00:00:00 +0000
 +++ src/main.cpp	2017-01-10 21:54:44 +0000
@@ -0,0 +1,60 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "actions-live.h"
++#include "cups-client.h"
++#include "exporter.h"
++#include "utils.h"
++
++#include <glib/gi18n.h>
++#include <gio/gio.h>
++
++using namespace unity::indicator::printers;
++
++int main() {
++    // Work around a deadlock in glib's type initialization.
++    // It can be removed when https://bugzilla.gnome.org/show_bug.cgi?id=674885 is fixed.
++    g_type_ensure(G_TYPE_DBUS_CONNECTION);
++
++    // boilerplate i18n
++    setlocale(LC_ALL, "");
++
++    // Need to prepend $SNAP to properly load translations
++    auto localedir = Utilities::prepend_snap_path(GETTEXT_LOCALEDIR);
++    bindtextdomain(GETTEXT_PACKAGE, localedir.c_str());
++    textdomain(GETTEXT_PACKAGE);
++
++    // set up us the machine
++    auto loop = g_main_loop_new(nullptr, false);
++
++    // create the menus
++    auto actions = std::make_shared<LiveActions>();
++    auto client = std::make_shared<CupsClient>();
++
++    // export them & run until we lose the busname
++    Exporter exporter;
++    exporter.name_lost().connect([loop](){
++        g_message("%s exiting; failed/lost bus ownership", GETTEXT_PACKAGE);
++        g_main_loop_quit(loop);
++    });
++    exporter.publish(actions, client);
++
++    g_main_loop_run(loop);
++
++    // cleanup
++    g_main_loop_unref(loop);
++    return 0;
++}
 === added file 'src/menu.cpp'
 --- src/menu.cpp	1970-01-01 00:00:00 +0000
 +++ src/menu.cpp	2017-01-10 21:54:44 +0000
@@ -0,0 +1,291 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "menu.h"
++
++#include <glib/gi18n.h>
++#include <gio/gio.h>
++
++#include <algorithm>
++#include <iterator>
++#include <map>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++
++class Menu::Impl
++{
++public:
++
++    static constexpr char const * ATTRIBUTE_JOB_ID {"x-canonical-job-id"};
++    static constexpr char const * ATTRIBUTE_TYPE {"x-canonical-type"};
++    static constexpr char const * TYPE_SECTION {"section"};
++
++    enum Section {
++        CURRENT,
++        QUEUED,
++        PAUSED,
++        NUM_SECTIONS
++    };
++
++    Impl(const std::shared_ptr<Actions>& actions,
++         const std::shared_ptr<Client>& client):
++        m_actions(actions),
++        m_client(client)
++    {
++        // initialize the menu
++        create_gmenu();
++        update_header();
++
++        m_client->job_state_changed().connect([this](const Job& job) {
++                const auto printer = job.printer;
++                g_debug("State changed for job %u '%s` on printer '%s'",
++                        job.id,
++                        job.name.c_str(),
++                        printer.description.empty() ? printer.name.c_str() : printer.description.c_str());
++
++                // Remove any existing menu item for the job.
++                remove(job);
++
++                Section section = NUM_SECTIONS;
++                switch (job.state) {
++                case Job::State::PENDING:
++                    section = QUEUED;
++                    break;
++                case Job::State::HELD:
++                    section = PAUSED;
++                    break;
++                case Job::State::PROCESSING:
++                    section = CURRENT;
++                    break;
++                case Job::State::STOPPED:
++                case Job::State::CANCELED:
++                case Job::State::ABORTED:
++                case Job::State::COMPLETED:
++                    update_header();
++                    return;
++                }
++
++                auto model = menu_model_for_section(section);
++                if (model != nullptr) {
++                    auto item = create_job_menu_item(job);
++                    g_menu_append_item(G_MENU(model), item);
++                    g_object_unref(item);
++                    m_current_jobs[job.id] = section;
++                }
++
++                update_header();
++            });
++    }
++
++    virtual ~Impl()
++    {
++        g_clear_object(&m_menu);
++    }
++
++    void update_header()
++    {
++        auto action_group = m_actions->action_group();
++        std::string action_name{"printers"};
++        auto state = create_header_state();
++        g_action_group_change_action_state(action_group,
++                                           action_name.c_str(),
++                                           state);
++    }
++
++    GVariant* get_serialized_icon(const std::string& icon_name)
++    {
++        auto icon = g_themed_icon_new_with_default_fallbacks(icon_name.c_str());
++        auto ret = g_icon_serialize(icon);
++        g_object_unref(icon);
++
++        return ret;
++    }
++
++    GVariant* create_header_state()
++    {
++        auto title_v = g_variant_new_string(_("Printing"));
++        const bool visible = !m_current_jobs.empty();
++        GVariantBuilder b;
++        g_variant_builder_init(&b, G_VARIANT_TYPE_VARDICT);
++        g_variant_builder_add(&b, "{sv}", "title", title_v);
++        g_variant_builder_add(&b, "{sv}", "accessible-desc", title_v);
++        g_variant_builder_add(&b, "{sv}", "icon", get_serialized_icon("printer-symbolic"));
++        g_variant_builder_add(&b, "{sv}", "visible", g_variant_new_boolean(visible));
++        return g_variant_builder_end(&b);
++    }
++
++    GMenuModel* menu_model()
++    {
++        return G_MENU_MODEL(m_menu);
++    }
++
++    GMenuModel* menu_model_for_section(Section section)
++    {
++        return g_menu_model_get_item_link(G_MENU_MODEL(m_submenu),
++                                          section,
++                                          G_MENU_LINK_SECTION);
++    }
++
++    void remove(const Job& job)
++    {
++        Section section = NUM_SECTIONS;
++        if(get_current_section_for_job(job, section)) {
++            auto model = menu_model_for_section(section);
++            auto value = g_variant_new_uint32(job.id);
++            auto pos = find_matching_menu_item(model, ATTRIBUTE_JOB_ID, value);
++
++            if (pos >= 0) {
++                g_menu_remove(G_MENU(model), pos);
++                m_current_jobs.erase(job.id);
++            }
++        }
++    }
++
++private:
++    std::shared_ptr<Actions> m_actions;
++    std::shared_ptr<Client> m_client;
++    std::map<uint32_t, Section> m_current_jobs;
++
++    GMenu* m_submenu = nullptr;
++    GMenu* m_menu = nullptr;
++
++    static GMenuItem* create_section_menu_item(const Section& section)
++    {
++        const char* label;
++        switch (section) {
++        case CURRENT:
++            label = _("Current jobs");
++            break;
++        case QUEUED:
++            label = _("Queued jobs");
++            break;
++        case PAUSED:
++            label = _("Paused jobs");
++            break;
++        default:
++            g_warning("Request for section title of unknown section: %u",
++                      static_cast<uint32_t>(section));
++            return nullptr;
++        }
++
++        // create a new item
++        auto item = g_menu_item_new(label, "indicator.section");
++        g_menu_item_set_attribute(item, ATTRIBUTE_TYPE, "s", TYPE_SECTION);
++
++        return item;
++    }
++
++    // Create the GMenuItem for the job.
++    static GMenuItem* create_job_menu_item(const Job& job)
++    {
++        auto menu_item = g_menu_item_new(job.name.c_str(), nullptr);
++        g_menu_item_set_attribute(menu_item, ATTRIBUTE_JOB_ID, "u", job.id);
++
++        return menu_item;
++    }
++
++    // find the position of the menumodel's item with the specified attribute
++    static int find_matching_menu_item(GMenuModel* mm, const char* attr,
++                                       GVariant* value)
++    {
++        g_return_val_if_fail(value != nullptr, -1);
++
++        for (int i = 0, n = g_menu_model_get_n_items(mm); i < n; ++i) {
++            auto test = g_menu_model_get_item_attribute_value(mm,
++                                                              i,
++                                                              attr,
++                                                              nullptr);
++            const bool equal = g_variant_equal(value, test);
++            g_clear_pointer(&test, g_variant_unref);
++            if (equal) {
++                return i;
++            }
++        }
++
++        return -1;
++    }
++
++    bool get_current_section_for_job(const Job& job, Section& section) const
++    {
++        const auto it = m_current_jobs.find(job.id);
++        if (it == m_current_jobs.end()) {
++            return false;
++        }
++
++        section = it->second;
++        return true;
++    }
++
++    void create_gmenu()
++    {
++        g_assert(m_submenu == nullptr);
++
++        // build the submenu
++        m_submenu = g_menu_new();
++        for(int i = 0; i < NUM_SECTIONS; i++) {
++            // Create the section menu
++            auto section = g_menu_new();
++            g_menu_append_section(m_submenu, nullptr, G_MENU_MODEL(section));
++
++            // Add the label menuitem for the section
++            auto item = create_section_menu_item(static_cast<Section>(i));
++            if (item != nullptr) {
++                g_menu_insert_item(section, 0, item);
++                g_clear_object(&item);
++            }
++
++            g_object_unref(section);
++        }
++
++        // add submenu to the header
++        const std::string detailed_action{"indicator.printers"};
++        auto header = g_menu_item_new(nullptr, detailed_action.c_str());
++        g_menu_item_set_attribute(header, "x-canonical-type", "s",
++                                  "com.canonical.indicator.root");
++        g_menu_item_set_submenu(header, G_MENU_MODEL(m_submenu));
++        g_object_unref(m_submenu);
++
++        // add header to the menu
++        m_menu = g_menu_new();
++        g_menu_append_item(m_menu, header);
++        g_object_unref(header);
++    }
++
++
++}; // class MenuImpl
++
++
++Menu::Menu(const std::shared_ptr<Actions>& actions,
++           const std::shared_ptr<Client>& client):
++    p(new Impl(actions, client))
++{
++}
++
++Menu::~Menu()
++{
++}
++
++GMenuModel* Menu::menu_model()
++{
++    return p->menu_model();
++}
++
++} // namespace printers
++} // namespace indicator
++} // namespace unity
 === added file 'src/menu.h'
 --- src/menu.h	1970-01-01 00:00:00 +0000
 +++ src/menu.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,57 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include "actions.h"
++#include "client.h"
++
++#include <memory> // std::shared_ptr
++#include <vector>
++
++#include <gio/gio.h> // GMenuModel
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++/**
++ * \brief A menu for a specific profile; eg, Desktop or Phone.
++ *
++ * @see MenuFactory
++ * @see Exporter
++ */
++class Menu
++{
++public:
++    Menu(const std::shared_ptr<Actions>& actions,
++         const std::shared_ptr<Client>& client);
++    virtual ~Menu();
++
++    GMenuModel* menu_model();
++
++private:
++    class Impl;
++    std::unique_ptr<Impl> p;
++
++    // disable copying
++    Menu(const Menu&) = delete;
++    Menu& operator=(const Menu&) = delete;
++};
++
++} // namespace printers
++} // namespace indicator
++} // namespace unity
 === added file 'src/printer.h'
 --- src/printer.h	1970-01-01 00:00:00 +0000
 +++ src/printer.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,44 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include <string>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++    struct Printer {
++        // State to match ipp_jstate_t from cups.h
++        typedef enum {
++            IDLE = 3,
++            PROCESSING,
++            STOPPED
++        } State;
++        State state = IDLE;
++
++        std::string name;
++        std::string description;
++        std::string text;
++        std::string uri;
++        std::string state_reasons;
++        bool accepting_jobs = false;
++    };
++
++} // printers
++} // indicators
++} // unity
 === removed file 'src/spawn-printer-settings.c'
 --- src/spawn-printer-settings.c	2012-02-15 10:40:19 +0000
 +++ src/spawn-printer-settings.c	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
--
--#include "spawn-printer-settings.h"
--
--void
--spawn_printer_settings ()
--{
--    spawn_printer_settings_with_args (NULL);
--}
--
--
--void
--spawn_printer_settings_with_args (const gchar *fmt,
--                                  ...)
--{
--    GString *cmdline;
--    GError *err = NULL;
--
--    cmdline = g_string_new ("system-config-printer ");
--
--    if (fmt) {
--        va_list args;
--        va_start (args, fmt);
--        g_string_append_vprintf (cmdline, fmt, args);
--        va_end (args);
--    }
--
--    g_spawn_command_line_async (cmdline->str, &err);
--    if (err) {
--        g_warning ("Could not spawn printer settings: %s", err->message);
--        g_error_free (err);
--    }
--
--    g_string_free (cmdline, TRUE);
--}
--
 === removed file 'src/spawn-printer-settings.h'
 --- src/spawn-printer-settings.h	2012-02-12 13:58:57 +0000
 +++ src/spawn-printer-settings.h	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
--
--#ifndef SPAWN_PRINTER_SETTINGS_H
--#define SPAWN_PRINTER_SETTINGS_H
--
--#include <glib.h>
--
--void spawn_printer_settings ();
--void spawn_printer_settings_with_args (const gchar *args, ...);
--
--#endif
--
 === added file 'src/utils.cpp'
 --- src/utils.cpp	1970-01-01 00:00:00 +0000
 +++ src/utils.cpp	2017-01-10 21:54:44 +0000
@@ -0,0 +1,37 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "utils.h"
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++std::string Utilities::prepend_snap_path(const std::string& path)
++{
++    auto get_snap_path = []() {
++        const char* env_snap = getenv("SNAP");
++        if (env_snap == nullptr) {
++            return "";
++        }
++        return env_snap;
++    };
++    return get_snap_path() + path;
++}
++
++} // printers
++} // indicators
++} // unity
 === added file 'src/utils.h'
 --- src/utils.h	1970-01-01 00:00:00 +0000
 +++ src/utils.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,32 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include <string>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++    class Utilities {
++    public:
++        static std::string prepend_snap_path(const std::string& path);
++    };
++
++} // printers
++} // indicators
++} // unity
 === removed directory 'test'
 === removed file 'test/Makefile.am'
 --- test/Makefile.am	2012-02-16 18:45:24 +0000
 +++ test/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
--
--noinst_PROGRAMS = mock-cups-notifier
--DISTCLEANFILES = mock-cups-notifier
--
--cups_notifier_sources = \
--	cups-notifier.c \
--	cups-notifier.h
--
--$(cups_notifier_sources): $(top_srcdir)/src/org.cups.cupsd.Notifier.xml
--	gdbus-codegen \
--	    --interface-prefix org.cups.cupsd \
--	    --c-namespace Cups \
--	    --generate-c-code cups-notifier \
--	    $^
--
--mock_cups_notifier_SOURCES = \
--	mock-cups-notifier.c
--
--nodist_mock_cups_notifier_SOURCES = $(cups_notifier_sources)
--
--mock_cups_notifier_CPPFLAGS = \
--	$(SERVICE_CFLAGS) \
--	-I$(top_builddir)/src
--
--mock_cups_notifier_LDADD = $(SERVICE_LIBS)
--
--BUILT_SOURCES = $(cups_notifier_sources)
--CLEANFILES = $(BUILT_SOURCES)
--
 === removed file 'test/mock-cups-notifier.c'
 --- test/mock-cups-notifier.c	2012-02-09 17:19:57 +0000
 +++ test/mock-cups-notifier.c	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
--
--#include <glib.h>
--#include <cups-notifier.h>
--
--
--int main (int argc, char **argv)
--{
--    GMainLoop *loop;
--    CupsNotifier *notifier;
--    GDBusConnection *con;
--    GError *error = NULL;
--
--    g_type_init ();
--
--    loop = g_main_loop_new (NULL, FALSE);
--
--    con = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
--    if (error) {
--        g_printerr ("Error getting system bus: %s\n", error->message);
--        g_error_free (error);
--        goto out;
--    }
--
--    notifier = cups_notifier_skeleton_new ();
--
--    g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (notifier),
--                                      con,
--                                      "/org/cups/cupsd/Notifier",
--                                      &error);
--    if (error) {
--        g_printerr ("Error exporting cups Notifier object: %s\n", error->message);
--        g_error_free (error);
--        goto out;
--    }
--
--    cups_notifier_emit_printer_state_changed (notifier,
--                                              "Printer state changed!",
--                                              "file:///tmp/print",
--                                              "hp-LaserJet-1012",
--                                              5,
--                                              "toner-low",
--                                              FALSE);
--
--    g_main_context_iteration (NULL, FALSE);
--
--out:
--    g_clear_object (&notifier);
--    g_clear_object (&con);
--    g_main_loop_unref (loop);
--    return 0;
--}
--
 === added directory 'tests'
 === added file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ tests/CMakeLists.txt	2017-01-10 21:54:44 +0000
@@ -0,0 +1,26 @@
++find_package(GMock REQUIRED)
++
++include_directories(
++  ${CMAKE_SOURCE_DIR}/src
++  ${SERVICE_DEPS_INCLUDE_DIRS}
++)
++link_directories(
++  ${SERVICE_DEPS_LIBRARY_DIRS}
++)
++
++add_executable(test-libindicator-printers
++  test_exporter.cpp
++  test_menu.cpp
++  test_utils.cpp
++)
++target_link_libraries(test-libindicator-printers
++  ${SERVICE_LIB_NAME}
++  ${SERVICE_DEPS_LIBRARIES}
++  ${CUPS_LIBS}
++
++  ${GTEST_LIBRARIES}
++  ${GMOCK_LIBRARIES}
++
++  ${CMAKE_THREAD_LIBS_INIT}
++)
++add_test(test-libindicator-printers test-libindicator-printers)
 === added file 'tests/actions-mock.h'
 --- tests/actions-mock.h	1970-01-01 00:00:00 +0000
 +++ tests/actions-mock.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,36 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include "actions.h"
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++    class MockActions: public Actions
++    {
++    public:
++        explicit MockActions(): Actions() {}
++        ~MockActions() = default;
++
++        void open_settings_app() {}
++    };
++
++} // printers
++} // indicator
++} // unity
 === added file 'tests/client-mock.h'
 --- tests/client-mock.h	1970-01-01 00:00:00 +0000
 +++ tests/client-mock.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,54 @@
++/*
++ * Copyright 2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include "client.h"
++
++#include <core/signal.h>
++#include <gmock/gmock.h>
++
++namespace unity {
++namespace indicator {
++namespace printers {
++
++    class MockClient: public Client
++    {
++    public:
++        explicit MockClient(): Client() {}
++        ~MockClient() = default;
++
++        core::Signal<const Printer&>& printer_state_changed()
++        {
++            return m_printer_state_changed;
++        }
++        core::Signal<const Job&>& job_state_changed()
++        {
++            return m_job_state_changed;
++        }
++
++        MOCK_METHOD0(create_subscription, void());
++        MOCK_METHOD0(renew_subscription, void());
++        MOCK_METHOD0(cancel_subscription, void());
++        MOCK_METHOD0(refresh, void());
++
++        core::Signal<const Printer&> m_printer_state_changed;
++        core::Signal<const Job&> m_job_state_changed;
++    };
++
++} // printers
++} // indicator
++} // unity
 === added file 'tests/glib-fixture.h'
 --- tests/glib-fixture.h	1970-01-01 00:00:00 +0000
 +++ tests/glib-fixture.h	2017-01-10 21:54:44 +0000
@@ -0,0 +1,220 @@
++/*
++ * Copyright 2013-2016-2017 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include <chrono>
++#include <functional> // std::function
++#include <map>
++#include <memory> // std::shared_ptr
++
++#include <glib.h>
++#include <glib/gstdio.h>
++#include <gio/gio.h>
++
++#include <gtest/gtest.h>
++
++#include <locale.h> // setlocale()
++
++class GlibFixture : public ::testing::Test
++{
++  public:
++
++    virtual ~GlibFixture() =default;
++
++  protected:
++
++    virtual void SetUp() override
++    {
++      setlocale(LC_ALL, "C.UTF-8");
++
++      loop = g_main_loop_new(nullptr, false);
++
++      // fail on unexpected messages from this domain
++      g_log_set_fatal_mask(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING);
++
++      g_unsetenv("DISPLAY");
++
++    }
++
++    virtual void TearDown() override
++    {
++      g_test_assert_expected_messages ();
++
++      g_clear_pointer(&loop, g_main_loop_unref);
++    }
++
++    void expectLogMessage (const gchar *domain, GLogLevelFlags level, const gchar *pattern)
++    {
++      g_test_expect_message (domain, level, pattern);
++    }
++
++  private:
++
++    static gboolean
++    wait_for_signal__timeout(gpointer name)
++    {
++      g_error("%s: timed out waiting for signal '%s'", G_STRLOC, (char*)name);
++      return G_SOURCE_REMOVE;
++    }
++
++    static gboolean
++    wait_msec__timeout(gpointer loop)
++    {
++      g_main_loop_quit(static_cast<GMainLoop*>(loop));
++      return G_SOURCE_CONTINUE;
++    }
++
++  protected:
++
++    /* convenience func to loop while waiting for a GObject's signal */
++    void wait_for_signal(gpointer o, const gchar * signal, const int timeout_seconds=5)
++    {
++      // wait for the signal or for timeout, whichever comes first
++      const auto handler_id = g_signal_connect_swapped(o, signal,
++                                                       G_CALLBACK(g_main_loop_quit),
++                                                       loop);
++      const auto timeout_id = g_timeout_add_seconds(timeout_seconds,
++                                                    wait_for_signal__timeout,
++                                                    loop);
++      g_main_loop_run(loop);
++      g_source_remove(timeout_id);
++      g_signal_handler_disconnect(o, handler_id);
++    }
++
++    /* convenience func to loop for N msec */
++    void wait_msec(int msec=50)
++    {
++      const auto id = g_timeout_add(msec, wait_msec__timeout, loop);

Print Indicator

Merge lp:~dobey/indicator-printers/cpp-refactor into lp:indicator-printers

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers