export proper xml FINALLY..

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 42137cde94e27b8418da12ab4fa3bfb85343c648..231bc4e2cd854def7e2f29c652d4ecfc622cbc37 100644 (file)
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -11,8 +11,6 @@ static void handle_method_call(GDBusConnection *conn,
                                                           GDBusMethodInvocation *invc,
                                                           gpointer usrdat) {
 
-       //if(g_strcmp0(method_name, "Introspect"
-
        GVariant *xml_ret_gvar;
        GString  *xml_ret;
        
@@ -71,17 +69,18 @@ static const GDBusInterfaceVTable interface_vtable =
 static void on_bus_acquired(GDBusConnection *conn,
                                                        const gchar *name,
                                                        gpointer user_data) {
-       g_print("got bus, name: %s\n", name);
-       
-       guint reg_id;
-
-       reg_id = g_dbus_connection_register_object(conn,
-                                                                                          "/org/freedesktop/hostname1",
-                                                                                          spect_data->interfaces[0], 
-                                                                                          &interface_vtable,
-                                                                                          NULL,
-                                                                                          NULL,
-                                                                                          NULL);
+
+       GError *err;
+
+       g_print("got bus, name: %s\n", name);   
+
+       //GDBusObjectSkeleton *hostnamed_dbobj = g_dbus_object_skeleton_new("/org/freedesktop/hostname1");
+
+       g_dbus_connection_register_object(conn,
+                                                                         "/org/freedesktop/hostname1",
+                                                                         spect_data->interfaces[0],
+                                                                         &interface_vtable,
+                                                                         NULL, NULL, NULL);
 }
 
 static void on_name_acquired(GDBusConnection *conn,
@@ -104,10 +103,16 @@ static void on_name_lost(GDBusConnection *conn,
 GError * hostnamed_init() {
 
        guint bus_descriptor;
-       GError *err = NULL;     
+       GError *err = NULL;
+       gchar **hostnamed_ispect_xml = g_malloc(3000);
+       gchar  *hostnamed_joined_xml = g_malloc(3000);
+
+       g_file_get_contents("conf/hostnamed-ispect.xml", hostnamed_ispect_xml, NULL, err);
+       hostnamed_joined_xml = g_strjoinv("\n", hostnamed_ispect_xml);
+       spect_data = g_dbus_node_info_new_for_xml(hostnamed_joined_xml, NULL);
        
        bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
-                                       (gchar *)"org.freedesktop.hostname1",
+                                       "org.freedesktop.hostname1",
                                                    G_BUS_NAME_OWNER_FLAGS_NONE,
                                                    on_bus_acquired,
                                                    on_name_acquired,

diff --git a/src/main.c b/src/main.c
index 59e23fe96ea74a26525ccde1cba2d10b629a02b2..f81e0208255eb71947cdc083dcefda2ca99fe16d 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,12 +1,11 @@
 /* debugging */
-#define INSTALL 1
-#define NO_BUILTIN_XML 1
-
+//#define INSTALL 1
+//#define NO_BUILTIN_XML 1
 /* end debugging */
 
 #include <gio/gio.h>
 #include "interfaces/hostnamed/hostnamed.c"
-#include "main.h"
+//#include "main.h"
 
 int main() {
 

diff --git a/src/main.h b/src/main.h
index 5e8093f0139afcf80bc1e67b383925d84fee68de..c8f97819dee7e4811a1715d80b25f3fafc71908d 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -1,5 +1,4 @@
 #include <gio/gio.h>
-#include "xml_defs.h"
 
 gboolean install_conf() {
        gchar *our_conf_uri   = "systemd-utl/xml-conf/";
@@ -13,7 +12,8 @@ gboolean install_conf() {
                /*TODO permissions w/ this */
                g_mkdir_with_parents(our_conf_path, 0644);
        
-               return (errors[0] == NULL);
+               return FALSE;
+               //return (errors[0] == NULL);
 
                } else
                        return FALSE;