aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-10-05 12:32:26 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-10-05 12:32:26 +0800
commit3c9c7a2ac1864cd7cf3b72737e0577612e672b01 (patch)
treeb4ef89a49f984f3a730d285406c4ec4d7d57cc56
parent6d1aea1b231c120441061c2046157b40e34f8e3a (diff)
downloadgsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.tar.gz
gsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.tar.zst
gsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.zip
Fix some compilation errors.
svn path=/branches/kill-bonobo/; revision=36561
-rw-r--r--doc/reference/shell/Makefile.am2
-rw-r--r--doc/reference/shell/eshell-sections.txt8
-rw-r--r--doc/reference/shell/tmpl/e-shell-module.sgml4
-rw-r--r--doc/reference/shell/tmpl/e-shell.sgml4
-rw-r--r--doc/reference/shell/tmpl/eshell-unused.sgml26
-rw-r--r--shell/Makefile.am4
-rw-r--r--shell/e-shell.c4
7 files changed, 39 insertions, 13 deletions
diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am
index 65d12055e5..6489b92840 100644
--- a/doc/reference/shell/Makefile.am
+++ b/doc/reference/shell/Makefile.am
@@ -68,6 +68,7 @@ INCLUDES= \
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 @@ GTKDOC_LIBS= \
$(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 \
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index e6cfb9cb4b..44daecdc46 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -19,8 +19,8 @@ e_shell_get_preferences_window
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 @@ EShellClass
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_get_shell
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
diff --git a/doc/reference/shell/tmpl/e-shell-module.sgml b/doc/reference/shell/tmpl/e-shell-module.sgml
index decce2d34c..aaf2fde7b3 100644
--- a/doc/reference/shell/tmpl/e-shell-module.sgml
+++ b/doc/reference/shell/tmpl/e-shell-module.sgml
@@ -52,7 +52,7 @@ EShellModule
@sort_order:
@is_busy:
@shutdown:
-@upgrade:
+@migrate:
<!-- ##### FUNCTION e_shell_module_new ##### -->
<para>
@@ -137,7 +137,7 @@ EShellModule
@Returns:
-<!-- ##### FUNCTION e_shell_module_upgrade ##### -->
+<!-- ##### FUNCTION e_shell_module_migrate ##### -->
<para>
</para>
diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml
index e2ed82e2b1..92cf1218ee 100644
--- a/doc/reference/shell/tmpl/e-shell.sgml
+++ b/doc/reference/shell/tmpl/e-shell.sgml
@@ -218,14 +218,14 @@ EShell
@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>
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index e69de29bb2..811d96dc64 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -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:
+
diff --git a/shell/Makefile.am b/shell/Makefile.am
index f8510f9357..96784950d6 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -61,7 +61,6 @@ eshellincludedir = $(privincludedir)/shell
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 @@ eshellinclude_HEADERS = \
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 @@ evolution_SOURCES = \
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 \
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 7461329e1d..71eaec483d 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -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 @@ shell_constructed (GObject *object)
g_dir_close (dir);
- e_shell_upgrade_attempt (shell);
+ e_shell_migrate_attempt (shell);
}
static void