Kill ECorbaConfigPage. Good riddance.

svn path=/branches/kill-bonobo/; revision=35943

3 files changed, 0 insertions, 225 deletions

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 18f092ac7d..8e001a57ba 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -131,8 +131,6 @@ evolution_SOURCES =				\
 	e-component-registry.h			\
 	e-config-upgrade.c			\
 	e-config-upgrade.h			\
-	e-corba-config-page.c			\
-	e-corba-config-page.h			\
 	e-shell.c				\
 	e-shell.h				\
 	e-shell-constants.h			\
diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c
deleted file mode 100644
index f464568381..0000000000
--- a/shell/e-corba-config-page.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-corba-config-page.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "e-corba-config-page.h"
-
-#include "Evolution.h"
-
-#include <string.h>
-
-#include <bonobo/bonobo-widget.h>
-#include <bonobo/bonobo-exception.h>
-#include <bonobo/bonobo-object.h>
-#include <bonobo/bonobo-listener.h>
-
-
-struct _ECorbaConfigPagePrivate {
-	GNOME_Evolution_ConfigControl config_control_interface;
-};
-
-G_DEFINE_TYPE (ECorbaConfigPage, e_corba_config_page, E_TYPE_CONFIG_PAGE)
-
-/* GObject methods.  */
-
-static void
-impl_dispose (GObject *object)
-{
-	ECorbaConfigPage *corba_config_page;
-	ECorbaConfigPagePrivate *priv;
-	CORBA_Environment ev;
-
-	corba_config_page = E_CORBA_CONFIG_PAGE (object);
-	priv = corba_config_page->priv;
-
-	CORBA_exception_init (&ev);
-
-	if (priv->config_control_interface != CORBA_OBJECT_NIL) {
-		bonobo_object_release_unref (priv->config_control_interface, &ev);
-		priv->config_control_interface = CORBA_OBJECT_NIL;
-	}
-
-	CORBA_exception_free (&ev);
-
-	(* G_OBJECT_CLASS (e_corba_config_page_parent_class)->dispose) (object);
-}
-
-static void
-impl_finalize (GObject *object)
-{
-	ECorbaConfigPage *corba_config_page;
-	ECorbaConfigPagePrivate *priv;
-
-	corba_config_page = E_CORBA_CONFIG_PAGE (object);
-	priv = corba_config_page->priv;
-
-	g_free (priv);
-
-	(* G_OBJECT_CLASS (e_corba_config_page_parent_class)->finalize) (object);
-}
-
-/* GTK+ ctors.  */
-
-static void
-e_corba_config_page_class_init (ECorbaConfigPageClass *class)
-{
-	GObjectClass *object_class;
-
-	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose  = impl_dispose;
-	object_class->finalize = impl_finalize;
-}
-
-static void
-e_corba_config_page_init (ECorbaConfigPage *corba_config_page)
-{
-	ECorbaConfigPagePrivate *priv;
-
-	priv = g_new (ECorbaConfigPagePrivate, 1);
-	priv->config_control_interface = CORBA_OBJECT_NIL;
-
-	corba_config_page->priv = priv;
-}
-
-
-gboolean
-e_corba_config_page_construct (ECorbaConfigPage *corba_config_page,
-			       GNOME_Evolution_ConfigControl corba_object)
-{
-	Bonobo_Control control;
-	GtkWidget *control_widget;
-	CORBA_Environment ev;
-
-	g_return_val_if_fail (E_IS_CORBA_CONFIG_PAGE (corba_config_page), FALSE);
-	g_return_val_if_fail (corba_object != CORBA_OBJECT_NIL, FALSE);
-
-	CORBA_exception_init (&ev);
-
-	control = GNOME_Evolution_ConfigControl__get_control (corba_object, &ev);
-	if (BONOBO_EX (&ev)) {
-		g_warning ("Can't get control from ::ConfigControl -- %s", BONOBO_EX_REPOID (&ev));
-		CORBA_exception_init (&ev);
-		return FALSE;
-	}
-
-	control_widget = bonobo_widget_new_control_from_objref (control, CORBA_OBJECT_NIL);
-	gtk_widget_show (control_widget);
-	gtk_container_add (GTK_CONTAINER (corba_config_page), control_widget);
-
-	/* Notice we *don't* unref the corba_object here as
-	   bonobo_widget_new_control_from_objref() effectively takes ownership
-	   for the object that we get from ::__get_control.  */
-
-	CORBA_exception_free (&ev);
-
-	return TRUE;
-}
-
-GtkWidget *
-e_corba_config_page_new_from_objref (GNOME_Evolution_ConfigControl corba_object)
-{
-	ECorbaConfigPage *corba_config_page;
-
-	g_return_val_if_fail (corba_object != CORBA_OBJECT_NIL, NULL);
-	g_return_val_if_fail (corba_object != CORBA_OBJECT_NIL, NULL);
-
-	corba_config_page = g_object_new (e_corba_config_page_get_type (), NULL);
-	if (! e_corba_config_page_construct (corba_config_page, corba_object)) {
-		gtk_widget_destroy (GTK_WIDGET (corba_config_page));
-		return NULL;
-	}
-
-	return GTK_WIDGET (corba_config_page);
-}
diff --git a/shell/e-corba-config-page.h b/shell/e-corba-config-page.h
deleted file mode 100644
index 0cf6b9f0da..0000000000
--- a/shell/e-corba-config-page.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* e-corba-config-page.h
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- * Author: Ettore Perazzoli <ettore@ximian.com>
- */
-
-#ifndef _E_CORBA_CONFIG_PAGE_H_
-#define _E_CORBA_CONFIG_PAGE_H_
-
-#include "e-config-page.h"
-
-#include "Evolution.h"
-
-#include <bonobo/bonobo-object.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#define E_TYPE_CORBA_CONFIG_PAGE			(e_corba_config_page_get_type ())
-#define E_CORBA_CONFIG_PAGE(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPage))
-#define E_CORBA_CONFIG_PAGE_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CORBA_CONFIG_PAGE, ECorbaConfigPageClass))
-#define E_IS_CORBA_CONFIG_PAGE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
-#define E_IS_CORBA_CONFIG_PAGE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CORBA_CONFIG_PAGE))
-
-
-typedef struct _ECorbaConfigPage        ECorbaConfigPage;
-typedef struct _ECorbaConfigPagePrivate ECorbaConfigPagePrivate;
-typedef struct _ECorbaConfigPageClass   ECorbaConfigPageClass;
-
-struct _ECorbaConfigPage {
-	EConfigPage parent;
-
-	ECorbaConfigPagePrivate *priv;
-};
-
-struct _ECorbaConfigPageClass {
-	EConfigPageClass parent_class;
-};
-
-
-GType      e_corba_config_page_get_type         (void);
-GtkWidget *e_corba_config_page_new_from_objref  (GNOME_Evolution_ConfigControl  objref);
-gboolean   e_corba_config_page_construct        (ECorbaConfigPage              *corba_config_page,
-						 GNOME_Evolution_ConfigControl  objref);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _E_CORBA_CONFIG_PAGE_H_ */