merge license, hostname buffer changes from master branch

[systembsd.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 56d3967faecf09bb106364a8863d16281e1cdf30..fc50a2445cdd8bc547163381d62f59c52ea7f6ab 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -28,30 +28,50 @@
 //#include "main/h"
 
 gboolean systemd_utils_init() {
+<<<<<<< HEAD
        #ifdef INSTALL
                if(!config_init()) {
-                       g_printf("%s\n", "FAILED to install configs in /etc/!");
-                       return FALSE; 
+                       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/!");
+            return FALSE; 
+        }
+    #endif
+    return TRUE;
+>>>>>>> master
 }
 
 int main() {
 
-       GMainLoop *mloop;
-       
-       if(!systemd_utils_init()) {
-               g_printf("failed to init, are you root?\n");
-               return 1; //TODO errno properly. grep for all "return 1;"s, not TODO'ing each one
-       }
+    GMainLoop *mloop;
+    
+    if(!systemd_utils_init()) {
+        g_printf("failed to init, are you root?\n");
+        return 1; //TODO errno properly. grep for all "return 1;"s, not TODO'ing each one
+    }
 
-       hostnamed_init();
+    hostnamed_init();
 
-       mloop = g_main_loop_new(NULL, TRUE);
+    mloop = g_main_loop_new(NULL, TRUE);
 
-       g_main_loop_run(mloop);
-       g_main_loop_unref(mloop);
+    g_main_loop_run(mloop);
+    g_main_loop_unref(mloop);
 
-       return 0;
+    return 0;
 }