diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-01 03:03:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-02-01 03:03:12 +0800 |
| commit | fee5916b60c605ff5086d8fdc2a85c5ea21351f6 (patch) | |
| tree | 4feaede1cf070448a32bd0ab846908e47747ceb7 /plugins/backup-restore | |
| parent | cd5ff486fb02451645f8b4b39608edca2da5e4a2 (diff) | |
| download | gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.gz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.bz2 gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.lz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.xz gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.tar.zst gsoc2013-evolution-fee5916b60c605ff5086d8fdc2a85c5ea21351f6.zip | |
Merge revisions 37108:37199 from trunk.
svn path=/branches/kill-bonobo/; revision=37200
Diffstat (limited to 'plugins/backup-restore')
| -rw-r--r-- | plugins/backup-restore/ChangeLog | 20 | ||||
| -rw-r--r-- | plugins/backup-restore/Makefile.am | 4 | ||||
| -rw-r--r-- | plugins/backup-restore/backup-restore.c | 13 | ||||
| -rw-r--r-- | plugins/backup-restore/backup.c | 1 |
4 files changed, 35 insertions, 3 deletions
diff --git a/plugins/backup-restore/ChangeLog b/plugins/backup-restore/ChangeLog index 4bea33f456..7413e0e564 100644 --- a/plugins/backup-restore/ChangeLog +++ b/plugins/backup-restore/ChangeLog @@ -1,3 +1,23 @@ +2009-01-30 Milan Crha <mcrha@redhat.com> + + * backup-restore.c: (sanity_check): Removed dangling '*/'. + +2009-01-28 Tor Lillqvist <tml@novell.com> + + Make it compile on Windows, by Fridrich Strbra. (Just compile; + little chance of it actually doing anything sensible on Windows at + this point...) + + * Makefile.am: Use -no-undefined on Windows. Link with libeutil. + + * backup.c: Remove unused <sys/wait.h>. + + * backup-restore.c: Check HAVE_SYS_WAIT_H. + +2009-01-21 Milan Crha <mcrha@redhat.com> + + * Makefile.am: Use also EVOLUTION_CALENDAR_CFLAGS. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index eaa5963a4f..f93a3c7460 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -6,6 +6,7 @@ INCLUDES = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -I$(top_srcdir) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ $(SHELL_CFLAGS) \ $(E_UTIL_CFLAGS) @@ -20,7 +21,8 @@ plugin_LTLIBRARIES = liborg-gnome-backup-restore.la liborg_gnome_backup_restore_la_SOURCES = backup-restore.c liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_backup_restore_la_LIBADD = \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(top_builddir)/e-util/libeutil.la privlibexec_PROGRAMS = evolution-backup evolution_backup_SOURCES = backup.c diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 3486844cc3..400dd85898 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -18,9 +18,16 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <unistd.h> #include <sys/types.h> -#include <sys/wait.h> +#ifdef HAVE_SYS_WAIT_H +# include <sys/wait.h> +#endif +#include <stdlib.h> #include <gtk/gtk.h> #include <glib/gi18n.h> #include <glib/gstdio.h> @@ -71,9 +78,13 @@ sanity_check (const char *filename) result = system (command); g_free (command); +#ifdef HAVE_SYS_WAIT_H g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result); return WIFEXITED (result) && (WEXITSTATUS (result) == 0); +#else + return result; +#endif } static guint32 diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 26c4fb958f..f7a42114aa 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -26,7 +26,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <sys/wait.h> #include <glib/gi18n.h> #include <gtk/gtk.h> |