Import upstream version 0.1.1

20 files changed, 2897 insertions, 4070 deletions

diff --git a/Makefile.am b/Makefile.am
index 753bde1..f90feae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
 
-SUBDIRS = src data test
+SUBDIRS = src data test po
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
diff --git a/Makefile.in b/Makefile.in
index c8c1653..ec6daaa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,14 +38,14 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
 	compile config.guess config.sub depcomp install-sh ltmain.sh \
-	missing
+	missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -113,6 +113,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -123,6 +124,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -130,6 +133,7 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
 DBUSSERVICEDIR = @DBUSSERVICEDIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -142,14 +146,27 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 INDICATORDIR = @INDICATORDIR@
-INDICATORICONDIR = @INDICATORICONDIR@
+INDICATORICONSDIR = @INDICATORICONSDIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -161,6 +178,10 @@ LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -178,6 +199,10 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
 SED = @SED@
 SERVICE_CFLAGS = @SERVICE_CFLAGS@
@@ -185,7 +210,9 @@ SERVICE_LIBS = @SERVICE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -219,6 +246,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -238,7 +267,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = src data test
+SUBDIRS = src data test po
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
diff --git a/aclocal.m4 b/aclocal.m4
index c6f1105..491143e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,6 +20,656 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
+# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+#
+# This file is free software, distributed under the terms of the GNU
+# General Public License.  As a special exception to the GNU General
+# Public License, this file may be distributed as part of a program
+# that contains a configuration script generated by Autoconf, under
+# the same distribution terms as the rest of that program.
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+#
+# Macro to add for using GNU gettext.
+# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996
+#
+# Modified to never use included libintl. 
+# Owen Taylor <otaylor@redhat.com>, 12/15/1998
+#
+# Major rework to remove unused code
+# Owen Taylor <otaylor@redhat.com>, 12/11/2002
+#
+# Added better handling of ALL_LINGUAS from GNU gettext version 
+# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+#
+# Modified to require ngettext
+# Matthias Clasen <mclasen@redhat.com> 08/06/2004
+#
+# We need this here as well, since someone might use autoconf-2.5x
+# to configure GLib then an older version to configure a package
+# using AM_GLIB_GNU_GETTEXT
+AC_PREREQ(2.53)
+
+dnl
+dnl We go to great lengths to make sure that aclocal won't 
+dnl try to pull in the installed version of these macros
+dnl when running aclocal in the glib directory.
+dnl
+m4_copy([AC_DEFUN],[glib_DEFUN])
+m4_copy([AC_REQUIRE],[glib_REQUIRE])
+dnl
+dnl At the end, if we're not within glib, we'll define the public
+dnl definitions in terms of our private definitions.
+dnl
+
+# GLIB_LC_MESSAGES
+#--------------------
+glib_DEFUN([GLIB_LC_MESSAGES],
+  [AC_CHECK_HEADERS([locale.h])
+    if test $ac_cv_header_locale_h = yes; then
+    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+    if test $am_cv_val_LC_MESSAGES = yes; then
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
+    fi
+  fi])
+
+# GLIB_PATH_PROG_WITH_TEST
+#----------------------------
+dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+[# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  /*)
+  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in ifelse([$5], , $PATH, [$5]); do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if [$3]; then
+	ac_cv_path_$1="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+  ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])
+
+# GLIB_WITH_NLS
+#-----------------
+glib_DEFUN([GLIB_WITH_NLS],
+  dnl NLS is obligatory
+  [USE_NLS=yes
+    AC_SUBST(USE_NLS)
+
+    gt_cv_have_gettext=no
+
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
+
+    AC_CHECK_HEADER(libintl.h,
+     [gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
+
+      #
+      # First check in libc
+      #
+      AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+        [AC_TRY_LINK([
+#include <libintl.h>
+],
+         [return !ngettext ("","", 1)],
+	  gt_cv_func_ngettext_libc=yes,
+          gt_cv_func_ngettext_libc=no)
+        ])
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+        	[AC_TRY_LINK([
+#include <libintl.h>
+],
+	          [return !dgettext ("","")],
+		  gt_cv_func_dgettext_libc=yes,
+	          gt_cv_func_dgettext_libc=no)
+        	])
+      fi
+  
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+        AC_CHECK_FUNCS(bind_textdomain_codeset)
+      fi
+
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test "$gt_cv_func_dgettext_libc" != "yes" \
+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+        
+        AC_CHECK_LIB(intl, bindtextdomain,
+	    [AC_CHECK_LIB(intl, ngettext,
+		    [AC_CHECK_LIB(intl, dgettext,
+			          gt_cv_func_dgettext_libintl=yes)])])
+
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+	  AC_MSG_CHECKING([if -liconv is needed to use gettext])
+	  AC_MSG_RESULT([])
+  	  AC_CHECK_LIB(intl, ngettext,
+          	[AC_CHECK_LIB(intl, dcgettext,
+		       [gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv],
+			:,-liconv)],
+		:,-liconv)
+        fi
+
+        #
+        # If we found libintl, then check in it for bind_textdomain_codeset();
+        # we'll prefer libc if neither have bind_textdomain_codeset(),
+        # and both have dgettext and ngettext
+        #
+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
+          AC_CHECK_FUNCS(bind_textdomain_codeset)
+          LIBS="$glib_save_LIBS"
+
+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+            gt_cv_func_dgettext_libc=no
+          else
+            if test "$gt_cv_func_dgettext_libc" = "yes" \
+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
+              gt_cv_func_dgettext_libintl=no
+            fi
+          fi
+        fi
+      fi
+
+      if test "$gt_cv_func_dgettext_libc" = "yes" \
+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        gt_cv_have_gettext=yes
+      fi
+  
+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        INTLLIBS="-lintl $libintl_extra_libs"
+      fi
+  
+      if test "$gt_cv_have_gettext" = "yes"; then
+	AC_DEFINE(HAVE_GETTEXT,1,
+	  [Define if the GNU gettext() function is already present or preinstalled.])
+	GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+	  AC_CHECK_FUNCS(dcgettext)
+	  MSGFMT_OPTS=
+	  AC_MSG_CHECKING([if msgfmt accepts -c])
+	  GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+	  AC_SUBST(MSGFMT_OPTS)
+	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr],
+	    [CATOBJEXT=.gmo 
+             DATADIRNAME=share],
+	    [case $host in
+	    *-*-solaris*)
+	    dnl On Solaris, if bind_textdomain_codeset is in libc,
+	    dnl GNU format message catalog is always supported,
+            dnl since both are added to the libc all together.
+	    dnl Hence, we'd like to go with DATADIRNAME=share and
+	    dnl and CATOBJEXT=.gmo in this case.
+            AC_CHECK_FUNC(bind_textdomain_codeset,
+	      [CATOBJEXT=.gmo 
+               DATADIRNAME=share],
+	      [CATOBJEXT=.mo
+               DATADIRNAME=lib])
+	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac])
+          LIBS="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+    ])
+
+    if test "$gt_cv_have_gettext" = "yes" ; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [always defined to indicate that i18n is enabled])
+    fi
+
+    dnl Test whether we really found GNU xgettext.
+    if test "$XGETTEXT" != ":"; then
+      dnl If it is not GNU xgettext we define it as : so that the
+      dnl Makefiles still can work.
+      if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        AC_MSG_RESULT(
+	  [found xgettext program is not GNU xgettext; ignore it])
+        XGETTEXT=":"
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    AC_OUTPUT_COMMANDS(
+      [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.ac.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(CATALOGS)
+    AC_SUBST(CATOBJEXT)
+    AC_SUBST(DATADIRNAME)
+    AC_SUBST(GMOFILES)
+    AC_SUBST(INSTOBJEXT)
+    AC_SUBST(INTLLIBS)
+    AC_SUBST(PO_IN_DATADIR_TRUE)
+    AC_SUBST(PO_IN_DATADIR_FALSE)
+    AC_SUBST(POFILES)
+    AC_SUBST(POSUB)
+  ])
+
+# AM_GLIB_GNU_GETTEXT
+# -------------------
+# Do checks necessary for use of gettext. If a suitable implementation 
+# of gettext is found in either in libintl or in the C library,
+# it will set INTLLIBS to the libraries needed for use of gettext
+# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+# on various variables needed by the Makefile.in.in installed by 
+# glib-gettextize.
+dnl
+glib_DEFUN([GLIB_GNU_GETTEXT],
+  [AC_REQUIRE([AC_PROG_CC])dnl
+   AC_REQUIRE([AC_HEADER_STDC])dnl
+   
+   GLIB_LC_MESSAGES
+   GLIB_WITH_NLS
+
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       AC_MSG_CHECKING(for catalogs to be installed)
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       AC_MSG_RESULT($LINGUAS)
+     fi
+
+     dnl Construct list of names of catalog files to be constructed.
+     if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+   dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+   dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+   dnl Try to locate is.
+   MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+   AC_SUBST(MKINSTALLDIRS)
+
+   dnl Generate list of files to be processed by xgettext which will
+   dnl be included in po/Makefile.
+   test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+  ])
+
+# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+# -------------------------------
+# Define VARIABLE to the location where catalog files will
+# be installed by po/Makefile.
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+glib_save_prefix="$prefix"
+glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
+if test "x$CATOBJEXT" = "x.mo" ; then
+  localedir=`eval echo "${libdir}/locale"`
+else
+  localedir=`eval echo "${datadir}/locale"`
+fi
+prefix="$glib_save_prefix"
+exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
+AC_DEFINE_UNQUOTED($1, "$localedir",
+  [Define the location where the catalogs will be installed])
+])
+
+dnl
+dnl Now the definitions that aclocal will find
+dnl
+ifdef(glib_configure_ac,[],[
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+])dnl
+
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+# 
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM.  Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+  m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 41 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+    1.[01234])
+	AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+    ;;
+    *)
+    ;;
+esac
+
+if test -n "$1"; then
+    AC_MSG_CHECKING([for intltool >= $1])
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+    [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    ]
+    AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	AC_MSG_ERROR([Your intltool is too old.  You need intltool $1 or later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+   AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+   AC_MSG_RESULT([$IT_PERL_VERSION])
+fi
+if test "x$2" != "xno-xml"; then
+   AC_MSG_CHECKING([for XML::Parser])
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       AC_MSG_RESULT([ok])
+   else
+       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([[]],
+                     [[extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr]])],
+    [DATADIRNAME=share],
+    [case $host in
+    *-*-solaris*)
+    dnl On Solaris, if bind_textdomain_codeset is in libc,
+    dnl GNU format message catalog is always supported,
+    dnl since both are added to the libc all together.
+    dnl Hence, we'd like to go with DATADIRNAME=share
+    dnl in this case.
+    AC_CHECK_FUNC(bind_textdomain_codeset,
+      [DATADIRNAME=share], [DATADIRNAME=lib])
+    ;;
+    *)
+    [DATADIRNAME=lib]
+    ;;
+    esac])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+  AC_CONFIG_COMMANDS([$1/stamp-it], [
+    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+       AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+    fi
+    rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+    >"$1/stamp-it.tmp"
+    [sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+    ]
+    [sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r $1/POTFILES
+	  }
+	 ' "$1/Makefile.in" >"$1/Makefile"]
+    rm -f "$1/Makefile.tmp"
+    mv "$1/stamp-it.tmp" "$1/stamp-it"
+  ])
+])dnl
+])
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
+
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -8626,6 +9276,39 @@ m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
 m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
 m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE([nls],
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT([$USE_NLS])
+  AC_SUBST([USE_NLS])
+])
+
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # serial 1 (pkg-config-0.24)
 # 
diff --git a/config.guess b/config.guess
index 40eaed4..d622a44 100755
--- a/config.guess
+++ b/config.guess
@@ -2,9 +2,9 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-05-11'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2011-05-11'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@ GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -792,13 +790,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -807,6 +804,9 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -943,7 +953,7 @@ EOF
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.h.in b/config.h.in
index 4b8c91a..2806380 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,11 +1,32 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* always defined to indicate that i18n is enabled */
+#undef ENABLE_NLS
+
+/* gettext package */
+#undef GETTEXT_PACKAGE
+
+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
+#undef HAVE_BIND_TEXTDOMAIN_CODESET
+
+/* Define to 1 if you have the `dcgettext' function. */
+#undef HAVE_DCGETTEXT
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
+/* Define if the GNU gettext() function is already present or preinstalled. */
+#undef HAVE_GETTEXT
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define if your <locale.h> file defines LC_MESSAGES. */
+#undef HAVE_LC_MESSAGES
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
diff --git a/config.sub b/config.sub
index 30fdca8..c894da4 100755
--- a/config.sub
+++ b/config.sub
@@ -2,9 +2,9 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-03-23'
+timestamp='2012-02-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-03-23'
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@ case $maybe_os in
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -247,17 +249,22 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +298,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -300,7 +307,7 @@ case $basic_machine in
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -315,8 +322,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -329,7 +335,10 @@ case $basic_machine in
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -352,11 +361,13 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -365,8 +376,10 @@ case $basic_machine in
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +413,7 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +421,11 @@ case $basic_machine in
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -711,7 +725,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -808,10 +821,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -1120,13 +1141,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1336,7 +1352,7 @@ case $os in
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1548,9 +1564,6 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
diff --git a/configure b/configure
index 589de1d..1133832 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for indicator-printers 0.1.
+# Generated by GNU Autoconf 2.68 for indicator-printers 0.1.1.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-printers'
 PACKAGE_TARNAME='indicator-printers'
