#include <string.h>
#include <glib/gstdio.h>
#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <hildon-widgets/hildon-program.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
#else
+#include <hildon/hildon-program.h>
#include <libgnomevfs/gnome-vfs-mime.h>
#endif
#include <tny-fs-stream.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon.h>
+#include <modest-accounts-window.h>
+#include <modest-folder-window.h>
+#endif
+
#include <tny-list.h>
#include <tny-iterator.h>
#include <tny-simple-list.h>
}
if (msg_view != NULL) {
- modest_window_mgr_register_window (win_mgr, msg_view);
- gtk_widget_show_all (GTK_WIDGET (msg_view));
+ if (!modest_window_mgr_register_window (win_mgr, msg_view, NULL)) {
+ gtk_widget_destroy (GTK_WIDGET (msg_view));
+ } else {
+ gtk_widget_show_all (GTK_WIDGET (msg_view));
+ }
}
}
{
TnyHeader *header;
ModestWindow *main_win = NULL, *msg_view = NULL;
- ModestHeaderView *header_view;
header = (TnyHeader *) user_data;
}
g_object_unref (header);
- /* Refilter the header view explicitly */
- header_view = (ModestHeaderView *)
- modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(main_win),
- MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
- if (header_view && MODEST_IS_HEADER_VIEW (header_view))
- modest_header_view_refilter (header_view);
+ /* Refilter the header views explicitely */
+
+ /* TODO: call modest_window_mgr_refilter_header_views */
+ /* this call will go through all the windows, get the header views and refilter them */
}
-static gboolean
-on_idle_delete_message (gpointer user_data)
+static gpointer
+thread_prepare_delete_message (gpointer userdata)
{
TnyList *headers = NULL, *tmp_headers = NULL;
TnyFolder *folder = NULL;
TnyHeader *header = NULL, *msg_header = NULL;
TnyMsg *msg = NULL;
TnyAccount *account = NULL;
- const char *uri = NULL;
+ char *uri;
gchar *uid = NULL;
ModestMailOperation *mail_op = NULL;
ModestWindow *main_win = NULL;
- uri = (char *) user_data;
-
+ uri = (char *) userdata;
+
msg = find_message_by_url (uri, &account);
if (account)
g_object_unref (account);
if (!msg) {
g_warning ("%s: Could not find message '%s'", __FUNCTION__, uri);
g_idle_add (notify_error_in_dbus_callback, NULL);
+ g_free (uri);
return FALSE;
}
g_warning ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
g_object_unref (msg);
g_idle_add (notify_error_in_dbus_callback, NULL);
+ g_free (uri);
return FALSE;
}
if (folder)
g_object_unref (folder);
g_idle_add (notify_error_in_dbus_callback, NULL);
+ g_free (uri);
return FALSE;
}
/* Clean */
if (header)
g_object_unref (header);
+ g_free (uri);
return FALSE;
}
+static gboolean
+on_idle_delete_message (gpointer user_data)
+{
+ const char *uri = NULL;
+
+ uri = (char *) user_data;
+
+ g_thread_create (thread_prepare_delete_message, g_strdup (uri), FALSE, NULL);
+
+ return FALSE;
+
+}
+
return FALSE;
}
+
+
static gint
on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
{
return OSSO_OK;
}
-static gint
-on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
-{
+static void
+on_send_receive_performer(gboolean canceled,
+ GError *err,
+ GtkWindow *parent_window,
+ TnyAccount *account,
+ gpointer user_data)
+{
ModestConnectedVia connect_when;
+ if (err || canceled) {
+ g_idle_add (notify_error_in_dbus_callback, NULL);
+ return;
+ }
+
connect_when = modest_conf_get_int (modest_runtime_get_conf (),
MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL);
/* We need this to allow modest to finish */
g_idle_add (notify_error_in_dbus_callback, NULL);
}
+}
+
+
+static gint
+on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
+{
+ TnyDevice *device = modest_runtime_get_device ();
+
+ if (!tny_device_is_online (device))
+ modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, NULL);
+ else
+ on_send_receive_performer (FALSE, NULL, NULL, NULL, NULL);
return OSSO_OK;
}
return OSSO_OK;
}
+#ifdef MODEST_TOOLKIT_HILDON2
+static gboolean
+on_idle_top_application (gpointer user_data)
+{
+ HildonWindowStack *stack;
+ GtkWidget *window;
+
+ /* This is a GDK lock because we are an idle callback and
+ * the code below is or does Gtk+ code */
+
+ gdk_threads_enter (); /* CHECKED */
+
+ stack = hildon_window_stack_get_default ();
+ window = GTK_WIDGET (hildon_window_stack_peek (stack));
+
+ if (window) {
+ gtk_window_present (GTK_WINDOW (window));
+ } else {
+ ModestWindowMgr *mgr;
+ mgr = modest_runtime_get_window_mgr ();
+ window = (GtkWidget *) modest_window_mgr_show_initial_window (mgr);
+ if (window) {
+ modest_platform_remove_new_mail_notifications (FALSE);
+ } else {
+ g_printerr ("modest: failed to get main window instance\n");
+ }
+ }
+
+ gdk_threads_leave (); /* CHECKED */
+
+ return FALSE; /* Do not call this callback again. */
+}
+#else
static gboolean
on_idle_top_application (gpointer user_data)
{
}
if (main_win) {
- /* Ideally, we would just use gtk_widget_show(),
- * but this widget is not coded correctly to support that: */
- gtk_widget_show_all (GTK_WIDGET (main_win));
- gtk_window_present (GTK_WINDOW (main_win));
-
/* If we're showing an already existing window then
reselect the INBOX */
if (!new_window) {
}
}
+ if (main_win) {
+ gtk_widget_show_all (GTK_WIDGET (main_win));
+ gtk_window_present (GTK_WINDOW (main_win));
+ }
+
gdk_threads_leave (); /* CHECKED */
return FALSE; /* Do not call this callback again. */
}
+#endif
static gint
on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
tny_folder_store_get_folders (folder_store,
all_folders,
NULL /* query */,
+ FALSE,
NULL /* error */);
TnyIterator *iter = tny_list_create_iterator (all_folders);
projects / modest / blobdiff