evolution r36561 - in branches/kill-bonobo: doc/reference/shell doc/reference/shell/tmpl shell

[mbarnes svn gnome org]

Author: mbarnes
Date: Sun Oct  5 04:32:26 2008
New Revision: 36561
URL: http://svn.gnome.org/viewvc/evolution?rev=36561&view=rev

Log:
Fix some compilation errors.


Modified:
   branches/kill-bonobo/doc/reference/shell/Makefile.am
   branches/kill-bonobo/doc/reference/shell/eshell-sections.txt
   branches/kill-bonobo/doc/reference/shell/tmpl/e-shell-module.sgml
   branches/kill-bonobo/doc/reference/shell/tmpl/e-shell.sgml
   branches/kill-bonobo/doc/reference/shell/tmpl/eshell-unused.sgml
   branches/kill-bonobo/shell/Makefile.am
   branches/kill-bonobo/shell/e-shell.c

Modified: branches/kill-bonobo/doc/reference/shell/Makefile.am
==============================================================================
--- branches/kill-bonobo/doc/reference/shell/Makefile.am	(original)
+++ branches/kill-bonobo/doc/reference/shell/Makefile.am	Sun Oct  5 04:32:26 2008
@@ -68,6 +68,7 @@
 GTKDOC_LIBS=								\
 	$(top_builddir)/shell/e-shell.o					\
 	$(top_builddir)/shell/e-shell-importer.o			\
+	$(top_builddir)/shell/e-shell-migrate.o				\
 	$(top_builddir)/shell/e-shell-nm.o				\
 	$(top_builddir)/shell/e-shell-window-private.o			\
 	$(top_builddir)/shell/es-event.o				\
@@ -76,7 +77,6 @@
 	$(top_builddir)/shell/.libs/e-shell-sidebar.o			\
 	$(top_builddir)/shell/.libs/e-shell-switcher.o			\
 	$(top_builddir)/shell/.libs/e-shell-taskbar.o			\
-	$(top_builddir)/shell/.libs/e-shell-upgrade.o			\
 	$(top_builddir)/shell/.libs/e-shell-view.o			\
 	$(top_builddir)/shell/.libs/e-shell-window-actions.o		\
 	$(top_builddir)/shell/.libs/e-shell-window.o			\

Modified: branches/kill-bonobo/doc/reference/shell/eshell-sections.txt
==============================================================================
--- branches/kill-bonobo/doc/reference/shell/eshell-sections.txt	(original)
+++ branches/kill-bonobo/doc/reference/shell/eshell-sections.txt	Sun Oct  5 04:32:26 2008
@@ -19,8 +19,8 @@
 e_shell_is_busy
 e_shell_do_quit
 e_shell_quit
-E_SHELL_UPGRADE_ERROR
-e_shell_upgrade_attempt
+E_SHELL_MIGRATE_ERROR
+e_shell_migrate_attempt
 <SUBSECTION Standard>
 E_SHELL
 E_IS_SHELL
@@ -32,7 +32,7 @@
 e_shell_get_type
 <SUBSECTION Private>
 EShellPrivate
-e_shell_upgrade_error_quirk
+e_shell_migrate_error_quirk
 </SECTION>
 
 <SECTION>
@@ -97,7 +97,7 @@
 e_shell_module_add_activity
 e_shell_module_is_busy
 e_shell_module_shutdown
-e_shell_module_upgrade
+e_shell_module_migrate
 e_shell_module_set_info
 <SUBSECTION Standard>
 E_SHELL_MODULE

Modified: branches/kill-bonobo/doc/reference/shell/tmpl/e-shell-module.sgml
==============================================================================
--- branches/kill-bonobo/doc/reference/shell/tmpl/e-shell-module.sgml	(original)
+++ branches/kill-bonobo/doc/reference/shell/tmpl/e-shell-module.sgml	Sun Oct  5 04:32:26 2008
@@ -52,7 +52,7 @@
 @sort_order: 
 @is_busy: 
 @shutdown: 
