2008-06-13 [mones] 3.4.0cvs96

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

diff --git a/ChangeLog b/ChangeLog
index af63c7322bfb0c3bceb9cfc80a33e073c2cb0814..05eb1a273b0baa157d67fc875d0e52395b92ef51 100644 (file)
--- 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
 2008-06-13 [mones]     3.4.0cvs95
 
        * src/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 22e4f33d6ce6f12c9a20cf960ad95dd189be3f7f..85672fc21f547038f4078742448099a03ac1c0bb 100644 (file)
--- 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.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
index a5b9321695b803a95859431bdcff403d5f70afa1..080299ed9227176b67200fca2ae0d8a9d7867a42 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=95
+EXTRA_VERSION=96

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/autofaces.c b/src/autofaces.c
index 110ccc1ffcf71187615e964d4523cb18b7ac3ff7..6582bb6e421078526c0501af334cf732b0d6a592 100644 (file)
--- 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;
 
        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) {
                            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
index 2c157afcd1278c3776204581c4edab1fd0f292a1..0d67298f29e57ca522d4611849101c1fcf1b0d78 100644 (file)
--- 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),
        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",
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(prefs_filtering_action_deleted), NULL);
        g_signal_connect(G_OBJECT(window), "size_allocate",