+2006-01-25 [colin] 1.9.100cvs186
+
+ * src/folder.c
+ * src/mainwindow.c
+ Fix subscribed folders not found
+ * src/compose.c
+ Don't try to encode as original mail's charset
+ if it's ascii
+
2006-01-25 [paul] 1.9.100cvs185
* AUTHORS
( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/glossary.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/dist/html/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/dist/pdf/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/dist/ps/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/dist/txt/Makefile.am; ) > 1.9.100cvs183.patchset
( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/glossary.xml; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/keyboard.xml; cvs diff -u -r 1.60.2.23 -r 1.60.2.24 po/es.po; ) > 1.9.100cvs184.patchset
( cvs diff -u -r 1.100.2.33 -r 1.100.2.34 AUTHORS; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 po/Makevars; cvs diff -u -r 1.58.2.18 -r 1.58.2.19 po/de.po; cvs diff -u -r 1.10.2.8 -r 1.10.2.9 po/pl.po; cvs diff -u -r 1.50.2.14 -r 1.50.2.15 po/pt_BR.po; cvs diff -u -r 1.17.2.16 -r 1.17.2.17 po/sr.po; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/authors.h; ) > 1.9.100cvs185.patchset
+( cvs diff -u -r 1.213.2.77 -r 1.213.2.78 src/folder.c; cvs diff -u -r 1.274.2.92 -r 1.274.2.93 src/mainwindow.c; cvs diff -u -r 1.382.2.229 -r 1.382.2.230 src/compose.c; ) > 1.9.100cvs186.patchset
MICRO_VERSION=100
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=185
+EXTRA_VERSION=186
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
test_conv_global_out = conv_codeset_strdup(chars, src_codeset, out_codeset);
}
- if (!test_conv_global_out && compose->orig_charset) {
+ if (!test_conv_global_out && compose->orig_charset
+ && strcmp(compose->orig_charset, CS_US_ASCII)) {
out_codeset = compose->orig_charset;
debug_print("failure; trying to convert to %s\n", out_codeset);
test_conv_reply = conv_codeset_strdup(chars, src_codeset, out_codeset);
if (!test_conv_global_out && !test_conv_reply) {
/* we're lost */
out_codeset = CS_INTERNAL;
- debug_print("finally using %s\n", out_codeset);
+ debug_print("failure; finally using %s\n", out_codeset);
}
g_free(test_conv_global_out);
g_free(test_conv_reply);
WantSyncData *want_sync_data = (WantSyncData *)data;
if (want_sync_data->folder == NULL || item->folder == want_sync_data->folder) {
- if(item->prefs->offlinesync && item->folder->klass->synchronise)
- want_sync_data->want_sync = TRUE;
- else
- want_sync_data->want_sync = FALSE;
+ if (item->prefs->offlinesync && item->folder->klass->synchronise)
+ want_sync_data->want_sync |= TRUE;
}
}
WantSyncData *want_sync_data = g_new0(WantSyncData, 1);
gboolean result;
want_sync_data->folder = folder;
+ want_sync_data->want_sync = FALSE;
folder_func_to_all_folders(folder_item_want_synchronise_func, want_sync_data);
result = want_sync_data->want_sync;
if (offline_ask_sync && ask && alertpanel(_("Folder synchronisation"),
_("Do you want to synchronise your folders now?"),
- GTK_STOCK_CANCEL, _("_Synchronise"), NULL) != G_ALERTALTERNATE)
+ GTK_STOCK_CANCEL, _("+_Synchronise"), NULL) != G_ALERTALTERNATE)
return;
folder_synchronise(NULL);