Spostata l'inizializzazione di libcaml in solipa.

Aggiunto il test (da implementare) per SolipaMail.

diff --git a/.gitignore b/.gitignore
index bdde3954e42fb4c494258ae6160abaa2fbc6e3a3..e86113aa45a8bc774c0a5afc8153738f8eb200ac 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ stamp-it
 intltool-*
 Rules-quot
 *.exe
+tests/mail

diff --git a/Makefile.am b/Makefile.am
index 6ff19b6dd06befeaeedaccda431d60cf295385e1..be8c6a8e074c18a0992cfa1c67823be89d16d945 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src data
+SUBDIRS = src data tests
 
 ACLOCAL_AMFLAGS = -I m4
 

diff --git a/configure.ac b/configure.ac
index 9e37eeffd9104b99d5afcca3901b64a9c9be4d67..6ca328c910c2d931189a5269123cd1dc85772661 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,5 +52,6 @@ AC_CONFIG_FILES([
        data/Makefile
        data/libsolipa/Makefile
        data/libsolipa/gui/Makefile
+       tests/Makefile
 ])
 AC_OUTPUT

diff --git a/src/libsolipa.h b/src/libsolipa.h
index 3eceb84ad732682641960515e91216060454e8de..81b23794469934d31f18aa03aae135d4cac058dd 100644 (file)
--- a/src/libsolipa.h
+++ b/src/libsolipa.h
@@ -20,5 +20,7 @@
 #define __LIBSOLIPA_H__
 
 #include <libsolipa/solipa.h>
+#include <libsolipa/allegato.h>
+#include <libsolipa/mail.h>
 
 #endif /* __LIBSOLIPA_H__ */

diff --git a/src/mail.c b/src/mail.c
index 37ec69399447e4595d7b684700a2cbe62336f6e9..23cd48199e00501e11302398bbe4f2456f37c2f9 100644 (file)
--- a/src/mail.c
+++ b/src/mail.c
@@ -271,11 +271,6 @@ solipa_mail_get_as_string (SolipaMail *mail)
                        return NULL;
                }
 
-       g_thread_init (NULL);
-
-       camel_init (NULL, FALSE);
-       camel_provider_init ();
-
        msg = camel_mime_message_new ();
        camel_mime_message_set_subject (msg, priv->subject);
 

diff --git a/src/solipa.c b/src/solipa.c
index 1e940f98015e86e2b87627dfa1b140ec3a0e9965..46072af0e8f923411cec9920ce603f455c6be4a6 100644 (file)
--- a/src/solipa.c
+++ b/src/solipa.c
@@ -20,6 +20,9 @@
        #include <config.h>
 #endif
 
+#include <stdlib.h>
+#include <camel/camel.h>
+
 #include "solipa.h"
 
 static void solipa_class_init (SolipaClass *class);
@@ -69,8 +72,24 @@ solipa_init (Solipa *solipa)
 Solipa
 *solipa_new ()
 {
+       Solipa *solipa;
+
+       gchar *camel_tmpdir;
+
+       /* inizializzo GType e GThread */
+       g_type_init ();
+       g_thread_init (NULL);
+
+       /* creo la directory temporanea per camel */
+       camel_tmpdir = mkdtemp (g_build_filename (g_get_tmp_dir (), g_strdup ("solipa-camel-XXXXXX"), NULL));
+
+       /* inizializzo camel */
+       camel_init (camel_tmpdir, FALSE);
+       camel_provider_init ();
+
+       solipa = SOLIPA (g_object_new (solipa_get_type (), NULL));
 
-       return SOLIPA (g_object_new (solipa_get_type (), NULL));
+       return solipa;
 }
 
 void

diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644 (file)
index 0000000..373e824
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,12 @@
+AM_CPPFLAGS = $(WARN_CFLAGS) \
+              $(DISABLE_DEPRECATED_CFLAGS) \
+              $(SOLIPA_CFLAGS) \
+              -I$(top_srcdir)/src \
+              -DGUIDIR="\"@abs_builddir@\""
+
+LIBS = $(SOLIPA_LIBS) \
+       -export-dynamic
+
+LDADD = $(top_builddir)/src/libsolipa.la
+
+noinst_PROGRAMS = mail

diff --git a/tests/mail.c b/tests/mail.c
new file mode 100644 (file)
index 0000000..30a97fb
--- /dev/null
+++ b/tests/mail.c
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2010 Andrea Zagli <azagli@libero.it>
+ *
+ *  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 2 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <solipa.h>
+#include <mail.h>
+
+int
+main (int argc, char **argv)
+{
+       Solipa *solipa;
+
+       solipa = solipa_new ();
+
+       return 0;
+}