]>
Commit | Line | Data |
---|---|---|
e5a3a775 BS |
1 | --- gnucash-2.6.3/src/core-utils/gnc-path.c.orig 2014-03-01 20:55:35.000000000 +0100 |
2 | +++ gnucash-2.6.3/src/core-utils/gnc-path.c 2014-06-24 21:56:28.519968927 +0200 | |
3 | @@ -23,12 +23,11 @@ | |
4 | #include "gnc-path.h" | |
5 | #include "gncla-dir.h" | |
6 | #include <stdio.h> | |
7 | -#include "binreloc.h" | |
8 | ||
9 | gchar *gnc_path_get_prefix() | |
10 | { | |
11 | //printf("Returning prefix %s\n", gnc_gbr_find_prefix (PREFIX)); | |
12 | - return gnc_gbr_find_prefix (PREFIX); | |
13 | + return g_strdup (PREFIX); | |
14 | } | |
15 | ||
16 | /** Returns the bindir path, usually | |
17 | @@ -38,7 +37,7 @@ | |
18 | gchar *gnc_path_get_bindir() | |
19 | { | |
20 | //printf("Returning bindir %s\n", gnc_gbr_find_bin_dir (BINDIR)); | |
21 | - return gnc_gbr_find_bin_dir (BINDIR); | |
22 | + return g_strdup (BINDIR); | |
23 | } | |
24 | ||
25 | /** Returns the libdir path, usually | |
26 | @@ -48,7 +47,7 @@ | |
27 | gchar *gnc_path_get_libdir() | |
28 | { | |
29 | //printf("Returning libdir %s\n", gnc_gbr_find_lib_dir (LIBDIR)); | |
30 | - return gnc_gbr_find_lib_dir (LIBDIR); | |
31 | + return g_strdup (LIBDIR); | |
32 | } | |
33 | ||
34 | /** Returns the datadir path, usually | |
35 | @@ -57,7 +56,7 @@ | |
36 | * @returns A newly allocated string. */ | |
37 | gchar *gnc_path_get_pkgdatadir() | |
38 | { | |
39 | - gchar *datadir = gnc_gbr_find_data_dir (DATADIR); | |
40 | + gchar *datadir = g_strdup (DATADIR); | |
41 | gchar *result = g_build_filename (datadir, "gnucash", (char*)NULL); | |
42 | g_free (datadir); | |
43 | //printf("Returning pkgdatadir %s\n", result); | |
44 | @@ -70,7 +69,7 @@ | |
45 | * @returns A newly allocated string. */ | |
46 | gchar *gnc_path_get_pkgdocdir() | |
47 | { | |
48 | - gchar *docdir = gnc_gbr_find_data_dir (DATADIR); | |
49 | + gchar *docdir = g_strdup (DATADIR); | |
50 | gchar *result = g_build_filename (docdir, "doc", "gnucash", (char*)NULL); | |
51 | g_free (docdir); | |
52 | //printf("Returning pkgdocdir %s\n", result); | |
53 | @@ -83,7 +82,7 @@ | |
54 | * @returns A newly allocated string. */ | |
55 | gchar *gnc_path_get_pkgsysconfdir() | |
56 | { | |
57 | - gchar *sysconfdir = gnc_gbr_find_etc_dir (SYSCONFDIR); | |
58 | + gchar *sysconfdir = g_strdup (SYSCONFDIR); | |
59 | gchar *result = g_build_filename (sysconfdir, "gnucash", (char*)NULL); | |
60 | g_free (sysconfdir); | |
61 | //printf("Returning pkgsysconfdir %s\n", result); |