2006-08-28 [paul] 2.4.0cvs104
authorPaul Mangan <paul@claws-mail.org>
Mon, 28 Aug 2006 12:10:36 +0000 (12:10 +0000)
committerPaul Mangan <paul@claws-mail.org>
Mon, 28 Aug 2006 12:10:36 +0000 (12:10 +0000)
* src/mh.c
fix data loss when moving to another
mailbox fails
* src/prefs_spelling.c
improve the english
* src/gtk/pluginwindow.c
improve the layout of the dialog text
All thanks to Colin

ChangeLog
PATCHSETS
configure.ac
src/gtk/pluginwindow.c
src/mh.c
src/prefs_spelling.c

index 8ce1b57..e4be030 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-08-28 [paul]      2.4.0cvs104
+
+       * src/mh.c
+               fix data loss when moving to another
+               mailbox fails
+       * src/prefs_spelling.c
+               improve the english
+       * src/gtk/pluginwindow.c
+               improve the layout of the dialog text
+       All thanks to Colin
+
 2006-08-28 [paul]      2.4.0cvs103
 
        * src/plugins/bogofilter/bogofilter.c
index a20c998..37f34e7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/bogofilter/Makefile.am;  ) > 2.4.0cvs101.patchset
 ( cvs diff -u -r 1.654.2.1840 -r 1.654.2.1841 configure.ac;  cvs diff -u -r 1.6.2.8 -r 1.6.2.9 po/Makefile.in.in;  cvs diff -u -r 1.1.4.2 -r 1.1.4.3 po/Makevars;  ) > 2.4.0cvs102.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/bogofilter/bogofilter_gtk.c;  ) > 2.4.0cvs103.patchset
+( cvs diff -u -r 1.79.2.39 -r 1.79.2.40 src/mh.c;  cvs diff -u -r 1.5.2.24 -r 1.5.2.25 src/prefs_spelling.c;  cvs diff -u -r 1.5.2.34 -r 1.5.2.35 src/gtk/pluginwindow.c;  ) > 2.4.0cvs104.patchset
index d4d3959..46cc1d6 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=103
+EXTRA_VERSION=104
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 8ba5599..008c7ae 100644 (file)
@@ -195,9 +195,11 @@ static void load_cb(GtkButton *button, PluginWindow *pluginwindow)
                        if (!file) continue;
                        plugin_load(file, &error);
                        if (error != NULL) {
+                               gchar *basename = g_path_get_basename(file);
                                alertpanel_error(
-                               _("The following error occured while loading the plugin [%s] :\n%s\n"),
-                               file, error);
+                               _("The following error occured while loading %s :\n\n%s\n"),
+                               basename, error);
+                               g_free(basename);
                                g_free(error);
                        }
 
index e3753cc..d88d2f6 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -644,6 +644,8 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
 
        for (cur = msglist; cur; cur = cur->next) {
                MsgInfo *msginfo = (MsgInfo *)cur->data;
+               GTuples *tuples;
+               gint num;
                if (msginfo == NULL)
                        continue;
                if (MSG_IS_MOVE(msginfo->flags) && MSG_IS_MOVE_DONE(msginfo->flags)) {
@@ -656,6 +658,14 @@ static gint mh_remove_msgs(Folder *folder, FolderItem *item,
                                GTK_EVENTS_FLUSH();
                        curnum++;
                }
+
+               if (relation) {
+                       tuples = g_relation_select(relation, msginfo, 0);
+                       num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
+                       g_tuples_destroy(tuples);
+                       if (num <= 0)
+                               continue;
+               }
                file = g_strconcat(path, G_DIR_SEPARATOR_S, itos(msginfo->msgnum), NULL);
                if (file == NULL)
                        continue;
index 4052b51..d647ced 100644 (file)
@@ -196,7 +196,7 @@ void prefs_spelling_create_widget(PrefsPage *_page, GtkWindow *window, gpointer
        gtk_tooltips_set_tip(tooltips, use_alternate_checkbtn, 
                        _("Faster switching with last used dictionary"), NULL);
 
-       PACK_FRAME(vbox1, path_frame, _("Dictionary path"));
+       PACK_FRAME(vbox1, path_frame, _("Path to dictionaries"));
        aspell_path_hbox = gtk_hbox_new(FALSE, 8);
        gtk_widget_show(aspell_path_hbox);
        gtk_container_add(GTK_CONTAINER(path_frame), aspell_path_hbox);