|
|
@ -38,7 +38,15 @@ |
|
|
tmpfile = g_build_filename(g_get_tmp_dir(), "obshutdown.lock", NULL); |
|
|
tmpfile = g_build_filename(g_get_tmp_dir(), "obshutdown.lock", NULL); |
|
|
|
|
|
|
|
|
if(g_file_test(tmpfile, G_FILE_TEST_EXISTS)) { |
|
|
if(g_file_test(tmpfile, G_FILE_TEST_EXISTS)) { |
|
|
@@ -288,13 +302,6 @@ void initDataDefault(void) |
|
|
@@ -112,7 +126,6 @@ void migrateConfigToXdgDir(void) |
|
|
|
|
|
gchar *oldFilename, *newFilename, *xdgPath; |
|
|
|
|
|
GFile *oldFile, *newFile; |
|
|
|
|
|
|
|
|
|
|
|
- |
|
|
|
|
|
xdgPath = g_build_filename(g_get_user_config_dir(), OBS_NAME, NULL); |
|
|
|
|
|
if (g_file_test(xdgPath, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) { |
|
|
|
|
|
g_free(xdgPath); |
|
|
|
|
|
@@ -288,13 +301,6 @@ void initDataDefault(void) |
|
|
/* Configs paths */ |
|
|
/* Configs paths */ |
|
|
myOptions.rcfile = getRcPath(); |
|
|
myOptions.rcfile = getRcPath(); |
|
|
myOptions.trcfile = NULL; |
|
|
myOptions.trcfile = NULL; |
|
|
@ -52,3 +60,11 @@ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
void freeData(void) |
|
|
void freeData(void) |
|
|
|
|
|
@@ -336,7 +342,6 @@ void freeData(void) |
|
|
|
|
|
g_free(myOptions.rcfile); |
|
|
|
|
|
if (myOptions.theme) |
|
|
|
|
|
g_free(myOptions.trcfile); |
|
|
|
|
|
- |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
inline void initGtk(int *argc, char ***argv) |
|
|
|