{
ModestEasysetupWizardDialogPrivate* priv;
gchar* provider_id = NULL;
+ EasysetupProviderComboBox *combo;
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
/* Work out the user email address */
- provider_id = modest_provider_picker_get_active_provider_id (
- MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
+ combo = EASYSETUP_PROVIDER_COMBO_BOX (priv->combo_account_serviceprovider);
+ provider_id = easysetup_provider_combo_box_get_active_provider_id (combo);
if (provider_id) {
gchar *email_address;
gchar *domain_name = modest_presets_get_domain (priv->presets, provider_id);
email_address = g_strdup_printf ("%s@%s",
- hildon_entry_get_text (HILDON_ENTRY (priv->entry_user_username)),
+ gtk_entry_get_text (GTK_ENTRY (priv->entry_user_username)),
domain_name);
/* Update the email address */
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), email_address);
+ gtk_entry_set_text (GTK_ENTRY (priv->entry_user_email), email_address);
g_free (email_address);
g_free (domain_name);
static gboolean
check_required_files (void)
{
- FILE *mcc_file = modest_utils_open_mcc_mapping_file (NULL);
+ FILE *mcc_file = modest_utils_open_mcc_mapping_file (FALSE,NULL);
if (!mcc_file) {
g_printerr ("modest: check for mcc file failed\n");
return FALSE;
- } else
+ } else
fclose (mcc_file);
-
+
+
+ mcc_file = modest_utils_open_mcc_mapping_file (TRUE, NULL);
+ if (!mcc_file) {
+ g_printerr ("modest: check for mcc file (for LC_MESSAGES) failed\n");
+ return FALSE;
+ } 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;
}
MODEST_CONF_NOTIFICATION_IDS,
MODEST_CONF_VALUE_INT, NULL);
- iter = header_list;
+ iter = URI_list;
while (iter) {
- gchar *display_address = NULL, *summary = NULL;
- const gchar *display_date;
+ gchar *display_address = NULL;
gboolean first_notification = TRUE;
gint notif_id;
- gchar *str;
ModestMsgNotificationData *data;
data = (ModestMsgNotificationData *) iter->data;
- /* constant string, don't free */
- display_date = modest_text_utils_get_display_date (tny_header_get_date_received (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);
- notification = hildon_notification_new (summary,
+ notification = hildon_notification_new (display_address,
data->subject,
"qgn_list_messagin",
"email.arrive");
+ g_free (display_address);
+
/* Add DBus action */
hildon_notification_add_dbus_action(notification,
"default",
MODEST_DBUS_OBJECT,
MODEST_DBUS_IFACE,
MODEST_DBUS_METHOD_OPEN_MESSAGE,
- G_TYPE_STRING, data->url,
+ G_TYPE_STRING, data->uri,
-1);
/* Play sound if the user wants. Show the LED
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);
-
iter = g_list_next (iter);
}
/* This directory should contain an "outbox" child directory: */
gchar *escaped, *filename;
+#if GLIB_CHECK_VERSION(2, 16, 0)
escaped = g_uri_escape_string (account_name, NULL, FALSE);
+#else
+ /* TODO: escape without calling glib */
+ escaped = g_strdup (account_name);
+#endif
filename = g_build_filename (g_get_home_dir(),
MODEST_DIR,
MODEST_PER_ACCOUNT_LOCAL_OUTBOX_FOLDERS_MAILDIR,