maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
syncevolution/.gitignore
Patrick Ohly 340579cbdb Merge branch 'HARMATTAN-1-3-1' 
Fetched the code and its history from the 1.3.1 archives at:
http://people.debian.org/~ovek/maemo/
http://people.debian.org/~ovek/harmattan/

Merged almost everything, except for Maemo/Harmattan specific build files:
  autogen-maemo.sh builddeb buildsrc debian

The following changes were also removed, because they are either local
workarounds or merge artifacts which probably also don't belong into
the Maemo/Harmattan branch:

diff --git a/configure.ac b/configure.ac
index cb66617..2c4403c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ if test "$enable_release_mode" = "yes"; then
    AC_DEFINE(SYNCEVOLUTION_STABLE_RELEASE, 1, [binary is meant for end-users])
 fi

-AM_INIT_AUTOMAKE([1.11.1 tar-ustar silent-rules subdir-objects -Wno-portability])
+AM_INIT_AUTOMAKE([subdir-objects -Wno-portability])

 AM_PROG_CC_C_O

diff --git a/src/backends/webdav/CalDAVSource.cpp b/src/backends/webdav/CalDAVSource.cpp
index decd170..7d338ac 100644
--- a/src/backends/webdav/CalDAVSource.cpp
+++ b/src/backends/webdav/CalDAVSource.cpp
@@ -1282,6 +1282,7 @@ void CalDAVSource::Event::fixIncomingCalendar(icalcomponent *calendar)
     // time.
     bool ridInUTC = false;
     const icaltimezone *zone = NULL;
