X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=fc50a2445cdd8bc547163381d62f59c52ea7f6ab;hb=e8f563da640afecdbe77027d7d27e0768f52bebc;hp=0c343e43faff7f869dd80b7b92ec8ec7fef3ce0b;hpb=fbc0295f6d0b50482a8f636b5ceba244e195ecaa;p=systembsd.git

diff --git a/src/main.c b/src/main.c
index 0c343e4..fc50a24 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,6 +28,25 @@
 //#include "main/h"
 
 gboolean systemd_utils_init() {
+<<<<<<< HEAD
+	#ifdef INSTALL
+		if(!config_init()) {
+			gchar *tmp;
+			tmp = "/etc/"; //what the hell is /etc/xdg anyway
+
+			g_printf("FAILED to install configs in %s!\n", tmp);
+			return FALSE;
+		} 
+		if(!init_xml()) {
+			gchar **tmp;
+			tmp = g_get_system_data_dirs();
+
+			g_printf("FAILED to install xml configs in %s!\n", tmp[0]);
+			return FALSE;
+		}
+	#endif
+	return TRUE;
+=======
     #ifdef INSTALL
         if(!config_init()) {
             g_printf("%s\n", "FAILED to install configs in /etc/!");
@@ -35,6 +54,7 @@ gboolean systemd_utils_init() {
         }
     #endif
     return TRUE;
+>>>>>>> master
 }
 
 int main() {