2000-09-18 Christopher James Lahey <clahey@helixcode.com> * configure.in: Added check for gnome-app-lib. Removed directories that have been moved to gal. From addressbook/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * backend/ebook/Makefile.am, contact-editor/Makefile.am, ename/Makefile.am, gui/component/Makefile.am, gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and $(EXTRA_GNOME_LIBS). Removed unneeded libraries. * backend/ebook/e-card.c, backend/pas/pas-backend-file.c, contact-editor/e-contact-editor-address.c, contact-editor/e-contact-editor-categories.c, contact-editor/e-contact-editor-categories.h, contact-editor/e-contact-editor-fullname.c, contact-editor/e-contact-editor.c, contact-editor/e-contact-save-as.c, ename/e-address-western.c, ename/test-ename-western-gtk.c, gui/component/addressbook-factory.c, gui/component/addressbook.c, gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c, gui/component/select-names/e-select-names-bonobo.c, gui/component/select-names/e-select-names-manager.c, gui/component/select-names/e-select-names-model.c, gui/component/select-names/e-select-names-table-model.c, gui/component/select-names/e-select-names-table-model.h, gui/component/select-names/e-select-names-text-model.h, gui/component/select-names/e-select-names.c, gui/component/select-names/e-select-names.h, gui/search/e-addressbook-search-dialog.c, gui/widgets/e-addressbook-model.h, gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c, gui/widgets/e-minicard-view-widget.c, gui/widgets/e-minicard-view-widget.h, gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h, gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c, gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c, printing/e-contact-print.c: Fixed the #include lines to deal properly with gal. From calendar/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and $(EXTRA_GNOME_LIBS). Removed unneeded libraries. * gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c, gui/e-week-view-event-item.c, gui/e-week-view.c, gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c, gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines to deal properly with gal. * gui/check-filled.xpm: New file since we can't include it from e-table anymore. From camel/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * camel-folder-search.c, camel-folder-search.h, camel-remote-store.c, providers/imap/camel-imap-folder.c, providers/imap/camel-imap-store.c: Fixed the #include lines to deal properly with gal. From composer/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and $(EXTRA_GNOME_LIBS). Removed unneeded libraries. * e-msg-composer-address-dialog.c, e-msg-composer-address-entry.c, e-msg-composer-attachment.c, e-msg-composer-hdrs.c, e-msg-composer.c: Fixed the #include lines to deal properly with gal. From e-util/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Removed all the files moved to gal. * e-dialog-widgets.c: Fixed the #include lines to deal properly with gal. * e-gui-utils.c, e-gui-utils.h: Removed all of the functionality that was moved to gal. * e-canvas-utils.c, e-canvas-utils.h, e-canvas-vbox.c, e-canvas-vbox.h, e-canvas.c, e-canvas.h, e-cursors.c, e-cursors.h, e-font.c, e-font.h, e-popup-menu.c, e-popup-menu.h, e-printable.c, e-printable.h, e-unicode.c, e-unicode.h, e-util.c, e-util.h, e-xml-utils.c, e-xml-utils.h: Moved to gal. From filter/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * filter-editor.c, filter-filter.c, filter-folder.c, filter-input.c, filter-message-search.c, filter-option.c, filter-rule.c, score-editor.c, vfolder-editor.c, vfolder-rule.c: Fixed the #include lines to deal properly with gal. From mail/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and $(EXTRA_GNOME_LIBS). Removed unneeded libraries. * component-factory.c, folder-browser-factory.c, folder-browser.c, mail-callbacks.c, mail-config-gui.c, mail-display.c, mail-display.h, main.c, message-list.c, message-list.h: Fixed the #include lines to deal properly with gal. From po/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * POTFILES.in: Removed files that have been moved to gal. From shell/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and $(EXTRA_GNOME_LIBS). Removed unneeded libraries. * e-component-registry.c, e-corba-storage-registry.c, e-corba-storage.c, e-folder-type-registry.c, e-folder.c, e-local-folder.c, e-local-storage.c, e-shell-folder-creation-dialog.c, e-shell-folder-selection-dialog.c, e-shell-folder-title-bar.c, e-shell-view.c, e-shell.c, e-shortcuts-view.c, e-shortcuts.c, e-storage-set-view.c, e-storage-set-view.h, e-storage-set.c, e-storage.c, evolution-local-storage.c, evolution-session.c, evolution-shell-client.c, evolution-shell-component-client.c, evolution-shell-component.c, evolution-shell-view.c, evolution-storage-listener.c, evolution-storage.c, main.c: Fixed the #include lines to deal properly with gal. From widgets/meeting-time-sel/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and $(EXTRA_GNOME_LIBS). Removed unneeded libraries. * e-meeting-time-sel-list-item.c, e-meeting-time-sel.c, e-meeting-time-sel.h: Fixed the #include lines to deal properly with gal. If you've read this far, you deserve a prize. The first email in my mailbox with the subject "What a commit message!" (and your physical mailing address somewhere in the message) will receive a free Helix Code T-shirt mailed to anywhere within the continental United States. I cannot be held responsible for problems with email systems anywhere. This is supposed to be for fun, so please don't make a fuss if something goes wrong and your mail doesn't reach me. Find my email elsewhere in this message, and if it's been more than a few days, you're probably too late. From widgets/misc/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and $(EXTRA_GNOME_LIBS). Removed unneeded libraries. * e-calendar-item.c, e-calendar.c, e-calendar.h, e-title-bar.c: Fixed the #include lines to deal properly with gal. * e-scroll-frame.c, e-scroll-frame.h: Moved to gal. From widgets/shortcut-bar/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and $(EXTRA_GNOME_LIBS). Removed unneeded libraries. * e-icon-bar.c, e-icon-bar.h, e-shortcut-bar.c, e-shortcut-model.c, test-shortcut-bar.c: Fixed the #include lines to deal properly with gal. From widgets/ChangeLog: 2000-09-18 Christopher James Lahey <clahey@helixcode.com> * Makefile.am: Removed directories that have been moved to gal. * e-paned/.cvsignore, e-paned/Makefile.am, e-paned/e-hpaned.c, e-paned/e-hpaned.h, e-paned/e-paned.c, e-paned/e-paned.h, e-paned/e-vpaned.c, e-paned/e-vpaned.h: Moved to gal. * e-reflow/.cvsignore, e-reflow/Makefile.am, e-reflow/e-reflow-sorted.c, e-reflow/e-reflow-sorted.h, e-reflow/e-reflow.c, e-reflow/e-reflow.h: Moved to gal. * e-table/.cvsignore, e-table/ChangeLog, e-table/LICENSE, e-table/Makefile.am, e-table/ROADMAP.e-table, e-table/TODO, e-table/add-col.xpm, e-table/arrow-down.xpm, e-table/arrow-up.xpm, e-table/check-empty.xpm, e-table/check-filled.xpm, e-table/clip.png, e-table/e-cell-checkbox.c, e-table/e-cell-checkbox.h, e-table/e-cell-string.c, e-table/e-cell-text.c, e-table/e-cell-text.h, e-table/e-cell-toggle.c, e-table/e-cell-toggle.h, e-table/e-cell-tree.c, e-table/e-cell-tree.h, e-table/e-cell.c, e-table/e-cell.h, e-table/e-table-click-to-add.c, e-table/e-table-click-to-add.h, e-table/e-table-col-dnd.h, e-table/e-table-col.c, e-table/e-table-col.h, e-table/e-table-column-model.h, e-table/e-table-column.c, e-table/e-table-config.c, e-table/e-table-config.glade, e-table/e-table-config.glade.h, e-table/e-table-config.h, e-table/e-table-defines.h, e-table/e-table-example-1.c, e-table/e-table-example-2.c, e-table/e-table-field-chooser-dialog.c, e-table/e-table-field-chooser-dialog.h, e-table/e-table-field-chooser-item.c, e-table/e-table-field-chooser-item.h, e-table/e-table-field-chooser.c, e-table/e-table-field-chooser.glade, e-table/e-table-field-chooser.glade.h, e-table/e-table-field-chooser.h, e-table/e-table-group-container.c, e-table/e-table-group-container.h, e-table/e-table-group-leaf.c, e-table/e-table-group-leaf.h, e-table/e-table-group.c, e-table/e-table-group.glade, e-table/e-table-group.glade.h, e-table/e-table-group.h, e-table/e-table-header-item.c, e-table/e-table-header-item.h, e-table/e-table-header.c, e-table/e-table-header.h, e-table/e-table-item.c, e-table/e-table-item.h, e-table/e-table-model.c, e-table/e-table-model.h, e-table/e-table-one.c, e-table/e-table-one.h, e-table/e-table-scrolled.c, e-table/e-table-scrolled.h, e-table/e-table-selection-model.c, e-table/e-table-selection-model.h, e-table/e-table-simple.c, e-table/e-table-simple.h, e-table/e-table-size-test.c, e-table/e-table-sort-info.c, e-table/e-table-sort-info.h, e-table/e-table-sorted-variable.c, e-table/e-table-sorted-variable.h, e-table/e-table-sorted.c, e-table/e-table-sorted.h, e-table/e-table-sorter.c, e-table/e-table-sorter.h, e-table/e-table-subset-variable.c, e-table/e-table-subset-variable.h, e-table/e-table-subset.c, e-table/e-table-subset.h, e-table/e-table-text-model.c, e-table/e-table-text-model.h, e-table/e-table-tooltip.h, e-table/e-table-tree.h, e-table/e-table.c, e-table/e-table.h, e-table/e-tree-example-1.c, e-table/e-tree-example-2.c, e-table/e-tree-model.c, e-table/e-tree-model.h, e-table/e-tree-simple.c, e-table/e-tree-simple.h, e-table/image1.png, e-table/image2.png, e-table/image3.png, e-table/remove-col.xpm, e-table/sample.table, e-table/table-test.c, e-table/table-test.h, e-table/test-check.c, e-table/test-cols.c, e-table/test-table.c: Moved to gal. * e-text/.cvsignore, e-text/Makefile.am, e-text/e-entry-test.c, e-text/e-entry.c, e-text/e-entry.h, e-text/e-text-event-processor-emacs-like.c, e-text/e-text-event-processor-emacs-like.h, e-text/e-text-event-processor-types.h, e-text/e-text-event-processor.c, e-text/e-text-event-processor.h, e-text/e-text-model.c, e-text/e-text-model.h, e-text/e-text-test.c, e-text/e-text.c, e-text/e-text.h: Moved to gal. i.e., ... changed evolution to work with gal. svn path=/trunk/; revision=5490
247 lines
6.6 KiB
C
247 lines
6.6 KiB
C
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
|
||
/* e-corba-storage-registry.c
|
||
*
|
||
* Copyright (C) 2000 Helix Code, Inc.
|
||
*
|
||
* 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.
|
||
*
|
||
* Author: Ettore Perazzoli
|
||
*/
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
#include <config.h>
|
||
#endif
|
||
|
||
#include <gal/util/e-util.h>
|
||
|
||
#include "e-corba-storage.h"
|
||
|
||
#include "e-corba-storage-registry.h"
|
||
|
||
|
||
#define PARENT_TYPE BONOBO_OBJECT_TYPE
|
||
static BonoboObjectClass *parent_class = NULL;
|
||
|
||
struct _ECorbaStorageRegistryPrivate {
|
||
EStorageSet *storage_set;
|
||
};
|
||
|
||
|
||
/* CORBA interface implementation. */
|
||
|
||
static POA_Evolution_StorageRegistry__vepv storage_registry_vepv;
|
||
|
||
static POA_Evolution_StorageRegistry *
|
||
create_servant (void)
|
||
{
|
||
POA_Evolution_StorageRegistry *servant;
|
||
CORBA_Environment ev;
|
||
|
||
servant = (POA_Evolution_StorageRegistry *) g_new0 (BonoboObjectServant, 1);
|
||
servant->vepv = &storage_registry_vepv;
|
||
|
||
CORBA_exception_init (&ev);
|
||
|
||
POA_Evolution_StorageRegistry__init ((PortableServer_Servant) servant, &ev);
|
||
if (ev._major != CORBA_NO_EXCEPTION) {
|
||
g_free (servant);
|
||
CORBA_exception_free (&ev);
|
||
return NULL;
|
||
}
|
||
|
||
CORBA_exception_free (&ev);
|
||
|
||
return servant;
|
||
}
|
||
|
||
static Evolution_StorageListener
|
||
impl_StorageRegistry_register_storage (PortableServer_Servant servant,
|
||
const Evolution_Storage storage_interface,
|
||
const CORBA_char *name,
|
||
CORBA_Environment *ev)
|
||
{
|
||
BonoboObject *bonobo_object;
|
||
ECorbaStorageRegistry *storage_registry;
|
||
ECorbaStorageRegistryPrivate *priv;
|
||
EStorage *storage;
|
||
Evolution_StorageListener listener_interface;
|
||
|
||
g_print ("Shell: Registering storage -- %s\n", name);
|
||
|
||
bonobo_object = bonobo_object_from_servant (servant);
|
||
storage_registry = E_CORBA_STORAGE_REGISTRY (bonobo_object);
|
||
priv = storage_registry->priv;
|
||
|
||
storage = e_corba_storage_new (storage_interface, name);
|
||
|
||
if (! e_storage_set_add_storage (priv->storage_set, storage)) {
|
||
CORBA_exception_set (ev,
|
||
CORBA_USER_EXCEPTION,
|
||
ex_Evolution_StorageRegistry_Exists,
|
||
NULL);
|
||
return CORBA_OBJECT_NIL;
|
||
}
|
||
|
||
gtk_object_unref (GTK_OBJECT (storage));
|
||
|
||
listener_interface = CORBA_Object_duplicate (e_corba_storage_get_StorageListener
|
||
(E_CORBA_STORAGE (storage)), ev);
|
||
|
||
return listener_interface;
|
||
}
|
||
|
||
static void
|
||
impl_StorageRegistry_unregister_storage (PortableServer_Servant servant,
|
||
const CORBA_char *name,
|
||
CORBA_Environment *ev)
|
||
{
|
||
BonoboObject *bonobo_object;
|
||
ECorbaStorageRegistry *storage_registry;
|
||
ECorbaStorageRegistryPrivate *priv;
|
||
EStorage *storage;
|
||
|
||
bonobo_object = bonobo_object_from_servant (servant);
|
||
storage_registry = E_CORBA_STORAGE_REGISTRY (bonobo_object);
|
||
priv = storage_registry->priv;
|
||
|
||
storage = e_storage_set_get_storage (priv->storage_set, name);
|
||
if (storage == NULL) {
|
||
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
|
||
ex_Evolution_StorageRegistry_NotFound,
|
||
NULL);
|
||
return;
|
||
}
|
||
|
||
/* FIXME: Yucky to get the storage by name and then remove it. */
|
||
/* FIXME: Check failure. */
|
||
e_storage_set_remove_storage (priv->storage_set, storage);
|
||
}
|
||
|
||
|
||
/* GtkObject methods. */
|
||
|
||
static void
|
||
destroy (GtkObject *object)
|
||
{
|
||
ECorbaStorageRegistry *corba_storage_registry;
|
||
ECorbaStorageRegistryPrivate *priv;
|
||
|
||
corba_storage_registry = E_CORBA_STORAGE_REGISTRY (object);
|
||
priv = corba_storage_registry->priv;
|
||
|
||
if (priv->storage_set != NULL)
|
||
gtk_object_unref (GTK_OBJECT (priv->storage_set));
|
||
g_free (priv);
|
||
|
||
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
|
||
}
|
||
|
||
|
||
/* Initialization. */
|
||
|
||
static void
|
||
corba_class_init (void)
|
||
{
|
||
POA_Evolution_StorageRegistry__vepv *vepv;
|
||
POA_Evolution_StorageRegistry__epv *epv;
|
||
PortableServer_ServantBase__epv *base_epv;
|
||
|
||
base_epv = g_new0 (PortableServer_ServantBase__epv, 1);
|
||
base_epv->_private = NULL;
|
||
base_epv->finalize = NULL;
|
||
base_epv->default_POA = NULL;
|
||
|
||
epv = g_new0 (POA_Evolution_StorageRegistry__epv, 1);
|
||
epv->register_storage = impl_StorageRegistry_register_storage;
|
||
epv->unregister_storage = impl_StorageRegistry_unregister_storage;
|
||
|
||
vepv = &storage_registry_vepv;
|
||
vepv->_base_epv = base_epv;
|
||
vepv->Bonobo_Unknown_epv = bonobo_object_get_epv ();
|
||
vepv->Evolution_StorageRegistry_epv = epv;
|
||
}
|
||
|
||
static void
|
||
class_init (ECorbaStorageRegistryClass *klass)
|
||
{
|
||
GtkObjectClass *object_class;
|
||
|
||
object_class = GTK_OBJECT_CLASS (klass);
|
||
object_class->destroy = destroy;
|
||
|
||
parent_class = gtk_type_class (PARENT_TYPE);
|
||
|
||
corba_class_init ();
|
||
}
|
||
|
||
static void
|
||
init (ECorbaStorageRegistry *corba_storage_registry)
|
||
{
|
||
ECorbaStorageRegistryPrivate *priv;
|
||
|
||
priv = g_new (ECorbaStorageRegistryPrivate, 1);
|
||
priv->storage_set = NULL;
|
||
|
||
corba_storage_registry->priv = priv;
|
||
}
|
||
|
||
|
||
void
|
||
e_corba_storage_registry_construct (ECorbaStorageRegistry *corba_storage_registry,
|
||
Evolution_StorageRegistry corba_object,
|
||
EStorageSet *storage_set)
|
||
{
|
||
ECorbaStorageRegistryPrivate *priv;
|
||
|
||
g_return_if_fail (corba_storage_registry != NULL);
|
||
g_return_if_fail (E_IS_CORBA_STORAGE_REGISTRY (corba_storage_registry));
|
||
g_return_if_fail (corba_object != CORBA_OBJECT_NIL);
|
||
|
||
bonobo_object_construct (BONOBO_OBJECT (corba_storage_registry), corba_object);
|
||
|
||
priv = corba_storage_registry->priv;
|
||
|
||
gtk_object_ref (GTK_OBJECT (storage_set));
|
||
priv->storage_set = storage_set;
|
||
}
|
||
|
||
ECorbaStorageRegistry *
|
||
e_corba_storage_registry_new (EStorageSet *storage_set)
|
||
{
|
||
ECorbaStorageRegistry *corba_storage_registry;
|
||
POA_Evolution_StorageRegistry *servant;
|
||
Evolution_StorageRegistry corba_object;
|
||
|
||
g_return_val_if_fail (storage_set != NULL, NULL);
|
||
g_return_val_if_fail (E_IS_STORAGE_SET (storage_set), NULL);
|
||
|
||
servant = create_servant ();
|
||
if (servant == NULL)
|
||
return NULL;
|
||
|
||
corba_storage_registry = gtk_type_new (e_corba_storage_registry_get_type ());
|
||
|
||
corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (corba_storage_registry),
|
||
servant);
|
||
|
||
e_corba_storage_registry_construct (corba_storage_registry, corba_object, storage_set);
|
||
|
||
return corba_storage_registry;
|
||
}
|
||
|
||
|
||
E_MAKE_TYPE (e_corba_storage_registry, "ECorbaStorageRegistry", ECorbaStorageRegistry, class_init, init, PARENT_TYPE)
|