|
Lines 891-917
Link Here
|
| 891 |
} |
890 |
} |
| 892 |
|
891 |
|
| 893 |
if (config_source == NULL) |
892 |
if (config_source == NULL) |
| 894 |
{ |
893 |
conf = gconf_engine_get_default(); |
| 895 |
/* If we aren't running from within a session, |
|
|
| 896 |
* assume we'll be touching the database locally |
| 897 |
*/ |
| 898 |
conf = NULL; |
| 899 |
if (g_getenv ("DBUS_SESSION_BUS_ADDRESS") == NULL) |
| 900 |
{ |
| 901 |
char *conffile; |
| 902 |
GSList *addresses; |
| 903 |
|
| 904 |
conffile = g_strconcat (GCONF_CONFDIR, "/path", NULL); |
| 905 |
addresses = gconf_load_source_path (conffile, NULL); |
| 906 |
g_free(conffile); |
| 907 |
|
| 908 |
conf = gconf_engine_get_local_for_addresses (addresses, &err); |
| 909 |
gconf_address_list_free (addresses); |
| 910 |
} |
| 911 |
|
| 912 |
if (conf == NULL) |
| 913 |
conf = gconf_engine_get_default(); |
| 914 |
} |
| 915 |
else |
894 |
else |
| 916 |
{ |
895 |
{ |
| 917 |
GSList *addresses; |
896 |
GSList *addresses; |
