From 7dfb9732b27778722214531d0c17b7e50e8a2fe1 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Mon, 5 Mar 2007 15:24:56 -0500 Subject: rename host-name to remote-host-name to make it more intuitive --- libck-connector/ck-connector.c | 8 ------ src/ck-session.c | 49 +++++++++++++++++++---------------- src/ck-session.h | 6 ++--- src/ck-session.xml | 4 +-- tools/linux/ck-collect-session-info.c | 12 ++++----- tools/list-sessions.c | 12 ++++----- 6 files changed, 44 insertions(+), 47 deletions(-) diff --git a/libck-connector/ck-connector.c b/libck-connector/ck-connector.c index 2e95f20..b5842c4 100644 --- a/libck-connector/ck-connector.c +++ b/libck-connector/ck-connector.c @@ -464,10 +464,6 @@ ck_connector_open_session_for_user (CkConnector *connector, goto out; } - if (! add_param_string (&iter_array, "host-name", "localhost")) { - goto out; - } - if (! add_param_string (&iter_array, "display-device", tty)) { goto out; } @@ -482,10 +478,6 @@ ck_connector_open_session_for_user (CkConnector *connector, goto out; } - if (! add_param_bool (&iter_array, "is-local", TRUE)) { - goto out; - } - if (! dbus_message_iter_close_container (&iter, &iter_array)) { goto out; } diff --git a/src/ck-session.c b/src/ck-session.c index 9d53072..d8f09f2 100644 --- a/src/ck-session.c +++ b/src/ck-session.c @@ -53,7 +53,7 @@ struct CkSessionPrivate char *display_device; char *x11_display_device; char *x11_display; - char *host_name; + char *remote_host_name; guint uid; gboolean active; @@ -86,7 +86,7 @@ enum { PROP_X11_DISPLAY_DEVICE, PROP_DISPLAY_DEVICE, PROP_SESSION_TYPE, - PROP_HOST_NAME, + PROP_REMOTE_HOST_NAME, PROP_IS_LOCAL, PROP_ACTIVE, PROP_IDLE_HINT, @@ -492,14 +492,14 @@ ck_session_get_x11_display_device (CkSession *session, } gboolean -ck_session_get_host_name (CkSession *session, - char **host_name, - GError **error) +ck_session_get_remote_host_name (CkSession *session, + char **remote_host_name, + GError **error) { g_return_val_if_fail (CK_IS_SESSION (session), FALSE); - if (host_name != NULL) { - *host_name = g_strdup (session->priv->host_name); + if (remote_host_name != NULL) { + *remote_host_name = g_strdup (session->priv->remote_host_name); } return TRUE; @@ -652,14 +652,14 @@ ck_session_set_x11_display_device (CkSession *session, } gboolean -ck_session_set_host_name (CkSession *session, - const char *host_name, - GError **error) +ck_session_set_remote_host_name (CkSession *session, + const char *remote_host_name, + GError **error) { g_return_val_if_fail (CK_IS_SESSION (session), FALSE); - g_free (session->priv->host_name); - session->priv->host_name = g_strdup (host_name); + g_free (session->priv->remote_host_name); + session->priv->remote_host_name = g_strdup (remote_host_name); return TRUE; } @@ -715,8 +715,8 @@ ck_session_set_property (GObject *object, case PROP_USER: ck_session_set_user (self, g_value_get_uint (value), NULL); break; - case PROP_HOST_NAME: - ck_session_set_host_name (self, g_value_get_string (value), NULL); + case PROP_REMOTE_HOST_NAME: + ck_session_set_remote_host_name (self, g_value_get_string (value), NULL); break; case PROP_IDLE_HINT: session_set_idle_hint_internal (self, g_value_get_boolean (value)); @@ -765,8 +765,8 @@ ck_session_get_property (GObject *object, case PROP_USER: g_value_set_uint (value, self->priv->uid); break; - case PROP_HOST_NAME: - g_value_set_string (value, self->priv->host_name); + case PROP_REMOTE_HOST_NAME: + g_value_set_string (value, self->priv->remote_host_name); break; case PROP_IDLE_HINT: g_value_set_boolean (value, self->priv->idle_hint); @@ -895,10 +895,10 @@ ck_session_class_init (CkSessionClass *klass) NULL, G_PARAM_READWRITE)); g_object_class_install_property (object_class, - PROP_HOST_NAME, - g_param_spec_string ("host-name", - "host-name", - "Host name", + PROP_REMOTE_HOST_NAME, + g_param_spec_string ("remote-host-name", + "remote-host-name", + "Remote host name", NULL, G_PARAM_READWRITE)); @@ -950,7 +950,7 @@ ck_session_finalize (GObject *object) g_free (session->priv->seat_id); g_free (session->priv->session_type); g_free (session->priv->x11_display); - g_free (session->priv->host_name); + g_free (session->priv->remote_host_name); G_OBJECT_CLASS (ck_session_parent_class)->finalize (object); } @@ -1008,7 +1008,12 @@ ck_session_new_with_parameters (const char *ssid, 1, &prop_val, G_MAXUINT); - g_object_set_property (object, prop_name, prop_val); + if (g_object_class_find_property (G_OBJECT_GET_CLASS (object), prop_name)) { + g_object_set_property (object, prop_name, prop_val); + } else { + ck_debug ("Skipping unknown parameter: %s", prop_name); + } + g_value_unset (prop_val); } } diff --git a/src/ck-session.h b/src/ck-session.h index 392e219..40c5e9d 100644 --- a/src/ck-session.h +++ b/src/ck-session.h @@ -101,8 +101,8 @@ gboolean ck_session_set_x11_display_device (CkSession *se gboolean ck_session_set_display_device (CkSession *session, const char *device, GError **error); -gboolean ck_session_set_host_name (CkSession *session, - const char *host_name, +gboolean ck_session_set_remote_host_name (CkSession *session, + const char *remote_host_name, GError **error); gboolean ck_session_set_session_type (CkSession *session, const char *type, @@ -138,7 +138,7 @@ gboolean ck_session_get_display_device (CkSession *se gboolean ck_session_get_session_type (CkSession *session, char **type, GError **error); -gboolean ck_session_get_host_name (CkSession *session, +gboolean ck_session_get_remote_host_name (CkSession *session, char **host_name, GError **error); gboolean ck_session_get_creation_time (CkSession *session, diff --git a/src/ck-session.xml b/src/ck-session.xml index 5a993cb..0c90fb1 100644 --- a/src/ck-session.xml +++ b/src/ck-session.xml @@ -24,8 +24,8 @@ - - + + diff --git a/tools/linux/ck-collect-session-info.c b/tools/linux/ck-collect-session-info.c index cee5ccc..ec6dda2 100644 --- a/tools/linux/ck-collect-session-info.c +++ b/tools/linux/ck-collect-session-info.c @@ -41,7 +41,7 @@ typedef struct { char *x11_display_device; char *x11_display; gboolean x11_can_connect; - char *hostname; + char *remote_host_name; char *session_type; gboolean is_local; gboolean is_local_is_set; @@ -53,7 +53,7 @@ session_info_free (SessionInfo *si) g_free (si->display_device); g_free (si->x11_display_device); g_free (si->x11_display); - g_free (si->hostname); + g_free (si->remote_host_name); g_free (si->session_type); g_free (si); } @@ -277,8 +277,8 @@ fill_x11_info (SessionInfo *si) si->is_local = TRUE; si->is_local_is_set = TRUE; - g_free (si->hostname); - si->hostname = g_strdup ("localhost"); + g_free (si->remote_host_name); + si->remote_host_name = NULL; } static gboolean @@ -331,8 +331,8 @@ print_session_info (SessionInfo *si) if (si->session_type != NULL) { printf ("session-type = %s\n", si->session_type); } - if (si->hostname != NULL) { - printf ("host-name = %s\n", si->hostname); + if (si->remote_host_name != NULL) { + printf ("remote-host-name = %s\n", si->remote_host_name); } if (si->is_local_is_set == TRUE) { printf ("is-local = %s\n", si->is_local ? "true" : "false"); diff --git a/tools/list-sessions.c b/tools/list-sessions.c index be61bbe..1ea9110 100644 --- a/tools/list-sessions.c +++ b/tools/list-sessions.c @@ -167,7 +167,7 @@ list_session (DBusGConnection *connection, char *x11_display; char *x11_display_device; char *display_device; - char *host_name; + char *remote_host_name; char *creation_time; char *idle_since_hint; gboolean is_active; @@ -188,7 +188,7 @@ list_session (DBusGConnection *connection, x11_display = NULL; x11_display_device = NULL; display_device = NULL; - host_name = NULL; + remote_host_name = NULL; creation_time = NULL; idle_since_hint = NULL; @@ -198,7 +198,7 @@ list_session (DBusGConnection *connection, get_string (proxy, "GetX11Display", &x11_display); get_string (proxy, "GetX11DisplayDevice", &x11_display_device); get_string (proxy, "GetDisplayDevice", &display_device); - get_string (proxy, "GetHostName", &host_name); + get_string (proxy, "GetRemoteHostName", &remote_host_name); get_boolean (proxy, "IsActive", &is_active); get_boolean (proxy, "IsLocal", &is_local); get_string (proxy, "GetCreationTime", &creation_time); @@ -216,7 +216,7 @@ list_session (DBusGConnection *connection, short_ssid = ssid + strlen (CK_PATH) + 1; } - printf ("%s:\n\tuid = '%d'\n\trealname = '%s'\n\tseat = '%s'\n\tsession-type = '%s'\n\tactive = %s\n\tx11-display = '%s'\n\tx11-display-device = '%s'\n\tdisplay-device = '%s'\n\thost-name = '%s'\n\tis-local = %s\n\ton-since = '%s'", + printf ("%s:\n\tuid = '%d'\n\trealname = '%s'\n\tseat = '%s'\n\tsession-type = '%s'\n\tactive = %s\n\tx11-display = '%s'\n\tx11-display-device = '%s'\n\tdisplay-device = '%s'\n\tremote-host-name = '%s'\n\tis-local = %s\n\ton-since = '%s'", short_ssid, uid, realname, @@ -226,7 +226,7 @@ list_session (DBusGConnection *connection, x11_display, x11_display_device, display_device, - host_name, + remote_host_name, is_local ? "TRUE" : "FALSE", creation_time); if (idle_since_hint != NULL && idle_since_hint[0] != '\0') { @@ -236,7 +236,7 @@ list_session (DBusGConnection *connection, g_free (idle_since_hint); g_free (creation_time); - g_free (host_name); + g_free (remote_host_name); g_free (realname); g_free (sid); g_free (session_type); -- cgit