BUILD: Cleaned unneeded information
authorSimón Pena <spenap@gmail.com>
Sat, 15 May 2010 23:08:30 +0000 (01:08 +0200)
committerSimón Pena <spenap@gmail.com>
Sun, 16 May 2010 00:02:03 +0000 (02:02 +0200)
The project is cleaned, and the files no needed yet are removed (to
be added back later).

examples/' Makefile.am is updated to automatically generate the tests
for the code

src/'s Makefile.am is emptied as there are no binary results there

25 files changed:
COPYING [deleted file]
Makefile.am
autogen.sh [changed mode: 0644->0755]
clean-auto.sh [deleted file]
configure.ac
data/Makefile.am [deleted file]
data/Makefile.in [deleted file]
data/com.nokia.maevies.service.in [deleted file]
data/maevies.desktop.in [deleted file]
debian/changelog [deleted file]
debian/compat [deleted file]
debian/control [deleted file]
debian/copyright [deleted file]
debian/postinst [deleted file]
debian/rules [deleted file]
examples/Makefile [deleted file]
examples/Makefile.am [new file with mode: 0644]
m4/.gitignore [new file with mode: 0644]
po/ChangeLog [deleted file]
po/POTFILES.in [deleted file]
src/Makefile.am
src/localisation.h [deleted file]
src/maevies_window.c [deleted file]
src/maevies_window.h [deleted file]
src/main.c

