From af60abe51121f6ab98d0c67d762e4e1da43a3e71 Mon Sep 17 00:00:00 2001 From: Akhil Laddha Date: Wed, 6 Jul 2011 10:17:04 +0530 Subject: [PATCH] Bug#654054 Fix eds build failure --- addressbook/libedata-book/Makefile.am | 4 ++-- calendar/libedata-cal/Makefile.am | 2 +- docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml | 1 + docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml | 2 ++ docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml | 1 + docs/reference/camel/tmpl/camel-cipher-context.sgml | 2 ++ 6 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am index bd04300..7506b63 100644 --- a/addressbook/libedata-book/Makefile.am +++ b/addressbook/libedata-book/Makefile.am @@ -71,7 +71,7 @@ e_book_backend_sqlitedb_test_CPPFLAGS = \ $(libedata_book_1_2_la_CPPFLAGS) e_book_backend_sqlitedb_test_SOURCES = e-book-backend-sqlitedb-test.c e_book_backend_sqlitedb_test_LDADD = \ - $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ + libedata-book-1.2.la \ $(libedata_book_1_2_la_LIBADD) factory_PROGRAMS = e-addressbook-factory @@ -95,7 +95,7 @@ e_addressbook_factory_SOURCES = \ e-data-book-migrate-basedir.c e_addressbook_factory_LDADD = \ - $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \ + libedata-book-1.2.la \ $(top_builddir)/libedataserver/libedataserver-1.2.la \ $(top_builddir)/libebackend/libebackend-1.2.la \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am index 1145bd9..5bbd4e6 100644 --- a/calendar/libedata-cal/Makefile.am +++ b/calendar/libedata-cal/Makefile.am @@ -111,7 +111,7 @@ e_calendar_factory_CPPFLAGS = \ e_calendar_factory_LDADD = \ $(top_builddir)/calendar/libecal/libecal-1.2.la \ $(top_builddir)/calendar/libegdbus/libegdbus-cal.la \ - $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \ + libedata-cal-1.2.la \ $(top_builddir)/libedataserver/libedataserver-1.2.la \ $(top_builddir)/libebackend/libebackend-1.2.la diff --git a/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml index 67436fd..ceddad4 100644 --- a/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml +++ b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml @@ -400,6 +400,7 @@ EBookBackend @EDataBookView *view, gpointer user_data: @EDataBookView *view, gpointer user_data: @EDataBookView *view, gpointer user_data: +@EDataBookView *view, gpointer user_data: @EDataBookView *view, gpointer user_data: @user_data: diff --git a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml index 0c27db2..0adecb8 100644 --- a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml +++ b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml @@ -30,6 +30,7 @@ e-cal-check-timezones @const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error: @const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error: @const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error: +@const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error: @const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error: @ecalclient: @cancellable: @@ -129,6 +130,7 @@ e-cal-check-timezones @const gchar *tzid, gconstpointer custom, GError **error: @const gchar *tzid, gconstpointer custom, GError **error: @const gchar *tzid, gconstpointer custom, GError **error: +@const gchar *tzid, gconstpointer custom, GError **error: @const gchar *tzid, gconstpointer custom, GError **error: @custom: @error: diff --git a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml index ffe51fc..b99ef63 100644 --- a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml +++ b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml @@ -254,6 +254,7 @@ Base class for calendar/tasks backend implementations. @EDataCalView *view, gpointer user_data: @EDataCalView *view, gpointer user_data: @EDataCalView *view, gpointer user_data: +@EDataCalView *view, gpointer user_data: @EDataCalView *view, gpointer user_data: @user_data: diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml index 9d95899..9a41671 100644 --- a/docs/reference/camel/tmpl/camel-cipher-context.sgml +++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml @@ -762,6 +762,8 @@ CamelCipherContext @gpointer cert_data: @gpointer cert_data: @gpointer cert_data: +@gpointer cert_data: +@gpointer cert_data: @gpointer cert_data: -- 2.7.4