Add an abstract base class for display factories. Rename gdm-xdmcp-manager

2007-08-03  William Jon McCann  <mccann@jhu.edu>

	* daemon/Makefile.am:
	* daemon/gdm-display-factory.c: (gdm_display_factory_error_quark),
	(gdm_display_factory_get_display_store),
	(gdm_display_factory_start), (gdm_display_factory_stop),
	(gdm_display_factory_set_display_store),
	(gdm_display_factory_set_property),
	(gdm_display_factory_get_property),
	(gdm_display_factory_class_init), (gdm_display_factory_init),
	(gdm_display_factory_finalize):
	* daemon/gdm-display-factory.h:
	* daemon/gdm-local-display-factory.c: (create_display_for_device),
	(create_displays_for_pci_devices),
	(gdm_local_display_factory_start),
	(gdm_local_display_factory_set_property),
	(gdm_local_display_factory_get_property),
	(gdm_local_display_factory_class_init):
	* daemon/gdm-local-display-factory.h:
	* daemon/gdm-manager.c: (gdm_manager_start),
	(gdm_manager_set_wait_for_go), (gdm_manager_constructor),
	(gdm_manager_finalize):
	* daemon/gdm-xdmcp-display-factory.c:
	(gdm_xdmcp_display_factory_error_quark), (get_next_session_serial),
	(setup_multicast), (open_port), (gdm_xdmcp_num_displays_from_host),
	(gdm_xdmcp_display_lookup_by_host), (get_willing_output),
	(gdm_xdmcp_send_willing), (gdm_xdmcp_send_unwilling),
	(gdm_xdmcp_send_forward_query), (handle_any_query),
	(handle_direct_query), (gdm_xdmcp_handle_broadcast_query),
	(gdm_xdmcp_handle_query), (gdm_xdmcp_handle_indirect_query),
	(gdm_forward_query_dispose), (remove_oldest_forward),
	(gdm_forward_query_alloc), (gdm_forward_query_lookup),
	(gdm_xdmcp_whack_queued_managed_forwards),
	(gdm_xdmcp_handle_forward_query),
	(gdm_xdmcp_really_send_managed_forward), (managed_forward_handler),
	(gdm_xdmcp_send_managed_forward),
	(gdm_xdmcp_send_got_managed_forward), (count_sessions),
	(gdm_xdmcp_recount_sessions), (purge_displays),
	(gdm_xdmcp_displays_purge), (display_dispose_check),
	(gdm_xdmcp_send_decline), (gdm_xdmcp_display_alloc),
	(gdm_xdmcp_send_accept), (gdm_xdmcp_handle_request),
	(gdm_xdmcp_display_lookup), (gdm_xdmcp_send_failed),
	(gdm_xdmcp_send_refuse), (gdm_xdmcp_handle_manage),
	(gdm_xdmcp_handle_managed_forward),
	(gdm_xdmcp_handle_got_managed_forward), (gdm_xdmcp_send_alive),
	(gdm_xdmcp_handle_keepalive), (decode_packet),
	(gdm_xdmcp_display_factory_start),
	(gdm_xdmcp_display_factory_stop),
	(gdm_xdmcp_display_factory_set_port),
	(gdm_xdmcp_display_factory_set_use_multicast),
	(gdm_xdmcp_display_factory_set_multicast_address),
	(gdm_xdmcp_display_factory_set_honor_indirect),
	(gdm_xdmcp_display_factory_set_max_displays_per_host),
	(gdm_xdmcp_display_factory_set_max_displays),
	(gdm_xdmcp_display_factory_set_max_pending_displays),
	(gdm_xdmcp_display_factory_set_max_wait),
	(gdm_xdmcp_display_factory_set_willing_script),
	(gdm_xdmcp_display_factory_set_property),
	(gdm_xdmcp_display_factory_get_property),
	(gdm_xdmcp_display_factory_class_init),
	(gdm_xdmcp_display_factory_init),
	(gdm_xdmcp_display_factory_finalize),
	(gdm_xdmcp_display_factory_new):
	* daemon/gdm-xdmcp-display-factory.h:
	* daemon/gdm-xdmcp-manager.c:
	* daemon/gdm-xdmcp-manager.h:
	Add an abstract base class for display factories.  Rename
	gdm-xdmcp-manager to gdm-xdmcp-display-factory.


svn path=/branches/mccann-gobject/; revision=5132

1 files changed, 199 insertions, 0 deletions

