From cc2e15a592b34be022bb649e18fe397c31214cb4 Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Mon, 3 Sep 2012 21:43:14 +0200
Subject: [PATCH] printers: Move common constants to pp-utils.h

Move constants which are used in more than one source file
to pp-utils.h. (#683229)
---
 panels/printers/pp-new-printer-dialog.c | 8 --------
 panels/printers/pp-utils.c              | 6 ------
 panels/printers/pp-utils.h              | 8 ++++++++
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
index 7c8bc4c5b..0d3ddb0aa 100644
--- a/panels/printers/pp-new-printer-dialog.c
+++ b/panels/printers/pp-new-printer-dialog.c
@@ -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
diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
index 1f149f1f6..7c89b1f5d 100644
--- a/panels/printers/pp-utils.c
+++ b/panels/printers/pp-utils.c
@@ -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)
diff --git a/panels/printers/pp-utils.h b/panels/printers/pp-utils.h
index d19c5e1ec..97860c3b2 100644
--- a/panels/printers/pp-utils.h
+++ b/panels/printers/pp-utils.h
@@ -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
 
 /*