-PACKAGE_VERSION='0.1'
-PACKAGE_STRING='indicator-printers 0.1'
+PACKAGE_VERSION='0.1.1'
+PACKAGE_STRING='indicator-printers 0.1.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -614,7 +614,7 @@ LTLIBOBJS
 LIBOBJS
 AM_CFLAGS
 DBUSSERVICEDIR
-INDICATORICONDIR
+INDICATORICONSDIR
 INDICATORDIR
 CUPS_CONFIG
 SERVICE_LIBS
@@ -624,6 +624,54 @@ APPLET_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+MKINSTALLDIRS
+POSUB
+POFILES
+PO_IN_DATADIR_FALSE
+PO_IN_DATADIR_TRUE
+INTLLIBS
+INSTOBJEXT
+GMOFILES
+CATOBJEXT
+CATALOGS
+MSGFMT_OPTS
+GETTEXT_PACKAGE
+DATADIRNAME
+ALL_LINGUAS
+INTLTOOL_PERL
+GMSGFMT
+MSGFMT
+MSGMERGE
+XGETTEXT
+INTLTOOL_POLICY_RULE
+INTLTOOL_SERVICE_RULE
+INTLTOOL_THEME_RULE
+INTLTOOL_SCHEMAS_RULE
+INTLTOOL_CAVES_RULE
+INTLTOOL_XML_NOMERGE_RULE
+INTLTOOL_XML_RULE
+INTLTOOL_KBD_RULE
+INTLTOOL_XAM_RULE
+INTLTOOL_UI_RULE
+INTLTOOL_SOUNDLIST_RULE
+INTLTOOL_SHEET_RULE
+INTLTOOL_SERVER_RULE
+INTLTOOL_PONG_RULE
+INTLTOOL_OAF_RULE
+INTLTOOL_PROP_RULE
+INTLTOOL_KEYS_RULE
+INTLTOOL_DIRECTORY_RULE
+INTLTOOL_DESKTOP_RULE
+intltool__v_merge_options_0
+intltool__v_merge_options_
+INTLTOOL_V_MERGE_OPTIONS
+INTLTOOL__v_MERGE_0
+INTLTOOL__v_MERGE_
+INTLTOOL_V_MERGE
+INTLTOOL_EXTRACT
+INTLTOOL_MERGE
+INTLTOOL_UPDATE
+USE_NLS
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
@@ -748,6 +796,8 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 enable_silent_rules
+enable_nls
+enable_localinstall
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1307,7 +1357,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-printers 0.1 to adapt to many kinds of systems.
+\`configure' configures indicator-printers 0.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1378,7 +1428,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-printers 0.1:";;
+     short | recursive ) echo "Configuration of indicator-printers 0.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1395,6 +1445,8 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
+  --disable-nls           do not use Native Language Support
+  --enable-localinstall   install all files locally (for distcheck)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1493,7 +1545,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-printers configure 0.1
+indicator-printers configure 0.1.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1858,7 +1910,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-printers $as_me 0.1, which was
+It was created by indicator-printers $as_me 0.1.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2675,7 +2727,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='indicator-printers'
- VERSION='0.1'
+ VERSION='0.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11458,9 +11510,1302 @@ fi
 AM_BACKSLASH='\'
 
 
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+  enableval=$enable_nls; USE_NLS=$enableval
+else
+  USE_NLS=yes
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
+
+
+
+
+case "$am__api_version" in
+    1.01234)
+	as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+    ;;
+    *)
+    ;;
+esac
+
+if test -n "0.35.0"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
+$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
+
+    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+	as_fn_error $? "Your intltool is too old.  You need intltool 0.35.0 or later." "$LINENO" 5
+fi
+
+# Extract the first word of "intltool-update", so it can be a program name with args.
+set dummy intltool-update; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $INTLTOOL_UPDATE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+if test -n "$INTLTOOL_UPDATE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
+$as_echo "$INTLTOOL_UPDATE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "intltool-merge", so it can be a program name with args.
+set dummy intltool-merge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $INTLTOOL_MERGE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+if test -n "$INTLTOOL_MERGE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+$as_echo "$INTLTOOL_MERGE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "intltool-extract", so it can be a program name with args.
+set dummy intltool-extract; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $INTLTOOL_EXTRACT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+if test -n "$INTLTOOL_EXTRACT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+$as_echo "$INTLTOOL_EXTRACT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+    as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+fi
+
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'
+
+
+
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+
+
+
+
+  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check the gettext tools to make sure they are GNU
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XGETTEXT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XGETTEXT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XGETTEXT=$ac_cv_path_XGETTEXT
+if test -n "$XGETTEXT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGMERGE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MSGMERGE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+MSGMERGE=$ac_cv_path_MSGMERGE
+if test -n "$MSGMERGE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+MSGFMT=$ac_cv_path_MSGFMT
+if test -n "$MSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GMSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+    as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5
+fi
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $INTLTOOL_PERL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+if test -n "$INTLTOOL_PERL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+$as_echo "$INTLTOOL_PERL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test -z "$INTLTOOL_PERL"; then
+   as_fn_error $? "perl not found" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+$as_echo_n "checking for perl >= 5.8.1... " >&6; }
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+   as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
+else
+   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+$as_echo "$IT_PERL_VERSION" >&6; }
+fi
+if test "x" != "xno-xml"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+$as_echo_n "checking for XML::Parser... " >&6; }
+   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+   else
+       as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5
+   fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+                       return _nl_msg_cat_cntr
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  DATADIRNAME=share
+else
+  case $host in
+    *-*-solaris*)
+                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+  DATADIRNAME=share
+else
+  DATADIRNAME=lib
+fi
+
+    ;;
+    *)
+    DATADIRNAME=lib
+    ;;
+    esac
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+
+
+
+
+
+GETTEXT_PACKAGE=indicator-printers
+
+
+cat >>confdefs.h <<_ACEOF
+#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE"
+_ACEOF
+
+
+   for ac_header in locale.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
+if test "x$ac_cv_header_locale_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LOCALE_H 1
+_ACEOF
+
+fi
+
+done
+
+    if test $ac_cv_header_locale_h = yes; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
+if ${am_cv_val_LC_MESSAGES+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <locale.h>
+int
+main ()
+{
+return LC_MESSAGES
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  am_cv_val_LC_MESSAGES=yes
+else
+  am_cv_val_LC_MESSAGES=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
+    if test $am_cv_val_LC_MESSAGES = yes; then
+
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+
+    fi
+  fi
+     USE_NLS=yes
+
+
+    gt_cv_have_gettext=no
+
+    CATOBJEXT=NONE
+    XGETTEXT=:
+    INTLLIBS=
+
+    ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = xyes; then :
+  gt_cv_func_dgettext_libintl="no"
+      libintl_extra_libs=""
+
+      #
+      # First check in libc
+      #
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
+$as_echo_n "checking for ngettext in libc... " >&6; }
+if ${gt_cv_func_ngettext_libc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libintl.h>
+
+int
+main ()
+{
+return !ngettext ("","", 1)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_ngettext_libc=yes
+else
+  gt_cv_func_ngettext_libc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
+$as_echo "$gt_cv_func_ngettext_libc" >&6; }
+
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
+$as_echo_n "checking for dgettext in libc... " >&6; }
+if ${gt_cv_func_dgettext_libc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <libintl.h>
+
+int
+main ()
+{
+return !dgettext ("","")
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  gt_cv_func_dgettext_libc=yes
+else
+  gt_cv_func_dgettext_libc=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
+      fi
+
+      if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+        for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+_ACEOF
+
+fi
+done
+
+      fi
+
+      #
+      # If we don't have everything we want, check in libintl
+      #
+      if test "$gt_cv_func_dgettext_libc" != "yes" \
+	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+         || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bindtextdomain ();
+int
+main ()
+{
+return bindtextdomain ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_bindtextdomain=yes
+else
+  ac_cv_lib_intl_bindtextdomain=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
+if ${ac_cv_lib_intl_ngettext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ngettext ();
+int
+main ()
+{
+return ngettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_ngettext=yes
+else
+  ac_cv_lib_intl_ngettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
+$as_echo_n "checking for dgettext in -lintl... " >&6; }
+if ${ac_cv_lib_intl_dgettext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dgettext ();
+int
+main ()
+{
+return dgettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_dgettext=yes
+else
+  ac_cv_lib_intl_dgettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+$as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
+  gt_cv_func_dgettext_libintl=yes
+fi
+
+fi
+
+fi
+
+
+	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
+$as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+$as_echo_n "checking for ngettext in -lintl... " >&6; }
+if ${ac_cv_lib_intl_ngettext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl -liconv $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char ngettext ();
+int
+main ()
+{
+return ngettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_ngettext=yes
+else
+  ac_cv_lib_intl_ngettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+$as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+$as_echo_n "checking for dcgettext in -lintl... " >&6; }
+if ${ac_cv_lib_intl_dcgettext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lintl -liconv $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dcgettext ();
+int
+main ()
+{
+return dcgettext ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_intl_dcgettext=yes
+else
+  ac_cv_lib_intl_dcgettext=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
+  gt_cv_func_dgettext_libintl=yes
+			libintl_extra_libs=-liconv
+else
+  :
+fi
+
+else
+  :
+fi
+
+        fi
+
+        #
+        # If we found libintl, then check in it for bind_textdomain_codeset();
+        # we'll prefer libc if neither have bind_textdomain_codeset(),
+        # and both have dgettext and ngettext
+        #
+        if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
+          for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+_ACEOF
+
+fi
+done
+
+          LIBS="$glib_save_LIBS"
+
+          if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+            gt_cv_func_dgettext_libc=no
+          else
+            if test "$gt_cv_func_dgettext_libc" = "yes" \
+		&& test "$gt_cv_func_ngettext_libc" = "yes"; then
+              gt_cv_func_dgettext_libintl=no
+            fi
+          fi
+        fi
+      fi
+
+      if test "$gt_cv_func_dgettext_libc" = "yes" \
+	|| test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        gt_cv_have_gettext=yes
+      fi
+
+      if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+        INTLLIBS="-lintl $libintl_extra_libs"
+      fi
+
+      if test "$gt_cv_have_gettext" = "yes"; then
+
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+	# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_MSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$MSGFMT" in
+  /*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+  ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != "no"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+	if test "$MSGFMT" != "no"; then
+          glib_save_LIBS="$LIBS"
+          LIBS="$LIBS $INTLLIBS"
+	  for ac_func in dcgettext
+do :
+  ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
+if test "x$ac_cv_func_dcgettext" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DCGETTEXT 1
+_ACEOF
+
+fi
+done
+
+	  MSGFMT_OPTS=
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
+$as_echo_n "checking if msgfmt accepts -c... " >&6; }
+	  cat >conftest.foo <<_ACEOF
+
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo@bar.xx>\n"
+"Language-Team: C <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
+  ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+echo "$as_me: failed input was:" >&5
+sed 's/^/| /' conftest.foo >&5
+fi
+
+	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+set dummy gmsgfmt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GMSGFMT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+if test -n "$GMSGFMT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+	  # Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XGETTEXT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case "$XGETTEXT" in
+  /*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
+	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  CATOBJEXT=.gmo
+             DATADIRNAME=share
+else
+  case $host in
+	    *-*-solaris*)
+	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
+  CATOBJEXT=.gmo
+               DATADIRNAME=share
+else
+  CATOBJEXT=.mo
+               DATADIRNAME=lib
+fi
+
+	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
+	    *)
+	    CATOBJEXT=.mo
+            DATADIRNAME=lib
+	    ;;
+	    esac
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+          LIBS="$glib_save_LIBS"
+	  INSTOBJEXT=.mo
+	else
+	  gt_cv_have_gettext=no
+	fi
+      fi
+
+fi
+
+
+
+    if test "$gt_cv_have_gettext" = "yes" ; then
+
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+    fi
+
+        if test "$XGETTEXT" != ":"; then
+                  if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+        : ;
+      else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+        XGETTEXT=":"
+      fi
+    fi
+
+    # We need to process the po/ directory.
+    POSUB=po
+
+    ac_config_commands="$ac_config_commands default-1"
+
+
+                for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+
+
+
+
+
+
+
+
+
+
+
+
+
+   if test "$gt_cv_have_gettext" = "yes"; then
+     if test "x$ALL_LINGUAS" = "x"; then
+       LINGUAS=
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+$as_echo_n "checking for catalogs to be installed... " >&6; }
+       NEW_LINGUAS=
+       for presentlang in $ALL_LINGUAS; do
+         useit=no
+         if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+           desiredlanguages="$LINGUAS"
+         else
+           desiredlanguages="$ALL_LINGUAS"
+         fi
+         for desiredlang in $desiredlanguages; do
+ 	   # Use the presentlang catalog if desiredlang is
+           #   a. equal to presentlang, or
+           #   b. a variant of presentlang (because in this case,
+           #      presentlang can be used as a fallback for messages
+           #      which are not translated in the desiredlang catalog).
+           case "$desiredlang" in
+             "$presentlang"*) useit=yes;;
+           esac
+         done
+         if test $useit = yes; then
+           NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+         fi
+       done
+       LINGUAS=$NEW_LINGUAS
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+$as_echo "$LINGUAS" >&6; }
+     fi
+
+          if test -n "$LINGUAS"; then
+       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+     fi
+   fi
+
+            MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+   fi
+
+
+         test -d po || mkdir po
+   if test "x$srcdir" != "x."; then
+     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+       posrcprefix="$srcdir/"
+     else
+       posrcprefix="../$srcdir/"
+     fi
+   else
+     posrcprefix="../"
+   fi
+   rm -f po/POTFILES
+   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+	< $srcdir/po/POTFILES.in > po/POTFILES
+
+
 ac_config_headers="$ac_config_headers config.h"
 
-ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile test/Makefile"
+ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile test/Makefile po/Makefile.in"
 
 
 
@@ -11857,12 +13202,35 @@ fi
 SERVICE_CFLAGS+=`$CUPS_CONFIG --cflags`
 SERVICE_LIBS+=`$CUPS_CONFIG --libs`
 
-INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
 
-DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
+with_localinstall="no"
+# Check whether --enable-localinstall was given.
+if test "${enable_localinstall+set}" = set; then :
+  enableval=$enable_localinstall; with_localinstall=$enableval
+else
+  with_localinstall=no
+fi
+
+
+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
+
 
 
+###########################
+# 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
 
 
 
@@ -11995,6 +13363,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
+  ac_config_commands="$ac_config_commands po/stamp-it"
+
+
+
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
@@ -12403,7 +13775,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-printers $as_me 0.1, which was
+This file was extended by indicator-printers $as_me 0.1.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12469,7 +13841,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-printers config.status 0.1
+indicator-printers config.status 0.1.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -12867,6 +14239,7 @@ fi
 
 
 
+
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -12877,11 +14250,14 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
     "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -14202,6 +15578,29 @@ fi
   chmod +x "$ofile"
 
  ;;
+    "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac ;;
+    "po/stamp-it":C)
+    if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
+       as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+    fi
+    rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+    >"po/stamp-it.tmp"
+    sed '/^#/d
+	 s/^[[].*] *//
+	 /^[ 	]*$/d
+	'"s|^|	$ac_top_srcdir/|" \
+      "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
+
+    sed '/^POTFILES =/,/[^\\]$/ {
+		/^POTFILES =/!d
+		r po/POTFILES
+	  }
+	 ' "po/Makefile.in" >"po/Makefile"
+    rm -f "po/Makefile.tmp"
+    mv "po/stamp-it.tmp" "po/stamp-it"
+   ;;
 
   esac
 done # for ac_tag
diff --git a/configure.ac b/configure.ac
index d19933a..a5b0c54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT(indicator-printers, 0.1)
+AC_INIT(indicator-printers, 0.1.1)
 
 AC_PREREQ(2.53)
 AM_INIT_AUTOMAKE([])
@@ -10,12 +10,19 @@ AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 AM_SILENT_RULES([yes])
 
+IT_PROG_INTLTOOL([0.35.0])
+GETTEXT_PACKAGE=indicator-printers
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
+AM_GLIB_GNU_GETTEXT
+
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_FILES([
     Makefile
     src/Makefile
     data/Makefile
     test/Makefile
+    po/Makefile.in
 ])
 
 PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= 3.0
@@ -33,15 +40,35 @@ AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([could not find cups.h]))
 SERVICE_CFLAGS+=`$CUPS_CONFIG --cflags`
 SERVICE_LIBS+=`$CUPS_CONFIG --libs`
 
-INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
 
-DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
+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(INDICATORICONDIR)
+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)
 
+
 AC_SUBST(AM_CFLAGS, "-Wall")
 
 AC_OUTPUT
diff --git a/data/Makefile.in b/data/Makefile.in
index 958895c..be9d926 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -40,7 +40,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -83,6 +83,7 @@ am__installdirs = "$(DESTDIR)$(dbus_servicesdir)"
 DATA = $(dbus_services_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -93,6 +94,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -100,6 +103,7 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
 DBUSSERVICEDIR = @DBUSSERVICEDIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -112,14 +116,27 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 INDICATORDIR = @INDICATORDIR@
-INDICATORICONDIR = @INDICATORICONDIR@
+INDICATORICONSDIR = @INDICATORICONSDIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -131,6 +148,10 @@ LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -148,6 +169,10 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
 SED = @SED@
 SERVICE_CFLAGS = @SERVICE_CFLAGS@
@@ -155,7 +180,9 @@ SERVICE_LIBS = @SERVICE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -189,6 +216,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
diff --git a/mkinstalldirs b/mkinstalldirs
new file mode 100755
index 0000000..4191a45
--- /dev/null
+++ b/mkinstalldirs
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+
+scriptversion=2009-04-28.21; # UTC
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+IFS=" ""	$nl"
+errstatus=0
+dirmode=
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
+
+# process command line arguments
+while test $# -gt 0 ; do
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage"
+      exit $?
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit $?
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+  0) exit 0 ;;
+esac
+
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
+case $dirmode in
+  '')
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
+    fi
+    ;;
+esac
+
+for file
+do
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
+  shift
+  IFS=$oIFS
+
+  for d
+  do
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
+
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
+
+      mkdir "$pathcomp" || lasterr=$?
+
+      if test ! -d "$pathcomp"; then
+	errstatus=$lasterr
+      else
+	if test ! -z "$dirmode"; then
+	  echo "chmod $dirmode $pathcomp"
+	  lasterr=
+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+	  if test ! -z "$lasterr"; then
+	    errstatus=$lasterr
+	  fi
+	fi
+      fi
+    fi
+
+    pathcomp=$pathcomp/
+  done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
new file mode 100644
index 0000000..06a8cfe
--- /dev/null
+++ b/po/Makefile.in.in
@@ -0,0 +1,222 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
+#
+# This file may be copied and used freely without restrictions.  It may
+# be used in projects which are not available under a GNU Public License,
+# but which still want to provide support for the GNU gettext functionality.
+#
+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <jacob@ximian.com> to install
+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p@.
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT   = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS
+
+POTFILES = \
+# This comment gets stripped out
+
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
+
+.po.pox:
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+
+.po.mo:
+	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
+
+.po.gmo:
+	$(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+
+.po.cat:
+	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	  && rm -f $@ && gencat $@ $*.msg
+
+
+all: all-@USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+	$(GENPOT)
+
+install: install-data
+install-data: install-data-@USE_NLS@
+install-data-no: all
+install-data-yes: all
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  $(mkdir_p) $$dir; \
+	  if test -r $$lang.gmo; then \
+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+	    echo "installing $(srcdir)/$$lang.gmo as" \
+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
+	  fi; \
+	  if test -r $$lang.gmo.m; then \
+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	  else \
+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+	    else \
+	      true; \
+	    fi; \
+	  fi; \
+	done
+
+# Empty stubs to satisfy archaic automake needs
+dvi info ctags tags CTAGS TAGS ID:
+
+# Define this as empty until I found a useful application.
+install-exec installcheck:
+
+uninstall:
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	done
+
+check: all $(GETTEXT_PACKAGE).pot
+	rm -f missing notexist
+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+	if [ -r missing -o -r notexist ]; then \
+	  exit 1; \
+	fi
+
+mostlyclean:
+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+	rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES stamp-it
+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f Makefile.in.in
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	extra_dists="$(EXTRA_DISTFILES)"; \
+	for file in $$extra_dists; do \
+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+	done; \
+	for file in $$dists; do \
+	  test -f $$file || file="$(srcdir)/$$file"; \
+	  ln $$file $(distdir) 2> /dev/null \
+	    || cp -p $$file $(distdir); \
+	done
+
+update-po: Makefile
+	$(MAKE) $(GETTEXT_PACKAGE).pot
+	tmpdir=`pwd`; \
+	linguas="$(USE_LINGUAS)"; \
+	for lang in $$linguas; do \
+	  echo "$$lang:"; \
+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+	  if $$result; then \
+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	      rm -f $$tmpdir/$$lang.new.po; \
+            else \
+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	        :; \
+	      else \
+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	        rm -f $$tmpdir/$$lang.new.po; \
+	        exit 1; \
+	      fi; \
+	    fi; \
+	  else \
+	    echo "msgmerge for $$lang.gmo failed!"; \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  fi; \
+	done
+
+Makefile POTFILES: stamp-it
+	@if test ! -f $@; then \
+	  rm -f stamp-it; \
+	  $(MAKE) stamp-it; \
+	fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+	       $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..f865141
--- /dev/null
+++ b/po/POTFILES.in
@@ -0,0 +1,6 @@
+[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
diff --git a/src/Makefile.am b/src/Makefile.am
index bedc091..6e10cb9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,7 @@ cups_notifier_sources = \
 	cups-notifier.c \
 	cups-notifier.h
 
-$(cups_notifier_sources): $(top_srcdir)/src/org.cups.cupsd.Notifier.xml
+$(cups_notifier_sources): org.cups.cupsd.Notifier.xml
 	gdbus-codegen \
 	    --interface-prefix org.cups.cupsd \
 	    --c-namespace Cups \
@@ -34,13 +34,15 @@ indicator_printers_service_SOURCES = \
 	indicator-printer-state-notifier.h \
 	spawn-printer-settings.c \
 	spawn-printer-settings.h \
-	dbus-names.h \
-	$(cups_notifier_sources)
+	dbus-names.h
+
+nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources)
 
 indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS)
 indicator_printers_service_LDADD = $(SERVICE_LIBS)
 
 
 BUILT_SOURCES = $(cups_notifier_sources)
+CLEANFILES= $(BUILT_SOURCES)
 EXTRA_DIST = org.cups.cupsd.Notifier.xml
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 03c80ac..06e00ad 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -42,7 +42,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -90,14 +90,15 @@ libprintersmenu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_CFLAGS) $(CFLAGS) $(libprintersmenu_la_LDFLAGS) \
 	$(LDFLAGS) -o $@
 PROGRAMS = $(libexec_PROGRAMS)
-am__objects_1 = indicator_printers_service-cups-notifier.$(OBJEXT)
 am_indicator_printers_service_OBJECTS = indicator_printers_service-indicator-printers-service.$(OBJEXT) \
 	indicator_printers_service-indicator-printers-menu.$(OBJEXT) \
 	indicator_printers_service-indicator-printer-state-notifier.$(OBJEXT) \
-	indicator_printers_service-spawn-printer-settings.$(OBJEXT) \
-	$(am__objects_1)
+	indicator_printers_service-spawn-printer-settings.$(OBJEXT)
+am__objects_1 = indicator_printers_service-cups-notifier.$(OBJEXT)
+nodist_indicator_printers_service_OBJECTS = $(am__objects_1)
 indicator_printers_service_OBJECTS =  \
-	$(am_indicator_printers_service_OBJECTS)
+	$(am_indicator_printers_service_OBJECTS) \
+	$(nodist_indicator_printers_service_OBJECTS)
 indicator_printers_service_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -126,13 +127,15 @@ AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libprintersmenu_la_SOURCES) \
-	$(indicator_printers_service_SOURCES)
+	$(indicator_printers_service_SOURCES) \
+	$(nodist_indicator_printers_service_SOURCES)
 DIST_SOURCES = $(libprintersmenu_la_SOURCES) \
 	$(indicator_printers_service_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -143,6 +146,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -150,6 +155,7 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
 DBUSSERVICEDIR = @DBUSSERVICEDIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -162,14 +168,27 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 INDICATORDIR = @INDICATORDIR@
-INDICATORICONDIR = @INDICATORICONDIR@
+INDICATORICONSDIR = @INDICATORICONSDIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -181,6 +200,10 @@ LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -198,6 +221,10 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
 SED = @SED@
 SERVICE_CFLAGS = @SERVICE_CFLAGS@
@@ -205,7 +232,9 @@ SERVICE_LIBS = @SERVICE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -239,6 +268,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -282,12 +313,13 @@ indicator_printers_service_SOURCES = \
 	indicator-printer-state-notifier.h \
 	spawn-printer-settings.c \
 	spawn-printer-settings.h \
-	dbus-names.h \
-	$(cups_notifier_sources)
+	dbus-names.h
 
+nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources)
 indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS)
 indicator_printers_service_LDADD = $(SERVICE_LIBS)
 BUILT_SOURCES = $(cups_notifier_sources)
+CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = org.cups.cupsd.Notifier.xml
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -642,6 +674,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -742,7 +775,7 @@ uninstall-am: uninstall-libexecPROGRAMS \
 	uninstall-libexecPROGRAMS uninstall-printersmenulibLTLIBRARIES
 
 
-$(cups_notifier_sources): $(top_srcdir)/src/org.cups.cupsd.Notifier.xml
+$(cups_notifier_sources): org.cups.cupsd.Notifier.xml
 	gdbus-codegen \
 	    --interface-prefix org.cups.cupsd \
 	    --c-namespace Cups \
diff --git a/src/cups-notifier.c b/src/cups-notifier.c
deleted file mode 100644
index c28a327..0000000
--- a/src/cups-notifier.c
+++ /dev/null
@@ -1,3531 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.31.16. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "cups-notifier.h"
-
-#ifdef G_OS_UNIX
-#  include <gio/gunixfdlist.h>
-#endif
-
-typedef struct
-{
-  GDBusArgInfo parent_struct;
-  gboolean use_gvariant;
-} _ExtendedGDBusArgInfo;
-
-typedef struct
-{
-  GDBusMethodInfo parent_struct;
-  const gchar *signal_name;
-  gboolean pass_fdlist;
-} _ExtendedGDBusMethodInfo;
-
-typedef struct
-{
-  GDBusSignalInfo parent_struct;
-  const gchar *signal_name;
-} _ExtendedGDBusSignalInfo;
-
-typedef struct
-{
-  GDBusPropertyInfo parent_struct;
-  const gchar *hyphen_name;
-  gboolean use_gvariant;
-} _ExtendedGDBusPropertyInfo;
-
-typedef struct
-{
-  GDBusInterfaceInfo parent_struct;
-  const gchar *hyphen_name;
-} _ExtendedGDBusInterfaceInfo;
-
-typedef struct
-{
-  const _ExtendedGDBusPropertyInfo *info;
-  guint prop_id;
-  GValue orig_value; /* the value before the change */
-} ChangedProperty;
-
-static void
-_changed_property_free (ChangedProperty *data)
-{
-  g_value_unset (&data->orig_value);
-  g_free (data);
-}
-
-static gboolean
-_g_strv_equal0 (gchar **a, gchar **b)
-{
-  gboolean ret = FALSE;
-  guint n;
-  if (a == NULL && b == NULL)
-    {
-      ret = TRUE;
-      goto out;
-    }
-  if (a == NULL || b == NULL)
-    goto out;
-  if (g_strv_length (a) != g_strv_length (b))
-    goto out;
-  for (n = 0; a[n] != NULL; n++)
-    if (g_strcmp0 (a[n], b[n]) != 0)
-      goto out;
-  ret = TRUE;
-out:
-  return ret;
-}
-
-static gboolean
-_g_variant_equal0 (GVariant *a, GVariant *b)
-{
-  gboolean ret = FALSE;
-  if (a == NULL && b == NULL)
-    {
-      ret = TRUE;
-      goto out;
-    }
-  if (a == NULL || b == NULL)
-    goto out;
-  ret = g_variant_equal (a, b);
-out:
-  return ret;
-}
-
-G_GNUC_UNUSED static gboolean
-_g_value_equal (const GValue *a, const GValue *b)
-{
-  gboolean ret = FALSE;
-  g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));
-  switch (G_VALUE_TYPE (a))
-    {
-      case G_TYPE_BOOLEAN:
-        ret = (g_value_get_boolean (a) == g_value_get_boolean (b));
-        break;
-      case G_TYPE_UCHAR:
-        ret = (g_value_get_uchar (a) == g_value_get_uchar (b));
-        break;
-      case G_TYPE_INT:
-        ret = (g_value_get_int (a) == g_value_get_int (b));
-        break;
-      case G_TYPE_UINT:
-        ret = (g_value_get_uint (a) == g_value_get_uint (b));
-        break;
-      case G_TYPE_INT64:
-        ret = (g_value_get_int64 (a) == g_value_get_int64 (b));
-        break;
-      case G_TYPE_UINT64:
-        ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));
-        break;
-      case G_TYPE_DOUBLE:
-        ret = (g_value_get_double (a) == g_value_get_double (b));
-        break;
-      case G_TYPE_STRING:
-        ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);
-        break;
-      case G_TYPE_VARIANT:
-        ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));
-        break;
-      default:
-        if (G_VALUE_TYPE (a) == G_TYPE_STRV)
-          ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));
-        else
-          g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));
-        break;
-    }
-  return ret;
-}
-
-/* ------------------------------------------------------------------------
- * Code for interface org.cups.cupsd.Notifier
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:CupsNotifier
- * @title: CupsNotifier
- * @short_description: Generated C code for the org.cups.cupsd.Notifier D-Bus interface
- *
- * This section contains code for working with the <link linkend="gdbus-interface-org-cups-cupsd-Notifier.top_of_page">org.cups.cupsd.Notifier</link> D-Bus interface in C.
- */
-
-/* ---- Introspection data for org.cups.cupsd.Notifier ---- */
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_server_started_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_server_started_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_server_started_ARG_text,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_server_started =
-{
-  {
-    -1,
-    "ServerStarted",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_server_started_ARG_pointers,
-    NULL
-  },
-  "server-started"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_server_restarted_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_server_restarted_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_server_restarted_ARG_text,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_server_restarted =
-{
-  {
-    -1,
-    "ServerRestarted",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_server_restarted_ARG_pointers,
-    NULL
-  },
-  "server-restarted"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_server_stopped_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_server_stopped_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_server_stopped_ARG_text,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_server_stopped =
-{
-  {
-    -1,
-    "ServerStopped",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_server_stopped_ARG_pointers,
-    NULL
-  },
-  "server-stopped"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_server_audit_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_server_audit_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_server_audit_ARG_text,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_server_audit =
-{
-  {
-    -1,
-    "ServerAudit",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_server_audit_ARG_pointers,
-    NULL
-  },
-  "server-audit"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_added_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_added_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_added_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_added_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_added_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_added_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_printer_added_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_printer_added_ARG_text,
-  &_cups_notifier_signal_info_printer_added_ARG_printer_uri,
-  &_cups_notifier_signal_info_printer_added_ARG_printer_name,
-  &_cups_notifier_signal_info_printer_added_ARG_printer_state,
-  &_cups_notifier_signal_info_printer_added_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_printer_added_ARG_printer_is_accepting_jobs,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_printer_added =
-{
-  {
-    -1,
-    "PrinterAdded",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_printer_added_ARG_pointers,
-    NULL
-  },
-  "printer-added"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_deleted_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_deleted_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_deleted_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_deleted_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_deleted_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_deleted_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_printer_deleted_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_printer_deleted_ARG_text,
-  &_cups_notifier_signal_info_printer_deleted_ARG_printer_uri,
-  &_cups_notifier_signal_info_printer_deleted_ARG_printer_name,
-  &_cups_notifier_signal_info_printer_deleted_ARG_printer_state,
-  &_cups_notifier_signal_info_printer_deleted_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_printer_deleted_ARG_printer_is_accepting_jobs,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_printer_deleted =
-{
-  {
-    -1,
-    "PrinterDeleted",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_printer_deleted_ARG_pointers,
-    NULL
-  },
-  "printer-deleted"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_modified_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_modified_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_modified_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_modified_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_modified_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_modified_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_printer_modified_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_printer_modified_ARG_text,
-  &_cups_notifier_signal_info_printer_modified_ARG_printer_uri,
-  &_cups_notifier_signal_info_printer_modified_ARG_printer_name,
-  &_cups_notifier_signal_info_printer_modified_ARG_printer_state,
-  &_cups_notifier_signal_info_printer_modified_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_printer_modified_ARG_printer_is_accepting_jobs,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_printer_modified =
-{
-  {
-    -1,
-    "PrinterModified",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_printer_modified_ARG_pointers,
-    NULL
-  },
-  "printer-modified"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_restarted_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_restarted_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_restarted_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_restarted_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_restarted_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_restarted_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_printer_restarted_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_printer_restarted_ARG_text,
-  &_cups_notifier_signal_info_printer_restarted_ARG_printer_uri,
-  &_cups_notifier_signal_info_printer_restarted_ARG_printer_name,
-  &_cups_notifier_signal_info_printer_restarted_ARG_printer_state,
-  &_cups_notifier_signal_info_printer_restarted_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_printer_restarted_ARG_printer_is_accepting_jobs,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_printer_restarted =
-{
-  {
-    -1,
-    "PrinterRestarted",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_printer_restarted_ARG_pointers,
-    NULL
-  },
-  "printer-restarted"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_stopped_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_stopped_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_stopped_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_stopped_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_stopped_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_stopped_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_printer_stopped_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_printer_stopped_ARG_text,
-  &_cups_notifier_signal_info_printer_stopped_ARG_printer_uri,
-  &_cups_notifier_signal_info_printer_stopped_ARG_printer_name,
-  &_cups_notifier_signal_info_printer_stopped_ARG_printer_state,
-  &_cups_notifier_signal_info_printer_stopped_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_printer_stopped_ARG_printer_is_accepting_jobs,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_printer_stopped =
-{
-  {
-    -1,
-    "PrinterStopped",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_printer_stopped_ARG_pointers,
-    NULL
-  },
-  "printer-stopped"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_shutdown_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_shutdown_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_shutdown_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_shutdown_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_shutdown_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_shutdown_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_printer_shutdown_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_printer_shutdown_ARG_text,
-  &_cups_notifier_signal_info_printer_shutdown_ARG_printer_uri,
-  &_cups_notifier_signal_info_printer_shutdown_ARG_printer_name,
-  &_cups_notifier_signal_info_printer_shutdown_ARG_printer_state,
-  &_cups_notifier_signal_info_printer_shutdown_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_printer_shutdown_ARG_printer_is_accepting_jobs,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_printer_shutdown =
-{
-  {
-    -1,
-    "PrinterShutdown",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_printer_shutdown_ARG_pointers,
-    NULL
-  },
-  "printer-shutdown"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_state_changed_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_state_changed_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_state_changed_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_state_changed_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_state_changed_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_state_changed_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_printer_state_changed_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_printer_state_changed_ARG_text,
-  &_cups_notifier_signal_info_printer_state_changed_ARG_printer_uri,
-  &_cups_notifier_signal_info_printer_state_changed_ARG_printer_name,
-  &_cups_notifier_signal_info_printer_state_changed_ARG_printer_state,
-  &_cups_notifier_signal_info_printer_state_changed_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_printer_state_changed_ARG_printer_is_accepting_jobs,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_printer_state_changed =
-{
-  {
-    -1,
-    "PrinterStateChanged",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_printer_state_changed_ARG_pointers,
-    NULL
-  },
-  "printer-state-changed"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_finishings_changed_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_finishings_changed_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_finishings_changed_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_finishings_changed_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_finishings_changed_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_finishings_changed_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_printer_finishings_changed_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_printer_finishings_changed_ARG_text,
-  &_cups_notifier_signal_info_printer_finishings_changed_ARG_printer_uri,
-  &_cups_notifier_signal_info_printer_finishings_changed_ARG_printer_name,
-  &_cups_notifier_signal_info_printer_finishings_changed_ARG_printer_state,
-  &_cups_notifier_signal_info_printer_finishings_changed_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_printer_finishings_changed_ARG_printer_is_accepting_jobs,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_printer_finishings_changed =
-{
-  {
-    -1,
-    "PrinterFinishingsChanged",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_printer_finishings_changed_ARG_pointers,
-    NULL
-  },
-  "printer-finishings-changed"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_media_changed_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_media_changed_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_media_changed_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_media_changed_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_media_changed_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_printer_media_changed_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_printer_media_changed_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_printer_media_changed_ARG_text,
-  &_cups_notifier_signal_info_printer_media_changed_ARG_printer_uri,
-  &_cups_notifier_signal_info_printer_media_changed_ARG_printer_name,
-  &_cups_notifier_signal_info_printer_media_changed_ARG_printer_state,
-  &_cups_notifier_signal_info_printer_media_changed_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_printer_media_changed_ARG_printer_is_accepting_jobs,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_printer_media_changed =
-{
-  {
-    -1,
-    "PrinterMediaChanged",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_printer_media_changed_ARG_pointers,
-    NULL
-  },
-  "printer-media-changed"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_job_id =
-{
-  {
-    -1,
-    "job_id",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_job_state =
-{
-  {
-    -1,
-    "job_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_job_state_reasons =
-{
-  {
-    -1,
-    "job_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_job_name =
-{
-  {
-    -1,
-    "job_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_created_ARG_job_impressions_completed =
-{
-  {
-    -1,
-    "job_impressions_completed",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_job_created_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_job_created_ARG_text,
-  &_cups_notifier_signal_info_job_created_ARG_printer_uri,
-  &_cups_notifier_signal_info_job_created_ARG_printer_name,
-  &_cups_notifier_signal_info_job_created_ARG_printer_state,
-  &_cups_notifier_signal_info_job_created_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_job_created_ARG_printer_is_accepting_jobs,
-  &_cups_notifier_signal_info_job_created_ARG_job_id,
-  &_cups_notifier_signal_info_job_created_ARG_job_state,
-  &_cups_notifier_signal_info_job_created_ARG_job_state_reasons,
-  &_cups_notifier_signal_info_job_created_ARG_job_name,
-  &_cups_notifier_signal_info_job_created_ARG_job_impressions_completed,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_job_created =
-{
-  {
-    -1,
-    "JobCreated",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_job_created_ARG_pointers,
-    NULL
-  },
-  "job-created"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_job_id =
-{
-  {
-    -1,
-    "job_id",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_job_state =
-{
-  {
-    -1,
-    "job_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_job_state_reasons =
-{
-  {
-    -1,
-    "job_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_job_name =
-{
-  {
-    -1,
-    "job_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_completed_ARG_job_impressions_completed =
-{
-  {
-    -1,
-    "job_impressions_completed",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_job_completed_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_job_completed_ARG_text,
-  &_cups_notifier_signal_info_job_completed_ARG_printer_uri,
-  &_cups_notifier_signal_info_job_completed_ARG_printer_name,
-  &_cups_notifier_signal_info_job_completed_ARG_printer_state,
-  &_cups_notifier_signal_info_job_completed_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_job_completed_ARG_printer_is_accepting_jobs,
-  &_cups_notifier_signal_info_job_completed_ARG_job_id,
-  &_cups_notifier_signal_info_job_completed_ARG_job_state,
-  &_cups_notifier_signal_info_job_completed_ARG_job_state_reasons,
-  &_cups_notifier_signal_info_job_completed_ARG_job_name,
-  &_cups_notifier_signal_info_job_completed_ARG_job_impressions_completed,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_job_completed =
-{
-  {
-    -1,
-    "JobCompleted",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_job_completed_ARG_pointers,
-    NULL
-  },
-  "job-completed"
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_text =
-{
-  {
-    -1,
-    "text",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_printer_uri =
-{
-  {
-    -1,
-    "printer_uri",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_printer_name =
-{
-  {
-    -1,
-    "printer_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_printer_state =
-{
-  {
-    -1,
-    "printer_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_printer_state_reasons =
-{
-  {
-    -1,
-    "printer_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_printer_is_accepting_jobs =
-{
-  {
-    -1,
-    "printer_is_accepting_jobs",
-    "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_job_id =
-{
-  {
-    -1,
-    "job_id",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_job_state =
-{
-  {
-    -1,
-    "job_state",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_job_state_reasons =
-{
-  {
-    -1,
-    "job_state_reasons",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_job_name =
-{
-  {
-    -1,
-    "job_name",
-    "s",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _cups_notifier_signal_info_job_state_ARG_job_impressions_completed =
-{
-  {
-    -1,
-    "job_impressions_completed",
-    "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _cups_notifier_signal_info_job_state_ARG_pointers[] =
-{
-  &_cups_notifier_signal_info_job_state_ARG_text,
-  &_cups_notifier_signal_info_job_state_ARG_printer_uri,
-  &_cups_notifier_signal_info_job_state_ARG_printer_name,
-  &_cups_notifier_signal_info_job_state_ARG_printer_state,
-  &_cups_notifier_signal_info_job_state_ARG_printer_state_reasons,
-  &_cups_notifier_signal_info_job_state_ARG_printer_is_accepting_jobs,
-  &_cups_notifier_signal_info_job_state_ARG_job_id,
-  &_cups_notifier_signal_info_job_state_ARG_job_state,
-  &_cups_notifier_signal_info_job_state_ARG_job_state_reasons,
-  &_cups_notifier_signal_info_job_state_ARG_job_name,
-  &_cups_notifier_signal_info_job_state_ARG_job_impressions_completed,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _cups_notifier_signal_info_job_state =
-{
-  {
-    -1,
-    "JobState",
-    (GDBusArgInfo **) &_cups_notifier_signal_info_job_state_ARG_pointers,
-    NULL
-  },
-  "job-state"
-};
-
-static const _ExtendedGDBusSignalInfo * const _cups_notifier_signal_info_pointers[] =
-{
-  &_cups_notifier_signal_info_server_started,
-  &_cups_notifier_signal_info_server_restarted,
-  &_cups_notifier_signal_info_server_stopped,
-  &_cups_notifier_signal_info_server_audit,
-  &_cups_notifier_signal_info_printer_added,
-  &_cups_notifier_signal_info_printer_deleted,
-  &_cups_notifier_signal_info_printer_modified,
-  &_cups_notifier_signal_info_printer_restarted,
-  &_cups_notifier_signal_info_printer_stopped,
-  &_cups_notifier_signal_info_printer_shutdown,
-  &_cups_notifier_signal_info_printer_state_changed,
-  &_cups_notifier_signal_info_printer_finishings_changed,
-  &_cups_notifier_signal_info_printer_media_changed,
-  &_cups_notifier_signal_info_job_created,
-  &_cups_notifier_signal_info_job_completed,
-  &_cups_notifier_signal_info_job_state,
-  NULL
-};
-
-static const _ExtendedGDBusInterfaceInfo _cups_notifier_interface_info =
-{
-  {
-    -1,
-    "org.cups.cupsd.Notifier",
-    NULL,
-    (GDBusSignalInfo **) &_cups_notifier_signal_info_pointers,
-    NULL,
-    NULL
-  },
-  "notifier",
-};
-
-
-/**
- * cups_notifier_interface_info:
- *
- * Gets a machine-readable description of the <link linkend="gdbus-interface-org-cups-cupsd-Notifier.top_of_page">org.cups.cupsd.Notifier</link> D-Bus interface.
- *
- * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
- */
-GDBusInterfaceInfo *
-cups_notifier_interface_info (void)
-{
-  return (GDBusInterfaceInfo *) &_cups_notifier_interface_info;
-}
-
-/**
- * cups_notifier_override_properties:
- * @klass: The class structure for a #GObject<!-- -->-derived class.
- * @property_id_begin: The property id to assign to the first overridden property.
- *
- * Overrides all #GObject properties in the #CupsNotifier interface for a concrete class.
- * The properties are overridden in the order they are defined.
- *
- * Returns: The last property id.
- */
-guint
-cups_notifier_override_properties (GObjectClass *klass, guint property_id_begin)
-{
-  return property_id_begin - 1;
-}
-
-
-
-/**
- * CupsNotifier:
- *
- * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-cups-cupsd-Notifier.top_of_page">org.cups.cupsd.Notifier</link>.
- */
-
-/**
- * CupsNotifierIface:
- * @parent_iface: The parent interface.
- * @job_completed: Handler for the #CupsNotifier::job-completed signal.
- * @job_created: Handler for the #CupsNotifier::job-created signal.
- * @job_state: Handler for the #CupsNotifier::job-state signal.
- * @printer_added: Handler for the #CupsNotifier::printer-added signal.
- * @printer_deleted: Handler for the #CupsNotifier::printer-deleted signal.
- * @printer_finishings_changed: Handler for the #CupsNotifier::printer-finishings-changed signal.
- * @printer_media_changed: Handler for the #CupsNotifier::printer-media-changed signal.
- * @printer_modified: Handler for the #CupsNotifier::printer-modified signal.
- * @printer_restarted: Handler for the #CupsNotifier::printer-restarted signal.
- * @printer_shutdown: Handler for the #CupsNotifier::printer-shutdown signal.
- * @printer_state_changed: Handler for the #CupsNotifier::printer-state-changed signal.
- * @printer_stopped: Handler for the #CupsNotifier::printer-stopped signal.
- * @server_audit: Handler for the #CupsNotifier::server-audit signal.
- * @server_restarted: Handler for the #CupsNotifier::server-restarted signal.
- * @server_started: Handler for the #CupsNotifier::server-started signal.
- * @server_stopped: Handler for the #CupsNotifier::server-stopped signal.
- *
- * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-cups-cupsd-Notifier.top_of_page">org.cups.cupsd.Notifier</link>.
- */
-
-static void
-cups_notifier_default_init (CupsNotifierIface *iface)
-{
-  /* GObject signals for received D-Bus signals: */
-  /**
-   * CupsNotifier::server-started:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.ServerStarted">"ServerStarted"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("server-started",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, server_started),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    1, G_TYPE_STRING);
-
-  /**
-   * CupsNotifier::server-restarted:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.ServerRestarted">"ServerRestarted"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("server-restarted",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, server_restarted),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    1, G_TYPE_STRING);
-
-  /**
-   * CupsNotifier::server-stopped:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.ServerStopped">"ServerStopped"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("server-stopped",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, server_stopped),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    1, G_TYPE_STRING);
-
-  /**
-   * CupsNotifier::server-audit:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.ServerAudit">"ServerAudit"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("server-audit",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, server_audit),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    1, G_TYPE_STRING);
-
-  /**
-   * CupsNotifier::printer-added:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterAdded">"PrinterAdded"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("printer-added",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, printer_added),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-  /**
-   * CupsNotifier::printer-deleted:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterDeleted">"PrinterDeleted"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("printer-deleted",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, printer_deleted),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-  /**
-   * CupsNotifier::printer-modified:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterModified">"PrinterModified"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("printer-modified",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, printer_modified),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-  /**
-   * CupsNotifier::printer-restarted:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterRestarted">"PrinterRestarted"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("printer-restarted",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, printer_restarted),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-  /**
-   * CupsNotifier::printer-stopped:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterStopped">"PrinterStopped"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("printer-stopped",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, printer_stopped),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-  /**
-   * CupsNotifier::printer-shutdown:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterShutdown">"PrinterShutdown"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("printer-shutdown",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, printer_shutdown),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-  /**
-   * CupsNotifier::printer-state-changed:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterStateChanged">"PrinterStateChanged"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("printer-state-changed",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, printer_state_changed),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-  /**
-   * CupsNotifier::printer-finishings-changed:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterFinishingsChanged">"PrinterFinishingsChanged"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("printer-finishings-changed",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, printer_finishings_changed),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-  /**
-   * CupsNotifier::printer-media-changed:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterMediaChanged">"PrinterMediaChanged"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("printer-media-changed",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, printer_media_changed),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    6, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN);
-
-  /**
-   * CupsNotifier::job-created:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   * @arg_job_id: Argument.
-   * @arg_job_state: Argument.
-   * @arg_job_state_reasons: Argument.
-   * @arg_job_name: Argument.
-   * @arg_job_impressions_completed: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.JobCreated">"JobCreated"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("job-created",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, job_created),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    11, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
-
-  /**
-   * CupsNotifier::job-completed:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   * @arg_job_id: Argument.
-   * @arg_job_state: Argument.
-   * @arg_job_state_reasons: Argument.
-   * @arg_job_name: Argument.
-   * @arg_job_impressions_completed: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.JobCompleted">"JobCompleted"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("job-completed",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, job_completed),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    11, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
-
-  /**
-   * CupsNotifier::job-state:
-   * @object: A #CupsNotifier.
-   * @arg_text: Argument.
-   * @arg_printer_uri: Argument.
-   * @arg_printer_name: Argument.
-   * @arg_printer_state: Argument.
-   * @arg_printer_state_reasons: Argument.
-   * @arg_printer_is_accepting_jobs: Argument.
-   * @arg_job_id: Argument.
-   * @arg_job_state: Argument.
-   * @arg_job_state_reasons: Argument.
-   * @arg_job_name: Argument.
-   * @arg_job_impressions_completed: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-cups-cupsd-Notifier.JobState">"JobState"</link> is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("job-state",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (CupsNotifierIface, job_state),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    11, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
-
-}
-
-typedef CupsNotifierIface CupsNotifierInterface;
-G_DEFINE_INTERFACE (CupsNotifier, cups_notifier, G_TYPE_OBJECT);
-
-/**
- * cups_notifier_emit_server_started:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.ServerStarted">"ServerStarted"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_server_started (
-    CupsNotifier *object,
-    const gchar *arg_text)
-{
-  g_signal_emit_by_name (object, "server-started", arg_text);
-}
-
-/**
- * cups_notifier_emit_server_restarted:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.ServerRestarted">"ServerRestarted"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_server_restarted (
-    CupsNotifier *object,
-    const gchar *arg_text)
-{
-  g_signal_emit_by_name (object, "server-restarted", arg_text);
-}
-
-/**
- * cups_notifier_emit_server_stopped:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.ServerStopped">"ServerStopped"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_server_stopped (
-    CupsNotifier *object,
-    const gchar *arg_text)
-{
-  g_signal_emit_by_name (object, "server-stopped", arg_text);
-}
-
-/**
- * cups_notifier_emit_server_audit:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.ServerAudit">"ServerAudit"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_server_audit (
-    CupsNotifier *object,
-    const gchar *arg_text)
-{
-  g_signal_emit_by_name (object, "server-audit", arg_text);
-}
-
-/**
- * cups_notifier_emit_printer_added:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterAdded">"PrinterAdded"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_printer_added (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  g_signal_emit_by_name (object, "printer-added", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs);
-}
-
-/**
- * cups_notifier_emit_printer_deleted:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterDeleted">"PrinterDeleted"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_printer_deleted (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  g_signal_emit_by_name (object, "printer-deleted", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs);
-}
-
-/**
- * cups_notifier_emit_printer_modified:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterModified">"PrinterModified"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_printer_modified (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  g_signal_emit_by_name (object, "printer-modified", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs);
-}
-
-/**
- * cups_notifier_emit_printer_restarted:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterRestarted">"PrinterRestarted"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_printer_restarted (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  g_signal_emit_by_name (object, "printer-restarted", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs);
-}
-
-/**
- * cups_notifier_emit_printer_stopped:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterStopped">"PrinterStopped"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_printer_stopped (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  g_signal_emit_by_name (object, "printer-stopped", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs);
-}
-
-/**
- * cups_notifier_emit_printer_shutdown:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterShutdown">"PrinterShutdown"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_printer_shutdown (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  g_signal_emit_by_name (object, "printer-shutdown", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs);
-}
-
-/**
- * cups_notifier_emit_printer_state_changed:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterStateChanged">"PrinterStateChanged"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_printer_state_changed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  g_signal_emit_by_name (object, "printer-state-changed", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs);
-}
-
-/**
- * cups_notifier_emit_printer_finishings_changed:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterFinishingsChanged">"PrinterFinishingsChanged"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_printer_finishings_changed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  g_signal_emit_by_name (object, "printer-finishings-changed", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs);
-}
-
-/**
- * cups_notifier_emit_printer_media_changed:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.PrinterMediaChanged">"PrinterMediaChanged"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_printer_media_changed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  g_signal_emit_by_name (object, "printer-media-changed", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs);
-}
-
-/**
- * cups_notifier_emit_job_created:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- * @arg_job_id: Argument to pass with the signal.
- * @arg_job_state: Argument to pass with the signal.
- * @arg_job_state_reasons: Argument to pass with the signal.
- * @arg_job_name: Argument to pass with the signal.
- * @arg_job_impressions_completed: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.JobCreated">"JobCreated"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_job_created (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed)
-{
-  g_signal_emit_by_name (object, "job-created", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs, arg_job_id, arg_job_state, arg_job_state_reasons, arg_job_name, arg_job_impressions_completed);
-}
-
-/**
- * cups_notifier_emit_job_completed:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- * @arg_job_id: Argument to pass with the signal.
- * @arg_job_state: Argument to pass with the signal.
- * @arg_job_state_reasons: Argument to pass with the signal.
- * @arg_job_name: Argument to pass with the signal.
- * @arg_job_impressions_completed: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.JobCompleted">"JobCompleted"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_job_completed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed)
-{
-  g_signal_emit_by_name (object, "job-completed", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs, arg_job_id, arg_job_state, arg_job_state_reasons, arg_job_name, arg_job_impressions_completed);
-}
-
-/**
- * cups_notifier_emit_job_state:
- * @object: A #CupsNotifier.
- * @arg_text: Argument to pass with the signal.
- * @arg_printer_uri: Argument to pass with the signal.
- * @arg_printer_name: Argument to pass with the signal.
- * @arg_printer_state: Argument to pass with the signal.
- * @arg_printer_state_reasons: Argument to pass with the signal.
- * @arg_printer_is_accepting_jobs: Argument to pass with the signal.
- * @arg_job_id: Argument to pass with the signal.
- * @arg_job_state: Argument to pass with the signal.
- * @arg_job_state_reasons: Argument to pass with the signal.
- * @arg_job_name: Argument to pass with the signal.
- * @arg_job_impressions_completed: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-cups-cupsd-Notifier.JobState">"JobState"</link> D-Bus signal.
- */
-void
-cups_notifier_emit_job_state (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed)
-{
-  g_signal_emit_by_name (object, "job-state", arg_text, arg_printer_uri, arg_printer_name, arg_printer_state, arg_printer_state_reasons, arg_printer_is_accepting_jobs, arg_job_id, arg_job_state, arg_job_state_reasons, arg_job_name, arg_job_impressions_completed);
-}
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * CupsNotifierProxy:
- *
- * The #CupsNotifierProxy structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * CupsNotifierProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #CupsNotifierProxy.
- */
-
-struct _CupsNotifierProxyPrivate
-{
-  GData *qdata;
-};
-
-static void cups_notifier_proxy_iface_init (CupsNotifierIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (CupsNotifierProxy, cups_notifier_proxy, G_TYPE_DBUS_PROXY,
-                         G_IMPLEMENT_INTERFACE (CUPS_TYPE_NOTIFIER, cups_notifier_proxy_iface_init));
-
-static void
-cups_notifier_proxy_finalize (GObject *object)
-{
-  CupsNotifierProxy *proxy = CUPS_NOTIFIER_PROXY (object);
-  g_datalist_clear (&proxy->priv->qdata);
-  G_OBJECT_CLASS (cups_notifier_proxy_parent_class)->finalize (object);
-}
-
-static void
-cups_notifier_proxy_get_property (GObject      *object,
-  guint         prop_id,
-  GValue       *value,
-  GParamSpec   *pspec)
-{
-}
-
-static void
-cups_notifier_proxy_set_property (GObject      *object,
-  guint         prop_id,
-  const GValue *value,
-  GParamSpec   *pspec)
-{
-}
-
-static void
-cups_notifier_proxy_g_signal (GDBusProxy *proxy,
-  const gchar *sender_name,
-  const gchar *signal_name,
-  GVariant *parameters)
-{
-  _ExtendedGDBusSignalInfo *info;
-  GVariantIter iter;
-  GVariant *child;
-  GValue *paramv;
-  guint num_params;
-  guint n;
-  guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_cups_notifier_interface_info, signal_name);
-  if (info == NULL)
-    return;
-  num_params = g_variant_n_children (parameters);
-  paramv = g_new0 (GValue, num_params + 1);
-  g_value_init (&paramv[0], CUPS_TYPE_NOTIFIER);
-  g_value_set_object (&paramv[0], proxy);
-  g_variant_iter_init (&iter, parameters);
-  n = 1;
-  while ((child = g_variant_iter_next_value (&iter)) != NULL)
-    {
-      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
-      if (arg_info->use_gvariant)
-        {
-          g_value_init (&paramv[n], G_TYPE_VARIANT);
-          g_value_set_variant (&paramv[n], child);
-          n++;
-        }
-      else
-        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
-      g_variant_unref (child);
-    }
-  signal_id = g_signal_lookup (info->signal_name, CUPS_TYPE_NOTIFIER);
-  g_signal_emitv (paramv, signal_id, 0, NULL);
-  for (n = 0; n < num_params + 1; n++)
-    g_value_unset (&paramv[n]);
-  g_free (paramv);
-}
-
-static void
-cups_notifier_proxy_g_properties_changed (GDBusProxy *_proxy,
-  GVariant *changed_properties,
-  const gchar *const *invalidated_properties)
-{
-  CupsNotifierProxy *proxy = CUPS_NOTIFIER_PROXY (_proxy);
-  guint n;
-  const gchar *key;
-  GVariantIter *iter;
-  _ExtendedGDBusPropertyInfo *info;
-  g_variant_get (changed_properties, "a{sv}", &iter);
-  while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
-    {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_cups_notifier_interface_info, key);
-      g_datalist_remove_data (&proxy->priv->qdata, key);
-      if (info != NULL)
-        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
-    }
-  g_variant_iter_free (iter);
-  for (n = 0; invalidated_properties[n] != NULL; n++)
-    {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_cups_notifier_interface_info, invalidated_properties[n]);
-      g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
-      if (info != NULL)
-        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
-    }
-}
-
-static void
-cups_notifier_proxy_init (CupsNotifierProxy *proxy)
-{
-  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, CUPS_TYPE_NOTIFIER_PROXY, CupsNotifierProxyPrivate);
-  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), cups_notifier_interface_info ());
-}
-
-static void
-cups_notifier_proxy_class_init (CupsNotifierProxyClass *klass)
-{
-  GObjectClass *gobject_class;
-  GDBusProxyClass *proxy_class;
-
-  g_type_class_add_private (klass, sizeof (CupsNotifierProxyPrivate));
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize     = cups_notifier_proxy_finalize;
-  gobject_class->get_property = cups_notifier_proxy_get_property;
-  gobject_class->set_property = cups_notifier_proxy_set_property;
-
-  proxy_class = G_DBUS_PROXY_CLASS (klass);
-  proxy_class->g_signal = cups_notifier_proxy_g_signal;
-  proxy_class->g_properties_changed = cups_notifier_proxy_g_properties_changed;
-
-}
-
-static void
-cups_notifier_proxy_iface_init (CupsNotifierIface *iface)
-{
-}
-
-/**
- * cups_notifier_proxy_new:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-cups-cupsd-Notifier.top_of_page">org.cups.cupsd.Notifier</link>. See g_dbus_proxy_new() for more details.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call cups_notifier_proxy_new_finish() to get the result of the operation.
- *
- * See cups_notifier_proxy_new_sync() for the synchronous, blocking version of this constructor.
- */
-void
-cups_notifier_proxy_new (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data)
-{
-  g_async_initable_new_async (CUPS_TYPE_NOTIFIER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.cups.cupsd.Notifier", NULL);
-}
-
-/**
- * cups_notifier_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to cups_notifier_proxy_new().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with cups_notifier_proxy_new().
- *
- * Returns: (transfer full) (type CupsNotifierProxy): The constructed proxy object or %NULL if @error is set.
- */
-CupsNotifier *
-cups_notifier_proxy_new_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return CUPS_NOTIFIER (ret);
-  else
-    return NULL;
-}
-
-/**
- * cups_notifier_proxy_new_sync:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-cups-cupsd-Notifier.top_of_page">org.cups.cupsd.Notifier</link>. See g_dbus_proxy_new_sync() for more details.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See cups_notifier_proxy_new() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type CupsNotifierProxy): The constructed proxy object or %NULL if @error is set.
- */
-CupsNotifier *
-cups_notifier_proxy_new_sync (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (CUPS_TYPE_NOTIFIER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.cups.cupsd.Notifier", NULL);
-  if (ret != NULL)
-    return CUPS_NOTIFIER (ret);
-  else
-    return NULL;
-}
-
-
-/**
- * cups_notifier_proxy_new_for_bus:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Like cups_notifier_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call cups_notifier_proxy_new_for_bus_finish() to get the result of the operation.
- *
- * See cups_notifier_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
- */
-void
-cups_notifier_proxy_new_for_bus (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data)
-{
-  g_async_initable_new_async (CUPS_TYPE_NOTIFIER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.cups.cupsd.Notifier", NULL);
-}
-
-/**
- * cups_notifier_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to cups_notifier_proxy_new_for_bus().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with cups_notifier_proxy_new_for_bus().
- *
- * Returns: (transfer full) (type CupsNotifierProxy): The constructed proxy object or %NULL if @error is set.
- */
-CupsNotifier *
-cups_notifier_proxy_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return CUPS_NOTIFIER (ret);
-  else
-    return NULL;
-}
-
-/**
- * cups_notifier_proxy_new_for_bus_sync:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Like cups_notifier_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See cups_notifier_proxy_new_for_bus() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type CupsNotifierProxy): The constructed proxy object or %NULL if @error is set.
- */
-CupsNotifier *
-cups_notifier_proxy_new_for_bus_sync (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (CUPS_TYPE_NOTIFIER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.cups.cupsd.Notifier", NULL);
-  if (ret != NULL)
-    return CUPS_NOTIFIER (ret);
-  else
-    return NULL;
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * CupsNotifierSkeleton:
- *
- * The #CupsNotifierSkeleton structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * CupsNotifierSkeletonClass:
- * @parent_class: The parent class.
- *
- * Class structure for #CupsNotifierSkeleton.
- */
-
-struct _CupsNotifierSkeletonPrivate
-{
-  GValue *properties;
-  GList *changed_properties;
-  GSource *changed_properties_idle_source;
-  GMainContext *context;
-  GMutex lock;
-};
-
-static void
-_cups_notifier_skeleton_handle_method_call (
-  GDBusConnection *connection,
-  const gchar *sender,
-  const gchar *object_path,
-  const gchar *interface_name,
-  const gchar *method_name,
-  GVariant *parameters,
-  GDBusMethodInvocation *invocation,
-  gpointer user_data)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (user_data);
-  _ExtendedGDBusMethodInfo *info;
-  GVariantIter iter;
-  GVariant *child;
-  GValue *paramv;
-  guint num_params;
-  guint num_extra;
-  guint n;
-  guint signal_id;
-  GValue return_value = G_VALUE_INIT;
-  info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
-  g_assert (info != NULL);
-  num_params = g_variant_n_children (parameters);
-  num_extra = info->pass_fdlist ? 3 : 2;  paramv = g_new0 (GValue, num_params + num_extra);
-  n = 0;
-  g_value_init (&paramv[n], CUPS_TYPE_NOTIFIER);
-  g_value_set_object (&paramv[n++], skeleton);
-  g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
-  g_value_set_object (&paramv[n++], invocation);
-  if (info->pass_fdlist)
-    {
-#ifdef G_OS_UNIX
-      g_value_init (&paramv[n], G_TYPE_UNIX_FD_LIST);
-      g_value_set_object (&paramv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
-#else
-      g_assert_not_reached ();
-#endif
-    }
-  g_variant_iter_init (&iter, parameters);
-  while ((child = g_variant_iter_next_value (&iter)) != NULL)
-    {
-      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
-      if (arg_info->use_gvariant)
-        {
-          g_value_init (&paramv[n], G_TYPE_VARIANT);
-          g_value_set_variant (&paramv[n], child);
-          n++;
-        }
-      else
-        g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
-      g_variant_unref (child);
-    }
-  signal_id = g_signal_lookup (info->signal_name, CUPS_TYPE_NOTIFIER);
-  g_value_init (&return_value, G_TYPE_BOOLEAN);
-  g_signal_emitv (paramv, signal_id, 0, &return_value);
-  if (!g_value_get_boolean (&return_value))
-    g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
-  g_value_unset (&return_value);
-  for (n = 0; n < num_params + num_extra; n++)
-    g_value_unset (&paramv[n]);
-  g_free (paramv);
-}
-
-static GVariant *
-_cups_notifier_skeleton_handle_get_property (
-  GDBusConnection *connection,
-  const gchar *sender,
-  const gchar *object_path,
-  const gchar *interface_name,
-  const gchar *property_name,
-  GError **error,
-  gpointer user_data)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (user_data);
-  GValue value = G_VALUE_INIT;
-  GParamSpec *pspec;
-  _ExtendedGDBusPropertyInfo *info;
-  GVariant *ret;
-  ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_cups_notifier_interface_info, property_name);
-  g_assert (info != NULL);
-  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
-  if (pspec == NULL)
-    {
-      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
-    }
-  else
-    {
-      g_value_init (&value, pspec->value_type);
-      g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
-      ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
-      g_value_unset (&value);
-    }
-  return ret;
-}
-
-static gboolean
-_cups_notifier_skeleton_handle_set_property (
-  GDBusConnection *connection,
-  const gchar *sender,
-  const gchar *object_path,
-  const gchar *interface_name,
-  const gchar *property_name,
-  GVariant *variant,
-  GError **error,
-  gpointer user_data)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (user_data);
-  GValue value = G_VALUE_INIT;
-  GParamSpec *pspec;
-  _ExtendedGDBusPropertyInfo *info;
-  gboolean ret;
-  ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_cups_notifier_interface_info, property_name);
-  g_assert (info != NULL);
-  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
-  if (pspec == NULL)
-    {
-      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
-    }
-  else
-    {
-      if (info->use_gvariant)
-        g_value_set_variant (&value, variant);
-      else
-        g_dbus_gvariant_to_gvalue (variant, &value);
-      g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
-      g_value_unset (&value);
-      ret = TRUE;
-    }
-  return ret;
-}
-
-static const GDBusInterfaceVTable _cups_notifier_skeleton_vtable =
-{
-  _cups_notifier_skeleton_handle_method_call,
-  _cups_notifier_skeleton_handle_get_property,
-  _cups_notifier_skeleton_handle_set_property
-};
-
-static GDBusInterfaceInfo *
-cups_notifier_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton)
-{
-  return cups_notifier_interface_info ();
-}
-
-static GDBusInterfaceVTable *
-cups_notifier_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton)
-{
-  return (GDBusInterfaceVTable *) &_cups_notifier_skeleton_vtable;
-}
-
-static GVariant *
-cups_notifier_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (_skeleton);
-
-  GVariantBuilder builder;
-  guint n;
-  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
-  if (_cups_notifier_interface_info.parent_struct.properties == NULL)
-    goto out;
-  for (n = 0; _cups_notifier_interface_info.parent_struct.properties[n] != NULL; n++)
-    {
-      GDBusPropertyInfo *info = _cups_notifier_interface_info.parent_struct.properties[n];
-      if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
-        {
-          GVariant *value;
-          value = _cups_notifier_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", info->name, NULL, skeleton);
-          if (value != NULL)
-            {
-              g_variant_take_ref (value);
-              g_variant_builder_add (&builder, "{sv}", info->name, value);
-              g_variant_unref (value);
-            }
-        }
-    }
-out:
-  return g_variant_builder_end (&builder);
-}
-
-static void
-cups_notifier_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
-{
-}
-
-static void
-_cups_notifier_on_signal_server_started (
-    CupsNotifier *object,
-    const gchar *arg_text)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(s)",
-                   arg_text));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "ServerStarted",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_server_restarted (
-    CupsNotifier *object,
-    const gchar *arg_text)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(s)",
-                   arg_text));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "ServerRestarted",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_server_stopped (
-    CupsNotifier *object,
-    const gchar *arg_text)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(s)",
-                   arg_text));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "ServerStopped",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_server_audit (
-    CupsNotifier *object,
-    const gchar *arg_text)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(s)",
-                   arg_text));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "ServerAudit",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_printer_added (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusb)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "PrinterAdded",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_printer_deleted (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusb)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "PrinterDeleted",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_printer_modified (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusb)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "PrinterModified",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_printer_restarted (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusb)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "PrinterRestarted",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_printer_stopped (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusb)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "PrinterStopped",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_printer_shutdown (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusb)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "PrinterShutdown",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_printer_state_changed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusb)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "PrinterStateChanged",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_printer_finishings_changed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusb)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "PrinterFinishingsChanged",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_printer_media_changed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusb)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "PrinterMediaChanged",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_job_created (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusbuussu)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs,
-                   arg_job_id,
-                   arg_job_state,
-                   arg_job_state_reasons,
-                   arg_job_name,
-                   arg_job_impressions_completed));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "JobCreated",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_job_completed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusbuussu)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs,
-                   arg_job_id,
-                   arg_job_state,
-                   arg_job_state_reasons,
-                   arg_job_name,
-                   arg_job_impressions_completed));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "JobCompleted",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void
-_cups_notifier_on_signal_job_state (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(sssusbuussu)",
-                   arg_text,
-                   arg_printer_uri,
-                   arg_printer_name,
-                   arg_printer_state,
-                   arg_printer_state_reasons,
-                   arg_printer_is_accepting_jobs,
-                   arg_job_id,
-                   arg_job_state,
-                   arg_job_state_reasons,
-                   arg_job_name,
-                   arg_job_impressions_completed));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.cups.cupsd.Notifier", "JobState",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void cups_notifier_skeleton_iface_init (CupsNotifierIface *iface);
-G_DEFINE_TYPE_WITH_CODE (CupsNotifierSkeleton, cups_notifier_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_IMPLEMENT_INTERFACE (CUPS_TYPE_NOTIFIER, cups_notifier_skeleton_iface_init));
-
-static void
-cups_notifier_skeleton_finalize (GObject *object)
-{
-  CupsNotifierSkeleton *skeleton = CUPS_NOTIFIER_SKELETON (object);
-  g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
-  if (skeleton->priv->changed_properties_idle_source != NULL)
-    g_source_destroy (skeleton->priv->changed_properties_idle_source);
-  g_main_context_unref (skeleton->priv->context);
-  g_mutex_clear (&skeleton->priv->lock);
-  G_OBJECT_CLASS (cups_notifier_skeleton_parent_class)->finalize (object);
-}
-
-static void
-cups_notifier_skeleton_init (CupsNotifierSkeleton *skeleton)
-{
-  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, CUPS_TYPE_NOTIFIER_SKELETON, CupsNotifierSkeletonPrivate);
-  g_mutex_init (&skeleton->priv->lock);
-  skeleton->priv->context = g_main_context_ref_thread_default ();
-}
-
-static void
-cups_notifier_skeleton_class_init (CupsNotifierSkeletonClass *klass)
-{
-  GObjectClass *gobject_class;
-  GDBusInterfaceSkeletonClass *skeleton_class;
-
-  g_type_class_add_private (klass, sizeof (CupsNotifierSkeletonPrivate));
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = cups_notifier_skeleton_finalize;
-
-  skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
-  skeleton_class->get_info = cups_notifier_skeleton_dbus_interface_get_info;
-  skeleton_class->get_properties = cups_notifier_skeleton_dbus_interface_get_properties;
-  skeleton_class->flush = cups_notifier_skeleton_dbus_interface_flush;
-  skeleton_class->get_vtable = cups_notifier_skeleton_dbus_interface_get_vtable;
-}
-
-static void
-cups_notifier_skeleton_iface_init (CupsNotifierIface *iface)
-{
-  iface->server_started = _cups_notifier_on_signal_server_started;
-  iface->server_restarted = _cups_notifier_on_signal_server_restarted;
-  iface->server_stopped = _cups_notifier_on_signal_server_stopped;
-  iface->server_audit = _cups_notifier_on_signal_server_audit;
-  iface->printer_added = _cups_notifier_on_signal_printer_added;
-  iface->printer_deleted = _cups_notifier_on_signal_printer_deleted;
-  iface->printer_modified = _cups_notifier_on_signal_printer_modified;
-  iface->printer_restarted = _cups_notifier_on_signal_printer_restarted;
-  iface->printer_stopped = _cups_notifier_on_signal_printer_stopped;
-  iface->printer_shutdown = _cups_notifier_on_signal_printer_shutdown;
-  iface->printer_state_changed = _cups_notifier_on_signal_printer_state_changed;
-  iface->printer_finishings_changed = _cups_notifier_on_signal_printer_finishings_changed;
-  iface->printer_media_changed = _cups_notifier_on_signal_printer_media_changed;
-  iface->job_created = _cups_notifier_on_signal_job_created;
-  iface->job_completed = _cups_notifier_on_signal_job_completed;
-  iface->job_state = _cups_notifier_on_signal_job_state;
-}
-
-/**
- * cups_notifier_skeleton_new:
- *
- * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-cups-cupsd-Notifier.top_of_page">org.cups.cupsd.Notifier</link>.
- *
- * Returns: (transfer full) (type CupsNotifierSkeleton): The skeleton object.
- */
-CupsNotifier *
-cups_notifier_skeleton_new (void)
-{
-  return CUPS_NOTIFIER (g_object_new (CUPS_TYPE_NOTIFIER_SKELETON, NULL));
-}
-
diff --git a/src/cups-notifier.h b/src/cups-notifier.h
deleted file mode 100644
index fac96d1..0000000
--- a/src/cups-notifier.h
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.31.16. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifndef __CUPS_NOTIFIER_H__
-#define __CUPS_NOTIFIER_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-
-/* ------------------------------------------------------------------------ */
-/* Declarations for org.cups.cupsd.Notifier */
-
-#define CUPS_TYPE_NOTIFIER (cups_notifier_get_type ())
-#define CUPS_NOTIFIER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CUPS_TYPE_NOTIFIER, CupsNotifier))
-#define CUPS_IS_NOTIFIER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CUPS_TYPE_NOTIFIER))
-#define CUPS_NOTIFIER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), CUPS_TYPE_NOTIFIER, CupsNotifierIface))
-
-struct _CupsNotifier;
-typedef struct _CupsNotifier CupsNotifier;
-typedef struct _CupsNotifierIface CupsNotifierIface;
-
-struct _CupsNotifierIface
-{
-  GTypeInterface parent_iface;
-
-  void (*job_completed) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed);
-
-  void (*job_created) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed);
-
-  void (*job_state) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed);
-
-  void (*printer_added) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-  void (*printer_deleted) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-  void (*printer_finishings_changed) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-  void (*printer_media_changed) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-  void (*printer_modified) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-  void (*printer_restarted) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-  void (*printer_shutdown) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-  void (*printer_state_changed) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-  void (*printer_stopped) (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-  void (*server_audit) (
-    CupsNotifier *object,
-    const gchar *arg_text);
-
-  void (*server_restarted) (
-    CupsNotifier *object,
-    const gchar *arg_text);
-
-  void (*server_started) (
-    CupsNotifier *object,
-    const gchar *arg_text);
-
-  void (*server_stopped) (
-    CupsNotifier *object,
-    const gchar *arg_text);
-
-};
-
-GType cups_notifier_get_type (void) G_GNUC_CONST;
-
-GDBusInterfaceInfo *cups_notifier_interface_info (void);
-guint cups_notifier_override_properties (GObjectClass *klass, guint property_id_begin);
-
-
-/* D-Bus signal emissions functions: */
-void cups_notifier_emit_server_started (
-    CupsNotifier *object,
-    const gchar *arg_text);
-
-void cups_notifier_emit_server_restarted (
-    CupsNotifier *object,
-    const gchar *arg_text);
-
-void cups_notifier_emit_server_stopped (
-    CupsNotifier *object,
-    const gchar *arg_text);
-
-void cups_notifier_emit_server_audit (
-    CupsNotifier *object,
-    const gchar *arg_text);
-
-void cups_notifier_emit_printer_added (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-void cups_notifier_emit_printer_deleted (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-void cups_notifier_emit_printer_modified (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-void cups_notifier_emit_printer_restarted (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-void cups_notifier_emit_printer_stopped (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-void cups_notifier_emit_printer_shutdown (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-void cups_notifier_emit_printer_state_changed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-void cups_notifier_emit_printer_finishings_changed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-void cups_notifier_emit_printer_media_changed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs);
-
-void cups_notifier_emit_job_created (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed);
-
-void cups_notifier_emit_job_completed (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed);
-
-void cups_notifier_emit_job_state (
-    CupsNotifier *object,
-    const gchar *arg_text,
-    const gchar *arg_printer_uri,
-    const gchar *arg_printer_name,
-    guint arg_printer_state,
-    const gchar *arg_printer_state_reasons,
-    gboolean arg_printer_is_accepting_jobs,
-    guint arg_job_id,
-    guint arg_job_state,
-    const gchar *arg_job_state_reasons,
-    const gchar *arg_job_name,
-    guint arg_job_impressions_completed);
-
-
-
-/* ---- */
-
-#define CUPS_TYPE_NOTIFIER_PROXY (cups_notifier_proxy_get_type ())
-#define CUPS_NOTIFIER_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CUPS_TYPE_NOTIFIER_PROXY, CupsNotifierProxy))
-#define CUPS_NOTIFIER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CUPS_TYPE_NOTIFIER_PROXY, CupsNotifierProxyClass))
-#define CUPS_NOTIFIER_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CUPS_TYPE_NOTIFIER_PROXY, CupsNotifierProxyClass))
-#define CUPS_IS_NOTIFIER_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CUPS_TYPE_NOTIFIER_PROXY))
-#define CUPS_IS_NOTIFIER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CUPS_TYPE_NOTIFIER_PROXY))
-
-typedef struct _CupsNotifierProxy CupsNotifierProxy;
-typedef struct _CupsNotifierProxyClass CupsNotifierProxyClass;
-typedef struct _CupsNotifierProxyPrivate CupsNotifierProxyPrivate;
-
-struct _CupsNotifierProxy
-{
-  /*< private >*/
-  GDBusProxy parent_instance;
-  CupsNotifierProxyPrivate *priv;
-};
-
-struct _CupsNotifierProxyClass
-{
-  GDBusProxyClass parent_class;
-};
-
-GType cups_notifier_proxy_get_type (void) G_GNUC_CONST;
-
-void cups_notifier_proxy_new (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data);
-CupsNotifier *cups_notifier_proxy_new_finish (
-    GAsyncResult        *res,
-    GError             **error);
-CupsNotifier *cups_notifier_proxy_new_sync (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error);
-
-void cups_notifier_proxy_new_for_bus (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data);
-CupsNotifier *cups_notifier_proxy_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error);
-CupsNotifier *cups_notifier_proxy_new_for_bus_sync (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error);
-
-
-/* ---- */
-
-#define CUPS_TYPE_NOTIFIER_SKELETON (cups_notifier_skeleton_get_type ())
-#define CUPS_NOTIFIER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CUPS_TYPE_NOTIFIER_SKELETON, CupsNotifierSkeleton))
-#define CUPS_NOTIFIER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), CUPS_TYPE_NOTIFIER_SKELETON, CupsNotifierSkeletonClass))
-#define CUPS_NOTIFIER_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CUPS_TYPE_NOTIFIER_SKELETON, CupsNotifierSkeletonClass))
-#define CUPS_IS_NOTIFIER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CUPS_TYPE_NOTIFIER_SKELETON))
-#define CUPS_IS_NOTIFIER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CUPS_TYPE_NOTIFIER_SKELETON))
-
-typedef struct _CupsNotifierSkeleton CupsNotifierSkeleton;
-typedef struct _CupsNotifierSkeletonClass CupsNotifierSkeletonClass;
-typedef struct _CupsNotifierSkeletonPrivate CupsNotifierSkeletonPrivate;
-
-struct _CupsNotifierSkeleton
-{
-  /*< private >*/
-  GDBusInterfaceSkeleton parent_instance;
-  CupsNotifierSkeletonPrivate *priv;
-};
-
-struct _CupsNotifierSkeletonClass
-{
-  GDBusInterfaceSkeletonClass parent_class;
-};
-
-GType cups_notifier_skeleton_get_type (void) G_GNUC_CONST;
-
-CupsNotifier *cups_notifier_skeleton_new (void);
-
-
-G_END_DECLS
-
-#endif /* __CUPS_NOTIFIER_H__ */
diff --git a/src/indicator-printer-state-notifier.c b/src/indicator-printer-state-notifier.c
index d3668a2..8261274 100644
--- a/src/indicator-printer-state-notifier.c
+++ b/src/indicator-printer-state-notifier.c
@@ -18,6 +18,7 @@
 
 #include "indicator-printer-state-notifier.h"
 
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <cups/cups.h>
 #include <string.h>
@@ -125,13 +126,13 @@ show_alert_box (const gchar *printer,
     primary_text = g_strdup_printf (reason, printer);
 
     if (njobs == 1)
-        fmt = "You have %d job queued to print on this printer.";
+        fmt = _("You have %d job queued to print on this printer.");
     else
-        fmt = "You have %d jobs queued to print on this printer.";
+        fmt = _("You have %d jobs queued to print on this printer.");
     secondary_text = g_strdup_printf (fmt, njobs);
 
     dialog = g_object_new (GTK_TYPE_MESSAGE_DIALOG,
-                           "title", "Printing Problem",
+                           "title", _("Printing Problem"),
                            "icon-name", "printer",
                            "image", image,
                            "text", primary_text,
@@ -147,7 +148,7 @@ show_alert_box (const gchar *printer,
     g_free (secondary_text);
 
     gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-                            "_Settings…", RESPONSE_SHOW_SYSTEM_SETTINGS,
+                            _("_Settings…"), RESPONSE_SHOW_SYSTEM_SETTINGS,
                             GTK_STOCK_OK, GTK_RESPONSE_OK,
                             NULL);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -313,14 +314,14 @@ indicator_printer_state_notifier_init (IndicatorPrinterStateNotifier *self)
 
     priv->printer_alerts = g_hash_table_new (g_str_hash, g_str_equal);
     g_hash_table_insert_many ( priv->printer_alerts,
-                               "media-low", "The printer “%s” is low on paper.",
-                               "media-empty", "The printer “%s” is out of paper.",
-                               "toner-low", "The printer “%s” is low on toner.",
-                               "toner-empty", "The printer “%s” is out of toner.",
-                               "cover-open", "A cover is open on the printer “%s”.",
-                               "door-open", "A door is open on the printer “%s”.",
-                               "cups-missing-filter", "The printer “%s” can’t be used, because required software is missing.",
-                               "offline", "The printer “%s” is currently off-line.",
+                               "media-low", _("The printer “%s” is low on paper."),
+                               "media-empty", _("The printer “%s” is out of paper."),
+                               "toner-low", _("The printer “%s” is low on toner."),
+                               "toner-empty", _("The printer “%s” is out of toner."),
+                               "cover-open", _("A cover is open on the printer “%s”."),
+                               "door-open", _("A door is open on the printer “%s”."),
+                               "cups-missing-filter", _("The printer “%s” can’t be used, because required software is missing."),
+                               "offline", _("The printer “%s” is currently off-line."),
                                NULL);
 }
 
diff --git a/src/indicator-printers-service.c b/src/indicator-printers-service.c
index 58644ab..5daf697 100644
--- a/src/indicator-printers-service.c
+++ b/src/indicator-printers-service.c
@@ -19,6 +19,7 @@
 #include <libindicator/indicator-service.h>
 #include <libdbusmenu-glib/dbusmenu-glib.h>
 #include <gtk/gtk.h>
+#include <cups/cups.h>
 #include "dbus-names.h"
 
 #include "cups-notifier.h"
@@ -26,10 +27,77 @@
 #include "indicator-printer-state-notifier.h"
 
 
+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", 0);
+
+    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 = attr->values[0].integer;
+    else
+        g_warning ("ipp-create-printer-subscription response doesn't contain "
+                   "subscription id.\n");
+
+    ippDelete (resp);
+    return id;
+}
+
+
+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
 service_shutdown (IndicatorService *service, gpointer user_data)
 {
+    int subscription_id = GPOINTER_TO_INT (user_data);
+
     g_debug("Shutting down indicator-printers-service");
+
+    cancel_subscription (subscription_id);
     gtk_main_quit ();
 }
 
@@ -42,15 +110,18 @@ int main (int argc, char *argv[])
     IndicatorPrintersMenu *menu;
     IndicatorPrinterStateNotifier *state_notifier;
     GError *error = NULL;
+    int subscription_id;
 
     gtk_init (&argc, &argv);
 
+    subscription_id = create_subscription ();
+
     service = indicator_service_new_version (INDICATOR_PRINTERS_DBUS_NAME,
                                              INDICATOR_PRINTERS_DBUS_VERSION);
     g_signal_connect (service,
                       "shutdown",
                       G_CALLBACK (service_shutdown),
-                      NULL);
+                      GINT_TO_POINTER (subscription_id));
 
     cups_notifier = cups_notifier_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
                                                           0,
diff --git a/test/Makefile.am b/test/Makefile.am
index d3e10bb..4084cba 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,10 +2,21 @@
 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 \
-	$(top_builddir)/src/cups-notifier.c \
-	$(top_builddir)/src/cups-notifier.h
+	mock-cups-notifier.c
+
+nodist_mock_cups_notifier_SOURCES = $(cups_notifier_sources)
 
 mock_cups_notifier_CPPFLAGS = \
 	$(SERVICE_CFLAGS) \
@@ -13,3 +24,6 @@ mock_cups_notifier_CPPFLAGS = \
 
 mock_cups_notifier_LDADD = $(SERVICE_LIBS)
 
+BUILT_SOURCES = $(cups_notifier_sources)
+CLEANFILES = $(BUILT_SOURCES)
+
diff --git a/test/Makefile.in b/test/Makefile.in
index cf3c8ab..d9a55ae 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -41,15 +41,17 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_mock_cups_notifier_OBJECTS =  \
-	mock_cups_notifier-mock-cups-notifier.$(OBJEXT) \
-	mock_cups_notifier-cups-notifier.$(OBJEXT)
-mock_cups_notifier_OBJECTS = $(am_mock_cups_notifier_OBJECTS)
+	mock_cups_notifier-mock-cups-notifier.$(OBJEXT)
+am__objects_1 = mock_cups_notifier-cups-notifier.$(OBJEXT)
+nodist_mock_cups_notifier_OBJECTS = $(am__objects_1)
+mock_cups_notifier_OBJECTS = $(am_mock_cups_notifier_OBJECTS) \
+	$(nodist_mock_cups_notifier_OBJECTS)
 am__DEPENDENCIES_1 =
 mock_cups_notifier_DEPENDENCIES = $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
@@ -81,12 +83,14 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(mock_cups_notifier_SOURCES)
+SOURCES = $(mock_cups_notifier_SOURCES) \
+	$(nodist_mock_cups_notifier_SOURCES)
 DIST_SOURCES = $(mock_cups_notifier_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -97,6 +101,8 @@ AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -104,6 +110,7 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CUPS_CONFIG = @CUPS_CONFIG@
 CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
 DBUSSERVICEDIR = @DBUSSERVICEDIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -116,14 +123,27 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
 GREP = @GREP@
 INDICATORDIR = @INDICATORDIR@
-INDICATORICONDIR = @INDICATORICONDIR@
+INDICATORICONSDIR = @INDICATORICONSDIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -135,6 +155,10 @@ LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -152,6 +176,10 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
 RANLIB = @RANLIB@
 SED = @SED@
 SERVICE_CFLAGS = @SERVICE_CFLAGS@
@@ -159,7 +187,9 @@ SERVICE_LIBS = @SERVICE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -193,6 +223,8 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -213,17 +245,23 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 DISTCLEANFILES = mock-cups-notifier
+cups_notifier_sources = \
+	cups-notifier.c \
+	cups-notifier.h
+
 mock_cups_notifier_SOURCES = \
-	mock-cups-notifier.c \
-	$(top_builddir)/src/cups-notifier.c \
-	$(top_builddir)/src/cups-notifier.h
+	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)
-all: all-am
+BUILT_SOURCES = $(cups_notifier_sources)
+CLEANFILES = $(BUILT_SOURCES)
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -314,19 +352,19 @@ mock_cups_notifier-mock-cups-notifier.obj: mock-cups-notifier.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mock_cups_notifier_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mock_cups_notifier-mock-cups-notifier.obj `if test -f 'mock-cups-notifier.c'; then $(CYGPATH_W) 'mock-cups-notifier.c'; else $(CYGPATH_W) '$(srcdir)/mock-cups-notifier.c'; fi`
 
-mock_cups_notifier-cups-notifier.o: $(top_builddir)/src/cups-notifier.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mock_cups_notifier_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mock_cups_notifier-cups-notifier.o -MD -MP -MF $(DEPDIR)/mock_cups_notifier-cups-notifier.Tpo -c -o mock_cups_notifier-cups-notifier.o `test -f '$(top_builddir)/src/cups-notifier.c' || echo '$(srcdir)/'`$(top_builddir)/src/cups-notifier.c
+mock_cups_notifier-cups-notifier.o: cups-notifier.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mock_cups_notifier_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mock_cups_notifier-cups-notifier.o -MD -MP -MF $(DEPDIR)/mock_cups_notifier-cups-notifier.Tpo -c -o mock_cups_notifier-cups-notifier.o `test -f 'cups-notifier.c' || echo '$(srcdir)/'`cups-notifier.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mock_cups_notifier-cups-notifier.Tpo $(DEPDIR)/mock_cups_notifier-cups-notifier.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/src/cups-notifier.c' object='mock_cups_notifier-cups-notifier.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cups-notifier.c' object='mock_cups_notifier-cups-notifier.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mock_cups_notifier_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mock_cups_notifier-cups-notifier.o `test -f '$(top_builddir)/src/cups-notifier.c' || echo '$(srcdir)/'`$(top_builddir)/src/cups-notifier.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mock_cups_notifier_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mock_cups_notifier-cups-notifier.o `test -f 'cups-notifier.c' || echo '$(srcdir)/'`cups-notifier.c
 
-mock_cups_notifier-cups-notifier.obj: $(top_builddir)/src/cups-notifier.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mock_cups_notifier_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mock_cups_notifier-cups-notifier.obj -MD -MP -MF $(DEPDIR)/mock_cups_notifier-cups-notifier.Tpo -c -o mock_cups_notifier-cups-notifier.obj `if test -f '$(top_builddir)/src/cups-notifier.c'; then $(CYGPATH_W) '$(top_builddir)/src/cups-notifier.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/src/cups-notifier.c'; fi`
+mock_cups_notifier-cups-notifier.obj: cups-notifier.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mock_cups_notifier_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mock_cups_notifier-cups-notifier.obj -MD -MP -MF $(DEPDIR)/mock_cups_notifier-cups-notifier.Tpo -c -o mock_cups_notifier-cups-notifier.obj `if test -f 'cups-notifier.c'; then $(CYGPATH_W) 'cups-notifier.c'; else $(CYGPATH_W) '$(srcdir)/cups-notifier.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mock_cups_notifier-cups-notifier.Tpo $(DEPDIR)/mock_cups_notifier-cups-notifier.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/src/cups-notifier.c' object='mock_cups_notifier-cups-notifier.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cups-notifier.c' object='mock_cups_notifier-cups-notifier.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mock_cups_notifier_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mock_cups_notifier-cups-notifier.obj `if test -f '$(top_builddir)/src/cups-notifier.c'; then $(CYGPATH_W) '$(top_builddir)/src/cups-notifier.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/src/cups-notifier.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mock_cups_notifier_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mock_cups_notifier-cups-notifier.obj `if test -f 'cups-notifier.c'; then $(CYGPATH_W) 'cups-notifier.c'; else $(CYGPATH_W) '$(srcdir)/cups-notifier.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -417,10 +455,12 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -442,6 +482,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -451,6 +492,7 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
@@ -522,7 +564,7 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-libtool clean-noinstPROGRAMS ctags distclean \
@@ -538,6 +580,13 @@ uninstall-am:
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
 
+$(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 \
+	    $^
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: