X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-platform.c;h=9485a63d0c3d7d1b0866463fb007af2114d6beb1;hp=344c56721e785a7da3bc1f404ec0ec4535b3d959;hb=837f3326aba3cc66c07024dc890b4f17bb623e7f;hpb=d10a12aaa23f7270c3e30d47ef01469832edc1e7 diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 344c567..9485a63 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -37,6 +37,7 @@ #include "maemo/modest-maemo-global-settings-dialog.h" #include "modest-widget-memory.h" #include +#include #include #include #include @@ -102,19 +103,21 @@ on_modest_conf_update_interval_changed (ModestConf* self, static gboolean check_required_files (void) { - FILE *mcc_file = modest_maemo_open_mcc_mapping_file (); + FILE *mcc_file = modest_utils_open_mcc_mapping_file (); + if (!mcc_file) { g_printerr ("modest: check for mcc file failed\n"); return FALSE; - } else + } else { fclose (mcc_file); - + } + if (access(MODEST_PROVIDER_DATA_FILE, R_OK) != 0 && access(MODEST_FALLBACK_PROVIDER_DATA_FILE, R_OK) != 0) { g_printerr ("modest: cannot find providers data\n"); return FALSE; } - + return TRUE; } @@ -335,7 +338,7 @@ modest_platform_activate_uri (const gchar *uri) modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE); hildon_banner_show_information (parent ? GTK_WIDGET(parent): NULL, NULL, _("mcen_ib_unsupported_link")); - g_warning ("%s: cannot open uri '%s'", __FUNCTION__,uri); + g_debug ("%s: cannot open uri '%s'", __FUNCTION__,uri); } return result; @@ -510,7 +513,7 @@ modest_platform_get_icon (const gchar *name, guint icon_size) GTK_ICON_LOOKUP_NO_SVG, &err); if (!pixbuf) { - g_printerr ("modest: error loading theme icon '%s': %s\n", + g_warning ("Error loading theme icon '%s': %s\n", name, err->message); g_error_free (err); } @@ -1098,7 +1101,7 @@ modest_platform_set_update_interval (guint minutes) * because we will replace it: */ if (alarm_cookie) { if (alarm_event_del(alarm_cookie) != 1) - g_warning ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie); + g_debug ("%s: alarm %d was not on the queue", __FUNCTION__, (int)alarm_cookie); alarm_cookie = 0; modest_conf_set_int (conf, MODEST_CONF_ALARM_ID, 0, NULL); } @@ -1214,16 +1217,12 @@ modest_platform_push_email_notification(void) } void -modest_platform_on_new_headers_received (TnyList *header_list, +modest_platform_on_new_headers_received (GList *URI_list, gboolean show_visual) { - g_return_if_fail (TNY_IS_LIST(header_list)); - - if (tny_list_get_length(header_list) == 0) { - g_warning ("%s: header list is empty", __FUNCTION__); + if (g_list_length (URI_list) == 0) return; - } - + if (!show_visual) { modest_platform_push_email_notification (); /* We do a return here to avoid indentation with an else */ @@ -1239,7 +1238,7 @@ modest_platform_on_new_headers_received (TnyList *header_list, NULL); HildonNotification *notification; - TnyIterator *iter; + GList *iter; GSList *notifications_list = NULL; /* Get previous notifications ids */ @@ -1247,35 +1246,25 @@ modest_platform_on_new_headers_received (TnyList *header_list, MODEST_CONF_NOTIFICATION_IDS, MODEST_CONF_VALUE_INT, NULL); - iter = tny_list_create_iterator (header_list); - while (!tny_iterator_is_done (iter)) { - 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); + iter = URI_list; + while (iter) { + gchar *display_address = NULL; gboolean first_notification = TRUE; gint notif_id; - gchar *str; + ModestMsgNotificationData *data; - /* constant string, don't free */ - display_date = modest_text_utils_get_display_date (tny_header_get_date_received (header)); + data = (ModestMsgNotificationData *) iter->data; - display_address = tny_header_dup_from (header); + display_address = g_strdup (data->from); modest_text_utils_get_display_address (display_address); /* string is changed in-place */ - - summary = g_strdup_printf ("%s - %s", display_date, display_address); - str = tny_header_dup_subject (header); - notification = hildon_notification_new (summary, - str, + + notification = hildon_notification_new (display_address, + data->subject, "qgn_list_messagin", "email.arrive"); - g_free (str); - /* Create the message URL */ - str = tny_header_dup_uid (header); - url = g_strdup_printf ("%s/%s", tny_folder_get_url_string (folder), - str); - g_free (str); + g_free (display_address); + /* Add DBus action */ hildon_notification_add_dbus_action(notification, "default", "Cancel", @@ -1283,7 +1272,7 @@ modest_platform_on_new_headers_received (TnyList *header_list, MODEST_DBUS_OBJECT, MODEST_DBUS_IFACE, MODEST_DBUS_METHOD_OPEN_MESSAGE, - G_TYPE_STRING, url, + G_TYPE_STRING, data->uri, -1); /* Play sound if the user wants. Show the LED @@ -1300,7 +1289,7 @@ modest_platform_on_new_headers_received (TnyList *header_list, "dialog-type", 4); notify_notification_set_hint_string(NOTIFY_NOTIFICATION (notification), "led-pattern", - MODEST_NEW_MAIL_LIGHTING_PATTERN); + MODEST_NEW_MAIL_LIGHTING_PATTERN); } /* Notify. We need to do this in an idle because this function @@ -1313,23 +1302,16 @@ modest_platform_on_new_headers_received (TnyList *header_list, /* We don't listen for the "closed" signal, because we don't care about if the notification was removed or not to store the list in gconf */ - - /* Free & carry on */ - g_free (display_address); - g_free (summary); - g_free (url); - g_object_unref (folder); - g_object_unref (header); - tny_iterator_next (iter); + + iter = g_list_next (iter); } - g_object_unref (iter); /* Save the ids */ modest_conf_set_list (modest_runtime_get_conf (), MODEST_CONF_NOTIFICATION_IDS, notifications_list, MODEST_CONF_VALUE_INT, NULL); g_slist_free (notifications_list); - + #endif /*MODEST_HAVE_HILDON_NOTIFY*/ } @@ -1473,7 +1455,7 @@ modest_platform_information_banner (GtkWidget *parent, const gchar *icon_name, const gchar *text) { - GtkWidget *banner, *banner_parent = NULL; + GtkWidget *banner_parent = NULL; ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); if (modest_window_mgr_get_num_windows (mgr) == 0) @@ -1496,8 +1478,25 @@ modest_platform_information_banner (GtkWidget *parent, return; } + modest_platform_system_banner (banner_parent, icon_name, text); + +} + +void +modest_platform_system_banner (GtkWidget *parent, + const gchar *icon_name, + const gchar *text) +{ + GtkWidget *banner = NULL; + ModestWindowMgr *mgr = modest_runtime_get_window_mgr (); + + + if (parent && GTK_IS_WINDOW (parent)) { + if (!gtk_window_is_active (GTK_WINDOW (parent))) + parent = NULL; + } - banner = hildon_banner_show_information (banner_parent, icon_name, text); + banner = hildon_banner_show_information (parent, icon_name, text); modest_window_mgr_register_banner (mgr); g_object_ref (mgr); @@ -1684,8 +1683,8 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name, 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__); + g_debug ("%s: don't show dialogs if there's no main window; assuming 'Cancel'", + __FUNCTION__); return FALSE; } @@ -1730,7 +1729,7 @@ modest_platform_run_alert_dialog (const gchar* prompt, 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;" + g_debug ("%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; } @@ -2147,12 +2146,14 @@ modest_platform_run_folder_details_dialog (GtkWindow *parent_window, void modest_platform_run_header_details_dialog (GtkWindow *parent_window, - TnyHeader *header) + TnyHeader *header, + gboolean async_get_size, + TnyMsg *msg) { GtkWidget *dialog; /* Create dialog */ - dialog = modest_details_dialog_new_with_header (parent_window, header); + dialog = modest_details_dialog_new_with_header (parent_window, header, TRUE); /* Run dialog */ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), @@ -2254,3 +2255,27 @@ modest_platform_get_list_to_move (ModestWindow *window) return list; } + +DBusConnection* +modest_platform_get_dbus_connection (void) +{ + osso_context_t *osso_context; + DBusConnection *con; + + osso_context = modest_maemo_utils_get_osso_context(); + + con = osso_get_dbus_connection (osso_context); + + return con; +} + +void +modest_platform_emit_folder_updated_signal (const gchar *account_id, const gchar *folder_id) +{ + DBusConnection *con; + + con = modest_platform_get_dbus_connection (); + if (!con) return; + + modest_dbus_emit_folder_updated_signal (con, account_id, folder_id); +}