talons

commit b05b0ed4257b1fd1af2722909eef8fb4b5490d80
parent d302656d3a69da8c2d626257f7305acd13b24b28
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Sun, 21 Mar 2010 18:46:31 +0000

2010-03-21 [pawel]	3.7.5cvs35

	* src/addrgather.c
		Remove superfluous gtk_widget_show_all()
	* src/mimeview.c
		Add forgotten colon
	* src/common/utils.c
		Return correct type

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/addrgather.c
 | 
2
--
M
src/common/utils.c
 | 
2
+-
M
src/mimeview.c
 | 
4
++--

6 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-21 [pawel]	3.7.5cvs35
+
+	* src/addrgather.c
+		Remove superfluous gtk_widget_show_all()
+	* src/mimeview.c
+		Add forgotten colon
+	* src/common/utils.c
+		Return correct type
+
 2010-03-21 [pawel]	3.7.5cvs34
 
 	* src/main.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3975,3 +3975,4 @@
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/de/glossary.xml;  ) > 3.7.5cvs32.patchset
 ( cvs diff -u -r 1.5.2.29 -r 1.5.2.30 po/zh_CN.po;  ) > 3.7.5cvs33.patchset
 ( cvs diff -u -r 1.115.2.225 -r 1.115.2.226 src/main.c;  cvs diff -u -r 1.1.2.89 -r 1.1.2.90 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/quicksearch.h;  ) > 3.7.5cvs34.patchset
+( cvs diff -u -r 1.5.10.30 -r 1.5.10.31 src/addrgather.c;  cvs diff -u -r 1.83.2.160 -r 1.83.2.161 src/mimeview.c;  cvs diff -u -r 1.36.2.183 -r 1.36.2.184 src/common/utils.c;  ) > 3.7.5cvs35.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=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/addrgather.c b/src/addrgather.c
@@ -480,8 +480,6 @@ static void addrgather_dlg_create(void)
 	gtk_window_set_default_size(GTK_WINDOW(window), prefs_common.addrgather_width,
 				    prefs_common.addrgather_height);
 
-	gtk_widget_show_all(vbox);
-
 	addrgather_dlg.window     = window;
 	addrgather_dlg.notebook   = notebook;
 	addrgather_dlg.btnOk      = btnOk;
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -1128,7 +1128,7 @@ static const gchar * line_has_quote_char_last(const gchar * str, const gchar *qu
 	int i;
 
 	if (quote_chars == NULL)
-		return FALSE;
+		return NULL;
 
 	for (i = 0; i < strlen(quote_chars); i++) {
 		tmp_pos = strrchr (str,	quote_chars[i]);
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -2352,12 +2352,12 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
 #if GTK_CHECK_VERSION(2,12,0)
 		tiptmp = g_strconcat(tip, "\n<b>",
 				prefs_common.attach_desc && mimeinfo->description ?
-				_("Description") : _("Filename:"),
+				_("Description:") : _("Filename:"),
 				" </b>", tmp, NULL);
 #else
 		tiptmp = g_strconcat(tip, "\n",
 				prefs_common.attach_desc && mimeinfo->description ?
-				_("Description") : _("Filename:"),
+				_("Description:") : _("Filename:"),
 				" ", tmp, NULL);
 #endif
 		g_free(tip);