From d37d28ddf27f9998a96e5b3fe12c3ffc048799f2 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 3 May 2000 00:05:06 +0000 Subject: Get rid of crufty `e-service' modules. svn path=/trunk/; revision=2764 --- shell/ChangeLog | 8 ++ shell/Makefile.am | 2 - shell/e-folder.h | 2 - shell/e-service.c | 242 ------------------------------------------------------ shell/e-service.h | 142 -------------------------------- 5 files changed, 8 insertions(+), 388 deletions(-) delete mode 100644 shell/e-service.c delete mode 100644 shell/e-service.h diff --git a/shell/ChangeLog b/shell/ChangeLog index 7012848a70..a57b493ada 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,11 @@ +2000-05-02 Ettore Perazzoli + + * e-folder.h: Removed member `eservice' from `EFolder'. + + * e-service.c: Removed. + + * e-service.h: Removed. + 2000-05-02 Matt Loper * Makefile.am: set G_LOG_DOMAIN. diff --git a/shell/Makefile.am b/shell/Makefile.am index 89f46991b3..fc98528686 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -26,8 +26,6 @@ evolution_SOURCES = \ e-folder.h \ e-init.c \ e-init.h \ - e-service.c \ - e-service.h \ e-shell.c \ e-shell.h \ e-shell-shortcut.c \ diff --git a/shell/e-folder.h b/shell/e-folder.h index 147399268b..71c0577655 100644 --- a/shell/e-folder.h +++ b/shell/e-folder.h @@ -36,8 +36,6 @@ struct _EFolder { EFolderType type; - EService *eservice; /* an Efolder should have an eservice */ - /* * General properties */ diff --git a/shell/e-service.c b/shell/e-service.c deleted file mode 100644 index c8c52383f7..0000000000 --- a/shell/e-service.c +++ /dev/null @@ -1,242 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * e-service.c: Abstract class for Evolution services - * - * Author: - * Bertrand Guiheneuf (bg@aful.org) - * Miguel de Icaza (miguel@helixcode.com) - * - * (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 - */ - - - - -#include -#include -#include "e-util/e-util.h" -#include "e-service.h" - -#define PARENT_TYPE gtk_object_get_type () - -static GtkObjectClass *parent_class; - -#define EFC(o) E_SERVICE_CLASS (GTK_OBJECT (o)->klass) - - - -static void -e_service_destroy (GtkObject *object) -{ - EService *eservice = E_SERVICE (object); - - if (eservice->uri) - g_free (eservice->uri); - - if (eservice->desc) - g_free (eservice->desc); - - if (eservice->home_page) - g_free (eservice->home_page); - - parent_class->destroy (object); -} - -static void -e_service_class_init (GtkObjectClass *object_class) -{ - parent_class = gtk_type_class (PARENT_TYPE); - - object_class->destroy = e_service_destroy; - - -} - -static void -e_service_init (GtkObject *object) -{ -} - -E_MAKE_TYPE (e_service, "EService", EService, e_service_class_init, e_service_init, PARENT_TYPE) - - -EFolder * -e_service_get_root_efolder (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->root_efolder; -} - - - -void -e_service_set_uri (EService *eservice, const char *uri) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - g_return_if_fail (uri != NULL); - - if (eservice->uri) - g_free (eservice->uri); - - eservice->uri = g_strdup (uri); -} - -const char * -e_service_get_uri (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->uri; -} - -void -e_service_set_description (EService *eservice, const char *desc) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - g_return_if_fail (desc != NULL); - - if (eservice->desc) - g_free (eservice->desc); - - eservice->desc = g_strdup (desc); -} - -const char * -e_service_get_description (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->desc; -} - -void -e_service_set_home_page (EService *eservice, const char *home_page) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - g_return_if_fail (home_page != NULL); - - if (eservice->home_page) - g_free (eservice->home_page); - - eservice->home_page = g_strdup (home_page); -} - -const char * -e_service_get_home_page (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->home_page; -} - -const char * -e_service_get_type_name (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - switch (eservice->type){ - case E_SERVICE_MAIL: - return _("A service containing mail items"); - - case E_SERVICE_CONTACTS: - return _("A service containing contacts"); - - case E_SERVICE_CALENDAR: - return _("A service containing calendar entries"); - - case E_SERVICE_TASKS: - return _("A service containing tasks"); - - default: - g_assert_not_reached (); - } - - return NULL; -} - -void -e_service_construct (EService *eservice, EServiceType type, - const char *uri, const char *name, - const char *desc, const char *home_page) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - - - /* EServices are self-owned */ - GTK_OBJECT_UNSET_FLAGS (GTK_OBJECT (eservice), GTK_FLOATING); - - if (uri) - eservice->uri = g_strdup (uri); - if (name) - eservice->name = g_strdup (name); - if (desc) - eservice->desc = g_strdup (desc); - if (home_page) - eservice->home_page = g_strdup (home_page); - - eservice->type = type; -} - -EService * -e_service_new (EServiceType type, - const char *uri, const char *name, - const char *desc, const char *home_page) -{ - EService *eservice; - - eservice = gtk_type_new (e_service_get_type ()); - - e_service_construct (eservice, type, uri, name, desc, home_page); - return eservice; -} - -const char * -e_service_get_name (EService *eservice) -{ - g_return_val_if_fail (eservice != NULL, NULL); - g_return_val_if_fail (E_IS_SERVICE (eservice), NULL); - - return eservice->name; -} - -void -e_service_set_name (EService *eservice, const char *name) -{ - g_return_if_fail (eservice != NULL); - g_return_if_fail (E_IS_SERVICE (eservice)); - - if (eservice->name) - g_free (eservice->name); - - eservice->name = g_strdup (name); -} - - diff --git a/shell/e-service.h b/shell/e-service.h deleted file mode 100644 index 3488d613ee..0000000000 --- a/shell/e-service.h +++ /dev/null @@ -1,142 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* camel-stream-fs.h : abstract class for the Evolution services */ - -/* - * - * Author : - * Bertrand Guiheneuf - * Miguel de Icaza (miguel@helixcode.com) - * - * Copyright 2000 Helix Code, Inc. (http://www.helixcode.com) - * - * 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 - */ - - -/* - * this class represents a service, that is, an object - * we can get e-folders from. - * - * In the case of the mail, it represents : - * - a store to get mail folder from (an imap server, - * an mbox toplevel directory - * or - * - a mail transport thanks to which you can send - * mail from. - * - * This class may probably handle the connection - * operations, and probably allow the some kind of - * configuration of the authentication methods - * used. - * - * - * NOTE : this class shares a lot of code and properties - * with the folder class. It may be a good idea to determine - * exactely if it would be useful to make both classes - * be children of another parent abstract class. - * for the moment, we don't really show the service to - * the user in the UI, so that there is not an urgent - * need to create the abstract parent class. - * - * - ber. - * - */ - - -#ifndef _E_SERVICE_H_ -#define _E_SERVICE_H_ - -#include "eshell-types.h" -#include - -#define E_SERVICE_TYPE (e_service_get_type ()) -#define E_SERVICE(o) (GTK_CHECK_CAST ((o), E_SERVICE_TYPE, EService)) -#define E_SERVICE_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_SERVICE_TYPE, EServiceClass)) -#define E_IS_SERVICE(o) (GTK_CHECK_TYPE ((o), E_SERVICE_TYPE)) -#define E_IS_SERVICE_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SERVICE_TYPE)) - - -typedef enum { - E_SERVICE_MAIL = 1 << 0, - E_SERVICE_CONTACTS = 1 << 1, - E_SERVICE_CALENDAR = 1 << 2, - E_SERVICE_TASKS = 1 << 3, - E_SERVICE_OTHER = 1 << 4 -} EServiceType; - - struct _EService { - - GtkObject parent_object; - - EFolder *root_efolder; /* a service may have a root EFolder */ - - /* - * General properties - */ - char *uri; /* Location */ - char *name; /* Short name */ - char *desc; /* Full description */ - char *home_page; /* Home page for this service */ - - EServiceType type; /* type of the service */ - - -}; - -typedef struct { - GtkObjectClass parent_class; - -} EServiceClass; - -GtkType e_service_get_type (void); -void e_service_construct (EService *eservice, - EServiceType type, - const char *uri, - const char *name, - const char *desc, - const char *home_page); -EService *e_service_new (EServiceType type, - const char *uri, - const char *name, - const char *desc, - const char *home_page); - -EFolder *e_service_get_root_efolder (EService *eservice); - -void e_service_set_uri (EService *eservice, - const char *uri); -const char *e_service_get_uri (EService *eservice); - -void e_service_set_description (EService *eservice, - const char *desc); -const char *e_service_get_description (EService *eservice); - -void e_service_set_home_page (EService *eservice, - const char *desc); -const char *e_service_get_home_page (EService *eservice); - -const char *e_service_get_name (EService *eservice); -void e_service_set_name (EService *eservice, - const char *name); - - -const char *e_service_get_type_name (EService *eservice); - -#endif /* _E_SERVICE_H_ */ - - - - -- cgit v1.2.3