* Fixes NB#80782, INBOX folder is now localized

pmo-trunk-r4291

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 4d854dd..b547afb 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -360,10 +360,10 @@ on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data)
 }
 
 static void
-text_cell_data  (GtkTreeViewColumn *column,  
+text_cell_data  (GtkTreeViewColumn *column,
                 GtkCellRenderer *renderer,
-                GtkTreeModel *tree_model,  
-                GtkTreeIter *iter,  
+                GtkTreeModel *tree_model,
+                GtkTreeIter *iter,
                 gpointer data)
 {
        ModestFolderViewPrivate *priv;
@@ -416,10 +416,16 @@ text_cell_data  (GtkTreeViewColumn *column,
                                                                
                /* Use bold font style if there are unread or unset messages */
                if (number > 0) {
-                       item_name = g_strdup_printf ("%s (%d)", fname, number);
+                       if (type == TNY_FOLDER_TYPE_INBOX)
+                               item_name = g_strdup_printf ("%s (%d)", _("mcen_me_folder_inbox"), number);
+                       else
+                               item_name = g_strdup_printf ("%s (%d)", fname, number);
                        item_weight = 800;
                } else {
-                       item_name = g_strdup (fname);
+                       if (type == TNY_FOLDER_TYPE_INBOX)
+                               item_name = g_strdup (_("mcen_me_folder_inbox"));
+                       else
+                               item_name = g_strdup (fname);
                        item_weight = 400;
                }
                

diff --git a/tests/dbus_api/test_compose_mail.c b/tests/dbus_api/test_compose_mail.c
index 9d3d88c..9abd2ae 100644 (file)
--- a/tests/dbus_api/test_compose_mail.c
+++ b/tests/dbus_api/test_compose_mail.c
@@ -22,7 +22,7 @@ int main(int argc, char *argv[])
        
        const gboolean ret = libmodest_dbus_client_compose_mail (
                osso_context,
-               "modesttest@openismus.com", /* to */
+               "modesttest@modesttest.com", /* to */
                "cc test", /* cc */
                "bcc test", /* bcc */
                "test subject", /* subject */

diff --git a/tests/dbus_api/test_mail_to.c b/tests/dbus_api/test_mail_to.c
index 715adb9..c0a4dd4 100644 (file)
--- a/tests/dbus_api/test_mail_to.c
+++ b/tests/dbus_api/test_mail_to.c
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
        
        /* Call the function in libmodest-dbus-client: */
        const gboolean ret = libmodest_dbus_client_mail_to (osso_context,
-               "mailto:murrayc@murrayc.com?subject=test%20subject%20via%20dbus&body=test%20body%20via%20dbus");
+               "mailto:nomail@nodomain.com?subject=test%20subject%20via%20dbus&body=test%20body%20via%20dbus");
        if (!ret) {
                printf("libmodest_dbus_client_mail_to() failed.\n");
                return OSSO_ERROR;

diff --git a/tests/dbus_api/test_open_message.c b/tests/dbus_api/test_open_message.c
index 195b8ab..a222d2e 100644 (file)
--- a/tests/dbus_api/test_open_message.c
+++ b/tests/dbus_api/test_open_message.c
@@ -19,7 +19,7 @@ main (int argc, char *argv[])
        }
        
        /* For instance, 
-        * "pop://murray.cumming%40gmail.com@pop.gmail.com:995/;use_ssl=wrapped/inbox/GmailId112e166949157685"
+        * "pop://nomail%40nodomain.com@pop.gmail.com:995/;use_ssl=wrapped/inbox/GmailId112e166949157685"
         */
        if (argc == 2) {
                url = argv[1];