talons

commit 8e77ac7657266efc3840ac5fefcd5f98b1fbfdaf
parent ca96a5cd434d7c6c04fdb0ef614f05758c24e8cd
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 26 Feb 2010 17:54:29 +0000

2010-02-26 [colin]	3.7.5cvs24

	* src/toolbar.c
		Don't translate empty description

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/toolbar.c
 | 
2
+-

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-26 [colin]	3.7.5cvs24
+
+	* src/toolbar.c
+		Don't translate empty description
+
 2010-02-22 [colin]	3.7.5cvs23
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3964,3 +3964,4 @@
 ( cvs diff -u -r 1.8.2.7 -r 1.8.2.8 .cvsignore;  ) > 3.7.5cvs21.patchset
 ( cvs diff -u -r 1.179.2.249 -r 1.179.2.250 src/imap.c;  cvs diff -u -r 1.34.2.21 -r 1.34.2.22 src/imap.h;  cvs diff -u -r 1.115.2.224 -r 1.115.2.225 src/main.c;  cvs diff -u -r 1.274.2.306 -r 1.274.2.307 src/mainwindow.c;  cvs diff -u -r 1.1.4.110 -r 1.1.4.111 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/etpan/imap-thread.h;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/etpan/nntp-thread.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/etpan/nntp-thread.h;  ) > 3.7.5cvs22.patchset
 ( cvs diff -u -r 1.382.2.546 -r 1.382.2.547 src/compose.c;  ) > 3.7.5cvs23.patchset
+( cvs diff -u -r 1.43.2.115 -r 1.43.2.116 src/toolbar.c;  ) > 3.7.5cvs24.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/toolbar.c b/src/toolbar.c
@@ -352,7 +352,7 @@ static void toolbar_parse_item(XMLFile *file, ToolbarType source)
 		if (g_utf8_collate(name, TOOLBAR_ICON_FILE) == 0) 
 			item->file = g_strdup (value);
 		else if (g_utf8_collate(name, TOOLBAR_ICON_TEXT) == 0)
-			item->text = g_strdup (gettext(value));
+			item->text = g_strdup (*value ? gettext(value):"");
 		else if (g_utf8_collate(name, TOOLBAR_ICON_ACTION) == 0)
 			item->index = toolbar_ret_val_from_text(value);
 		if (item->index == -1 && !strcmp(value, "A_DELETE")) {