diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2012-08-25 05:29:47 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-08-25 05:35:56 +0800 |
commit | ccefbd7f7704a76536d8a0982b1b8f700c70e0ca (patch) | |
tree | 15350037578ed32f24326141a350dbd9aa8f97dd | |
parent | ae3ed3d477fa2fd7e63e20192edb792e72ee5100 (diff) | |
download | gsoc2013-evolution-ccefbd7f7704a76536d8a0982b1b8f700c70e0ca.tar gsoc2013-evolution-ccefbd7f7704a76536d8a0982b1b8f700c70e0ca.tar.gz gsoc2013-evolution-ccefbd7f7704a76536d8a0982b1b8f700c70e0ca.tar.bz2 gsoc2013-evolution-ccefbd7f7704a76536d8a0982b1b8f700c70e0ca.tar.lz gsoc2013-evolution-ccefbd7f7704a76536d8a0982b1b8f700c70e0ca.tar.xz gsoc2013-evolution-ccefbd7f7704a76536d8a0982b1b8f700c70e0ca.tar.zst gsoc2013-evolution-ccefbd7f7704a76536d8a0982b1b8f700c70e0ca.zip |
Remove test EShellBackend module.
This was useful early in the kill-bonobo project when I was rewriting
EShell from scratch. Nowadays not so much. Drop it.
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | shell/Makefile.am | 4 | ||||
-rw-r--r-- | shell/test/Makefile.am | 31 | ||||
-rw-r--r-- | shell/test/e-test-shell-backend.c | 203 | ||||
-rw-r--r-- | shell/test/e-test-shell-backend.h | 67 | ||||
-rw-r--r-- | shell/test/e-test-shell-view.c | 159 | ||||
-rw-r--r-- | shell/test/e-test-shell-view.h | 66 | ||||
-rw-r--r-- | shell/test/evolution-module-test.c | 41 |
10 files changed, 0 insertions, 584 deletions
diff --git a/Makefile.am b/Makefile.am index dfa620ff48..a8dc58d99c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -147,7 +147,6 @@ MAINTAINERCLEANFILES = \ DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ --disable-goa \ - --enable-test-component \ --disable-image-inline \ --disable-pst-import \ --disable-weather \ diff --git a/configure.ac b/configure.ac index 3eccc16667..5d980e8880 100644 --- a/configure.ac +++ b/configure.ac @@ -410,16 +410,6 @@ dnl Purify support dnl *************** EVO_PURIFY_SUPPORT -dnl ************** -dnl Test Component -dnl ************** -AC_ARG_ENABLE([test-component], - AS_HELP_STRING([--enable-test-component], - [Enable test component.]), - [enable_test_comp=$enableval],[enable_test_comp=no]) - -AM_CONDITIONAL(ENABLE_TEST_COMPONENT, [test x$enable_test_comp = xyes]) - dnl *************** dnl Timezone checks dnl *************** @@ -1441,7 +1431,6 @@ libemail-engine/libemail-engine.pc libgnomecanvas/Makefile shell/Makefile shell/evo-version.h -shell/test/Makefile ui/Makefile views/Makefile views/addressbook/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 5265689c54..c1a97eddf9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -419,7 +419,6 @@ shell/e-shell-window.c shell/e-shell-window-private.c shell/main.c shell/shell.error.xml -shell/test/e-test-shell-backend.c smclient/eggdesktopfile.c smclient/eggsmclient.c smime/gui/ca-trust-dialog.c diff --git a/shell/Makefile.am b/shell/Makefile.am index 7f4cf87b77..c2829a1cc4 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,7 +1,3 @@ -if ENABLE_TEST_COMPONENT -SUBDIRS = . test -endif - # Executable bin_PROGRAMS = evolution diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am deleted file mode 100644 index c46229d146..0000000000 --- a/shell/test/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -module_LTLIBRARIES = libevolution-module-test.la - -libevolution_module_test_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/shell \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/menus \ - -I$(top_srcdir)/widgets/misc \ - -I$(top_builddir)/shell \ - -DG_LOG_DOMAIN=\"evolution-test\" \ - $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) - -libevolution_module_test_la_SOURCES = \ - evolution-module-test.c \ - e-test-shell-backend.c \ - e-test-shell-backend.h \ - e-test-shell-view.c \ - e-test-shell-view.h - -libevolution_module_test_la_LIBADD = \ - $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) - -libevolution_module_test_la_LDFLAGS = \ - -avoid-version -module $(NO_UNDEFINED) - --include $(top_srcdir)/git.mk diff --git a/shell/test/e-test-shell-backend.c b/shell/test/e-test-shell-backend.c deleted file mode 100644 index 0d97308c48..0000000000 --- a/shell/test/e-test-shell-backend.c +++ /dev/null @@ -1,203 +0,0 @@ -/* - * e-test-shell-backend.c - * - * 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 <http://www.gnu.org/licenses/> - * - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include "e-test-shell-backend.h" - -#include <glib/gi18n.h> - -#include "shell/e-shell.h" -#include "shell/e-shell-window.h" - -#include "e-test-shell-view.h" - -static gpointer parent_class; -static GType test_shell_backend_type; - -static void -action_test_item_new_cb (GtkAction *action, - EShellWindow *shell_window) -{ - g_debug ("%s", G_STRFUNC); -} - -static void -action_test_source_new_cb (GtkAction *action, - EShellWindow *shell_window) -{ - g_debug ("%s", G_STRFUNC); -} - -static GtkActionEntry item_entries[] = { - - { "test-item-new", - "document-new", - NC_("New", "_Test Item"), - NULL, - N_("Create a new test item"), - G_CALLBACK (action_test_item_new_cb) } -}; - -static GtkActionEntry source_entries[] = { - - { "test-source-new", - "folder-new", - NC_("New", "Test _Source"), - NULL, - N_("Create a new test source"), - G_CALLBACK (action_test_source_new_cb) } -}; - -static void -test_shell_backend_start (EShellBackend *shell_backend) -{ - g_debug ("%s", G_STRFUNC); -} - -static gboolean -test_shell_backend_migrate (EShellBackend *shell_backend, - gint major, - gint minor, - gint micro, - GError **error) -{ - g_debug ("%s (from %d.%d.%d)", G_STRFUNC, major, minor, micro); - - return TRUE; -} - -static gboolean -test_shell_backend_handle_uri_cb (EShellBackend *shell_backend, - const gchar *uri) -{ - g_debug ("%s (uri=%s)", G_STRFUNC, uri); - - return FALSE; -} - -static void -test_shell_backend_window_added_cb (EShellBackend *shell_backend, - GtkWindow *window) -{ - const gchar *backend_name; - - g_debug ("%s (%s)", G_STRFUNC, G_OBJECT_TYPE_NAME (window)); - - if (!E_IS_SHELL_WINDOW (window)) - return; - - backend_name = E_SHELL_BACKEND_GET_CLASS (shell_backend)->name; - - e_shell_window_register_new_item_actions ( - E_SHELL_WINDOW (window), backend_name, - item_entries, G_N_ELEMENTS (item_entries)); - - e_shell_window_register_new_source_actions ( - E_SHELL_WINDOW (window), backend_name, - source_entries, G_N_ELEMENTS (source_entries)); -} - -static void -test_shell_backend_window_removed_cb (EShellBackend *shell_backend) -{ - g_debug ("%s", G_STRFUNC); -} - -static void -test_shell_backend_constructed (GObject *object) -{ - EShell *shell; - EShellBackend *shell_backend; - - shell_backend = E_SHELL_BACKEND (object); - shell = e_shell_backend_get_shell (shell_backend); - - g_signal_connect_swapped ( - shell, "handle-uri", - G_CALLBACK (test_shell_backend_handle_uri_cb), - shell_backend); - - g_signal_connect_swapped ( - shell, "window-added", - G_CALLBACK (test_shell_backend_window_added_cb), - shell_backend); - - g_signal_connect_swapped ( - shell, "window-removed", - G_CALLBACK (test_shell_backend_window_removed_cb), - shell_backend); - - /* Chain up to parent's constructed() method. */ - G_OBJECT_CLASS (parent_class)->constructed (object); -} - -static void -test_shell_backend_class_init (ETestShellBackendClass *class) -{ - GObjectClass *object_class; - EShellBackendClass *shell_backend_class; - - parent_class = g_type_class_peek_parent (class); - - object_class = G_OBJECT_CLASS (class); - object_class->constructed = test_shell_backend_constructed; - - shell_backend_class = E_SHELL_BACKEND_CLASS (class); - shell_backend_class->shell_view_type = E_TYPE_TEST_SHELL_VIEW; - shell_backend_class->name = "test"; - shell_backend_class->aliases = "monkey"; - shell_backend_class->schemes = ""; - shell_backend_class->sort_order = 100; - shell_backend_class->preferences_page = NULL; - shell_backend_class->start = test_shell_backend_start; - shell_backend_class->migrate = test_shell_backend_migrate; -} - -static void -test_shell_backend_init (ETestShellBackend *test_shell_backend) -{ -} - -GType -e_test_shell_backend_get_type (void) -{ - return test_shell_backend_type; -} - -void -e_test_shell_backend_register_type (GTypeModule *type_module) -{ - const GTypeInfo type_info = { - sizeof (ETestShellBackendClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) test_shell_backend_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (ETestShellBackend), - 0, /* n_preallocs */ - (GInstanceInitFunc) test_shell_backend_init, - NULL /* value_table */ - }; - - test_shell_backend_type = g_type_module_register_type ( - type_module, E_TYPE_SHELL_BACKEND, - "ETestShellBackend", &type_info, 0); -} diff --git a/shell/test/e-test-shell-backend.h b/shell/test/e-test-shell-backend.h deleted file mode 100644 index 0d342bfbcc..0000000000 --- a/shell/test/e-test-shell-backend.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * e-test-shell-backend.h - * - * 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 <http://www.gnu.org/licenses/> - * - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef E_TEST_SHELL_BACKEND_H -#define E_TEST_SHELL_BACKEND_H - -#include <shell/e-shell-backend.h> - -/* Standard GObject macros */ -#define E_TYPE_TEST_SHELL_BACKEND \ - (e_test_shell_backend_get_type ()) -#define E_TEST_SHELL_BACKEND(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), E_TYPE_TEST_SHELL_BACKEND, ETestShellBackend)) -#define E_TEST_SHELL_BACKEND_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), E_TYPE_TEST_SHELL_BACKEND, ETestShellBackendClass)) -#define E_IS_TEST_SHELL_BACKEND(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), E_TYPE_TEST_SHELL_BACKEND)) -#define E_IS_TEST_SHELL_BACKEND_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), E_TYPE_TEST_SHELL_BACKEND)) -#define E_TEST_SHELL_BACKEND_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), E_TYPE_TEST_SHELL_BACKEND, ETestShellBackendClass)) - -G_BEGIN_DECLS - -typedef struct _ETestShellBackend ETestShellBackend; -typedef struct _ETestShellBackendClass ETestShellBackendClass; -typedef struct _ETestShellBackendPrivate ETestShellBackendPrivate; - -struct _ETestShellBackend { - EShellBackend parent; - ETestShellBackendPrivate *priv; -}; - -struct _ETestShellBackendClass { - EShellBackendClass parent_class; -}; - -GType e_test_shell_backend_get_type (void); -void e_test_shell_backend_register_type - (GTypeModule *type_module); - -G_END_DECLS - -#endif /* E_TEST_SHELL_BACKEND_H */ diff --git a/shell/test/e-test-shell-view.c b/shell/test/e-test-shell-view.c deleted file mode 100644 index 68d4ff9a7b..0000000000 --- a/shell/test/e-test-shell-view.c +++ /dev/null @@ -1,159 +0,0 @@ -/* - * e-test-shell-view.c - * - * 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 <http://www.gnu.org/licenses/> - * - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include "e-test-shell-view.h" - -#include "shell/e-shell-content.h" -#include "shell/e-shell-sidebar.h" - -#define E_TEST_SHELL_VIEW_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_TEST_SHELL_VIEW, ETestShellViewPrivate)) - -struct _ETestShellViewPrivate { - EActivity *activity; -}; - -static gpointer parent_class; -static GType test_shell_view_type; - -static void -test_shell_view_toggled (EShellView *shell_view) -{ -#if 0 - gboolean is_active; - const gchar *active; - - is_active = e_shell_view_is_active (shell_view); - active = is_active ? "active" : "inactive"; - g_debug ("%s (now %s)", G_STRFUNC, active); -#endif -} - -static void -test_shell_view_dispose (GObject *object) -{ - ETestShellViewPrivate *priv; - - priv = E_TEST_SHELL_VIEW_GET_PRIVATE (object); - - if (priv->activity != NULL) { - e_activity_set_state (priv->activity, E_ACTIVITY_COMPLETED); - g_object_unref (priv->activity); - priv->activity = NULL; - } - - /* Chain up to parent's dispose() method. */ - G_OBJECT_CLASS (parent_class)->dispose (object); -} - -static void -test_shell_view_constructed (GObject *object) -{ - ETestShellViewPrivate *priv; - EShellContent *shell_content; - EShellSidebar *shell_sidebar; - EShellBackend *shell_backend; - EShellView *shell_view; - EActivity *activity; - GCancellable *cancellable; - GtkWidget *widget; - - /* Chain up to parent's constructed() method. */ - G_OBJECT_CLASS (parent_class)->constructed (object); - - priv = E_TEST_SHELL_VIEW_GET_PRIVATE (object); - - shell_view = E_SHELL_VIEW (object); - shell_backend = e_shell_view_get_shell_backend (shell_view); - shell_content = e_shell_view_get_shell_content (shell_view); - shell_sidebar = e_shell_view_get_shell_sidebar (shell_view); - - widget = gtk_label_new ("Content Widget"); - gtk_container_add (GTK_CONTAINER (shell_content), widget); - gtk_widget_show (widget); - - widget = gtk_label_new ("Sidebar Widget"); - gtk_container_add (GTK_CONTAINER (shell_sidebar), widget); - gtk_widget_show (widget); - - activity = e_activity_new (); - cancellable = g_cancellable_new (); - e_activity_set_cancellable (activity, cancellable); - e_activity_set_text (activity, "Test Activity"); - e_shell_backend_add_activity (shell_backend, activity); - g_object_unref (cancellable); - priv->activity = activity; -} - -static void -test_shell_view_class_init (ETestShellViewClass *class, - GTypeModule *type_module) -{ - GObjectClass *object_class; - EShellViewClass *shell_view_class; - - parent_class = g_type_class_peek_parent (class); - g_type_class_add_private (class, sizeof (ETestShellViewPrivate)); - - object_class = G_OBJECT_CLASS (class); - object_class->dispose = test_shell_view_dispose; - object_class->constructed = test_shell_view_constructed; - - shell_view_class = E_SHELL_VIEW_CLASS (class); - shell_view_class->label = "Test"; - shell_view_class->icon_name = "face-monkey"; - shell_view_class->toggled = test_shell_view_toggled; -} - -static void -test_shell_view_init (ETestShellView *test_shell_view) -{ - test_shell_view->priv = - E_TEST_SHELL_VIEW_GET_PRIVATE (test_shell_view); -} - -GType -e_test_shell_view_get_type (void) -{ - return test_shell_view_type; -} - -void -e_test_shell_view_register_type (GTypeModule *type_module) -{ - const GTypeInfo type_info = { - sizeof (ETestShellViewClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) test_shell_view_class_init, - (GClassFinalizeFunc) NULL, - type_module, - sizeof (ETestShellView), - 0, /* n_preallocs */ - (GInstanceInitFunc) test_shell_view_init, - NULL /* value_table */ - }; - - test_shell_view_type = g_type_module_register_type ( - type_module, E_TYPE_SHELL_VIEW, - "ETestShellView", &type_info, 0); -} diff --git a/shell/test/e-test-shell-view.h b/shell/test/e-test-shell-view.h deleted file mode 100644 index 85c33bfb39..0000000000 --- a/shell/test/e-test-shell-view.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * e-test-shell-view.h - * - * 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 <http://www.gnu.org/licenses/> - * - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef E_TEST_SHELL_VIEW_H -#define E_TEST_SHELL_VIEW_H - -#include <shell/e-shell-view.h> - -/* Standard GObject macros */ -#define E_TYPE_TEST_SHELL_VIEW \ - (e_test_shell_view_get_type ()) -#define E_TEST_SHELL_VIEW(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST \ - ((obj), E_TYPE_TEST_SHELL_VIEW, ETestShellView)) -#define E_TEST_SHELL_VIEW_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_CAST \ - ((cls), E_TYPE_TEST_SHELL_VIEW, ETestShellViewClass)) -#define E_IS_TEST_SHELL_VIEW(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE \ - ((obj), E_TYPE_TEST_SHELL_VIEW)) -#define E_IS_TEST_SHELL_VIEW_CLASS(cls) \ - (G_TYPE_CHECK_CLASS_TYPE \ - ((cls), E_TYPE_TEST_SHELL_VIEW)) -#define E_TEST_SHELL_VIEW_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS \ - ((obj), E_TYPE_TEST_SHELL_VIEW, ETestShellViewClass)) - -G_BEGIN_DECLS - -typedef struct _ETestShellView ETestShellView; -typedef struct _ETestShellViewClass ETestShellViewClass; -typedef struct _ETestShellViewPrivate ETestShellViewPrivate; - -struct _ETestShellView { - EShellView parent; - ETestShellViewPrivate *priv; -}; - -struct _ETestShellViewClass { - EShellViewClass parent_class; -}; - -GType e_test_shell_view_get_type (void); -void e_test_shell_view_register_type (GTypeModule *type_module); - -G_END_DECLS - -#endif /* E_TEST_SHELL_VIEW_H */ diff --git a/shell/test/evolution-module-test.c b/shell/test/evolution-module-test.c deleted file mode 100644 index 1fe3c7c0d0..0000000000 --- a/shell/test/evolution-module-test.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * evolution-module-test.c - * - * 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 <http://www.gnu.org/licenses/> - * - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include "e-test-shell-backend.h" -#include "e-test-shell-view.h" - -/* Module Entry Points */ -void e_module_load (GTypeModule *type_module); -void e_module_unload (GTypeModule *type_module); - -G_MODULE_EXPORT void -e_module_load (GTypeModule *type_module) -{ - /* Register dynamically loaded types. */ - - e_test_shell_backend_register_type (type_module); - e_test_shell_view_register_type (type_module); -} - -G_MODULE_EXPORT void -e_module_unload (GTypeModule *type_module) -{ -} |