[pan2/pre-032712] fix for hotkey tab
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2/pre-032712] fix for hotkey tab
- Date: Tue, 27 Mar 2012 17:16:14 +0000 (UTC)
commit 64cf9a7671d544b2a8d0e56b1d6a445b2ff86209
Author: Heinrich MÃller <henmull src gnome org>
Date: Tue Mar 27 19:13:47 2012 +0200
fix for hotkey tab
pan/gui/actions.cc | 12 ++++++------
pan/gui/gui.cc | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index 36954b2..126d80b 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -780,24 +780,24 @@ pan :: add_actions (PanUI * ui, GtkUIManager * ui_manager, Prefs * p, Data* data
for (int i=0;i<n_entries;++i)
{
- if (!entries[i].label) continue;
- action_trans[entries[i].name] = (entries[i].label ? entries[i].label : "");
+ const gchar* abbrev = entries[i].tooltip ? entries[i].tooltip : entries[i].label ? entries[i].label : "";
+ action_trans[entries[i].name] = abbrev;
const gchar* translation = gtk_action_group_translate_string (action_group, action_trans[entries[i].name].c_str());
action_trans[entries[i].name] = translation ? translation : "";
}
for (int i=0;i<n_toggle_entries;++i)
{
- if (!toggle_entries[i].label) continue;
- action_trans[toggle_entries[i].name] = (toggle_entries[i].label ? toggle_entries[i].label : "");
+ const gchar* abbrev = toggle_entries[i].tooltip ? toggle_entries[i].tooltip : toggle_entries[i].label ? toggle_entries[i].label : "";
+ action_trans[toggle_entries[i].name] = abbrev;
const gchar* translation = gtk_action_group_translate_string (action_group, action_trans[toggle_entries[i].name].c_str());
action_trans[toggle_entries[i].name] = translation ? translation : "";
}
for (int i=0;i<G_N_ELEMENTS(match_toggle_entries);++i)
{
- if (!match_toggle_entries[i].label) continue;
- action_trans[match_toggle_entries[i].name] = (match_toggle_entries[i].label ? match_toggle_entries[i].label : "");
+ const gchar* abbrev = match_toggle_entries[i].tooltip ? match_toggle_entries[i].tooltip : match_toggle_entries[i].label ? match_toggle_entries[i].label : "";
+ action_trans[match_toggle_entries[i].name] = abbrev;
const gchar* translation = gtk_action_group_translate_string (action_group, action_trans[match_toggle_entries[i].name].c_str());
action_trans[match_toggle_entries[i].name] = translation ? translation : "";
}
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 2fbb765..2914919 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -714,7 +714,7 @@ namespace
if (status == OK) {
#ifdef HAVE_GMIME_CRYPTO
GPGDecErr err;
- GMimeMessage * message = _cache.get_message (_article.get_part_mids(),err);
+ GMimeMessage * message = _cache.get_message (_article.get_part_mids(), err);
#else
GMimeMessage * message = _cache.get_message (_article.get_part_mids());
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]