projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixes a potential crash when deleting accounts
[modest]
/
src
/
hildon2
/
modest-msg-view-window.c
diff --git
a/src/hildon2/modest-msg-view-window.c
b/src/hildon2/modest-msg-view-window.c
index
5519206
..
226d5b5
100644
(file)
--- a/
src/hildon2/modest-msg-view-window.c
+++ b/
src/hildon2/modest-msg-view-window.c
@@
-1443,7
+1443,7
@@
modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
g_free (current_search);
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;
}
return;
}
@@
-1454,7
+1454,8
@@
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) {
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 {
g_free (priv->last_search);
priv->last_search = NULL;
} else {
@@
-1463,7
+1464,8
@@
modest_msg_view_window_find_toolbar_search (GtkWidget *widget,
}
} else {
if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) {
}
} 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 {
g_free (priv->last_search);
priv->last_search = NULL;
} else {
@@
-1507,6
+1509,8
@@
modest_msg_view_window_zoom_plus (ModestWindow *window)
{
gdouble zoom_level;
ModestMsgViewWindowPrivate *priv;
{
gdouble zoom_level;
ModestMsgViewWindowPrivate *priv;
+ gint int_zoom;
+ gchar *banner_text;
g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), 1.0);
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), 1.0);
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@
-1514,7
+1518,8
@@
modest_msg_view_window_zoom_plus (ModestWindow *window)
zoom_level = modest_zoomable_get_zoom (MODEST_ZOOMABLE (priv->msg_view));
if (zoom_level >= 2.0) {
zoom_level = modest_zoomable_get_zoom (MODEST_ZOOMABLE (priv->msg_view));
if (zoom_level >= 2.0) {
- 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;
} else if (zoom_level >= 1.5) {
zoom_level = 2.0;
return FALSE;
} else if (zoom_level >= 1.5) {
zoom_level = 2.0;
@@
-1531,10
+1536,13
@@
modest_msg_view_window_zoom_plus (ModestWindow *window)
}
/* set zoom level */
}
/* set zoom level */
+ int_zoom = (gint) rint (zoom_level*100.0+0.1);
+ banner_text = g_strdup_printf (_("wdgt_ib_zoom"), int_zoom);
+ modest_platform_information_banner (GTK_WIDGET (window), NULL, banner_text);
+ g_free (banner_text);
modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
return TRUE;
modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
return TRUE;
-
}
static gboolean
}
static gboolean
@@
-1542,6
+1550,8
@@
modest_msg_view_window_zoom_minus (ModestWindow *window)
{
gdouble zoom_level;
ModestMsgViewWindowPrivate *priv;
{
gdouble zoom_level;
ModestMsgViewWindowPrivate *priv;
+ gint int_zoom;
+ gchar *banner_text;
g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), 1.0);
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), 1.0);
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
@@
-1549,7
+1559,8
@@
modest_msg_view_window_zoom_minus (ModestWindow *window)
zoom_level = modest_zoomable_get_zoom (MODEST_ZOOMABLE (priv->msg_view));
if (zoom_level <= 0.5) {
zoom_level = modest_zoomable_get_zoom (MODEST_ZOOMABLE (priv->msg_view));
if (zoom_level <= 0.5) {
- 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;
} else if (zoom_level <= 0.8) {
zoom_level = 0.5;
return FALSE;
} else if (zoom_level <= 0.8) {
zoom_level = 0.5;
@@
-1566,6
+1577,10
@@
modest_msg_view_window_zoom_minus (ModestWindow *window)
}
/* set zoom level */
}
/* set zoom level */
+ int_zoom = (gint) rint (zoom_level*100.0+0.1);
+ banner_text = g_strdup_printf (_("wdgt_ib_zoom"), int_zoom);
+ modest_platform_information_banner (GTK_WIDGET (window), NULL, banner_text);
+ g_free (banner_text);
modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
return TRUE;
modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
return TRUE;
@@
-1603,7
+1618,7
@@
modest_msg_view_window_key_event (GtkWidget *window,
if (event->type == GDK_KEY_PRESS) {
GtkScrollType scroll_type;
if (event->type == GDK_KEY_PRESS) {
GtkScrollType scroll_type;
-
+
switch (event->keyval) {
case GDK_Up:
case GDK_KP_Up:
switch (event->keyval) {
case GDK_Up:
case GDK_KP_Up:
@@
-1625,7
+1640,7
@@
modest_msg_view_window_key_event (GtkWidget *window,
scroll_type = GTK_SCROLL_END; break;
default: scroll_type = GTK_SCROLL_NONE;
}
scroll_type = GTK_SCROLL_END; break;
default: scroll_type = GTK_SCROLL_NONE;
}
-
+
/* g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", */
/* scroll_type, FALSE, &return_value); */
return FALSE;
/* g_signal_emit_by_name (G_OBJECT (priv->main_scroll), "scroll-child", */
/* scroll_type, FALSE, &return_value); */
return FALSE;
@@
-2265,7
+2280,7
@@
on_account_removed (TnyAccountStore *account_store,
parent_acc = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
/* Close this window if I'm showing a message of the removed account */
parent_acc = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
/* Close this window if I'm showing a message of the removed account */
- if (strcmp (parent_acc, our_acc) == 0)
+ if (our_acc && parent_acc && strcmp (parent_acc, our_acc) == 0)
modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (user_data));
}
}
modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (user_data));
}
}
@@
-2604,8
+2619,8
@@
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) {
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"));
}
} else {
hildon_banner_show_information (NULL, NULL, _("mail_ib_file_operation_failed"));
}
@@
-2698,7
+2713,7
@@
save_attachments_response (GtkDialog *dialog,
if (!modest_utils_folder_writable (chooser_uri)) {
hildon_banner_show_information
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;
} else {
TnyIterator *iter;
@@
-2710,7
+2725,7
@@
save_attachments_response (GtkDialog *dialog,
!tny_mime_part_is_purged (mime_part) &&
(tny_mime_part_get_filename (mime_part) != NULL)) {
SaveMimePartPair *pair;
!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) {
pair = g_slice_new0 (SaveMimePartPair);
if (tny_list_get_length (mime_parts) > 1) {
@@
-3137,8
+3152,18
@@
modest_msg_view_window_add_to_contacts (ModestMsgViewWindow *self)
gboolean contacts_to_add = FALSE;
msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
gboolean contacts_to_add = FALSE;
msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
- if (msg == NULL) return;
- recipients = modest_tny_msg_get_all_recipients_list (msg);
+ if (msg == NULL) {
+ TnyHeader *header;
+
+ header = modest_msg_view_window_get_header (self);
+ if (header == NULL)
+ return;
+ recipients = modest_tny_msg_header_get_all_recipients_list (header);
+ g_object_unref (header);
+ } else {
+ recipients = modest_tny_msg_get_all_recipients_list (msg);
+ g_object_unref (msg);
+ }
if (recipients != NULL) {
GtkWidget *picker_dialog;
if (recipients != NULL) {
GtkWidget *picker_dialog;
@@
-3185,5
+3210,4
@@
modest_msg_view_window_add_to_contacts (ModestMsgViewWindow *self)
}
if (recipients) {g_slist_foreach (recipients, (GFunc) g_free, NULL); g_slist_free (recipients);}
}
if (recipients) {g_slist_foreach (recipients, (GFunc) g_free, NULL); g_slist_free (recipients);}
- g_object_unref (msg);
}
}