Move vbox cell renderer, rating widget and source list view into libcinaest

Make libcinaest depend on hildon-1

diff --git a/Makefile.am b/Makefile.am
index aa1f965..4b2a35f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,6 @@ pkgconfig_DATA = cinaest.pc
 # Sources
 cinaest_SOURCES = \
         src/main.c \
-       src/cell-renderer-vbox.c \
        src/genre-filter-dialog.c \
         src/movie-list-menu.c \
         src/movie-list-store.c \
@@ -54,16 +53,13 @@ cinaest_SOURCES = \
        src/orientation.c \
        src/plugin-registrar.c \
        src/poster/movie-poster-factory.c \
-       src/rating-widget.c \
        src/settings-dialog.c \
        src/source-dialog.c \
        src/source-list-menu.c \
-       src/source-list-view.c \
        src/source-list-window.c
 
 cinaest_VALASOURCES = \
         src/main.vala \
-       src/cell-renderer-vbox.vala \
        src/genre-filter-dialog.vala \
         src/movie-list-menu.vala \
         src/movie-list-store.vala \
@@ -74,11 +70,9 @@ cinaest_VALASOURCES = \
        src/orientation.vala \
        src/plugin-registrar.vala \
        src/poster/movie-poster-factory.vala \
-       src/rating-widget.vala \
        src/settings-dialog.vala \
        src/source-dialog.vala \
        src/source-list-menu.vala \
-       src/source-list-view.vala \
        src/source-list-window.vala
 
 src/main.c: ${cinaest_VALASOURCES}
@@ -93,37 +87,40 @@ cinaest_LDADD = ${CINAEST_LIBS} ${DBUS_LIBS} ${GCONF_LIBS} ${HILDON_LIBS} \
        ${MAEMO_LAUNCHER_LIBS} ${OSSO_LIBS} ${GMODULE_LIBS} -lcinaest
 
 libcinaest_la_SOURCES = \
+       src/cell-renderer-vbox.c \
        src/genres.c \
         src/movie.c \
        src/movie-filter.c \
-        src/plugin-interface.c
+        src/plugin-interface.c \
+       src/rating-widget.c \
+       src/source-list-view.c
 
 libcinaest_la_VALASOURCES = \
+       src/cell-renderer-vbox.vala \
        src/genres.vala \
         src/movie.vala \
        src/movie-filter.vala \
-        src/plugin-interface.vala
+        src/plugin-interface.vala \
+       src/rating-widget.vala \
+       src/source-list-view.vala
 
-src/genres.c: ${libcinaest_la_VALASOURCES}
+src/cell-renderer-vbox.c: ${libcinaest_la_VALASOURCES}
        ${VALAC} -C -H cinaest.h --library cinaest ${libcinaest_la_VALASOURCES} ${libcinaest_la_VALAFLAGS}
        mv cinaest.vapi ./vapi
 
 libcinaest_la_VALAFLAGS = --vapidir ./vapi --pkg config \
        --pkg hildon-1 --pkg libosso
-libcinaest_la_CFLAGS = ${HILDON_CFLAGS} ${OSSO_CFLAGS}
+libcinaest_la_CFLAGS = ${HILDON_CFLAGS} ${OSSO_CFLAGS} \
+       -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\"
 libcinaest_la_LIBADD = ${HILDON_LIBS} ${OSSO_LIBS}
 
 libcatalog_plugin_la_SOURCES = \
        src/plugins/catalog-plugin.c \
-       src/cell-renderer-vbox.c \
-       src/plugins/catalog-sqlite.c \
-       src/source-list-view.c
+       src/plugins/catalog-sqlite.c
 
 libcatalog_plugin_la_VALASOURCES = \
        src/plugins/catalog-plugin.vala \
-       src/cell-renderer-vbox.vala \
-       src/plugins/catalog-sqlite.vala \
-       src/source-list-view.vala
+       src/plugins/catalog-sqlite.vala
 
 libcatalog_plugin_la_VALAFLAGS = --vapidir ./vapi --pkg config --pkg cinaest \
        --pkg hildon-1 --pkg libosso --pkg sqlite3

diff --git a/cinaest.pc.in b/cinaest.pc.in
index 3eba52a..8f2ae91 100644 (file)
--- a/cinaest.pc.in
+++ b/cinaest.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: @PACKAGE@
 Description: Cinaest common classes and plugin interface library
-Requires: gtk+-2.0 libosso
+Requires: gtk+-2.0 hildon-1 libosso
 Version: @VERSION@
 Libs: -L${libdir} -lcinaest
 Cflags: -I${includedir}

diff --git a/src/cell-renderer-vbox.vala b/src/cell-renderer-vbox.vala
index d400cd8..5aea2cb 100644 (file)
--- a/src/cell-renderer-vbox.vala
+++ b/src/cell-renderer-vbox.vala
@@ -18,7 +18,7 @@
 
 using Gtk;
 
-class CellRendererVBox : CellRenderer {
+public class CellRendererVBox : CellRenderer {
        private List<CellRenderer> children;
 
        public CellRendererVBox () {

diff --git a/vapi/cinaest.deps b/vapi/cinaest.deps
index 5e48039..e523254 100644 (file)
--- a/vapi/cinaest.deps
+++ b/vapi/cinaest.deps
@@ -1,2 +1,3 @@
 gtk+-2.0
+hildon-1
 libosso