diff --git a/daemon/gdm-display-factory.c b/daemon/gdm-display-factory.c
new file mode 100644
index 00000000..d21746ef
--- /dev/null
+++ b/daemon/gdm-display-factory.c
@@ -0,0 +1,199 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <glib-object.h>
+
+#include "gdm-display-factory.h"
+#include "gdm-display-store.h"
+
+#define GDM_DISPLAY_FACTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_DISPLAY_FACTORY, GdmDisplayFactoryPrivate))
+
+struct GdmDisplayFactoryPrivate
+{
+	GdmDisplayStore *display_store;
+};
+
+enum {
+	LAST_SIGNAL
+};
+
+enum {
+	PROP_0,
+	PROP_DISPLAY_STORE,
+};
+
+static guint signals [LAST_SIGNAL] = { 0, };
+
+static void	gdm_display_factory_class_init	(GdmDisplayFactoryClass *klass);
+static void	gdm_display_factory_init	(GdmDisplayFactory      *factory);
+static void	gdm_display_factory_finalize	(GObject	        *object);
+
+G_DEFINE_ABSTRACT_TYPE (GdmDisplayFactory, gdm_display_factory, G_TYPE_OBJECT)
+
+GQuark
+gdm_display_factory_error_quark (void)
+{
+	static GQuark ret = 0;
+	if (ret == 0) {
+		ret = g_quark_from_static_string ("gdm_display_factory_error");
+	}
+
+	return ret;
+}
+
+GdmDisplayStore *
+gdm_display_factory_get_display_store (GdmDisplayFactory *factory)
+{
+	g_return_val_if_fail (GDM_IS_DISPLAY_FACTORY (factory), NULL);
+
+	return factory->priv->display_store;
+}
+
+gboolean
+gdm_display_factory_start (GdmDisplayFactory *factory,
+			   GError           **error)
+{
+	gboolean ret;
+
+	g_return_val_if_fail (GDM_IS_DISPLAY_FACTORY (factory), FALSE);
+
+	g_object_ref (factory);
+	ret = GDM_DISPLAY_FACTORY_GET_CLASS (factory)->start (factory);
+	g_object_unref (factory);
+
+	return ret;
+}
+
+gboolean
+gdm_display_factory_stop (GdmDisplayFactory *factory,
+			  GError           **error)
+{
+	gboolean ret;
+
+	g_return_val_if_fail (GDM_IS_DISPLAY_FACTORY (factory), FALSE);
+
+	g_object_ref (factory);
+	ret = GDM_DISPLAY_FACTORY_GET_CLASS (factory)->stop (factory);
+	g_object_unref (factory);
+
+	return ret;
+}
+
+static void
+gdm_display_factory_set_display_store (GdmDisplayFactory *factory,
+				       GdmDisplayStore   *display_store)
+{
+	if (factory->priv->display_store != NULL) {
+		g_object_unref (factory->priv->display_store);
+		factory->priv->display_store = NULL;
+	}
+
+	if (display_store != NULL) {
+		factory->priv->display_store = g_object_ref (display_store);
+	}
+}
+
+static void
+gdm_display_factory_set_property (GObject      *object,
+				  guint	        prop_id,
+				  const GValue *value,
+				  GParamSpec   *pspec)
+{
+	GdmDisplayFactory *self;
+
+	self = GDM_DISPLAY_FACTORY (object);
+
+	switch (prop_id) {
+	case PROP_DISPLAY_STORE:
+		gdm_display_factory_set_display_store (self, g_value_get_object (value));
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+gdm_display_factory_get_property (GObject    *object,
+				  guint       prop_id,
+				  GValue     *value,
+				  GParamSpec *pspec)
+{
+	GdmDisplayFactory *self;
+
+	self = GDM_DISPLAY_FACTORY (object);
+
+	switch (prop_id) {
+	case PROP_DISPLAY_STORE:
+		g_value_set_object (value, self->priv->display_store);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+static void
+gdm_display_factory_class_init (GdmDisplayFactoryClass *klass)
+{
+	GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->get_property = gdm_display_factory_get_property;
+	object_class->set_property = gdm_display_factory_set_property;
+	object_class->finalize = gdm_display_factory_finalize;
+
+        g_object_class_install_property (object_class,
+                                         PROP_DISPLAY_STORE,
+                                         g_param_spec_object ("display-store",
+							      "display store",
+							      "display store",
+							      GDM_TYPE_DISPLAY_STORE,
+							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+	g_type_class_add_private (klass, sizeof (GdmDisplayFactoryPrivate));
+}
+
+static void
+gdm_display_factory_init (GdmDisplayFactory *factory)
+{
+	factory->priv = GDM_DISPLAY_FACTORY_GET_PRIVATE (factory);
+}
+
+static void
+gdm_display_factory_finalize (GObject *object)
+{
+	GdmDisplayFactory *factory;
+
+	g_return_if_fail (object != NULL);
+	g_return_if_fail (GDM_IS_DISPLAY_FACTORY (object));
+
+	factory = GDM_DISPLAY_FACTORY (object);
+
+	g_return_if_fail (factory->priv != NULL);
+
+	G_OBJECT_CLASS (gdm_display_factory_parent_class)->finalize (object);
+}