diff --git a/COPYING b/COPYING
deleted file mode 100644 (file)
index 83af310..0000000
--- a/COPYING
+++ /dev/null
@@ -1,21 +0,0 @@
-The code examples copyrighted by Nokia Corporation that are included to
-this material are licensed to you under following MIT-style License:
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-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.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
index 7c54656..e77d513 100644 (file)
@@ -1,43 +1,3 @@
-# List extras to package
-EXTRA_DIST = \
-        autogen.sh \
-        debian/postinst \
-        debian/copyright \
-        debian/control \
-        debian/rules \
-               debian/changelog \
-               debian/postinst \
-               src/*
+SUBDIRS = src examples
 
-# Sub directories
-SUBDIRS = data po
-
-# Includes
-INCLUDES = $(DEPS_CFLAGS) $(HILDON_CFLAGS) $(OSSO_CFLAGS)
-
-# Binary
-bin_PROGRAMS = \
-        maevies
-# /Binary
-
-# Sources
-maevies_SOURCES = \
-        src/main.c \
-        src/movie_info_provider.c \
-        src/tmdb_movie.c \
-        src/extra_scenes_provider.c \
-               src/watc_provider.c \
-               src/maevies_movie.c \
-               src/maevies_window.c
-# /Sources
-
-# LDADD
-maevies_LDADD = \
-        $(DEPS_LIBS) $(HILDON_LIBS) $(OSSO_LIBS)
-# /LDADD
-
-deb: dist
-       -mkdir $(top_builddir)/debian-build
-       cd $(top_builddir)/debian-build && tar zxf ../$(top_builddir)/$(PACKAGE)-$(VERSION).tar.gz
-       cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) && dpkg-buildpackage -rfakeroot
-       rm -rf $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION)
+ACLOCAL_AMFLAGS = -I m4
old mode 100644 (file)
new mode 100755 (executable)
index c0917f5..e056024
@@ -1,12 +1,13 @@
 #!/bin/sh
 
-set -x
-glib-gettextize --copy --force
-libtoolize --copy --automake
-intltoolize --copy --force --automake
-
-aclocal-1.8
-autoconf
-autoheader
-automake-1.8 --add-missing --copy --foreign
-./configure --enable-maintainer-mode
+set -ex
+
+rm -rf autom4te.cache
+
+autoreconf --force -i
+
+if test x$NOCONFIGURE = x; then
+    ./configure "$@"
+else
+    echo Skipping configure process.
+fi
diff --git a/clean-auto.sh b/clean-auto.sh
deleted file mode 100755 (executable)
index 6d89f40..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-FILES="Makefile.in \
-       aclocal.m4 \
-       autom4te.cache \
-       config.guess \
-       config.h.in \
-       config.sub \
-       configure \
-       depcomp \
-       install-sh \
-       intltool-extract.in \
-       intltool-merge.in \
-       intltool-update.in \
-       ltmain.sh \
-       missing \
-       mkinstalldirs \
-       src/Makefile.in \
-       src/Makefile \
-       po/Makefile.in.in"
-
-for file in $FILES;
-do
-       if [[ -a $file ]];
-       then
-               if [[ -d $file ]];
-               then 
-                       rm -r $file;
-               else
-                       rm $file;
-               fi
-       fi
-done
-
-rm -rf *~
index 7f3508f..0dba813 100644 (file)
@@ -1,66 +1,26 @@
-dnl Process this file with autoconf to produce a configure script.
+AC_PREREQ([2.62])
 
-AC_INIT(maevies,0.1)
-AM_CONFIG_HEADER(config.h)
+AC_INIT([maevies], [0.1.0], [https://garage.maemo.org/tracker/?atid=4092&group_id=1093],
+               [maevies],[https://garage.maemo.org/projects/maevies/])
 
-AM_INIT_AUTOMAKE([1.7.9])
+AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([-Wall foreign])
 
 AC_PROG_CC
-AC_STDC_HEADERS
 AC_PROG_INSTALL
-dnl AC_PREFIX_DEFAULT(/var/lib/install/usr)
-AC_PREFIX_DEFAULT(/usr)
-
-CFLAGS="$CFLAGS -Wall -ansi -pedantic -Wmissing-prototypes -Wmissing-declarations"
-
-PKG_CHECK_MODULES(DEPS, gtk+-2.0 >= 2.2 glib-2.0 >= 2.2 gnome-vfs-2.0 >= 2.2 rest-0.6 >= 0.6)
-AC_SUBST(DEPS_CFLAGS)
-AC_SUBST(DEPS_LIBS)
-
-PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.8.4 hildon-fm-2 >= 0.8.4)
-AC_SUBST(HILDON_LIBS)
-AC_SUBST(HILDON_CFLAGS)
-
-PKG_CHECK_MODULES(OSSO, libosso >= 0.8.4)
-AC_SUBST(OSSO_LIBS)
-AC_SUBST(OSSO_CFLAGS)
-
-PKG_CHECK_MODULES(OSSOSETTINGS, osso-af-settings >= 0.8.4)
-
-localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`
-hildondesktopentrydir=/usr/share/dbus-1/services
-hildoncpdesktopentrydir=/usr/
-hildonstatusbarplugindir=`$PKG_CONFIG hildon-status-bar-lib --variable=pluginlibdir`
-hildoncplibdir=`$PKG_CONFIG hildon-control-panel --variable=pluginlibdir`
-hildoniconthemedir=$HOME/.icons/hicolor
-
-AC_SUBST(localedir)
-AC_DEFINE_UNQUOTED(localedir,"$localedir",[localedir])
-AC_SUBST(desktopentrydir)
-AC_SUBST(hildondesktopentrydir)
-AC_SUBST(hildoncpdesktopentrydir)
-AC_SUBST(hildonstatusbarplugindir)
-AC_SUBST(hildoncplibdir)
-AC_SUBST(hildoniconthemedir)
-
-IT_PROG_INTLTOOL([0.35.0])
-GETTEXT_PACKAGE="$PACKAGE_NAME"
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
-                                     [The domain to use with gettext])
-AM_GLIB_GNU_GETTEXT
+AC_PROG_LIBTOOL
 
-USE_NLS=yes
-AC_SUBST(USE_NLS)
+AC_HEADER_STDC
 
+PKG_CHECK_MODULES([DEPS],  [glib-2.0 gobject-2.0 rest-0.6 >= 0.6])
 
 AC_CONFIG_FILES([
-    Makefile 
-    src/Makefile
-    data/Makefile 
-    po/Makefile.in
-    data/com.nokia.maevies.service
-    data/maevies.desktop
+       Makefile
+       src/Makefile
+       examples/Makefile
 ])
 
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644 (file)
index 33fe157..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# This software is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-#
-dbusdir=$(datadir)/dbus-1/services
-dbus_DATA=com.nokia.maevies.service
-
-desktopdir=$(datadir)/applications/hildon
-desktop_DATA = maevies.desktop
-
-EXTRA_DIST = $(dbus_DATA) $(desktop_DATA)
diff --git a/data/Makefile.in b/data/Makefile.in
deleted file mode 100644 (file)
index 3fbd248..0000000
+++ /dev/null
@@ -1,404 +0,0 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This software is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# This software is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this software; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-#
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(srcdir)/com.nokia.maevies.service.in \
-       $(srcdir)/maevies.desktop.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = com.nokia.maevies.service maevies.desktop
-SOURCES =
-DIST_SOURCES =
-am__installdirs = "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(desktopdir)"
-dbusDATA_INSTALL = $(INSTALL_DATA)
-desktopDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dbus_DATA) $(desktop_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DEPS_CFLAGS = @DEPS_CFLAGS@
-DEPS_LIBS = @DEPS_LIBS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-HILDON_CFLAGS = @HILDON_CFLAGS@
-HILDON_LIBS = @HILDON_LIBS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-OSSOSETTINGS_CFLAGS = @OSSOSETTINGS_CFLAGS@
-OSSOSETTINGS_LIBS = @OSSOSETTINGS_LIBS@
-OSSO_CFLAGS = @OSSO_CFLAGS@
-OSSO_LIBS = @OSSO_LIBS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-datarootdir = @datarootdir@
-desktopentrydir = @desktopentrydir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-hildoncpdesktopentrydir = @hildoncpdesktopentrydir@
-hildoncplibdir = @hildoncplibdir@
-hildondesktopentrydir = @hildondesktopentrydir@
-hildoniconthemedir = @hildoniconthemedir@
-hildonstatusbarplugindir = @hildonstatusbarplugindir@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-dbusdir = $(datadir)/dbus-1/services
-dbus_DATA = com.nokia.maevies.service
-desktopdir = $(datadir)/applications/hildon
-desktop_DATA = maevies.desktop
-EXTRA_DIST = $(dbus_DATA) $(desktop_DATA)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-               && exit 0; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  data/Makefile'; \
-       cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  data/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-com.nokia.maevies.service: $(top_builddir)/config.status $(srcdir)/com.nokia.maevies.service.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-maevies.desktop: $(top_builddir)/config.status $(srcdir)/maevies.desktop.in
-       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-uninstall-info-am:
-install-dbusDATA: $(dbus_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(dbusdir)" || $(mkdir_p) "$(DESTDIR)$(dbusdir)"
-       @list='$(dbus_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(dbusDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(dbusdir)/$$f'"; \
-         $(dbusDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(dbusdir)/$$f"; \
-       done
-
-uninstall-dbusDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(dbus_DATA)'; for p in $$list; do \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f '$(DESTDIR)$(dbusdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(dbusdir)/$$f"; \
-       done
-install-desktopDATA: $(desktop_DATA)
-       @$(NORMAL_INSTALL)
-       test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
-       @list='$(desktop_DATA)'; for p in $$list; do \
-         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \
-         $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \
-       done
-
-uninstall-desktopDATA:
-       @$(NORMAL_UNINSTALL)
-       @list='$(desktop_DATA)'; for p in $$list; do \
-         f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \
-         rm -f "$(DESTDIR)$(desktopdir)/$$f"; \
-       done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-       list='$(DISTFILES)'; for file in $$list; do \
-         case $$file in \
-           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-           $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-         esac; \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-           dir="/$$dir"; \
-           $(mkdir_p) "$(distdir)$$dir"; \
-         else \
-           dir=''; \
-         fi; \
-         if test -d $$d/$$file; then \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-           fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-         else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-       for dir in "$(DESTDIR)$(dbusdir)" "$(DESTDIR)$(desktopdir)"; do \
-         test -z "$$dir" || $(mkdir_p) "$$dir"; \
-       done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-       -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dbusDATA install-desktopDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dbusDATA uninstall-desktopDATA \
-       uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-       distclean-generic distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am \
-       install-dbusDATA install-desktopDATA install-exec \
-       install-exec-am install-info install-info-am install-man \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-       uninstall-dbusDATA uninstall-desktopDATA uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/data/com.nokia.maevies.service.in b/data/com.nokia.maevies.service.in
deleted file mode 100644 (file)
index 7739797..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.maevies
-Exec=@prefix@/bin/maevies
diff --git a/data/maevies.desktop.in b/data/maevies.desktop.in
deleted file mode 100644 (file)
index b112717..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Name=Maevies
-Exec=@prefix@/bin/maevies
-Icon=qgn_list_documents
-X-Window-Icon=maemopad-window
-X-Window-Icon-Dimmed=maemopad-window-dimmed
-X-Osso-Service=maevies
-X-Osso-Type=application/x-executable
-X-HildonDesk-ShowInToolbar=true
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index d51b420..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-maevies (1.0.0) unstable; urgency=low
-
-  * Created from template.
-
- -- Simón Pena <bulfaiter@gmail.com>  Thu, 24 Apr 2008 17:22:00 -0600
diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 7813681..0000000
+++ /dev/null
@@ -1 +0,0 @@
-5
\ No newline at end of file
diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index 4ef9976..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: maevies
-Section: user/other
-Priority: optional
-Maintainer: Simón Pena <bulfaiter@gmail.com>
-Build-Depends: debhelper (>= 5), intltool, hildon-base-lib-dev, hildon-libs-dev, hildon-fm-dev, 
-               libgtk2.0-dev, libosso-gnomevfs2-dev, libglib2.0-dev, libdbus-glib-1-dev, libosso-dev
-Standards-Version: 3.7.2
-
-Package: maevies
-Architecture: any
-#Depends: maemo
-Description: A movie advisor for Maemo
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index 093d051..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-Copyright (c) 2007-2008 INdT, (c) 2009 Nokia.
-This code example is licensed under a MIT-style license,
-that can be found in the file called "COPYING" in the package
-
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644 (file)
index 3e78d9a..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-#update the icon cache
-gtk-update-icon-cache -f /usr/share/icons/hicolor
diff --git a/debian/rules b/debian/rules
deleted file mode 100644 (file)
index 88fd184..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-PACKAGENAME = maevies
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-       test -e ./configure || ./autogen.sh 
-       dh_testdir
-       # Add here commands to configure the package.
-       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --prefix=/usr
-       touch configure-stamp
-
-build: build-stamp
-
-build-stamp:  configure-stamp
-       dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE)
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp 
-
-       # Add here commands to clean up after the build process.
-       mv debian/rules debian/rules.save
-       -$(MAKE) distclean
-       mv debian/rules.save debian/rules
-
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-
-    # Add here commands to install the package into debian/$(PACKAGENAME)
-       $(MAKE) DESTDIR=$(CURDIR)/debian/$(PACKAGENAME) install
-    
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/examples/Makefile b/examples/Makefile
deleted file mode 100644 (file)
index b8c3354..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-CC = gcc
-
-REST_LIBS = `pkg-config rest-0.6 --libs`
-
-REST_FLAGS = `pkg-config rest-0.6 --cflags`
-
-SRC_FLAGS = -I../src/
-
-LIBS_TMDB = $(REST_LIBS)
-
-FLAGS_TMDB = $(REST_FLAGS) -I../src/
-
-LIBS_GTRANSLATE = $(REST_LIBS)
-
-FLAGS_GTRANSLATE = $(REST_FLAGS)
-
-LIBS_GMOVIES = `pkg-config libxml-2.0 rest-0.6 --libs`
-
-FLAGS_GMOVIES = `pkg-config libxml-2.0 rest-0.6 --cflags`
-
-all: gtranslate gmovies tmdb watc
-       
-watc: watc_provider.o test_watc.o
-       $(CC) -ggdb -o watc watc_provider.o test_watc.o $(REST_LIBS)    
-       
-test_watc.o: test_watc.c
-       $(CC) -ggdb -c test_watc.c $(REST_FLAGS) $(SRC_FLAGS)
-       
-watc_provider.o: ../src/watc_provider.c
-       $(CC) -ggdb -c ../src/watc_provider.c $(REST_FLAGS) $(SRC_FLAGS)
-
-gtranslate: gtranslate.o
-       $(CC) -o gtranslate gtranslate.o $(LIBS_GTRANSLATE)
-
-gtranslate.o: gtranslate.c
-       $(CC) -c gtranslate.c $(FLAGS_GTRANSLATE)
-
-gmovies: gmovies.o
-       $(CC) -g -o gmovies gmovies.o $(LIBS_GMOVIES)
-
-gmovies.o: gmovies.c
-       $(CC) -g -c gmovies.c $(FLAGS_GMOVIES)
-       
-tmdb: test_tmdb.o tmdb_movie.o
-       $(CC) -ggdb -o tmdb test_tmdb.o tmdb_movie.o $(LIBS_TMDB)
-
-tmdb_movie.o: ../src/tmdb_movie.c
-       $(CC) -ggdb -c ../src/tmdb_movie.c $(FLAGS_TMDB)
-       
-test_tmdb.o: test_tmdb.c
-       $(CC) -ggdb -c test_tmdb.c $(FLAGS_TMDB)
-
-clean:
-       rm -rf gtranslate gtranslate.o gmovies gmovies.o tmdb tmdb_movie.o test_tmdb.o watc test_watc.o watc_provider.o *~
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644 (file)
index 0000000..282c9fa
--- /dev/null
@@ -0,0 +1,52 @@
+bin_PROGRAMS = gmovies_test \
+       tmdb_test \
+       gtranslate_test \
+       watc_test
+
+gmovies_test_SOURCES = \
+       gmovies.c
+
+gmovies_test_CFLAGS = \
+       $(DEPS_CFLAGS)
+
+gmovies_test_LDADD = \
+       $(DEPS_LIBS)
+
+tmdb_test_SOURCES = \
+       test_tmdb.c \
+       $(top_srcdir)/src/tmdb_movie.c \
+       $(top_srcdir)/src/tmdb_movie.h
+
+tmdb_test_CFLAGS = \
+       -I $(top_srcdir)/src/ \
+       $(DEPS_CFLAGS)
+
+tmdb_test_LDADD = \
+       $(DEPS_LIBS)
+
+gtranslate_test_SOURCES = \
+       gtranslate.c
+
+gtranslate_test_CFLAGS = \
+       $(DEPS_CFLAGS)
+gtranslate_test_LDADD = \
+       $(DEPS_LIBS)
+
+watc_test_SOURCES = \
+       test_watc.c \
+       $(top_srcdir)/src/watc_provider.c \
+       $(top_srcdir)/src/watc_provider.h
+
+watc_test_CFLAGS = \
+       -I $(top_srcdir)/src/ \
+       $(DEPS_CFLAGS)
+
+watc_test_LDADD = \
+       $(DEPS_LIBS)
+
+MAINTAINERCLEANFILES = \
+       *.in \
+       *~
+
+DISTCLEANFILES = $(MAINTAINERCLEANFILES)
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/po/ChangeLog b/po/ChangeLog
deleted file mode 100644 (file)
index 8b13789..0000000
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/po/POTFILES.in b/po/POTFILES.in
deleted file mode 100644 (file)
index e723152..0000000
+++ /dev/null
@@ -1 +0,0 @@
-src/main.c
index 8a6de89..6d62d5a 100644 (file)
@@ -1,2 +1,16 @@
-EXTRA_DIST = \
-       main.c 
\ No newline at end of file
+bin_PROGRAMS = mvs
+
+mvs_SOURCES = \
+       main.c
+       
+mvs_CFLAGS = \
+       $(DEPS_CFLAGS)
+
+mvs_LDADD = \
+       $(DEPS_LIBS)
+
+MAINTAINERCLEANFILES = \
+       *.in \
+       *~
+
+DISTCLEANFILES = $(MAINTAINERCLEANFILES)
diff --git a/src/localisation.h b/src/localisation.h
deleted file mode 100644 (file)
index 719da34..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2008 INdT, (c) 2009 Nokia.
- *
- * This code example is licensed under a MIT-style license,
- * that can be found in the file called "COPYING" in the package
- *
- */
-
-/*
- ============================================================================
- Name        : localisation.h
- Author      : Simón Pena
- Version     : 0.1
- Description : Header with localization facilities
- ============================================================================
- */
-#ifndef LOCALISATION_H
-#define LOCALISATION_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif                          /* HAVE_CONFIG_H */
-
-#ifdef ENABLE_NLS
-#include <locale.h>
-#include <libintl.h>
-#define _(String) gettext(String)
-#ifdef gettext_noop
-#define N_(String) gettext_noop(String)
-#else
-#define N_(String) (String)
-#endif
-#define locale_init() setlocale(LC_ALL, "");\
-    bindtextdomain(GETTEXT_PACKAGE, localedir);\
-    textdomain(GETTEXT_PACKAGE);
-#else                           /* NLS is disabled */
-#define locale_init()
-#define _(String) (String)
-#define N_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain)
-#define bind_textdomain_codeset(Domain,Codeset) (Codeset)
-#endif                          /* ENABLE_NLS */
-
-#endif /* LOCALISATION_H */
-#ifndef LOCALISATION_H
-#define LOCALISATION_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif                          /* HAVE_CONFIG_H */
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) gettext(String)
-#ifdef gettext_noop
-#define N_(String) gettext_noop(String)
-#else
-#define N_(String) (String)
-#endif
-#define locale_init() setlocale(LC_ALL, "");\
-    bindtextdomain(GETTEXT_PACKAGE, localedir);\
-    textdomain(GETTEXT_PACKAGE);
-#else                           /* NLS is disabled */
-#define locale_init()
-#define _(String) (String)
-#define N_(String) (String)
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,String) (String)
-#define dcgettext(Domain,String,Type) (String)
-#define bindtextdomain(Domain,Directory) (Domain)
-#define bind_textdomain_codeset(Domain,Codeset) (Codeset)
-#endif                          /* ENABLE_NLS */
-
-#endif /* LOCALISATION_H */
-
diff --git a/src/maevies_window.c b/src/maevies_window.c
deleted file mode 100644 (file)
index 549b77d..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * maevies_window.c
- *
- * This file is part of maevies
- * Copyright (C) 2009 spenap <spenap@gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- */
-
-#include "maevies_window.h"
-
-static void hello_item_clicked(GtkButton *button, gpointer data);
-
-G_DEFINE_TYPE(MaeviesWindow, maevies_window, HILDON_TYPE_WINDOW)
-
-static void maevies_window_dispose(GObject *object) {
-
-       MaeviesWindow *self = MAEVIES_WINDOW(object);
-
-       /* Free member data.
-        * Note that the child widgets are destroyed automatically.
-        */
-
-       G_OBJECT_CLASS (maevies_window_parent_class)->dispose(object);
-}
-
-static void maevies_window_finalize(GObject *object) {
-       G_OBJECT_CLASS (maevies_window_parent_class)->finalize(object);
-}
-
-static void maevies_window_class_init(MaeviesWindowClass *klass) {
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-       object_class->dispose = maevies_window_dispose;
-       object_class->finalize = maevies_window_finalize;
-}
-
-static void maevies_window_init(MaeviesWindow *self) {
-
-       /* Create button and add it to main view */
-       self->hello_item = gtk_button_new_with_label("Hello World!!!");
-       gtk_container_add(GTK_CONTAINER(self), self->hello_item);
-
-       g_signal_connect(G_OBJECT(self->hello_item), "clicked", G_CALLBACK(hello_item_clicked),
-                       self);
-
-       /* Init movie */
-       self->movie = maevies_movie_new("Zombieland");
-}
-
-MaeviesWindow* maevies_window_new(osso_context_t *osso) {
-       MaeviesWindow *self = MAEVIES_WINDOW(g_object_new(MAEVIES_TYPE_WINDOW,
-                                       NULL));
-
-       /* Avoid adding extra code such as this to a _new() function when writing
-        * widgets that should be reusable. This should really be a GObject property.
-        */
-       self->osso = osso;
-
-       return self;
-}
-
-static void hello_item_clicked(GtkButton* button, gpointer data) {
-
-       MaeviesWindow *self = MAEVIES_WINDOW(data);
-       gchar *has_stingers = NULL;
-
-       g_assert(self);
-
-       movie_get_info(self->movie, NULL);
-
-
-       if (self->movie->has_stingers)
-               has_stingers = "Con escenas";
-       else
-               has_stingers = "Sin escenas";
-
-       gtk_button_set_label(button, has_stingers);
-}
diff --git a/src/maevies_window.h b/src/maevies_window.h
deleted file mode 100644 (file)
index cb20c23..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * maevies_window.h
- *
- * This file is part of maevies
- * Copyright (C) 2009 spenap <spenap@gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- */
-
-#ifndef MAEVIES_WINDOW_H_
-#define MAEVIES_WINDOW_H_
-
-#include <hildon/hildon.h>
-#include <libosso.h>
-
-#include "maevies_movie.h"
-
-G_BEGIN_DECLS
-
-#define MAEVIES_TYPE_WINDOW maevies_window_get_type()
-
-#define MAEVIES_WINDOW(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  MAEVIES_TYPE_WINDOW, MaeviesWindow))
-
-#define MAEVIES_WINDOW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  MAEVIES_TYPE_WINDOW, MaeviesWindowClass))
-
-#define MAEVIES_IS_WINDOW(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  MAEVIES_TYPE_WINDOW))
-
-#define MAEVIES_IS_WINDOW_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  MAEVIES_TYPE_WINDOW))
-
-#define MAEVIES_WINDOW_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  MAEVIES_TYPE_WINDOW, MaeviesWindowClass))
-
-typedef struct _MaeviesWindow MaeviesWindow;
-typedef struct _MaeviesWindowClass MaeviesWindowClass;
-
-struct _MaeviesWindow {
-
-       /* The Hildon window */
-       HildonWindow parent;
-
-       /* Osso context */
-       osso_context_t *osso;
-
-       /* "Say hello world" button */
-       GtkWidget *hello_item;
-
-       MaeviesMovie *movie;
-};
-
-struct _MaeviesWindowClass {
-       HildonWindowClass parent_class;
-};
-
-GType maevies_window_get_type(void);
-
-MaeviesWindow* maevies_window_new(osso_context_t *osso);
-
-G_END_DECLS
-
-#endif /* MAEVIES_WINDOW_H_ */
index b6604df..8d9f014 100644 (file)
-/*******************************************************************************
- * Copyright (c) 2007-2008 INdT, (c) 2009 Nokia.
+/*
+ * Copyright (C) 2010 Simón Pena
  *
- * This code example is licensed under a MIT-style license,
- * that can be found in the file called "COPYING" in the package
+ * Contact: spenap@gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  *
  */
 
