fork remote-login-service as remote-logon-service

5 files changed, 34 insertions, 36 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index b5f5d5b..fa9b8c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,8 @@
-
 pkglibexec_PROGRAMS = \
-	remote-login-service
+	remote-logon-service
 
 EXTRA_DIST = \
-	com.canonical.RemoteLogin.xml
+	org.ArcticaProject.RemoteLogon.xml
 
 noinst_LTLIBRARIES = \
 	libservers.la \
@@ -14,14 +13,14 @@ noinst_LTLIBRARIES = \
 ################################
 
 libgenerated_la_SOURCES = \
-	remote-login.c \
-	remote-login.h
+	remote-logon.c \
+	remote-logon.h
 libgenerated_la_CFLAGS = \
 	$(SERVICE_CFLAGS)
-$(libgenerated_la_SOURCES): com.canonical.RemoteLogin.xml
+$(libgenerated_la_SOURCES): org.ArcticaProject.RemoteLogon.xml
 	gdbus-codegen \
-		--interface-prefix com.canonical \
-		--generate-c remote-login \
+		--interface-prefix org.ArcticaProject \
+		--generate-c remote-logon \
 		$^
 
 BUILT_SOURCES = $(libgenerated_la_SOURCES)
@@ -53,19 +52,18 @@ libservers_la_LDFLAGS = \
 	$(COVERAGE_LDFLAGS) $(GCRYPT_LIBS) -lm
 
 ################################
-# remote-login-service
+# remote-logon-service
 ################################
 
-remote_login_service_CFLAGS = \
-	-DDEFAULT_CONFIG_FILE="\"$(sysconfdir)/remote-login-service.conf\"" \
+remote_logon_service_CFLAGS = \
+	-DDEFAULT_CONFIG_FILE="\"$(sysconfdir)/remote-logon-service.conf\"" \
 	$(SERVICE_CFLAGS) \
 	$(COVERAGE_CFLAGS)
-remote_login_service_LDADD = \
+remote_logon_service_LDADD = \
 	$(builddir)/libservers.la \
 	$(builddir)/libgenerated.la \
 	$(SERVICE_LIBS)
-remote_login_service_LDFLAGS = \
+remote_logon_service_LDFLAGS = \
 	$(COVERAGE_LDFLAGS)
-remote_login_service_SOURCES = \
+remote_logon_service_SOURCES = \
 	main.c
-
diff --git a/src/defines.h b/src/defines.h
index e205d2c..3747db1 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -19,7 +19,7 @@
 #ifndef __DEFINES_H__
 #define __DEFINES_H__
 
-#define CONFIG_MAIN_GROUP "Remote Login Service"
+#define CONFIG_MAIN_GROUP "Remote Logon Service"
 #define CONFIG_MAIN_SERVERS   "Servers"
 #define CONFIG_SERVER_PREFIX  "Server"
 #define CONFIG_SERVER_NAME    "Name"
diff --git a/src/main.c b/src/main.c
index 74e09e0..80a5745 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,7 @@
 /* NOTE: Required to build without optimizations */
 #include <locale.h>
 
-#include "remote-login.h"
+#include "remote-logon.h"
 #include "defines.h"
 
 #include "server.h"
@@ -51,7 +51,7 @@ error_domain (void)
 {
 	static GQuark value = 0;
 	if (value == 0) {
-		value = g_quark_from_static_string("remote-login-service");
+		value = g_quark_from_static_string("remote-logon-service");
 	}
 	return value;
 }
@@ -59,7 +59,7 @@ error_domain (void)
 /* When one of the state changes on the server emit that so that everone knows there
    might be a new server available. */
 static void
-server_status_updated (Server * server, ServerState newstate, RemoteLogin * rl)
+server_status_updated (Server * server, ServerState newstate, RemoteLogon * rl)
 {
 	GVariant * array = NULL;
 
@@ -73,14 +73,14 @@ server_status_updated (Server * server, ServerState newstate, RemoteLogin * rl)
 		array = g_variant_new_array(G_VARIANT_TYPE("(sssba(sbva{sv})a(si))"), NULL, 0);
 	}
 
-	remote_login_emit_servers_updated(rl, array);
+	remote_logon_emit_servers_updated(rl, array);
 	return;
 }
 
 /* Looks for the config file and does some basic parsing to pull out the UCCS servers
    that are configured in it */
 static void
-find_config_file (GKeyFile * parsed, const gchar * cmnd_line, RemoteLogin * rl)
+find_config_file (GKeyFile * parsed, const gchar * cmnd_line, RemoteLogon * rl)
 {
 	GError * error = NULL;
 	const gchar * file = DEFAULT_CONFIG_FILE;
@@ -151,7 +151,7 @@ server_list_to_array (GVariantBuilder * builder, GList * items)
 }
 
 static gboolean
