evolution r35938 - branches/kill-bonobo/shell

[mbarnes svn gnome org]

Author: mbarnes
Date: Fri Aug  8 15:15:17 2008
New Revision: 35938
URL: http://svn.gnome.org/viewvc/evolution?rev=35938&view=rev

Log:
Fix some compilation errors.


Modified:
   branches/kill-bonobo/shell/e-shell-module.c
   branches/kill-bonobo/shell/e-shell-module.h
   branches/kill-bonobo/shell/e-shell-window.c
   branches/kill-bonobo/shell/e-shell-window.h
   branches/kill-bonobo/shell/e-shell.c

Modified: branches/kill-bonobo/shell/e-shell-module.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-module.c	(original)
+++ branches/kill-bonobo/shell/e-shell-module.c	Fri Aug  8 15:15:17 2008
@@ -299,6 +299,8 @@
 	shell_module->priv->info.schemas = g_intern_string (info->schemas);
 	shell_module->priv->info.shell_view_type = info->shell_view_type;
 
-	shell_module->priv->info.request_quit = info->request_quit;
+	shell_module->priv->info.is_busy = info->is_busy;
+	shell_module->priv->info.shutdown = info->shutdown;
+	shell_module->priv->info.send_and_receive = info->send_and_receive;
 	shell_module->priv->info.window_created = info->window_created;
 }

Modified: branches/kill-bonobo/shell/e-shell-module.h
==============================================================================
--- branches/kill-bonobo/shell/e-shell-module.h	(original)
+++ branches/kill-bonobo/shell/e-shell-module.h	Fri Aug  8 15:15:17 2008
@@ -79,7 +79,7 @@
 GType		e_shell_module_get_view_type	(EShellModule *shell_module);
 gboolean	e_shell_module_is_busy		(EShellModule *shell_module);
 gboolean	e_shell_module_shutdown		(EShellModule *shell_module);
-void		e_shell_module_send_and_receive	(EShellModlue *shell_module);
+void		e_shell_module_send_and_receive	(EShellModule *shell_module);
 void		e_shell_module_window_created	(EShellModule *shell_module,
 						 EShellWindow *shell_window);
 void		e_shell_module_set_info		(EShellModule *shell_module,

Modified: branches/kill-bonobo/shell/e-shell-window.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-window.c	(original)
+++ branches/kill-bonobo/shell/e-shell-window.c	Fri Aug  8 15:15:17 2008
@@ -115,6 +115,12 @@
 	return type;
 }
 
+GtkWidget *
+e_shell_window_new (void)
+{
+	return g_object_new (E_TYPE_SHELL_WINDOW, NULL);
+}
+
 GtkUIManager *
 e_shell_window_get_ui_manager (EShellWindow *window)
 {

Modified: branches/kill-bonobo/shell/e-shell-window.h
==============================================================================
--- branches/kill-bonobo/shell/e-shell-window.h	(original)
+++ branches/kill-bonobo/shell/e-shell-window.h	Fri Aug  8 15:15:17 2008
@@ -59,6 +59,7 @@
 };
 
 GType		e_shell_window_get_type		(void);
+GtkWidget *	e_shell_window_new		(void);
 GtkUIManager *	e_shell_window_get_ui_manager	(EShellWindow *window);
 GtkAction *	e_shell_window_get_action	(EShellWindow *window,
 						 const gchar *action_name);

Modified: branches/kill-bonobo/shell/e-shell.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell.c	(original)
+++ branches/kill-bonobo/shell/e-shell.c	Fri Aug  8 15:15:17 2008
@@ -20,11 +20,14 @@
 
 #include "e-shell.h"
 
+#include <glib/gi18n.h>
+
+#include "e-shell-module.h"
+#include "e-shell-registry.h"
+
 #define SHUTDOWN_TIMEOUT	500  /* milliseconds */
 
 static GList *active_windows;
-static gboolean session_started;
-static gboolean shutting_down;
 
 static gboolean
 shell_window_delete_event_cb (EShellWindow *shell_window)
@@ -56,7 +59,7 @@
 	static guint source_id = 0;
 	static guint message_timer = 1;
 
-	list = e_shell_registry_get_modules ();
+	list = e_shell_registry_list_modules ();
 
 	/* Any module can defer shutdown if it's still busy. */
 	for (iter = list; proceed && iter != NULL; iter = iter->next) {
@@ -97,7 +100,7 @@
 	return !proceed;
 }
 
-void
+EShellWindow *
 e_shell_create_window (void)
 {
 	GtkWidget *shell_window;
@@ -115,4 +118,6 @@
 		shell_window_weak_notify_cb, NULL);
 
 	gtk_widget_show (shell_window);
+
+	return E_SHELL_WINDOW (shell_window);
 }