#include <modest-hildon-includes.h>
#include <modest-maemo-utils.h>
#include <dbus_api/modest-dbus-callbacks.h>
-#include <libosso-abook/osso-abook.h>
#include <maemo/modest-osso-autosave-callbacks.h>
#include <libosso.h>
#include <alarmd/alarm_event.h> /* For alarm_event_add(), etc. */
#include <string.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
+#ifdef MODEST_HAVE_ABOOK
+#include <libosso-abook/osso-abook.h>
+#endif /*MODEST_HAVE_ABOOK*/
+
#define HILDON_OSSO_URI_ACTION "uri-action"
#define URI_ACTION_COPY "copy:"
-/* The maximun number of notifications that could be shown in the
- desktop. It's specified by the specs and limited by the screen
- size */
-#define MAX_NOTIFICATIONS 6
-
-static osso_context_t *osso_context = NULL;
+static osso_context_t *osso_context = NULL; /* urgh global */
static void
on_modest_conf_update_interval_changed (ModestConf* self,
ModestConfNotificationId id,
gpointer user_data)
{
+ g_return_if_fail (key);
+
if (strcmp (key, MODEST_CONF_UPDATE_INTERVAL) == 0) {
const guint update_interval_minutes =
modest_conf_get_int (self, MODEST_CONF_UPDATE_INTERVAL, NULL);
{
osso_hw_state_t hw_state = { 0 };
DBusConnection *con;
-
+ GSList *acc_names;
+
if (!check_required_files ()) {
g_printerr ("modest: missing required files\n");
return FALSE;
"key_changed",
G_CALLBACK (on_modest_conf_update_interval_changed),
NULL);
-
- /* Get the initial update interval from gconf: */
- on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL,
- MODEST_CONF_EVENT_KEY_CHANGED, 0, NULL);
+ /* only force the setting of the default interval, if there are actually
+ * any accounts */
+ acc_names = modest_account_mgr_account_names (modest_runtime_get_account_mgr(), TRUE);
+ if (acc_names) {
+ /* Get the initial update interval from gconf: */
+ on_modest_conf_update_interval_changed(conf, MODEST_CONF_UPDATE_INTERVAL,
+ MODEST_CONF_EVENT_KEY_CHANGED, 0, NULL);
+ modest_account_mgr_free_account_names (acc_names);
+ }
+
+
+#ifdef MODEST_HAVE_ABOOK
/* initialize the addressbook */
if (!osso_abook_init (&argc, &argv, osso_context)) {
g_printerr ("modest: failed to initialized addressbook\n");
return FALSE;
}
-
+#endif /*MODEST_HAVE_ABOOK*/
+
+
return TRUE;
}
sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"));
sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;
- sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY;
+ sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
priority_sort_id = sort_key;
sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))));
if (current_sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) {
gpointer flags_sort_type_pointer;
flags_sort_type_pointer = g_object_get_data (G_OBJECT (cols->data), MODEST_HEADER_VIEW_FLAG_SORT);
- if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY)
+ if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY_MASK)
hildon_sort_dialog_set_sort_key (dialog, priority_sort_id);
else
hildon_sort_dialog_set_sort_key (dialog, attachments_sort_id);
-typedef struct _UtilIdleData {
+typedef struct _ConnectAndWaitData {
GMutex *mutex;
GMainLoop *wait_loop;
gboolean has_callback;
gulong handler;
-} UtilIdleData;
+} ConnectAndWaitData;
+
+
+static void
+quit_wait_loop (TnyAccount *account,
+ ConnectAndWaitData *data)
+{
+ /* Set the has_callback to TRUE (means that the callback was
+ executed and wake up every code waiting for cond to be
+ TRUE */
+ g_mutex_lock (data->mutex);
+ data->has_callback = TRUE;
+ if (data->wait_loop)
+ g_main_loop_quit (data->wait_loop);
+ g_mutex_unlock (data->mutex);
+}
static void
on_connection_status_changed (TnyAccount *account,
TnyConnectionStatus status,
gpointer user_data)
{
- UtilIdleData *data = (UtilIdleData *) user_data;
TnyConnectionStatus conn_status;
+ ConnectAndWaitData *data;
+ /* Ignore if reconnecting or disconnected */
conn_status = tny_account_get_connection_status (account);
if (conn_status == TNY_CONNECTION_STATUS_RECONNECTING ||
conn_status == TNY_CONNECTION_STATUS_DISCONNECTED)
return;
/* Remove the handler */
+ data = (ConnectAndWaitData *) user_data;
g_signal_handler_disconnect (account, data->handler);
- /* Set the has_callback to TRUE (means that the callback was
- executed and wake up every code waiting for cond to be
- TRUE */
- g_mutex_lock (data->mutex);
- data->has_callback = TRUE;
- if (data->wait_loop)
- g_main_loop_quit (data->wait_loop);
- g_mutex_unlock (data->mutex);
+ /* Quit from wait loop */
+ quit_wait_loop (account, (ConnectAndWaitData *) user_data);
+}
+
+static void
+on_tny_camel_account_set_online_cb (TnyCamelAccount *account,
+ gboolean canceled,
+ GError *err,
+ gpointer user_data)
+{
+ /* Quit from wait loop */
+ quit_wait_loop (TNY_ACCOUNT (account), (ConnectAndWaitData *) user_data);
}
gboolean
modest_platform_connect_and_wait (GtkWindow *parent_window,
TnyAccount *account)
{
- UtilIdleData *data = NULL;
+ ConnectAndWaitData *data = NULL;
gboolean device_online;
TnyDevice *device;
TnyConnectionStatus conn_status;
if (device_online && conn_status == TNY_CONNECTION_STATUS_CONNECTED)
return TRUE;
+ /* Create the helper */
+ data = g_slice_new0 (ConnectAndWaitData);
+ data->mutex = g_mutex_new ();
+ data->has_callback = FALSE;
+
/* Connect the device */
if (!device_online) {
- data = g_slice_new0 (UtilIdleData);
- data->mutex = g_mutex_new ();
- data->has_callback = FALSE;
-
/* Track account connection status changes */
data->handler = g_signal_connect (account, "connection-status-changed",
G_CALLBACK (on_connection_status_changed),
/* If the device connection failed then exit */
if (!device_online && data->handler)
goto frees;
+ } else {
+ /* Force a reconnection of the account */
+ tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (account), TRUE,
+ on_tny_camel_account_set_online_cb, data);
}
/* Wait until the callback is executed */
g_signal_handler_disconnect (account, data->handler);
g_mutex_free (data->mutex);
g_main_loop_unref (data->wait_loop);
- g_slice_free (UtilIdleData, data);
+ g_slice_free (ConnectAndWaitData, data);
}
conn_status = tny_account_get_connection_status (account);
iter = tny_list_create_iterator (header_list);
while (!tny_iterator_is_done (iter)) {
- gchar *url = NULL, *display_address = NULL, *display_date = NULL, *summary = NULL;
+ gchar *url = NULL, *display_address = NULL, *summary = NULL;
+ const gchar *display_date;
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
TnyFolder *folder = tny_header_get_folder (header);
gboolean first_notification = TRUE;
gint notif_id;
-
+
+ /* constant string, don't free */
display_date = modest_text_utils_get_display_date (tny_header_get_date_received (header));
display_address = g_strdup(tny_header_get_from (header));
tny_header_get_subject (header),
"qgn_list_messagin",
"email.arrive");
-
/* Create the message URL */
url = g_strdup_printf ("%s/%s", tny_folder_get_url_string (folder),
tny_header_get_uid (header));
not to store the list in gconf */
/* Free & carry on */
- g_free (display_date);
g_free (display_address);
g_free (summary);
g_free (url);
gboolean
-modest_platform_run_certificate_conformation_dialog (const gchar* server_name,
+modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
const gchar *certificate)
{
GtkWidget *note;
gint response;
- GtkWindow *main_win =
- (GtkWindow*)modest_window_mgr_get_main_window (modest_runtime_get_window_mgr());
+ ModestWindow *main_win;
+
+ if (!modest_window_mgr_main_window_exists (modest_runtime_get_window_mgr())) {
+ g_warning ("%s: don't show dialogs if there's no main window; assuming 'Cancel'",
+ __FUNCTION__);
+ return FALSE;
+ }
+ /* don't create it */
+ main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE);
+ g_return_val_if_fail (main_win, FALSE); /* should not happen */
+
+
gchar *question = g_strdup_printf (_("mcen_nc_unknown_certificate"),
server_name);
note = hildon_note_new_confirmation_add_buttons (
- main_win,
+ GTK_WINDOW(main_win),
question,
_("mcen_bd_dialog_ok"), GTK_RESPONSE_OK,
_("mcen_bd_view"), GTK_RESPONSE_HELP, /* abusing this... */
on_destroy_dialog (GTK_DIALOG(note));
g_free (question);
- return response;
+ return response == GTK_RESPONSE_OK;
}
modest_platform_run_alert_dialog (const gchar* prompt,
gboolean is_question)
{
- ModestWindow *main_window =
- modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+ ModestWindow *main_win;
+
+ if (!modest_window_mgr_main_window_exists (modest_runtime_get_window_mgr())) {
+ g_warning ("%s:\n'%s'\ndon't show dialogs if there's no main window;"
+ " assuming 'Cancel' for questions, 'Ok' otherwise", prompt, __FUNCTION__);
+ return is_question ? FALSE : TRUE;
+ }
+
+ main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+ g_return_val_if_fail (main_win, FALSE); /* should not happen */
gboolean retval = TRUE;
if (is_question) {
* when it is a question.
* Obviously, we need tinymail to use more specific error codes instead,
* so we know what buttons to show. */
- GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_window),
+ GtkWidget *dialog = GTK_WIDGET (hildon_note_new_confirmation (GTK_WINDOW (main_win),
prompt));
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
GTK_WINDOW (dialog));
on_destroy_dialog (GTK_DIALOG(dialog));
} else {
/* Just show the error text and use the default response: */
- modest_platform_run_information_dialog (GTK_WINDOW (main_window),
+ modest_platform_run_information_dialog (GTK_WINDOW (main_win),
prompt);
}
return retval;
projects / modest / blobdiff