X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=883491d08422f7642e5ccfa78a6c5f9bfd897470;hb=d8cca2763d3a9c9e46e827321a83bd26c40871e3;hp=eade580d280b608f6812120e64a59b971609711f;hpb=0278dabc7e2e767712e75de5045ed664f1f5fb30;p=modest

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index eade580..883491d 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -934,6 +934,7 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self,
 ModestWindow *
 modest_msg_view_window_new_with_header_model (TnyMsg *msg, 
 					      const gchar *modest_account_name,
+					      const gchar *mailbox, /*ignored */
 					      const gchar *msg_uid,
 					      GtkTreeModel *model, 
 					      GtkTreeRowReference *row_reference)
@@ -1032,6 +1033,7 @@ modest_msg_view_window_new_with_header_model (TnyMsg *msg,
 ModestWindow *
 modest_msg_view_window_new_for_search_result (TnyMsg *msg, 
 					      const gchar *modest_account_name,
+					      const gchar *mailbox, /*ignored*/
 					      const gchar *msg_uid)
 {
 	ModestMsgViewWindow *window = NULL;
@@ -1065,8 +1067,9 @@ modest_msg_view_window_new_for_search_result (TnyMsg *msg,
 
 ModestWindow *
 modest_msg_view_window_new_for_attachment (TnyMsg *msg, 
-			    const gchar *modest_account_name,
-			    const gchar *msg_uid)
+					   const gchar *modest_account_name,
+					   const gchar *mailbox, /* ignored */
+					   const gchar *msg_uid)
 {
 	GObject *obj = NULL;
 	ModestMsgViewWindowPrivate *priv;	
@@ -1468,7 +1471,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 
 	if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
 		g_free (current_search);
-		hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ecdg_ib_find_rep_enter_text"));
+		hildon_banner_show_information (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
 		return;
 	}
 
@@ -1479,7 +1482,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 		result = modest_isearch_view_search (MODEST_ISEARCH_VIEW (priv->msg_view),
 						     priv->last_search);
 		if (!result) {
-			hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_no_matches"));
+			hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_no_matches"));
 			g_free (priv->last_search);
 			priv->last_search = NULL;
 		} else {
@@ -1488,7 +1491,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
 		}
 	} else {
 		if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) {
-			hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_search_complete"));
+			hildon_banner_show_information (NULL, NULL, _HL("ckct_ib_find_search_complete"));
 			g_free (priv->last_search);
 			priv->last_search = NULL;
 		} else {
@@ -1547,7 +1550,7 @@ modest_msg_view_window_zoom_plus (ModestWindow *window)
 	group = gtk_radio_action_get_group (zoom_radio_action);
 
 	if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (group->data))) {
-		hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_max_zoom_level_reached"));
+		hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_max_zoom_level_reached"));
 		return FALSE;
 	}
 
@@ -1579,7 +1582,8 @@ modest_msg_view_window_zoom_minus (ModestWindow *window)
 				gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->next->data), TRUE);
 				return TRUE;
 			} else {
-			  hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_min_zoom_level_reached"));
+			  hildon_banner_show_information (NULL, NULL, 
+							  _CS("ckct_ib_min_zoom_level_reached"));
 				return FALSE;
 			}
 			break;
@@ -2656,7 +2660,8 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window,
 			gchar *account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (window)));
 			if (!account)
 				account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
-			msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, attachment_uid);
+			msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, 
+									     NULL, attachment_uid);
 			modest_window_set_zoom (MODEST_WINDOW (msg_win), 
 						modest_window_get_zoom (MODEST_WINDOW (window)));
 			modest_window_mgr_register_window (mgr, msg_win, MODEST_WINDOW (window));
@@ -2718,10 +2723,11 @@ idle_save_mime_part_show_result (SaveMimePartInfo *info)
 		if (info->result == GNOME_VFS_OK) {
 			hildon_banner_show_information (NULL, NULL, _CS("sfil_ib_saved"));
 		} else if (info->result == GNOME_VFS_ERROR_NO_SPACE) {
-			hildon_banner_show_information (NULL, NULL, dgettext("ke-recv", 
-									     "cerm_device_memory_full"));
+			hildon_banner_show_information (NULL, NULL, 
+							_KR("cerm_device_memory_full"));
 		} else {
-			hildon_banner_show_information (NULL, NULL, _("mail_ib_file_operation_failed"));
+			hildon_banner_show_information (NULL, NULL, 
+							_("mail_ib_file_operation_failed"));
 		}
 		gdk_threads_leave (); /* CHECKED */
 	}
@@ -2812,7 +2818,7 @@ save_attachments_response (GtkDialog *dialog,
 
 	if (!modest_utils_folder_writable (chooser_uri)) {
 		hildon_banner_show_information 
-			(NULL, NULL, dgettext("hildon-fm", "sfil_ib_readonly_location"));
+			(NULL, NULL, _FM("sfil_ib_readonly_location"));
 	} else {
 		TnyIterator *iter;
 
@@ -2824,7 +2830,7 @@ save_attachments_response (GtkDialog *dialog,
 			    !tny_mime_part_is_purged (mime_part) &&
 			    (tny_mime_part_get_filename (mime_part) != NULL)) {
 				SaveMimePartPair *pair;
-					
+
 				pair = g_slice_new0 (SaveMimePartPair);
 
 				if (tny_list_get_length (mime_parts) > 1) {
@@ -3215,3 +3221,4 @@ modest_msg_view_window_add_to_contacts (ModestMsgViewWindow *self)
 	modest_ui_actions_on_add_to_contacts (NULL, MODEST_WINDOW (self));
 }
 
+