From 427d93b3dfab0e7fcf3ac820dbce2d2f182a9b19 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 5 Jul 2013 16:27:51 -0400 Subject: Remove GalViewFactory. No longer used. --- .../evolution-util/evolution-util-docs.sgml | 1 - .../evolution-util/evolution-util-sections.txt | 17 ----- doc/reference/evolution-util/evolution-util.types | 1 - e-util/Makefile.am | 2 - e-util/e-util.h | 1 - e-util/gal-view-factory.c | 87 ---------------------- e-util/gal-view-factory.h | 80 -------------------- 7 files changed, 189 deletions(-) delete mode 100644 e-util/gal-view-factory.c delete mode 100644 e-util/gal-view-factory.h diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml b/doc/reference/evolution-util/evolution-util-docs.sgml index d0b8edbbdf..de12adbb21 100644 --- a/doc/reference/evolution-util/evolution-util-docs.sgml +++ b/doc/reference/evolution-util/evolution-util-docs.sgml @@ -194,7 +194,6 @@ View Management - diff --git a/doc/reference/evolution-util/evolution-util-sections.txt b/doc/reference/evolution-util/evolution-util-sections.txt index cca4a50f54..7ea056988f 100644 --- a/doc/reference/evolution-util/evolution-util-sections.txt +++ b/doc/reference/evolution-util/evolution-util-sections.txt @@ -4636,23 +4636,6 @@ gal_view_etable_get_type GalViewEtablePrivate -
-gal-view-factory -GalViewFactory -GalViewFactory -gal_view_factory_get_type_code -gal_view_factory_new_view - -GAL_VIEW_FACTORY -GAL_IS_VIEW_FACTORY -GAL_TYPE_VIEW_FACTORY -GAL_VIEW_FACTORY_CLASS -GAL_IS_VIEW_FACTORY_CLASS -GAL_VIEW_FACTORY_GET_CLASS -GalViewFactoryClass -gal_view_factory_get_type -
-
gal-view-instance GalViewInstance diff --git a/doc/reference/evolution-util/evolution-util.types b/doc/reference/evolution-util/evolution-util.types index 5f46786739..ac366915b4 100644 --- a/doc/reference/evolution-util/evolution-util.types +++ b/doc/reference/evolution-util/evolution-util.types @@ -163,7 +163,6 @@ e_web_view_gtkhtml_get_type e_web_view_preview_get_type gal_view_collection_get_type gal_view_etable_get_type -gal_view_factory_get_type gal_view_get_type gal_view_instance_get_type gal_view_instance_save_as_dialog_get_type diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 52a3e4d517..1f9644892c 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -329,7 +329,6 @@ evolution_util_include_HEADERS = \ gal-a11y-util.h \ gal-view-collection.h \ gal-view-etable.h \ - gal-view-factory.h \ gal-view-instance-save-as-dialog.h \ gal-view-instance.h \ gal-view.h \ @@ -564,7 +563,6 @@ libevolution_util_la_SOURCES = \ gal-a11y-util.c \ gal-view-collection.c \ gal-view-etable.c \ - gal-view-factory.c \ gal-view-instance-save-as-dialog.c \ gal-view-instance.c \ gal-view.c \ diff --git a/e-util/e-util.h b/e-util/e-util.h index c2339c8b76..0299c968d3 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -224,7 +224,6 @@ #include #include #include -#include #include #include #include diff --git a/e-util/gal-view-factory.c b/e-util/gal-view-factory.c deleted file mode 100644 index 9d0ef7596f..0000000000 --- a/e-util/gal-view-factory.c +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Chris Lahey - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "gal-view-factory.h" - -G_DEFINE_TYPE (GalViewFactory, gal_view_factory, G_TYPE_OBJECT) - -/* XXX Should GalViewFactory be a GInterface? */ - -static void -gal_view_factory_class_init (GalViewFactoryClass *class) -{ -} - -static void -gal_view_factory_init (GalViewFactory *factory) -{ -} - -/** - * gal_view_factory_get_type_code: - * @factory: a #GalViewFactory - * - * Returns: The type code - */ -const gchar * -gal_view_factory_get_type_code (GalViewFactory *factory) -{ - GalViewFactoryClass *class; - GalViewClass *view_class; - - g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), NULL); - - class = GAL_VIEW_FACTORY_GET_CLASS (factory); - - /* All GalView types are registered statically, so there's no - * harm in dereferencing the class pointer after unreffing it. */ - view_class = g_type_class_ref (class->gal_view_type); - g_return_val_if_fail (GAL_IS_VIEW_CLASS (view_class), NULL); - g_type_class_unref (view_class); - - return view_class->type_code; -} - -/** - * gal_view_factory_new_view: - * @factory: a #GalViewFactory - * @title: the title for the view - * - * Returns: The new view - */ -GalView * -gal_view_factory_new_view (GalViewFactory *factory, - const gchar *title) -{ - GalViewFactoryClass *class; - - g_return_val_if_fail (GAL_IS_VIEW_FACTORY (factory), NULL); - - class = GAL_VIEW_FACTORY_GET_CLASS (factory); - - return g_object_new (class->gal_view_type, "title", title, NULL); -} - diff --git a/e-util/gal-view-factory.h b/e-util/gal-view-factory.h deleted file mode 100644 index 0eb4d00786..0000000000 --- a/e-util/gal-view-factory.h +++ /dev/null @@ -1,80 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see - * - * - * Authors: - * Chris Lahey - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#if !defined (__E_UTIL_H_INSIDE__) && !defined (LIBEUTIL_COMPILATION) -#error "Only should be included directly." -#endif - -#ifndef GAL_VIEW_FACTORY_H -#define GAL_VIEW_FACTORY_H - -#include - -/* Standard GObject macros */ -#define GAL_TYPE_VIEW_FACTORY \ - (gal_view_factory_get_type ()) -#define GAL_VIEW_FACTORY(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), GAL_TYPE_VIEW_FACTORY, GalViewFactory)) -#define GAL_VIEW_FACTORY_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), GAL_TYPE_VIEW_FACTORY, GalViewFactoryClass)) -#define GAL_IS_VIEW_FACTORY(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), GAL_TYPE_VIEW_FACTORY)) -#define GAL_IS_VIEW_FACTORY_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), GAL_TYPE_VIEW_FACTORY)) -#define GAL_VIEW_FACTORY_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), GAL_TYPE_VIEW_FACTORY, GalViewFactoryClass)) - -G_BEGIN_DECLS - -typedef struct _GalViewFactory GalViewFactory; -typedef struct _GalViewFactoryClass GalViewFactoryClass; - -struct _GalViewFactory { - GObject parent; -}; - -struct _GalViewFactoryClass { - GObjectClass parent_class; - - GType gal_view_type; -}; - -GType gal_view_factory_get_type (void); - -/* Returns the code for use in identifying this type of object in the - * view list. This identifier should identify this as being the - * unique factory for xml files which were written out with this - * identifier. Thus each factory should have a unique type code. */ -const gchar * gal_view_factory_get_type_code (GalViewFactory *factory); - -GalView * gal_view_factory_new_view (GalViewFactory *factory, - const gchar *title); - -G_END_DECLS - -#endif /* GAL_VIEW_FACTORY_H */ -- cgit v1.2.3