commit 8a552717c10c88f15729487bd504ed2c02edd56b
parent d79e409c4a38bf8029006f986c50d88366039669
Author: Colin Leroy <colin@colino.net>
Date: Tue, 23 Apr 2013 08:39:57 +0200
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
Diffstat:
13 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/manual/claws-mail-manual.xml b/manual/claws-mail-manual.xml
@@ -21,7 +21,7 @@
<ulink url="http://www.claws-mail.org/">The Claws Mail Team</ulink>
</corpauthor>
<copyright>
- <year>2006-2011</year>
+ <year>2006-2013</year>
<holder>The Claws Mail Team.</holder>
</copyright>
<legalnotice id="license">
diff --git a/manual/de/claws-mail-manual.xml b/manual/de/claws-mail-manual.xml
@@ -21,7 +21,7 @@
<ulink url="http://www.claws-mail.org/">Das Team von Claws Mail</ulink>
</corpauthor>
<copyright>
- <year>2006-2011</year>
+ <year>2006-2013</year>
<holder>Das Team von Claws Mail.</holder>
</copyright>
<legalnotice id="license">
diff --git a/manual/es/claws-mail-manual.xml b/manual/es/claws-mail-manual.xml
@@ -22,7 +22,7 @@
<ulink url="http://www.claws-mail.org/">El equipo de &SC;</ulink>
</corpauthor>
<copyright>
- <year>2006-2011</year>
+ <year>2006-2013</year>
<holder>El equipo de &SC;.</holder>
</copyright>
<legalnotice id="license">
diff --git a/manual/fr/claws-mail-manual.xml b/manual/fr/claws-mail-manual.xml
@@ -21,7 +21,7 @@
<ulink url="http://www.claws-mail.org/">L'équipe de Claws Mail</ulink>
</corpauthor>
<copyright>
- <year>2006-2011</year>
+ <year>2006-2013</year>
<holder>L'équipe de Claws Mail.</holder>
</copyright>
<legalnotice id="license">
diff --git a/manual/it/claws-mail-manual.xml b/manual/it/claws-mail-manual.xml
@@ -21,7 +21,7 @@
<ulink url="http://www.claws-mail.org/">Il Team di Claws Mail</ulink>
</corpauthor>
<copyright>
- <year>2006-2011</year>
+ <year>2006-2013</year>
<holder>Il Team di Claws Mail.</holder>
</copyright>
<legalnotice id="license">
diff --git a/manual/pl/claws-mail-manual.xml b/manual/pl/claws-mail-manual.xml
@@ -21,7 +21,7 @@
<ulink url="http://www.claws-mail.org/">Autorzy Claws Mail</ulink>
</corpauthor>
<copyright>
- <year>2006</year>
+ <year>2006-2013</year>
<holder>Autorzy Claws Mail.</holder>
</copyright>
<legalnotice id="license">
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -139,6 +139,7 @@ src/plugins/spam_report/spam_report.c
src/plugins/spamassassin/spamassassin.c
src/plugins/spamassassin/spamassassin_gtk.c
src/plugins/tnef_parse/tnef_parse.c
+src/plugins/vcalendar/common-views.c
src/plugins/vcalendar/vcalendar.c
src/plugins/vcalendar/vcal_prefs.c
src/plugins/vcalendar/vcal_folder.c
diff --git a/src/folderview.c b/src/folderview.c
@@ -796,7 +796,7 @@ static void mark_all_read_cb(GtkAction *action, gpointer data)
&& prefs_common.ask_mark_all_read) {
val = alertpanel_full(_("Mark all as read"),
_("Do you really want to mark all mails in this "
- "folder as read ?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+ "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -1004,6 +1004,17 @@ void mimeview_clear(MimeView *mimeview)
mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
}
+gchar * get_message_check_signature_shortcut(MessageView *messageview) {
+ GtkUIManager *ui_manager;
+
+ if (messageview->window != NULL)
+ ui_manager = messageview->ui_manager;
+ else
+ ui_manager = messageview->mainwin->ui_manager;
+
+ return cm_menu_item_get_shortcut(ui_manager, "Menu/Message/CheckSignature");
+}
+
static void check_signature_cb(GtkWidget *widget, gpointer user_data);
static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
@@ -1059,25 +1070,26 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo,
break;
}
if (mycode == SIGNATURE_UNCHECKED) {
- GtkUIManager *ui_manager;
gchar *tmp = privacy_mimeinfo_sig_info_short(mimeinfo);
- gchar *shortcut;
+ gchar *shortcut = get_message_check_signature_shortcut(mimeview->messageview);
- if (mimeview->messageview->window != NULL)
- ui_manager = mimeview->messageview->ui_manager;
+ if (*shortcut == '\0')
+ text = g_strdup_printf(_("%s Click the icon to check it."), tmp);
else
- ui_manager = mimeview->messageview->mainwin->ui_manager;
-
- shortcut = cm_menu_item_get_shortcut(ui_manager, "Menu/Message/CheckSignature");
-
- text = g_strdup_printf(_("%s Click the icon or hit '%s' to check it."),
- tmp, shortcut);
+ text = g_strdup_printf(_("%s Click the icon or hit '%s' to check it."),
+ tmp, shortcut);
g_free(tmp);
g_free(shortcut);
} else if (mycode != SIGNATURE_CHECK_TIMEOUT) {
text = privacy_mimeinfo_sig_info_short(mimeinfo);
} else if (mycode == SIGNATURE_CHECK_TIMEOUT) {
- text = g_strdup(_("Timeout checking the signature. Click the icon or hit 'C' to try again."));
+ gchar *shortcut = get_message_check_signature_shortcut(mimeview->messageview);
+
+ if (*shortcut == '\0')
+ text = g_strdup(_("Timeout checking the signature. Click the icon to try again."));
+ else
+ text = g_strdup_printf(_("Timeout checking the signature. Click the icon or hit '%s' to try again."), shortcut);
+ g_free(shortcut);
}
noticeview_set_text(mimeview->siginfoview, text);
diff --git a/src/plugins/att_remover/att_remover.c b/src/plugins/att_remover/att_remover.c
@@ -416,7 +416,7 @@ static void remove_attachments(GSList *msglist)
if (alertpanel_full(_("Destroy attachments"),
_("Do you really want to remove all attachments from "
- "the selected messages ?\n\n"
+ "the selected messages?\n\n"
"The deleted data will be unrecoverable."),
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL,
FALSE, NULL, ALERT_QUESTION, G_ALERTALTERNATE) != G_ALERTALTERNATE)
diff --git a/src/plugins/bsfilter/bsfilter.c b/src/plugins/bsfilter/bsfilter.c
@@ -587,7 +587,11 @@ gint plugin_init(gchar **error)
FolderItem *bsfilter_get_spam_folder(MsgInfo *msginfo)
{
- FolderItem *item = folder_find_item_from_identifier(config.save_folder);
+ FolderItem *item = NULL;
+
+ if (config.save_folder != NULL) {
+ item = folder_find_item_from_identifier(config.save_folder);
+ }
if (item || msginfo == NULL || msginfo->folder == NULL)
return item;
diff --git a/src/plugins/vcalendar/vcalendar.c b/src/plugins/vcalendar/vcalendar.c
@@ -1086,7 +1086,7 @@ static gboolean vcalviewer_action_cb(GtkButton *widget, gpointer data)
if (!account) {
AlertValue val = alertpanel_full(_("No account found"),
_("You have no account matching any attendee.\n"
- "Do you want to reply anyway ?"),
+ "Do you want to reply anyway?"),
GTK_STOCK_CANCEL, _("+Reply anyway"), NULL, FALSE,
NULL, ALERT_QUESTION, G_ALERTDEFAULT);
if (val == G_ALERTALTERNATE) {
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -4112,7 +4112,7 @@ void summary_mark_all_read(SummaryView *summaryview)
if (prefs_common.ask_mark_all_read) {
val = alertpanel_full(_("Mark all as read"),
_("Do you really want to mark all mails in this "
- "folder as read ?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
+ "folder as read?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
