[PATCH] fix for automake and cleanup (both evo2)
Stefan Behlert <[email protected]> Wed, 3 Nov 2004 17:10:04 +0100
| Newsgroups | gmane.comp.gnome.apps.multisync.devel |
|---|---|
| Message-ID | <[email protected]> |
Moin,
I've appended two patches, both are for the evoultion2-plugin:
first, newer versions of automake seem to require that the files 'NEWS' and
'AUTHORS' are not only present but are not empty, too.
(if present bbut empty, "Makefile.am: required file `./NEWS' not found"
is reported)
The patch simply adds a ' ' to these files (please, add the correct value
to 'AUTHORS', I was not sure about the author and didn't want to add the
wrong one)
second, I added a few '#include "xyz.h"' to various files in the evo2 src
dir, to avoid those nasty warnings about missing prototypes when
compiling [e.g. "evolution_sync.c:130: warning: implicit declaration of
function `evo2_calendar_open'"].
I removed two or three unused variables, too.
Both diffs are against the multisync-cvs-snapshot [03-Nov-2004].
ciao,
Stefan
--
Stefan Behlert
automake.diff
(text/plain, 598 B)
diff -urN multisync-0.82/plugins/evolution2_sync.orig/AUTHORS multisync-0.82/plugins/evolution2_sync/AUTHORS --- multisync-0.82/plugins/evolution2_sync.orig/AUTHORS 2004-10-07 15:37:59.000000000 +0200 +++ multisync-0.82/plugins/evolution2_sync/AUTHORS 2004-10-12 13:44:19.000000000 +0200 @@ -0,0 +1 @@ + diff -urN multisync-0.82/plugins/evolution2_sync.orig/NEWS multisync-0.82/plugins/evolution2_sync/NEWS --- multisync-0.82/plugins/evolution2_sync.orig/NEWS 2004-10-07 15:37:59.000000000 +0200 +++ multisync-0.82/plugins/evolution2_sync/NEWS 2004-10-12 13:44:35.000000000 +0200 @@ -0,0 +1 @@ +
cleanup.diff
(text/plain, 8 KB)
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/evolution_ebook.c multisync-0.82/plugins/evolution2_sync/src/evolution_ebook.c
--- multisync-0.82/plugins/evolution2_sync.orig/src/evolution_ebook.c 2004-10-27 17:18:46.000000000 +0200
+++ multisync-0.82/plugins/evolution2_sync/src/evolution_ebook.c 2004-10-28 13:09:38.000000000 +0200
@@ -1,4 +1,5 @@
#include "evolution_sync.h"
+#include "evolution_ebook.h"
gboolean evo2_addrbook_open(evo_environment *env)
{
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/evolution_ebook.h multisync-0.82/plugins/evolution2_sync/src/evolution_ebook.h
--- multisync-0.82/plugins/evolution2_sync.orig/src/evolution_ebook.h 1970-01-01 01:00:00.000000000 +0100
+++ multisync-0.82/plugins/evolution2_sync/src/evolution_ebook.h 2004-10-28 13:09:41.000000000 +0200
@@ -0,0 +1,30 @@
+#ifndef _EVO2_EBOOK_h
+#define _EVO2_EBOOK_h
+
+/*
+ MultiSync Evolution2 Plugin
+ Copyright (C) 2004 Tom Foottit <[email protected]>
+ Copyright (C) 2004 Bo Lincoln <[email protected]>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2 as
+ published by the Free Software Foundation;
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
+ CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
+ COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
+ SOFTWARE IS DISCLAIMED.
+*/
+
+gboolean evo2_addrbook_open(evo_environment *env);
+gboolean evo2_addrbook_modify(evo_environment *env, char *data, char *uid, char *uidret, int *uidretlen);
+
+#endif /* _EVO2_EBOOK_h */
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/evolution_ecal.c multisync-0.82/plugins/evolution2_sync/src/evolution_ecal.c
--- multisync-0.82/plugins/evolution2_sync.orig/src/evolution_ecal.c 2004-10-27 17:18:46.000000000 +0200
+++ multisync-0.82/plugins/evolution2_sync/src/evolution_ecal.c 2004-10-28 15:19:35.311217624 +0200
@@ -1,4 +1,5 @@
#include "evolution_sync.h"
+#include "evolution_ecal.h"
gboolean evo2_calendar_open(evo_environment *env)
{
@@ -33,7 +35,6 @@
gboolean evo2_calendar_modify(evo_environment *env, char *data, char *uid, char *uidret, int *uidretlen)
{
- ECalComponent *cal;
icalcomponent *icomp;
uidret = NULL;
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/evolution_ecal.h multisync-0.82/plugins/evolution2_sync/src/evolution_ecal.h
--- multisync-0.82/plugins/evolution2_sync.orig/src/evolution_ecal.h 1970-01-01 01:00:00.000000000 +0100
+++ multisync-0.82/plugins/evolution2_sync/src/evolution_ecal.h 2004-10-28 13:54:34.259695328 +0200
@@ -0,0 +1,7 @@
+#ifndef _EVO2_ECAL_H_
+#define _EVO2_ECAL_H_
+
+gboolean evo2_calendar_open(evo_environment *env);
+gboolean evo2_calendar_modify(evo_environment *env, char *data, char *uid, char *uidret, int *uidretlen);
+
+#endif /* _EVO2_ECAL_H_ */
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/evolution_etodo.c multisync-0.82/plugins/evolution2_sync/src/evolution_etodo.c
--- multisync-0.82/plugins/evolution2_sync.orig/src/evolution_etodo.c 2004-10-27 17:18:46.000000000 +0200
+++ multisync-0.82/plugins/evolution2_sync/src/evolution_etodo.c 2004-10-28 13:55:44.060084056 +0200
@@ -1,4 +1,5 @@
#include "evolution_sync.h"
+#include "evolution_etodo.h"
gboolean evo2_tasks_open(evo_environment *env)
{
@@ -33,7 +34,6 @@
gboolean evo2_tasks_modify(evo_environment *env, char *data, char *uid, char *uidret, int *uidretlen)
{
- ECalComponent *cal;
icalcomponent *icomp;
uidret = NULL;
*uidretlen = 0;
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/evolution_etodo.h multisync-0.82/plugins/evolution2_sync/src/evolution_etodo.h
--- multisync-0.82/plugins/evolution2_sync.orig/src/evolution_etodo.h 1970-01-01 01:00:00.000000000 +0100
+++ multisync-0.82/plugins/evolution2_sync/src/evolution_etodo.h 2004-10-28 13:55:44.061083904 +0200
@@ -0,0 +1,8 @@
+#ifndef _EVO2_ETODO_H_
+#define _EVO2_ETODO_H_
+
+gboolean evo2_tasks_open(evo_environment *env);
+gboolean evo2_tasks_modify(evo_environment *env, char *data, char *uid, char *uidret, int *uidretlen);
+
+#endif /* _EVO2_ETODO_H_ */
+
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/evolution_sync.c multisync-0.82/plugins/evolution2_sync/src/evolution_sync.c
--- multisync-0.82/plugins/evolution2_sync.orig/src/evolution_sync.c 2004-10-27 17:18:46.000000000 +0200
+++ multisync-0.82/plugins/evolution2_sync/src/evolution_sync.c 2004-10-28 13:51:51.575427096 +0200
@@ -1,5 +1,10 @@
#include "evolution_sync.h"
+#include "xml.h"
+#include "evolution_ebook.h"
+#include "evolution_etodo.h"
+#include "evolution_ecal.h"
+
/*
MultiSync Evolution2 Plugin
Copyright (C) 2004 Tom Foottit <[email protected]>
@@ -77,11 +82,11 @@
break;
case 3:
//debug
- printf("[evo2-sync] DEBUG: %s\n", buffer);
+ // printf("[evo2-sync] DEBUG: %s\n", buffer);
break;
case 4:
//fulldebug
- printf("[evo2-sync] FULL DEBUG: %s\n", buffer);
+ // printf("[evo2-sync] FULL DEBUG: %s\n", buffer);
break;
}
va_end(arglist);
@@ -113,8 +113,6 @@
env->change_id = g_strdup_printf("msyncid%s", g_path_get_basename(sync_get_datapath(env->handle)));
env->commondata.object_types = object_types;
- ESource *source;
-
if (object_types & SYNC_OBJECT_TYPE_PHONEBOOK && env->adressbook_path && strlen(env->adressbook_path)) {
if (!evo2_addrbook_open(env)) {
sync_set_pair_status(env->handle, "Unable to open addressbook");
@@ -144,7 +147,6 @@
int evo_get_data(void *object, sync_object_type format, char **data, int *datasize, const char **uid)
{
- char *buffer;
EBookChange *ebc;
ECalChange *ecc;
switch (format) {
@@ -242,7 +244,6 @@
void syncobj_modify(evo_environment *env, char* object, char *uid, sync_object_type objtype, char *returnuid, int *returnuidlen)
{
- GError *error = NULL;
evo_debug(env, 2, "start: syncobj_modify");
switch (objtype) {
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/evolution_sync.h multisync-0.82/plugins/evolution2_sync/src/evolution_sync.h
--- multisync-0.82/plugins/evolution2_sync.orig/src/evolution_sync.h 2004-10-27 17:18:46.000000000 +0200
+++ multisync-0.82/plugins/evolution2_sync/src/evolution_sync.h 2004-10-28 13:49:45.094655096 +0200
@@ -42,6 +42,7 @@
#include <fcntl.h>
#include <errno.h>
#include <stdio.h>
+#include <string.h>
#include <sys/stat.h>
typedef struct {
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/gui.c multisync-0.82/plugins/evolution2_sync/src/gui.c
--- multisync-0.82/plugins/evolution2_sync.orig/src/gui.c 2004-10-27 17:18:46.000000000 +0200
+++ multisync-0.82/plugins/evolution2_sync/src/gui.c 2004-10-28 15:39:41.073913832 +0200
@@ -35,6 +35,7 @@
#include "gui.h"
#include "interface.h"
#include "support.h"
+#include "xml.h"
GtkWidget* evowindow = NULL;
evo_environment *evoconn = NULL;
diff -urN multisync-0.82/plugins/evolution2_sync.orig/src/xml.c multisync-0.82/plugins/evolution2_sync/src/xml.c
--- multisync-0.82/plugins/evolution2_sync.orig/src/xml.c 2004-10-27 17:18:46.000000000 +0200
+++ multisync-0.82/plugins/evolution2_sync/src/xml.c 2004-10-28 12:51:53.000000000 +0200
@@ -68,7 +69,7 @@
}
xmlFreeDoc(doc);
- evo_debug(env, 3, "end: load_palm_state");
+ evo_debug(env, 3, "end: load_evo_settings");
return 0;
}
@@ -87,5 +88,5 @@
xmlSaveFile(env->configfile, doc);
xmlFreeDoc(doc);
- evo_debug(env, 3, "end: save_palm_state");
+ evo_debug(env, 3, "end: save_evo_settings");
}