diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-09-05 06:39:24 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-09-05 06:39:24 +0800 |
| commit | a6939cf10dffcd41d609bc0131f1e0b882529fbf (patch) | |
| tree | b2bd6843c14c3ef2951831e996abe58ce691c2cc | |
| parent | f966fe07757883ad5168a16daa2da39afbb388b3 (diff) | |
| download | gsoc2013-evolution-a6939cf10dffcd41d609bc0131f1e0b882529fbf.tar gsoc2013-evolution-a6939cf10dffcd41d609bc0131f1e0b882529fbf.tar.gz gsoc2013-evolution-a6939cf10dffcd41d609bc0131f1e0b882529fbf.tar.bz2 gsoc2013-evolution-a6939cf10dffcd41d609bc0131f1e0b882529fbf.tar.lz gsoc2013-evolution-a6939cf10dffcd41d609bc0131f1e0b882529fbf.tar.xz gsoc2013-evolution-a6939cf10dffcd41d609bc0131f1e0b882529fbf.tar.zst gsoc2013-evolution-a6939cf10dffcd41d609bc0131f1e0b882529fbf.zip | |
Return FALSE here. (get_base_url): Add a cast.
* upgrade-mailer.c (upgrade): Return FALSE here.
(get_base_url): Add a cast.
* component-factory.c (storage_xfer_folder): Removed unused
variables.
* Makefile.am: Rename upgrade-mailer to evolution-mail-upgrade.
svn path=/trunk/; revision=17981
| -rw-r--r-- | mail/ChangeLog | 10 | ||||
| -rw-r--r-- | mail/Makefile.am | 8 | ||||
| -rw-r--r-- | mail/component-factory.c | 2 | ||||
| -rw-r--r-- | mail/upgrade-mailer.c | 4 | ||||
| -rw-r--r-- | shell/ChangeLog | 9 |
5 files changed, 28 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 4911e47c60..ee58e7499d 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,13 @@ +2002-09-04 Ettore Perazzoli <ettore@ximian.com> + + * upgrade-mailer.c (upgrade): Return FALSE here. + (get_base_url): Add a cast. + + * component-factory.c (storage_xfer_folder): Removed unused + variables. + + * Makefile.am: Rename upgrade-mailer to evolution-mail-upgrade. + 2002-09-04 Jeffrey Stedfast <fejj@ximian.com> * Makefile.am: Add upgrade-mailer.c to the build. diff --git a/mail/Makefile.am b/mail/Makefile.am index 21c65f3f98..74aa8898b4 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = importers -bin_PROGRAMS = evolution-mail upgrade-mailer +bin_PROGRAMS = \ + evolution-mail \ + evolution-mail-upgrade importerdir = $(privlibdir)/evolution-mail-importers @@ -153,8 +155,8 @@ evolution_mail_LDADD = \ evolution_mail_LDFLAGS = \ -export-dynamic -upgrade_mailer_SOURCES = upgrade-mailer.c -upgrade_mailer_LDADD = $(EVOLUTION_MAIL_LIBS) +evolution_mail_upgrade_SOURCES = upgrade-mailer.c +evolution_mail_upgrade_LDADD = $(EVOLUTION_MAIL_LIBS) oafdir = $(datadir)/oaf oaf_in_files = GNOME_Evolution_Mail.oaf.in diff --git a/mail/component-factory.c b/mail/component-factory.c index 50202fbce1..fdef24dca8 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -1244,7 +1244,7 @@ storage_xfer_folder (EvolutionStorage *storage, { CamelException ex; char *src, *dst; - char *p, c, sep; + char sep; d(printf("Transfer folder on store source = '%s' dest = '%s'\n", source_path, destination_path)); diff --git a/mail/upgrade-mailer.c b/mail/upgrade-mailer.c index f20d482157..e25b63aefe 100644 --- a/mail/upgrade-mailer.c +++ b/mail/upgrade-mailer.c @@ -137,7 +137,7 @@ get_base_url (const char *protocol, const char *uri) base_url = p; p = strchr (p, '/'); - base_url = g_strdup_printf ("%s://%.*s", protocol, p ? p - base_url : strlen (base_url), base_url); + base_url = g_strdup_printf ("%s://%.*s", protocol, p ? (int) (p - base_url) : strlen (base_url), base_url); return base_url; } @@ -852,6 +852,8 @@ upgrade (void) mailer_upgrade (db); gtk_main_quit (); + + return FALSE; } int main (int argc, char **argv) diff --git a/shell/ChangeLog b/shell/ChangeLog index 2e3cc825aa..8d4c903e2c 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,14 @@ 2002-09-04 Ettore Perazzoli <ettore@ximian.com> + * Makefile.am (INCLUDES): Add a -DPREFIX. + + * main.c (main): New command-line option "force-upgrade". + (show_development_warning): Suggest 1.0.8, not 1.0.5. + (upgrade_from_1_0_if_needed): New. + (idle_cb): Call it. + +2002-09-04 Ettore Perazzoli <ettore@ximian.com> + * e-shell-view.c (new_folder_cb): Pass FALSE as @queue to e_shell_view_display_uri() here. |