-handle_get_servers (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpointer user_data)
+handle_get_servers (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data)
 {
 	GVariant * array = NULL;
 
@@ -197,7 +197,7 @@ handle_get_servers_login_cb (UccsServer * server, gboolean unlocked, gpointer us
 
 /* Handle the GetServerForLogin DBus call */
 static gboolean
-handle_get_servers_login (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpointer user_data)
+handle_get_servers_login (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data)
 {
 	GVariant * params = g_dbus_method_invocation_get_parameters(invocation);
 	const gchar * sender = g_dbus_method_invocation_get_sender(invocation);
@@ -283,7 +283,7 @@ handle_get_domains_list_helper (GList * list, const gchar * uri)
 
 /* Get the cached domains for a server */
 static gboolean
-handle_get_domains (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpointer user_data)
+handle_get_domains (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data)
 {
 	GVariant * params = g_dbus_method_invocation_get_parameters(invocation);
 
@@ -321,7 +321,7 @@ handle_get_domains (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpoint
 
 /* Set a given server as last used */
 static gboolean
-handle_set_last_used_server (RemoteLogin * rl, GDBusMethodInvocation * invocation, gpointer user_data)
+handle_set_last_used_server (RemoteLogon * rl, GDBusMethodInvocation * invocation, gpointer user_data)
 {
 	GVariant * params = g_dbus_method_invocation_get_parameters(invocation);
 
@@ -379,7 +379,7 @@ name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
 static gchar * cmnd_line_config = NULL;
 
 static GOptionEntry general_options[] = {
-	{"config-file",  'c',  0,  G_OPTION_ARG_FILENAME,  &cmnd_line_config, N_("Configuration file for the remote login service.  Defaults to '/etc/remote-login-service.conf'."), N_("key_file")},
+	{"config-file",  'c',  0,  G_OPTION_ARG_FILENAME,  &cmnd_line_config, N_("Configuration file for the remote logon service.  Defaults to '/etc/remote-logon-service.conf'."), N_("key_file")},
 	{NULL}
 };
 
@@ -405,7 +405,7 @@ main (int argc, char * argv[])
 	/* Handle command line parameters */
 	GOptionContext * context;
 	context = g_option_context_new(_("- Determine the remote servers that can be logged into"));
-	g_option_context_add_main_entries(context, general_options, "remote-login-service");
+	g_option_context_add_main_entries(context, general_options, "remote-logon-service");
 
 	if (!g_option_context_parse(context, &argc, &argv, &error)) {
 		g_print("option parsing failed: %s\n", error->message);
@@ -422,11 +422,11 @@ main (int argc, char * argv[])
 	}
 
 	/* Build Dbus Interface */
-	RemoteLogin * skel = remote_login_skeleton_new();
+	RemoteLogon * skel = remote_logon_skeleton_new();
 	/* Export it */
 	g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(skel),
 	                                 session_bus,
-	                                 "/com/canonical/RemoteLogin",
+	                                 "/org/ArcticaProject/RemoteLogon",
 	                                 NULL);
 	g_signal_connect(skel, "handle-get-servers", G_CALLBACK(handle_get_servers), NULL);
 	g_signal_connect(skel, "handle-get-servers-for-login", G_CALLBACK(handle_get_servers_login), NULL);
@@ -434,7 +434,7 @@ main (int argc, char * argv[])
 	g_signal_connect(skel, "handle-set-last-used-server", G_CALLBACK(handle_set_last_used_server), NULL);
 
 	g_bus_own_name_on_connection(session_bus,
-	                             "com.canonical.RemoteLogin",
+	                             "org.ArcticaProject.RemoteLogon",
 	                             G_BUS_NAME_OWNER_FLAGS_NONE,
 	                             NULL, /* aquired handler */
 	                             name_lost,
diff --git a/src/com.canonical.RemoteLogin.xml b/src/org.ArcticaProject.RemoteLogon.xml
index f0d8cb1..9e1bd26 100644
--- a/src/com.canonical.RemoteLogin.xml
+++ b/src/org.ArcticaProject.RemoteLogon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <node name="/">
-	<interface name="com.canonical.RemoteLogin">
+	<interface name="org.ArcticaProject.RemoteLogon">
 		<!-- SERVER LIST DOCS - it's in a few places :-)
 			s: server type: "ica", "freerdp", "x2go", "uccs"
 			s: server name
diff --git a/src/uccs-server.c b/src/uccs-server.c
index d8c61a9..69710df 100644
--- a/src/uccs-server.c
+++ b/src/uccs-server.c
@@ -180,9 +180,9 @@ clear_hash_helper (gpointer key, gpointer value, gpointer user_data)
 
 	g_dbus_connection_emit_signal(helper->session,
 	                              (const gchar *)key, /* dest */
-	                              "/com/canonical/RemoteLogin", /* object path */
-	                              "com.canonical.RemoteLogin", /* interface name */
-	                              "com.canonical.RemoteLogin.LoginChanged", /* signal name */
+	                              "/org/ArcticaProject/RemoteLogon", /* object path */
+	                              "org.ArcticaProject.RemoteLogon", /* interface name */
+	                              "org.ArcticaProject.RemoteLogon.LoginChanged", /* signal name */
 	                              helper->params, /* params */
 	                              &error);
 
@@ -807,7 +807,7 @@ uccs_server_get_servers (UccsServer * server, const gchar * address)
 	gchar *last_used_server_name = NULL;
 	if (server->username != NULL && server->password != NULL) {
 		gchar *username_sha = g_compute_checksum_for_string (G_CHECKSUM_SHA256, server->username, -1);
-		gchar *file_path = g_build_path ("/", g_get_user_cache_dir(), "remote-login-service", "cache", username_sha, NULL);
+		gchar *file_path = g_build_path ("/", g_get_user_cache_dir(), "remote-logon-service", "cache", username_sha, NULL);
 		gchar *encryptedContents;
 		gsize encryptedContentsLength;
 		if (g_file_get_contents (file_path, &encryptedContents, &encryptedContentsLength, NULL)) {
@@ -932,7 +932,7 @@ set_last_used_server (Server * server, const gchar * uri)
 			gchar *enc_data = do_aes_encrypt(data, UCCS_SERVER(server)->password, &enc_data_length);
 			g_free (data);
 
-			gchar *dir_path = g_build_path ("/", g_get_user_cache_dir(), "remote-login-service", "cache", NULL);
+			gchar *dir_path = g_build_path ("/", g_get_user_cache_dir(), "remote-logon-service", "cache", NULL);
 			gint status = g_mkdir_with_parents (dir_path, 0700);
 			if (status == 0)
 			{