talons

commit 80378635c6adeec013e0fe48ec889ff2893bf823
parent 88a058f0a73d03f049de24f7729c9466f162d0f5
Author: Ricardo Mones <mones@claws-mail.org>
Date:   Fri, 13 Jun 2008 15:26:22 +0000

2008-06-13 [mones]	3.4.0cvs96

	* src/autofaces.c
		Fix crasher ;-)
	* src/prefs_filtering_action.c
		Fixed cosmetic bug, processing also displays "Filtering"

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/autofaces.c
 | 
2
+-
M
src/prefs_filtering_action.c
 | 
2
+-

5 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-13 [mones]	3.4.0cvs96
+
+	* src/autofaces.c
+		Fix crasher ;-)
+	* src/prefs_filtering_action.c
+		Fixed cosmetic bug, processing also displays "Filtering"
+
 2008-06-13 [mones]	3.4.0cvs95
 
 	* src/Makefile.am
diff --git a/PATCHSETS b/PATCHSETS
@@ -3391,3 +3391,4 @@
 ( cvs diff -u -r 1.60.2.118 -r 1.60.2.119 src/addressbook.c;  ) > 3.4.0cvs93.patchset
 ( cvs diff -u -r 1.8.2.6 -r 1.8.2.7 .cvsignore;  cvs diff -u -r 1.1.2.56 -r 1.1.2.57 src/imap_gtk.c;  cvs diff -u -r 1.2.2.30 -r 1.2.2.31 src/mh_gtk.c;  cvs diff -u -r 1.204.2.171 -r 1.204.2.172 src/prefs_common.c;  cvs diff -u -r 1.103.2.109 -r 1.103.2.110 src/prefs_common.h;  cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/inputdialog.h;  ) > 3.4.0cvs94.patchset
 ( cvs diff -u -r 1.155.2.87 -r 1.155.2.88 src/Makefile.am;  diff -u /dev/null src/autofaces.c;  diff -u /dev/null src/autofaces.h;  cvs diff -u -r 1.382.2.452 -r 1.382.2.453 src/compose.c;  ) > 3.4.0cvs95.patchset
+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/autofaces.c;  cvs diff -u -r 1.1.4.52 -r 1.1.4.53 src/prefs_filtering_action.c;  ) > 3.4.0cvs96.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=95
+EXTRA_VERSION=96
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/autofaces.c b/src/autofaces.c
@@ -33,7 +33,7 @@ gint get_content_for_any_face(gchar *buf, gint len, gchar *anyname, gint maxlen)
 	gchar *xfile;
 	gint  lastc;
 
-	xfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR, AUTOFACES_DIR,
+	xfile = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, AUTOFACES_DIR,
 	                    G_DIR_SEPARATOR_S, anyname, NULL);
 	buf[0] = '\0';
 	if ((xfp = fopen(xfile, "rb")) == NULL) {
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
@@ -385,7 +385,7 @@ static void prefs_filtering_action_create(void)
 	gtk_widget_grab_default(ok_btn);
 
 	gtk_window_set_title(GTK_WINDOW(window),
-			     _("Filtering action configuration"));
+			     _("Action configuration"));
 	g_signal_connect(G_OBJECT(window), "delete_event",
 			 G_CALLBACK(prefs_filtering_action_deleted), NULL);
 	g_signal_connect(G_OBJECT(window), "size_allocate",