- upgrade: 
+ migrate: 
 
 <!-- ##### FUNCTION e_shell_module_new ##### -->
 <para>
@@ -137,7 +137,7 @@
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_module_upgrade ##### -->
+<!-- ##### FUNCTION e_shell_module_migrate ##### -->
 <para>
 
 </para>

Modified: branches/kill-bonobo/doc/reference/shell/tmpl/e-shell.sgml
==============================================================================
--- branches/kill-bonobo/doc/reference/shell/tmpl/e-shell.sgml	(original)
+++ branches/kill-bonobo/doc/reference/shell/tmpl/e-shell.sgml	Sun Oct  5 04:32:26 2008
@@ -218,14 +218,14 @@
 @Returns: 
 
 
-<!-- ##### MACRO E_SHELL_UPGRADE_ERROR ##### -->
+<!-- ##### MACRO E_SHELL_MIGRATE_ERROR ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### FUNCTION e_shell_upgrade_attempt ##### -->
+<!-- ##### FUNCTION e_shell_migrate_attempt ##### -->
 <para>
 
 </para>

Modified: branches/kill-bonobo/doc/reference/shell/tmpl/eshell-unused.sgml
==============================================================================
--- branches/kill-bonobo/doc/reference/shell/tmpl/eshell-unused.sgml	(original)
+++ branches/kill-bonobo/doc/reference/shell/tmpl/eshell-unused.sgml	Sun Oct  5 04:32:26 2008
@@ -0,0 +1,26 @@
+<!-- ##### MACRO E_SHELL_UPGRADE_ERROR ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION e_shell_module_upgrade ##### -->
+<para>
+
+</para>
+
+ shell_module: 
+ major: 
+ minor: 
+ micro: 
+ error: 
+ Returns: 
+
+<!-- ##### FUNCTION e_shell_upgrade_attempt ##### -->
+<para>
+
+</para>
+
+ shell: 
+ Returns: 
+

Modified: branches/kill-bonobo/shell/Makefile.am
==============================================================================
--- branches/kill-bonobo/shell/Makefile.am	(original)
+++ branches/kill-bonobo/shell/Makefile.am	Sun Oct  5 04:32:26 2008
@@ -61,7 +61,6 @@
 eshellinclude_HEADERS = 			\
 	e-shell-common.h			\
 	e-shell-content.h			\
-	e-shell-migrate.h			\
 	e-shell-module.h			\
 	e-shell-sidebar.h			\
 	e-shell-switcher.h			\
@@ -74,7 +73,6 @@
 libeshell_la_SOURCES =				\
 	$(IDL_GENERATED)			\
 	e-shell-content.c			\
-	e-shell-migrate.c			\
 	e-shell-module.c			\
 	e-shell-sidebar.c			\
 	e-shell-switcher.c			\
@@ -102,6 +100,8 @@
 	e-shell.h				\
 	e-shell-importer.c			\
 	e-shell-importer.h			\
+	e-shell-migrate.c			\
+	e-shell-migrate.h			\
 	e-shell-window-private.c		\
 	e-shell-window-private.h		\
 	es-event.c				\

Modified: branches/kill-bonobo/shell/e-shell.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell.c	(original)
+++ branches/kill-bonobo/shell/e-shell.c	Sun Oct  5 04:32:26 2008
@@ -25,8 +25,8 @@
 #include <e-preferences-window.h>
 #include <e-util/e-util.h>
 
+#include <e-shell-migrate.h>
 #include <e-shell-module.h>
-#include <e-shell-upgrade.h>
 #include <e-shell-window.h>
 
 #define SHUTDOWN_TIMEOUT	500  /* milliseconds */
@@ -327,7 +327,7 @@
 
 	g_dir_close (dir);
 
-	e_shell_upgrade_attempt (shell);
+	e_shell_migrate_attempt (shell);
 }
 
 static void