diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-05 12:32:26 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-05 12:32:26 +0800 |
| commit | 3c9c7a2ac1864cd7cf3b72737e0577612e672b01 (patch) | |
| tree | b4ef89a49f984f3a730d285406c4ec4d7d57cc56 /shell | |
| parent | 6d1aea1b231c120441061c2046157b40e34f8e3a (diff) | |
| download | gsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.tar gsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.tar.gz gsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.tar.bz2 gsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.tar.lz gsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.tar.xz gsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.tar.zst gsoc2013-evolution-3c9c7a2ac1864cd7cf3b72737e0577612e672b01.zip | |
Fix some compilation errors.
svn path=/branches/kill-bonobo/; revision=36561
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 4 | ||||
| -rw-r--r-- | shell/e-shell.c | 4 |
2 files changed, 4 insertions, 4 deletions
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 |