-/*
- ============================================================================
- Name        : main.c
- Author      : Simón Pena
- Version     : 0.1
- Description : Hildon GUI Application in C
- ============================================================================
- */
-/* Includes */
-#include <hildon/hildon-program.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkbutton.h>
-#include <libosso.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "localisation.h"
-#include "extra_scenes_provider.h"
-#include "maevies_window.h"
-
-/* Defines to add the application to dbus and keep it running
- * Please do not modify "APP_NAME" (or other defines) to different name
- */
-#define APP_NAME "maevies"
-#define APP_VER "0.1"
-#define APP_SERVICE "com.nokia.maevies"
-#define APP_METHOD "/com/nokia/maevies"
-/* end defines */
-
-typedef struct _AppData AppData;
-
-struct _AppData {
-
-       HildonProgram *program;
-       MaeviesWindow *window;
-
-};
-
-static gint dbus_callback(const gchar *interface, const gchar *method,
-               GArray *arguments, gpointer data, osso_rpc_t *retval);
-
-gint main(gint argc, gchar* argv[]) {
-
-       osso_context_t *osso_cont;
-       osso_return_t ret;
-       AppData *data = g_new0(AppData,1);
-
-       locale_init();
-
-       osso_cont = osso_initialize(APP_NAME, APP_VER, TRUE, NULL);
-       g_assert(osso_cont);
-
-       /* Initialize the GTK. */
-       gtk_init(&argc, &argv);
-
-       /* Initialize thread system */
-       g_thread_init(NULL);
-
-       /* Create the hildon program and setup the title */
-       data->program = HILDON_PROGRAM(hildon_program_get_instance());
-       g_set_application_name("Maevies");
-
-       /* Create HildonWindow and set it to HildonProgram */
-       data->window = maevies_window_new(osso_cont);
-       hildon_program_add_window(data->program, HILDON_WINDOW(data->window));
-
-       ret = osso_rpc_set_cb_f(data->window->osso, APP_SERVICE, APP_METHOD,
-                       APP_SERVICE, dbus_callback, GTK_WIDGET(data->window));
-       if (ret != OSSO_OK) {
-               fprintf(stderr, "osso_rpc_set_cb_f failed: %d.\n", ret);
-               exit(1);
-       }
-
-       /* Begin the main application */
-       gtk_widget_show_all(GTK_WIDGET(data->window));
-
-       /* Quit program when window is closed. */
-       g_signal_connect(G_OBJECT(data->window), "delete_event",
-                       G_CALLBACK(gtk_main_quit), NULL);
-
-       /* Quit program when window is otherwise destroyed. */
-       g_signal_connect(G_OBJECT(data->window), "destroy", G_CALLBACK(gtk_main_quit),
-                       NULL);
-
-       gtk_main();
-
-       /* Clean up: */
-       gtk_widget_destroy(GTK_WIDGET (data->window));
-       g_free(data);
-
-       /* Exit */
-       return 0;
-}
-
-static gint dbus_callback(const gchar *interface, const gchar *method,
-               GArray *arguments, gpointer data, osso_rpc_t *retval) {
-       printf("dbus: %s, %s\n", interface, method);
+#include <stdio.h>
+#include <glib.h>
 
-       if (!strcmp(method, "top_application"))
-               gtk_window_present(GTK_WINDOW(data));
+int
+main (int argc, char **argv)
+{
+        g_print ("Hello maevies!\n");
 
-       return DBUS_TYPE_INVALID;
+        return 0;
 }