printers: Move common constants to pp-utils.h
Move constants which are used in more than one source file to pp-utils.h. (#683229)
This commit is contained in:
parent
1f76a739e3
commit
cc2e15a592
3 changed files with 8 additions and 14 deletions
|
@ -42,8 +42,6 @@
|
|||
#include <gdk/gdkx.h>
|
||||
#endif
|
||||
|
||||
#define MECHANISM_BUS "org.opensuse.CupsPkHelper.Mechanism"
|
||||
|
||||
#define PACKAGE_KIT_BUS "org.freedesktop.PackageKit"
|
||||
#define PACKAGE_KIT_PATH "/org/freedesktop/PackageKit"
|
||||
#define PACKAGE_KIT_MODIFY_IFACE "org.freedesktop.PackageKit.Modify"
|
||||
|
@ -53,12 +51,6 @@
|
|||
#define FIREWALLD_PATH "/org/fedoraproject/FirewallD"
|
||||
#define FIREWALLD_IFACE "org.fedoraproject.FirewallD"
|
||||
|
||||
#define SCP_BUS "org.fedoraproject.Config.Printing"
|
||||
#define SCP_PATH "/org/fedoraproject/Config/Printing"
|
||||
#define SCP_IFACE "org.fedoraproject.Config.Printing"
|
||||
|
||||
#define ALLOWED_CHARACTERS "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
|
||||
|
||||
#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
|
||||
#define HAVE_CUPS_1_6 1
|
||||
#endif
|
||||
|
|
|
@ -29,12 +29,6 @@
|
|||
|
||||
#include "pp-utils.h"
|
||||
|
||||
#define MECHANISM_BUS "org.opensuse.CupsPkHelper.Mechanism"
|
||||
|
||||
#define SCP_BUS "org.fedoraproject.Config.Printing"
|
||||
#define SCP_PATH "/org/fedoraproject/Config/Printing"
|
||||
#define SCP_IFACE "org.fedoraproject.Config.Printing"
|
||||
|
||||
#define DBUS_TIMEOUT 120000
|
||||
|
||||
#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
|
||||
|
|
|
@ -24,6 +24,14 @@
|
|||
#include <gtk/gtk.h>
|
||||
#include <cups/cups.h>
|
||||
|
||||
#define ALLOWED_CHARACTERS "abcdefghijklmnopqrtsuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_"
|
||||
|
||||
#define MECHANISM_BUS "org.opensuse.CupsPkHelper.Mechanism"
|
||||
|
||||
#define SCP_BUS "org.fedoraproject.Config.Printing"
|
||||
#define SCP_PATH "/org/fedoraproject/Config/Printing"
|
||||
#define SCP_IFACE "org.fedoraproject.Config.Printing"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
/*
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue