X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=42137cde94e27b8418da12ab4fa3bfb85343c648;hb=779c3163b3088c140854071fd3b122baec097d26;hp=3f461e9e4f3a05ccadfafa72e708be27d57fa034;hpb=80043b3695d542783fa08dc6c351276a104ff1f1;p=systembsd.git

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 3f461e9..42137cd 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -1,8 +1,6 @@
 #include <gio/gio.h>
-#include "hostnamed.h"
 
 GDBusNodeInfo *spect_data;
-GMainLoop *loop;
 
 static void handle_method_call(GDBusConnection *conn,
 			   				   const gchar *sender,
@@ -13,11 +11,11 @@ static void handle_method_call(GDBusConnection *conn,
 							   GDBusMethodInvocation *invc,
 							   gpointer usrdat) {
 
-	g_printf("%s wants to call %s, at %s with interface %s\n", sender, method_name, obj_path, interf_name);
+	//if(g_strcmp0(method_name, "Introspect"
 
-	GString  *xml_ret;
 	GVariant *xml_ret_gvar;
-
+	GString  *xml_ret;
+	
 	g_dbus_interface_info_generate_xml(spect_data->interfaces[0], (guint)0, xml_ret);
 	xml_ret_gvar = g_variant_new_string(xml_ret->str);
 	g_dbus_method_invocation_return_value(invc, xml_ret_gvar);
@@ -84,7 +82,6 @@ static void on_bus_acquired(GDBusConnection *conn,
 											   NULL,
 											   NULL,
 											   NULL);
-	g_assert(reg_id > 0);
 }
 
 static void on_name_acquired(GDBusConnection *conn,
@@ -98,19 +95,18 @@ static void on_name_lost(GDBusConnection *conn,
 						 const gchar *name,
 						 gpointer user_data) {
 
-	g_print("lost name %s, exiting...\n", name);
-	g_main_loop_quit(loop);
+	g_print("lost name %s, exiting...", name);
+	//TODO exit through g_main_loop properly...
+	exit(0);
 }
 
 /* safe call to try and start hostnamed */
-GError hostnamed_init() {
+GError * hostnamed_init() {
 
 	guint bus_descriptor;
 	GError *err = NULL;	
-
-	spect_data = g_dbus_node_info_new_for_xml(SYSTEMD_HOSTNAMED_XML, &err);
-
-	bus_descriptor = g_bus_own_name(G_BUS_TYPE_SESSION,
+	
+	bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
 	                                (gchar *)"org.freedesktop.hostname1",
 				                    G_BUS_NAME_OWNER_FLAGS_NONE,
 				                    on_bus_acquired,
@@ -119,6 +115,6 @@ GError hostnamed_init() {
 				                    NULL,
 				                    NULL);
 
-	loop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(loop);
+	//TODO: malloc and return reference as if a main() closed
+	return err;
 }