gentoo-overlay/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch

From 6ce180eace2bb3b9954d0b9ca74c7108e772ad68 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 8 Dec 2013 23:44:56 +0100
Subject: [PATCH 2/2] Fix some absolute paths to be appropriate for Gentoo

---
 panels/datetime/Makefile.am         | 1 +
 panels/datetime/test-endianess.c    | 4 ++--
 panels/datetime/test-timezone.c     | 2 +-
 panels/datetime/tz.h                | 4 ++--
 panels/printers/Makefile.am         | 3 +++
 panels/printers/cc-printers-panel.c | 4 ++--
 panels/printers/pp-host.c           | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
index fc85592..133845f 100644
--- a/panels/datetime/Makefile.am
+++ b/panels/datetime/Makefile.am
@@ -24,6 +24,7 @@ AM_CPPFLAGS =						\
 	$(DATETIME_PANEL_CFLAGS)			\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
+	-DREALDATADIR="\"$(datadir)\""                  \
 	$(NULL)
 
 noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
index 490df17..b43fc87 100644
--- a/panels/datetime/test-endianess.c
+++ b/panels/datetime/test-endianess.c
@@ -38,11 +38,11 @@ int main (int argc, char **argv)
 		return 0;
 	}
 
-	dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
+	dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
 	if (dir == NULL) {
 		/* Try with /usr/share/locale/
 		 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
-		dir = g_dir_open ("/usr/share/locale/", 0, NULL);
+		dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
 		if (dir == NULL) {
 			return 1;
 		}
diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
index 5667657..8483b87 100644
--- a/panels/datetime/test-timezone.c
+++ b/panels/datetime/test-timezone.c
@@ -1,7 +1,7 @@
 #include <gtk/gtk.h>
 #include "cc-timezone-map.h"
 
-#define TZ_DIR "/usr/share/zoneinfo/"
+#define TZ_DIR REALDATADIR "/zoneinfo/"
 
 static GList *
 get_timezone_list (GList *tzs,
diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
index 71c1c23..ca4b3c4 100644
--- a/panels/datetime/tz.h
+++ b/panels/datetime/tz.h
@@ -29,9 +29,9 @@
 #include <glib.h>
 
 #ifndef __sun
-#  define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
+#  define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
 #else
-#  define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
+#  define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
 #endif
 
 typedef struct _TzDB TzDB;
diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
index 63a33b4..12e2e45 100644
--- a/panels/printers/Makefile.am
+++ b/panels/printers/Makefile.am
@@ -7,6 +7,9 @@ INCLUDES = 						\
 	$(SMBCLIENT_CFLAGS)				\
 	-I$(top_srcdir)/shell/				\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+	-DREALDATADIR="\"$(datadir)\""                  \
+	-DPREFIX="\"$(prefix)\""                        \
+	-DLIBEXECDIR="\"$(libexecdir)\""                \
 	$(NULL)
 
 noinst_LTLIBRARIES = libprinters.la
diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
index 29b8173..24bcdf8 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
@@ -2428,8 +2428,8 @@ test_page_cb (GtkButton *button,
 
   if (printer_name)
     {
-      const gchar  *const dirs[] = { "/usr/share/cups",
-                                     "/usr/local/share/cups",
+      const gchar  *const dirs[] = { REALDATADIR "/cups",
+                                     PREFIX "/local/share/cups",
                                      NULL };
       const gchar  *testprint[] = { "%s/data/testprint",
                                     "%s/data/testprint.ps",
diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
index a994a61..51efe50 100644
--- a/panels/printers/pp-host.c
+++ b/panels/printers/pp-host.c
@@ -251,7 +251,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
   data->devices->devices = NULL;
 
   argv = g_new0 (gchar *, 3);
-  argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
+  argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
   argv[1] = g_strdup (priv->hostname);
 
   /* Use SNMP to get printer's informations */
-- 
1.8.3.2