#
# Makefile.am
-# Time-stamp: <2006-11-28 17:42:40 (djcb)>
+# Time-stamp: <2007-01-13 14:46:41 (djcb)>
SUBDIRS=$(MODEST_PLATFORM) widgets
DIST_SUBDIRS = widgets gtk maemo
modest-account-keys.h\
modest-account-mgr.h\
modest-account-mgr.c\
+ modest-debug.c\
+ modest-debug.h\
modest-icon-factory.c\
modest-icon-factory.h\
modest-tny-account-store.h\
--- /dev/null
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <modest-debug.h>
+
+/* http://primates.ximian.com/~federico/news-2006-04.html#memory-debugging-infrastructure*/
+ModestDebugFlags
+modest_debug_get_debug_flags ()
+{
+ GDebugKey debug_keys[] = {
+ { "abort-on-warning", MODEST_DEBUG_ABORT_ON_WARNING },
+ { "log-actions", MODEST_DEBUG_LOG_ACTIONS },
+ { "debug-objects", MODEST_DEBUG_DEBUG_OBJECTS },
+ { "debug-signals", MODEST_DEBUG_DEBUG_SIGNALS }
+ };
+ const gchar *str;
+ ModestDebugFlags debug_flags = -1;
+
+ if (debug_flags != -1)
+ return debug_flags;
+
+ str = g_getenv (MODEST_DEBUG);
+
+ if (str != NULL)
+ debug_flags = g_parse_debug_string (str, debug_keys, G_N_ELEMENTS (debug_keys));
+ else
+ debug_flags = 0;
+
+ return debug_flags;
+}
+
+
+void
+modest_debug_g_type_init (void)
+{
+ GTypeDebugFlags gflags;
+ ModestDebugFlags mflags;
+
+ gflags = 0;
+ mflags = modest_debug_get_debug_flags ();
+
+ if (mflags & MODEST_DEBUG_DEBUG_OBJECTS)
+ gflags |= G_TYPE_DEBUG_OBJECTS;
+ if (mflags & MODEST_DEBUG_DEBUG_SIGNALS)
+ gflags |= G_TYPE_DEBUG_SIGNALS;
+
+ g_type_init_with_debug_flags (gflags);
+
+}
+
+void
+modest_debug_logging_init (void)
+{
+ ModestDebugFlags mflags;
+ mflags = modest_debug_get_debug_flags ();
+
+ if (mflags & MODEST_DEBUG_ABORT_ON_WARNING)
+ g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
+ G_LOG_LEVEL_CRITICAL |
+ G_LOG_LEVEL_WARNING);
+}
--- /dev/null
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+
+#define MODEST_DEBUG "MODEST_DEBUG"
+
+typedef enum {
+ MODEST_DEBUG_ABORT_ON_WARNING = 1 << 0,
+ MODEST_DEBUG_LOG_ACTIONS = 1 << 1, /* not in use atm */
+ MODEST_DEBUG_DEBUG_OBJECTS = 1 << 2, /* for g_type_init */
+ MODEST_DEBUG_DEBUG_SIGNALS = 1 << 3 /* for g_type_init */
+} ModestDebugFlags;
+
+
+/**
+ * modest_debug_get_flags
+ *
+ * get the debug flags for modest; they are read from the MODEST_DEBUG
+ * environment variable; the flags specified as strings, separated by ':'.
+ * Possible values are:
+ * - "abort-on-warning": abort the program when a gtk/glib/.. warning occurs.
+ * useful when running in debugger
+ * - "log-actions": log user actions (not in use atm)
+ * - "track-object": track the use of (g)objects in the program. this option influences
+ * g_type_init_with_debug_flags
+ * - "track-signals": track the use of (g)signals in the program. this option influences
+ * g_type_init_with_debug_flags
+ * if you would want to track signals and log actions, you could do something like:
+ * MODEST_DEBUG="log-actions:track-signals" ./modest
+ * NOTE that the flags will stay the same during the run of the program, even
+ * if the environment variable changes.
+ *
+ * Returns: the bitwise OR of the debug flags
+ */
+ModestDebugFlags modest_debug_get_flags (void) G_GNUC_CONST;
+
+/**
+ * modest_g_type_init
+ *
+ * do a g_type_init_with_debug_flags based on the modest debug flags
+ */
+void modest_debug_g_type_init (void);
+
+/**
+ * modest_g_type_init
+ *
+ * do set the logging based on the modest debug flags (ie. whether
+ * we should abort when a warning occurs.
+ */
+void modest_debug_logging_init (void);
#include <tny-list.h>
#include <tny-simple-list.h>
-#include "config.h"
-#include "modest-conf.h"
-#include "modest-account-mgr.h"
-#include "modest-ui.h"
-#include "modest-icon-factory.h"
-#include "modest-tny-account-store.h"
-#include "modest-tny-platform-factory.h"
-#include "modest-mail-operation.h"
-
-
-#if MODEST_PLATFORM_ID==2
+#include <config.h>
+#include <modest-conf.h>
+#include <modest-account-mgr.h>
+#include <modest-ui.h>
+#include <modest-debug.h>
+#include <modest-icon-factory.h>
+#include <modest-tny-account-store.h>
+#include <modest-tny-platform-factory.h>
+#include <modest-mail-operation.h>
+
+#if MODEST_PLATFORM_ID==2 /* maemo */
#include <libosso.h>
#endif /* MODEST_PLATFORM==2 */
#define MODEST_ERR_SEND 6
static gboolean hildon_init (); /* NOP if HILDON is not defined */
-
static int start_ui (const gchar* mailto, const gchar *cc,
const gchar *bcc, const gchar* subject, const gchar *body,
TnyAccountStore *account_store);
TnyPlatformFactory *fact = NULL;
TnyAccountStore *account_store = NULL;
ModestConf *modest_conf = NULL;
-
+
GError *err = NULL;
int retval = MODEST_ERR_NONE;
- static gboolean debug=FALSE, batch=FALSE;
+ static gboolean batch=FALSE;
static gchar *mailto, *subject, *bcc, *cc, *body;
static GOptionEntry options[] = {
- { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug,
- "Run in debug mode", NULL},
{ "mailto", 'm', 0, G_OPTION_ARG_STRING, &mailto,
"New email to <addresses> (comma-separated)", NULL},
{ "subject", 's', 0, G_OPTION_ARG_STRING, &subject,
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- g_type_init ();
- g_thread_init (NULL);
- gdk_threads_init ();
+ modest_debug_g_type_init ();
+ modest_debug_logging_init ();
+ g_thread_init (NULL);
+
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, options, NULL);
retval = MODEST_ERR_RUN;
goto cleanup;
}
-
- if (debug)
- g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING);
if (!getenv("DISPLAY"))
batch = TRUE;
if (!batch) {
+ gdk_threads_init ();
gtk_init (&argc, &argv);
retval = start_ui (mailto, cc, bcc, subject, body, account_store);
} else
const gchar* subject, const gchar *body,
TnyAccountStore *account_store)
{
-
ModestUI *modest_ui;
- gint retval = 0;
-
- #ifndef OLD_UI_STUFF
ModestWindow *win;
- #endif
+ gint retval = 0;
modest_ui = MODEST_UI(modest_ui_new (account_store));
if (!modest_ui) {
modest_icon_factory_uninit ();
return retval;
}
-
+
static gboolean
hildon_init ()
}
-
static int
send_mail (const gchar* mailto, const gchar *cc, const gchar *bcc,
const gchar* subject, const gchar *body)
mail_operation = modest_mail_operation_new ();
modest_mail_operation_send_new_mail (mail_operation,
- account,
- "djcb@djcbsoftware.nl", mailto, cc, bcc,
+ account, "test@example.com",
+ mailto, cc, bcc,
subject, body, NULL);
-
-
+
+
if (modest_mail_operation_get_status (mail_operation) ==
MODEST_MAIL_OPERATION_STATUS_FAILED) {
retval = MODEST_ERR_SEND;
retval = MODEST_ERR_NONE; /* hurray! */
cleanup:
- if (iter) g_object_unref (G_OBJECT (iter));
- if (accounts) g_object_unref (G_OBJECT (accounts));
- if (mail_operation) g_object_unref (G_OBJECT (mail_operation));
+ if (iter)
+ g_object_unref (G_OBJECT (iter));
+ if (accounts)
+ g_object_unref (G_OBJECT (accounts));
+ if (mail_operation)
+ g_object_unref (G_OBJECT (mail_operation));
return retval;
}