X-Git-Url: https://uglyman.kremlin.cc/gitweb/gitweb.cgi?p=systembsd.git;a=blobdiff_plain;f=src%2Finterfaces%2Fhostnamed%2Fhostnamed.c;h=ad7df31fa55ba1badf37f2b7aa7d7742c314db18;hp=3fac9a4e8dcf6a0414169d0e0deafb5271fbe20f;hb=5b005882b2af5868261a01a386028291516aabb0;hpb=76b67a1868f8e9f47121d87819147ac157889432

diff --git a/src/interfaces/hostnamed/hostnamed.c b/src/interfaces/hostnamed/hostnamed.c
index 3fac9a4..ad7df31 100644
--- a/src/interfaces/hostnamed/hostnamed.c
+++ b/src/interfaces/hostnamed/hostnamed.c
@@ -25,13 +25,13 @@
 
 GPtrArray *hostnamed_freeable;
 GDBusNodeInfo *spect_data;
-Hostname1 *hostnamed_interf;
+hostnamedHostname1 *hostnamed_interf;
 
 /* begin method/property/signal code */
 
 /* TODO make sure these guys only work if called by root */
 static gboolean
-on_handle_set_hostname(Hostname1 *hn1_passed_interf,
+on_handle_set_hostname(hostnamedHostname1 *hn1_passed_interf,
                        GDBusMethodInvocation *invoc,
                        const gchar *greet,
                        gpointer data) {
@@ -39,7 +39,7 @@ on_handle_set_hostname(Hostname1 *hn1_passed_interf,
 }
 
 static gboolean
-on_handle_set_static_hostname(Hostname1 *hn1_passed_interf,
+on_handle_set_static_hostname(hostnamedHostname1 *hn1_passed_interf,
                               GDBusMethodInvocation *invoc,
                               const gchar *greet,
                               gpointer data) {
@@ -47,7 +47,7 @@ on_handle_set_static_hostname(Hostname1 *hn1_passed_interf,
 }
 
 static gboolean
-on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf,
+on_handle_set_pretty_hostname(hostnamedHostname1 *hn1_passed_interf,
                               GDBusMethodInvocation *invoc,
                               const gchar *greet,
                               gpointer data) {
@@ -55,7 +55,7 @@ on_handle_set_pretty_hostname(Hostname1 *hn1_passed_interf,
 }
 
 static gboolean
-on_handle_set_chassis(Hostname1 *hn1_passed_interf,
+on_handle_set_chassis(hostnamedHostname1 *hn1_passed_interf,
                       GDBusMethodInvocation *invoc,
                       const gchar *greet,
                       gpointer data) {
@@ -63,7 +63,7 @@ on_handle_set_chassis(Hostname1 *hn1_passed_interf,
 }
 
 static gboolean
-on_handle_set_icon_name(Hostname1 *hn1_passed_interf,
+on_handle_set_icon_name(hostnamedHostname1 *hn1_passed_interf,
                         GDBusMethodInvocation *invoc,
                         const gchar *greet,
                         gpointer data) {
@@ -138,7 +138,7 @@ our_get_os_pretty_name() {
 
 /* end method/property/signal code, begin bus/name handlers */
 
-static void on_bus_acquired(GDBusConnection *conn,
+static void hostnamed_on_bus_acquired(GDBusConnection *conn,
                             const gchar *name,
                             gpointer user_data) {
 
@@ -146,13 +146,13 @@ static void on_bus_acquired(GDBusConnection *conn,
 
 }
 
-static void on_name_acquired(GDBusConnection *conn,
+static void hostnamed_on_name_acquired(GDBusConnection *conn,
                              const gchar *name,
                              gpointer user_data) {
 
     g_print("got '%s' on system bus\n", name);
 
-    hostnamed_interf = hostname1_skeleton_new();
+    hostnamed_interf = hostnamed_hostname1_skeleton_new();
 
     /* attach function pointers to generated struct's method handlers */
     g_signal_connect(hostnamed_interf, "handle-set-hostname", G_CALLBACK(on_handle_set_hostname), NULL);
@@ -162,16 +162,16 @@ static void on_name_acquired(GDBusConnection *conn,
     g_signal_connect(hostnamed_interf, "handle-set-icon-name", G_CALLBACK(on_handle_set_icon_name), NULL);
 
     /* set our properties before export */
-    hostname1_set_hostname(hostnamed_interf, our_get_hostname());
-    hostname1_set_static_hostname(hostnamed_interf, our_get_static_hostname());
-    hostname1_set_pretty_hostname(hostnamed_interf, our_get_pretty_hostname());
-    hostname1_set_chassis(hostnamed_interf, our_get_chassis());
-    hostname1_set_icon_name(hostnamed_interf, our_get_icon_name());
-    hostname1_set_kernel_name(hostnamed_interf, our_get_kernel_name());
-    hostname1_set_kernel_version(hostnamed_interf, our_get_kernel_version());
-    hostname1_set_kernel_release(hostnamed_interf, our_get_kernel_release());
-    hostname1_set_operating_system_cpename(hostnamed_interf, our_get_os_cpename());
-    hostname1_set_operating_system_pretty_name(hostnamed_interf, our_get_os_pretty_name());
+    hostnamed_hostname1_set_hostname(hostnamed_interf, our_get_hostname());
+    hostnamed_hostname1_set_static_hostname(hostnamed_interf, our_get_static_hostname());
+    hostnamed_hostname1_set_pretty_hostname(hostnamed_interf, our_get_pretty_hostname());
+    hostnamed_hostname1_set_chassis(hostnamed_interf, our_get_chassis());
+    hostnamed_hostname1_set_icon_name(hostnamed_interf, our_get_icon_name());
+    hostnamed_hostname1_set_kernel_name(hostnamed_interf, our_get_kernel_name());
+    hostnamed_hostname1_set_kernel_version(hostnamed_interf, our_get_kernel_version());
+    hostnamed_hostname1_set_kernel_release(hostnamed_interf, our_get_kernel_release());
+    hostnamed_hostname1_set_operating_system_cpename(hostnamed_interf, our_get_os_cpename());
+    hostnamed_hostname1_set_operating_system_pretty_name(hostnamed_interf, our_get_os_pretty_name());
  
     if(!g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(hostnamed_interf),
                                                                    conn,
@@ -183,7 +183,7 @@ static void on_name_acquired(GDBusConnection *conn,
 
 }
 
-static void on_name_lost(GDBusConnection *conn,
+static void hostnamed_on_name_lost(GDBusConnection *conn,
                          const gchar *name,
                          gpointer user_data) {
 
@@ -216,9 +216,9 @@ GError *hostnamed_init() {
     bus_descriptor = g_bus_own_name(G_BUS_TYPE_SYSTEM,
                                     "org.freedesktop.hostname1",
                                     G_BUS_NAME_OWNER_FLAGS_NONE,
-                                    on_bus_acquired,
-                                    on_name_acquired,
-                                    on_name_lost,
+                                    hostnamed_on_bus_acquired,
+                                    hostnamed_on_name_acquired,
+                                    hostnamed_on_name_lost,
                                     NULL,
                                     NULL);