Make x_authority_new_local_cookie to de-duplicate code

diff --git a/src/x-authority.c b/src/x-authority.c
index 6e08d12e36abfc5e0e37570459f38e2a99bc2f5e..2f919e1f5ff228c3185bd39cc21a30d1e28943a8 100644 (file)
--- a/src/x-authority.c
+++ b/src/x-authority.c
@@ -67,6 +67,15 @@ x_authority_new_cookie (guint16 family, const guint8 *address, gsize address_len
     return x_authority_new (family, address, address_length, number, "MIT-MAGIC-COOKIE-1", cookie, 16);
 }
 
+XAuthority *
+x_authority_new_local_cookie (const gchar *number)
+{
+    gchar hostname[1024];
+
+    gethostname (hostname, 1024);
+    return x_authority_new_cookie (XAUTH_FAMILY_LOCAL, (guint8 *) hostname, strlen (hostname), number);
+}
+
 void
 x_authority_set_family (XAuthority *auth, guint16 family)
 {

diff --git a/src/x-authority.h b/src/x-authority.h
index 101cb1cac323008c656b110c4f1e6d1504989158..d908422f506165a6be534b3b37cc2a2937c4d9b2 100644 (file)
--- a/src/x-authority.h
+++ b/src/x-authority.h
@@ -56,6 +56,8 @@ XAuthority *x_authority_new (guint16 family, const guint8 *address, gsize addres
 
 XAuthority *x_authority_new_cookie (guint16 family, const guint8 *address, gsize address_length, const gchar *number);
 
+XAuthority *x_authority_new_local_cookie (const gchar *number);
+
 void x_authority_set_family (XAuthority *auth, guint16 family);
 
 guint16 x_authority_get_family (XAuthority *auth);

diff --git a/src/x-server-local.c b/src/x-server-local.c
index 0f5cc204998897919804e177864d15227ac09e51..0860651a72eda432f32feecb80a66bc6fb5125d9 100644 (file)
--- a/src/x-server-local.c
+++ b/src/x-server-local.c
@@ -12,7 +12,6 @@
 #include <config.h>
 #include <string.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <glib/gstdio.h>
@@ -204,16 +203,15 @@ XServerLocal *
 x_server_local_new (void)
 {
     XServerLocal *self;
-    gchar hostname[1024], *number, *name;
+    gchar *number, *name;
     XAuthority *cookie;
 
     self = g_object_new (X_SERVER_LOCAL_TYPE, NULL);
 
     x_server_set_display_number (X_SERVER (self), x_server_local_get_unused_display_number ());
 
-    gethostname (hostname, 1024);
     number = g_strdup_printf ("%d", x_server_get_display_number (X_SERVER (self)));
-    cookie = x_authority_new_cookie (XAUTH_FAMILY_LOCAL, (guint8*) hostname, strlen (hostname), number);
+    cookie = x_authority_new_local_cookie (number);
     x_server_set_authority (X_SERVER (self), cookie);
     g_free (number);
     g_object_unref (cookie);

diff --git a/src/x-server-xvnc.c b/src/x-server-xvnc.c
index 4c5597c9f781e0ce9bf85a8bf5f2e38eabb201e0..ec6bbe32162f07a571f0fd6dd150904b765bf1d1 100644 (file)
--- a/src/x-server-xvnc.c
+++ b/src/x-server-xvnc.c
@@ -12,7 +12,6 @@
 #include <config.h>
 #include <string.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <glib/gstdio.h>
@@ -185,7 +184,7 @@ x_server_xvnc_start (DisplayServer *display_server)
     gboolean result, backup_logs;
     gchar *filename, *run_dir, *dir, *log_file, *absolute_command;
     GString *command;
-    gchar hostname[1024], *number;
+    gchar *number;
     GError *error = NULL;
 
     g_return_val_if_fail (server->priv->x_server_process == NULL, FALSE);
@@ -216,9 +215,8 @@ x_server_xvnc_start (DisplayServer *display_server)
         return FALSE;
     }
 
-    gethostname (hostname, 1024);
     number = g_strdup_printf ("%d", x_server_get_display_number (X_SERVER (server)));
-    authority = x_authority_new_cookie (XAUTH_FAMILY_LOCAL, (guint8*) hostname, strlen (hostname), number);
+    authority = x_authority_new_local_cookie (number);
 
     x_server_set_authority (X_SERVER (server), authority);