+    icalcomponent *parent = NULL;

     for (icalcomponent *comp = icalcomponent_get_first_component(calendar, ICAL_VEVENT_COMPONENT);
          comp;
@@ -1295,6 +1296,7 @@ void CalDAVSource::Event::fixIncomingCalendar(icalcomponent *calendar)
         // is parent event? -> remember time zone unless it is UTC
         static const struct icaltimetype null = { 0 };
         if (!memcmp(&rid, &null, sizeof(null))) {
+            parent = comp;
             struct icaltimetype dtstart = icalcomponent_get_dtstart(comp);
             if (!icaltime_is_utc(dtstart)) {
                 zone = icaltime_get_timezone(dtstart);
diff --git a/src/backends/webdav/CalDAVSource.h b/src/backends/webdav/CalDAVSource.h
index 517ac2f..fa7c2ca 100644
--- a/src/backends/webdav/CalDAVSource.h
+++ b/src/backends/webdav/CalDAVSource.h
@@ -45,6 +45,10 @@ class CalDAVSource : public WebDAVSource,
     virtual void removeMergedItem(const std::string &luid);
     virtual void flushItem(const string &uid);
     virtual std::string getSubDescription(const string &uid, const string &subid);
+    virtual void updateSynthesisInfo(SynthesisInfo &info,
+                                     XMLConfigFragments &fragments) {
+        info.m_backendRule = "HAVE-SYNCEVOLUTION-EXDATE-DETACHED";
+    }

     // implementation of SyncSourceLogging callback
     virtual std::string getDescription(const string &luid);

Making SySync_ConsolePrintf a real instance inside SyncEvolution leads
to link errors in other configurations. It really has to be extern. Added
a comment to the master branch to make that more obvious:

-extern "C" { // without curly braces, g++ 4.2 thinks the variable is extern
-    int (*SySync_ConsolePrintf)(FILE *stream, const char *format, ...);
-}
+// This is just the declaration. The actual function pointer instance
+// is inside libsynthesis, which, for historic purposes, doesn't define
+// it in its header files (yet).
+extern "C" int (*SySync_ConsolePrintf)(FILE *stream, const char *format, ...);
2012-11-01 19:13:58 +01:00

132 lines
2.8 KiB
Text
Raw Blame History

# general
*.la
*.lo
*.o
*.pyc
*~
.deps
.dirstamp
.libs
Makefile
Makefile.in
# top level
/INSTALL
/autom4te.cache
/aclocal.m4
/compile
/config.guess
/config.h
/config.h.in
/config.log
/config.status
/config.sub
/configure
/depcomp
/INSTALL
/install-sh
/libtool
/ltmain.sh
/m4
/missing
/mkinstalldirs
/README
/README.html
/stamp-h1
/syncevolution.1
/syncevolution-*.tar.gz
# for Maemo build
/libsynthesis
# po
/po/*.gmo
/po/.intltool-merge-cache
/po/LINGUAS
/po/Makefile.in.in
/po/POTFILES
/po/stamp-it
# src
/src/autotroll.mk
/src/Client_Source_*.log
/src/Client_Sync_*.log
/src/Client_Sync_*.A
/src/client-test
/src/LogDirTest
/src/LogRedirectTest_glib.out
/src/N7SyncEvo*.log
/src/synccompare
/src/syncevo-dbus-server
/src/syncevo-http-server
/src/syncevolution
/src/testcases/
# src/backends
/src/backends/backends.am
# src/backends/webdav
/src/backends/webdav/syncevo-webdav-lookup
# src/dbus/glib
/src/dbus/glib/stamp-syncevo-connection-bindings.h
/src/dbus/glib/stamp-syncevo-connection-glue.h
/src/dbus/glib/stamp-syncevo-server-bindings.h
/src/dbus/glib/stamp-syncevo-server-glue.h
/src/dbus/glib/stamp-syncevo-session-bindings.h
/src/dbus/glib/stamp-syncevo-session-glue.h
/src/dbus/glib/syncevo-connection-glue.h
/src/dbus/glib/syncevo-connection-bindings.h
/src/dbus/glib/syncevo-connection.xml
/src/dbus/glib/syncevo-dbus.pc
/src/dbus/glib/syncevo-marshal.c
/src/dbus/glib/syncevo-marshal.h
/src/dbus/glib/syncevo-server-glue.h
/src/dbus/glib/syncevo-server-bindings.h
/src/dbus/glib/syncevo-server.xml
/src/dbus/glib/syncevo-session-glue.h
/src/dbus/glib/syncevo-session-bindings.h
/src/dbus/glib/syncevo-session.xml
/src/dbus/glib/test-syncevo-dbus
# src/dbus/interfaces
/src/dbus/interfaces/syncevo-connection-doc.xml
/src/dbus/interfaces/syncevo-dbus-api-doc.html
/src/dbus/interfaces/syncevo-dbus-api-doc.xml
/src/dbus/interfaces/syncevo-server-doc.xml
/src/dbus/interfaces/syncevo-session-doc.xml
# src/dbus/qt
/src/dbus/qt/autotroll.mk
/src/dbus/qt/syncevolution-qt-dbus.pc
/src/dbus/qt/stamp-connection
/src/dbus/qt/stamp-server
/src/dbus/qt/stamp-session
/src/dbus/qt/syncevo-connection-full.cpp
/src/dbus/qt/syncevo-connection-full.h
/src/dbus/qt/syncevo-connection-full.moc.cpp
/src/dbus/qt/syncevo-server-full.cpp
/src/dbus/qt/syncevo-server-full.h
/src/dbus/qt/syncevo-server-full.moc.cpp
/src/dbus/qt/syncevo-session-full.cpp
/src/dbus/qt/syncevo-session-full.h
/src/dbus/qt/syncevo-session-full.moc.cpp
# src/dbus/server
/src/dbus/server/org.syncevolution.service
/src/dbus/server/syncevo-dbus-server-startup.sh
/src/dbus/server/syncevo-dbus-server.desktop
# src/gdbus
/src/gdbus/example
# src/gtk-ui
/src/gtk-ui/sync-ui
/src/gtk-ui/sync.desktop
/src/gtk-ui/ui.xml
# src/syncevo
/src/syncevo-phone-config
/src/syncevo/CmdlineHelp.c
/src/syncevo/SyncEvolutionXML.c
/src/syncevo/syncevolution.pc
Reference in a new issue View git blame Copy permalink