|
Line
Link Here
|
| 0 |
-- |
0 |
++ b/panels/datetime/test-endianess.c |
| 1 |
-- a/panels/datetime/test-endianess.c |
|
|
|
Lines 38-48
Link Here
|
| 38 |
return 0; |
38 |
return 0; |
| 39 |
} |
39 |
} |
| 40 |
|
40 |
|
| 41 |
dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); |
41 |
dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL); |
| 42 |
if (dir == NULL) { |
42 |
if (dir == NULL) { |
| 43 |
/* Try with /usr/share/locale/ |
43 |
/* Try with /usr/share/locale/ |
| 44 |
* https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ |
44 |
* https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ |
| 45 |
dir = g_dir_open ("/usr/share/locale/", 0, NULL); |
45 |
dir = g_dir_open (REALDATADIR "/locale/", 0, NULL); |
| 46 |
if (dir == NULL) { |
46 |
if (dir == NULL) { |
| 47 |
return 1; |
47 |
return 1; |
| 48 |
} |
48 |
} |
| 49 |
-- a/panels/datetime/test-timezone.c |
49 |
++ b/panels/datetime/test-timezone.c |
|
Lines 1-7
Link Here
|
| 1 |
#include <gtk/gtk.h> |
1 |
#include <gtk/gtk.h> |
| 2 |
#include "cc-timezone-map.h" |
2 |
#include "cc-timezone-map.h" |
| 3 |
|
3 |
|
| 4 |
#define TZ_DIR "/usr/share/zoneinfo/" |
4 |
#define TZ_DIR REALDATADIR "/zoneinfo/" |
| 5 |
|
5 |
|
| 6 |
static GList * |
6 |
static GList * |
| 7 |
get_timezone_list (GList *tzs, |
7 |
get_timezone_list (GList *tzs, |
| 8 |
-- a/panels/datetime/tz.h |
8 |
++ b/panels/datetime/tz.h |
|
Lines 29-37
Link Here
|
| 29 |
#include <glib.h> |
29 |
#include <glib.h> |
| 30 |
|
30 |
|
| 31 |
#ifndef __sun |
31 |
#ifndef __sun |
| 32 |
# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" |
32 |
# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab" |
| 33 |
#else |
33 |
#else |
| 34 |
# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" |
34 |
# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab" |
| 35 |
#endif |
35 |
#endif |
| 36 |
|
36 |
|
| 37 |
typedef struct _TzDB TzDB; |
37 |
typedef struct _TzDB TzDB; |
| 38 |
-- a/panels/printers/cc-printers-panel.c |
38 |
++ b/panels/printers/cc-printers-panel.c |
|
Lines 2199-2206
Link Here
|
| 2199 |
|
2199 |
|
| 2200 |
if (printer_name) |
2200 |
if (printer_name) |
| 2201 |
{ |
2201 |
{ |
| 2202 |
const gchar *const dirs[] = { "/usr/share/cups", |
2202 |
const gchar *const dirs[] = { REALDATADIR "/cups", |
| 2203 |
"/usr/local/share/cups", |
2203 |
PREFIX "/local/share/cups", |
| 2204 |
NULL }; |
2204 |
NULL }; |
| 2205 |
const gchar *testprint[] = { "%s/data/testprint", |
2205 |
const gchar *testprint[] = { "%s/data/testprint", |
| 2206 |
"%s/data/testprint.ps", |
2206 |
"%s/data/testprint.ps", |
| 2207 |
-- a/panels/printers/pp-host.c |
2207 |
++ b/panels/printers/pp-host.c |
|
Lines 251-257
Link Here
|
| 251 |
data->devices->devices = NULL; |
251 |
data->devices->devices = NULL; |
| 252 |
|
252 |
|
| 253 |
argv = g_new0 (gchar *, 3); |
253 |
argv = g_new0 (gchar *, 3); |
| 254 |
argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); |
254 |
argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp"); |
| 255 |
argv[1] = g_strdup (priv->hostname); |
255 |
argv[1] = g_strdup (priv->hostname); |
| 256 |
|
256 |
|
| 257 |
/* Use SNMP to get printer's informations */ |
257 |
/* Use SNMP to get printer's informations */ |
