evolution r35950 - branches/kill-bonobo/shell

[mbarnes svn gnome org]

Author: mbarnes
Date: Mon Aug 11 01:05:38 2008
New Revision: 35950
URL: http://svn.gnome.org/viewvc/evolution?rev=35950&view=rev

Log:
Add a few stub functions to get compilation to complete.
Kill e-active-connection-dialog.glade (unused).


Removed:
   branches/kill-bonobo/shell/e-active-connection-dialog.glade
Modified:
   branches/kill-bonobo/shell/Makefile.am
   branches/kill-bonobo/shell/e-shell-window-actions.c
   branches/kill-bonobo/shell/e-shell.c

Modified: branches/kill-bonobo/shell/Makefile.am
==============================================================================
--- branches/kill-bonobo/shell/Makefile.am	(original)
+++ branches/kill-bonobo/shell/Makefile.am	Mon Aug 11 01:05:38 2008
@@ -59,13 +59,11 @@
 eshellincludedir = $(privincludedir)/shell
 
 eshellinclude_HEADERS = 			\
-	Evolution.h				\
 	e-shell-common.h			\
 	e-shell-module.h			\
 	e-shell-view.h				\
 	e-shell-window.h			\
 	e-shell-window-actions.h		\
-	e-user-creatable-items-handler.h	\
 	es-event.h				\
 	es-menu.h
 
@@ -76,7 +74,6 @@
 	e-shell-view.c				\
 	e-shell-window.c			\
 	e-shell-window-actions.c		\
-	e-user-creatable-items-handler.c	\
 	$(eshellinclude_HEADERS)
 
 libeshell_la_LDFLAGS = $(NO_UNDEFINED)
@@ -123,7 +120,6 @@
 @EVO_PLUGIN_RULE@
 
 glade_DATA =						\
-	e-active-connection-dialog.glade		\
 	import.glade
 
 # GConf schemas

Modified: branches/kill-bonobo/shell/e-shell-window-actions.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-window-actions.c	(original)
+++ branches/kill-bonobo/shell/e-shell-window-actions.c	Mon Aug 11 01:05:38 2008
@@ -1117,7 +1117,7 @@
 	domain = GETTEXT_PACKAGE;
 
 	/* Shell Actions */
-	action_group = ACTION_GROUP (SHELL);
+	action_group = window->priv->shell_actions;
 	gtk_action_group_set_translation_domain (action_group, domain);
 	gtk_action_group_add_actions (
 		action_group, shell_entries,
@@ -1128,22 +1128,22 @@
 	gtk_ui_manager_insert_action_group (manager, action_group, 0);
 
 	/* New Item Actions (empty) */
-	action_group = ACTION_GROUP (NEW_ITEM);
+	action_group = window->priv->new_item_actions;
 	gtk_action_group_set_translation_domain (action_group, domain);
 	gtk_ui_manager_insert_action_group (manager, action_group, 0);
 
 	/* New Group Actions (empty) */
-	action_group = ACTION_GROUP (NEW_GROUP);
+	action_group = window->priv->new_group_actions;
 	gtk_action_group_set_translation_domain (action_group, domain);
 	gtk_ui_manager_insert_action_group (manager, action_group, 0);
 
 	/* New Source Actions (empty) */
-	action_group = ACTION_GROUP (NEW_SOURCE);
+	action_group = window->priv->new_source_actions;
 	gtk_action_group_set_translation_domain (action_group, domain);
 	gtk_ui_manager_insert_action_group (manager, action_group, 0);
 
 	/* Shell View Actions (empty) */
-	action_group = ACTION_GROUP (SHELL_VIEW);
+	action_group = window->priv->shell_view_actions;
 	gtk_action_group_set_translation_domain (action_group, domain);
 	gtk_ui_manager_insert_action_group (manager, action_group, 0);
 }
@@ -1160,7 +1160,7 @@
 
 	g_return_if_fail (E_IS_SHELL_WINDOW (window));
 
-	action_group = ACTION_GROUP (SHELL_VIEW);
+	action_group = window->priv->shell_view_actions;
 	types = e_shell_registry_get_view_types (&n_types);
 	manager = e_shell_window_get_ui_manager (window);
 	merge_id = gtk_ui_manager_new_merge_id (manager);

Modified: branches/kill-bonobo/shell/e-shell.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell.c	(original)
+++ branches/kill-bonobo/shell/e-shell.c	Mon Aug 11 01:05:38 2008
@@ -159,6 +159,31 @@
 	return e_shell_module_handle_uri (shell_module, uri);
 }
 
+void
+e_shell_send_receive (GtkWindow *parent)
+{
+	/* FIXME */
+}
+
+void
+e_shell_go_offline (void)
+{
+	/* FIXME */
+}
+
+void
+e_shell_go_online (void)
+{
+	/* FIXME */
+}
+
+EShellLineStatus
+e_shell_get_line_status (void)
+{
+	/* FIXME */
+	return E_SHELL_LINE_STATUS_ONLINE;
+}
+
 GtkWidget *
 e_shell_get_preferences_window (void)
 {
@@ -169,3 +194,24 @@
 
 	return preferences_window;
 }
+
+gboolean
+e_shell_is_busy (void)
+{
+	/* FIXME */
+	return FALSE;
+}
+
+gboolean
+e_shell_do_quit (void)
+{
+	/* FIXME */
+	return TRUE;
+}
+
+gboolean
+e_shell_quit (void)
+{
+	/* FIXME */
+	return TRUE;
+}