From caa862135195b828d2e8355436fdd6eb0ec2443e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 7 May 2009 07:21:57 -0400 Subject: Convert EShellModule to EShellBackend Split the GTypeModule loader out of EShellModule as EModule, and rename EShellModule to EShellBackend. Backends (formerly modules) should now subclass EShellBackend. This commit converts EShell but breaks all the shell backends. --- shell/e-shell-view.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'shell/e-shell-view.h') diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index 1392acfa0a..66a72325fb 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -29,8 +29,8 @@ #define E_SHELL_VIEW_H #include +#include #include -#include #include #include #include @@ -95,12 +95,6 @@ struct _EShellView { * search rules for this shell view. The XML files * are usually named something like * viewtypes.xml. - * @type_module: The corresponding #GTypeModule for this shell - * view. Subclasses are responsible for setting - * this. An easy way do so is to pass it to the - * shell view's #GClassInitFunc via the - * class_data field in - * #GTypeInfo. * @view_collection: A unique #GalViewCollection instance is created * for each subclass and shared across all instances * of that subclass. That much is done automatically @@ -142,10 +136,6 @@ struct _EShellViewClass { /* Base name of the search rule definition file. */ const gchar *search_rules; - /* Subclasses should set this via the "class_data" field in - * the GTypeInfo they pass to g_type_module_register_type(). */ - GTypeModule *type_module; - /* A unique instance is created for each subclass. */ GalViewCollection *view_collection; @@ -173,11 +163,11 @@ gint e_shell_view_get_page_num (EShellView *shell_view); void e_shell_view_set_page_num (EShellView *shell_view, gint page_num); GtkSizeGroup * e_shell_view_get_size_group (EShellView *shell_view); +EShellBackend * e_shell_view_get_shell_backend (EShellView *shell_view); EShellContent * e_shell_view_get_shell_content (EShellView *shell_view); EShellSidebar * e_shell_view_get_shell_sidebar (EShellView *shell_view); EShellTaskbar * e_shell_view_get_shell_taskbar (EShellView *shell_view); EShellWindow * e_shell_view_get_shell_window (EShellView *shell_view); -EShellModule * e_shell_view_get_shell_module (EShellView *shell_view); void e_shell_view_update_actions (EShellView *shell_view); void e_shell_view_show_popup_menu (EShellView *shell_view, const gchar *widget_path, -- cgit