Google plugin: report D-Bus errors

[cinaest] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4ba24c9..5cc486a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,8 @@ src/main.c: ${cinaest_VALASOURCES}
        ${VALAC} -C ${cinaest_VALASOURCES} ${cinaest_VALAFLAGS}
 
 cinaest_VALAFLAGS = --disable-dbus-transformation --vapidir ./vapi --pkg config --pkg cinaest \
-       --pkg dbus-glib-1 --pkg gconf-2.0 --pkg hildon-1 --pkg libosso --pkg gmodule-2.0
+       --pkg dbus-glib-1 --pkg gconf-2.0 --pkg hildon-1 --pkg libosso --pkg gmodule-2.0 \
+       --pkg gobject-2.0-fix
 cinaest_CFLAGS = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} \
        ${MAEMO_LAUNCHER_CFLAGS} ${OSSO_CFLAGS} ${GMODULE_CFLAGS} \
        -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
@@ -130,7 +131,7 @@ libcatalog_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
 libcatalog_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${SQLITE3_CFLAGS} \
        -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
 libcatalog_plugin_la_LIBADD = ${CINAEST_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${SQLITE3_LIBS}
-libcatalog_plugin_la_LDFLAGS = -module
+libcatalog_plugin_la_LDFLAGS = -module -avoid-version
 
 src/plugins/catalog-plugin.c: ${libcatalog_plugin_la_VALASOURCES}
        ${VALAC} -C ${libcatalog_plugin_la_VALASOURCES} ${libcatalog_plugin_la_VALAFLAGS}
@@ -150,7 +151,7 @@ libgoogle_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
 libgoogle_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${GCONF_CFLAGS} ${HILDON_CFLAGS} ${HILDONMIME_CFLAGS} ${JSON_CFLAGS} ${OSSO_CFLAGS}
 libgoogle_plugin_la_CPPFLAGS = ${CALENDAR_CFLAGS}
 libgoogle_plugin_la_LIBADD = ${CALENDAR_LIBS} ${CINAEST_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} ${HILDONMIME_LIBS} ${JSON_LIBS} ${OSSO_LIBS}
-libgoogle_plugin_la_LDFLAGS = -module
+libgoogle_plugin_la_LDFLAGS = -module -avoid-version
 
 src/plugins/google-plugin.c: ${libgoogle_plugin_la_VALASOURCES}
        ${VALAC} -C ${libgoogle_plugin_la_VALASOURCES} ${libgoogle_plugin_la_VALAFLAGS}
@@ -163,18 +164,24 @@ libimdb_plugin_la_SOURCES = \
 libimdb_plugin_la_VALASOURCES = \
         src/plugins/imdb-plugin.vala \
         src/imdb/imdb-sqlite.vala \
-        src/imdb/plaintext-downloader-interface.vala \
         src/plugins/imdb-download-dialog.vala
 
 libimdb_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
-       --pkg dbus-glib-1 --pkg hildon-1 --pkg libosso --pkg sqlite3
+       --pkg dbus-glib-1 --pkg hildon-1 --pkg libosso --pkg sqlite3 \
+       --pkg plaintext-downloader-interface
 libimdb_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${DBUS_CFLAGS} ${HILDON_CFLAGS} ${OSSO_CFLAGS} ${SQLITE3_CFLAGS}
 libimdb_plugin_la_LIBADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${HILDON_LIBS} ${OSSO_LIBS} ${SQLITE3_LIBS}
-libimdb_plugin_la_LDFLAGS = -module
+libimdb_plugin_la_LDFLAGS = -module -avoid-version
 
-src/plugins/imdb-plugin.c: ${libimdb_plugin_la_VALASOURCES}
+src/plugins/imdb-plugin.c: ${libimdb_plugin_la_VALASOURCES} vapi/plaintext-downloader-interface.vapi
        ${VALAC} -C ${libimdb_plugin_la_VALASOURCES} ${libimdb_plugin_la_VALAFLAGS}
 
+# The sed invocation works around a valac bug
+vapi/plaintext-downloader-interface.vapi:
+       ${VALAC} --pkg dbus-glib-1 -C -H plaintext-downloader-interface.h --library plaintext-downloader-interface src/imdb/plaintext-downloader-interface.vala
+       sed -i 's/signals = )/signals = ("progress", "description_changed"))/' plaintext-downloader-interface.vapi
+       mv plaintext-downloader-interface.vapi vapi
+
 libmoviepilot_plugin_la_SOURCES = \
        src/plugins/moviepilot-plugin.c
 
@@ -185,7 +192,7 @@ libmoviepilot_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest
        --pkg dbus-glib-1 --pkg hildon-1 --pkg json-glib-1.0 --pkg libosso
 libmoviepilot_plugin_la_CFLAGS = ${CINAEST_CFLAGS} ${HILDON_CFLAGS} ${JSON_CFLAGS} ${OSSO_CFLAGS}
 libmoviepilot_plugin_la_LIBADD = ${CINAEST_LIBS} ${HILDON_LIBS} ${JSON_LIBS} ${OSSO_LIBS}
-libmoviepilot_plugin_la_LDFLAGS = -module
+libmoviepilot_plugin_la_LDFLAGS = -module -avoid-version
 
 src/plugins/moviepilot-plugin.c: ${libmoviepilot_plugin_la_VALASOURCES}
        ${VALAC} -C $^ ${libmoviepilot_plugin_la_VALAFLAGS}
@@ -222,14 +229,18 @@ src/backends/moviepilot/moviepilot-backend.c: ${cinaest_moviepilot_backend_VALAS
 
 imdb_plaintext_downloader_SOURCES = \
         src/imdb/imdb-plaintext-downloader.c \
-       src/imdb/imdb-ftp-downloader.c \
+       src/imdb/ftp-downloader.c \
+       src/imdb/gzip-input-stream.c \
+       src/imdb/imdb-gzip-parser.c \
        src/imdb/imdb-line-parser.c \
         src/imdb/imdb-sqlite.c \
         src/imdb/plaintext-downloader-interface.c
 
 imdb_plaintext_downloader_VALASOURCES = \
         src/imdb/imdb-plaintext-downloader.vala \
-       src/imdb/imdb-ftp-downloader.vala \
+       src/imdb/ftp-downloader.vala \
+       src/imdb/gzip-input-stream.vala \
+       src/imdb/imdb-gzip-parser.vala \
        src/imdb/imdb-line-parser.vala \
         src/imdb/imdb-sqlite.vala \
         src/imdb/plaintext-downloader-interface.vala
@@ -264,6 +275,7 @@ ACLOCAL_AMFLAGS = -Im4
 
 CLEANFILES = \
        ${cinaest_SOURCES} \
+       ${libcinaest_la_SOURCES} \
        ${libcatalog_plugin_la_SOURCES} \
        $(patsubst %.vala,%.c,${libgoogle_plugin_la_VALASOURCES}) \
        ${libimdb_plugin_la_SOURCES} \
@@ -271,4 +283,8 @@ CLEANFILES = \
        ${imdb_plaintext_downloader_SOURCES} \
        ${google_poster_downloader_SOURCES} \
        ${cinaest_google_backend_SOURCES} \
-       ${cinaest_moviepilot_backend_SOURCES}
+       ${cinaest_moviepilot_backend_SOURCES} \
+       plaintext-downloader-interface.h \
+       cinaest.h \
+       vapi/plaintext-downloader-interface.vapi \
+       vapi/cinaest.vapi