[pan2: 264/268] Merge branch 'testing' into new_master
- From: Heinrich MÃller <henmull src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan2: 264/268] Merge branch 'testing' into new_master
- Date: Mon, 2 Jan 2012 16:00:11 +0000 (UTC)
commit 2a59865c9279232155fe577460c5b3c305557f7a
Merge: fe582d4 3a70a13
Author: Heinrich MÃller <henmull src gnome org>
Date: Mon Jan 2 13:22:22 2012 +0100
Merge branch 'testing' into new_master
Conflicts:
pan/gui/body-pane.cc
pan/gui/gui.cc
pan/gui/header-pane.cc
pan/gui/log-ui.cc
pan/gui/post-ui.cc
pan/gui/prefs.h
pan/gui/server-ui.cc
pan/gui/server-ui.h
INSTALL | 243 ++-
README | 21 +-
TODO | 199 --
configure.in | 91 +-
pan.cbp | 819 +++++
pan.png | Bin 4909 -> 3897 bytes
pan/data-impl/Makefile.am | 6 +-
pan/data-impl/add-server.cc | 26 +-
pan/data-impl/article-filter.cc | 4 +-
pan/data-impl/article-filter.h | 1 +
pan/data-impl/data-impl.cc | 104 +
pan/data-impl/data-impl.h | 107 +-
pan/data-impl/headers-test.cc | 12 +-
pan/data-impl/headers.cc | 15 +-
pan/data-impl/my-tree.cc | 160 +-
pan/data-impl/profiles.cc | 36 +-
pan/data-impl/rules-filter.cc | 111 +
pan/data-impl/rules-filter.h | 61 +
pan/data-impl/server.cc | 189 +-
pan/data-impl/speed-test-load-group.cc | 2 +-
pan/data-impl/task-archive.cc | 2 +-
pan/data-impl/xover.cc | 2 +
pan/data/Makefile.am | 31 +-
pan/data/article-cache.cc | 18 +-
pan/data/article-cache.h | 9 +-
pan/data/article.cc | 9 +
pan/data/cert-store.cc | 368 ++
pan/data/cert-store.h | 166 +
pan/data/data.cc | 2 +-
pan/data/data.h | 109 +-
pan/data/encode-cache.cc | 257 ++
pan/data/encode-cache.h | 122 +
pan/data/server-info.h | 18 +
pan/general/Makefile.am | 35 +-
pan/general/debug.cc | 2 +
pan/general/debug.h | 12 +-
pan/general/file-util.cc | 29 +-
pan/general/file-util.h | 5 +
pan/general/log.cc | 13 +-
pan/general/log.h | 10 +
pan/general/macros.h | 3 +
pan/general/progress.cc | 2 +
pan/general/worker-pool.cc | 1 +
pan/gui/Makefile.am | 11 +-
pan/gui/actions.cc | 67 +-
pan/gui/body-pane.cc | 346 ++-
pan/gui/body-pane.h | 52 +-
pan/gui/dl-headers-ui.cc | 2 +-
pan/gui/e-action-combo-box.h | 3 +
pan/gui/e-cte-dialog.c | 142 +
pan/gui/e-cte-dialog.h | 15 +
pan/gui/group-pane.cc | 9 +-
pan/gui/group-prefs-dialog.cc | 56 +-
pan/gui/group-prefs-dialog.h | 10 +-
pan/gui/gui.cc | 424 ++-
pan/gui/gui.h | 53 +-
pan/gui/header-pane.cc | 166 +-
pan/gui/header-pane.h | 22 +-
pan/gui/hig.cc | 3 +
pan/gui/log-ui.cc | 138 +-
pan/gui/log-ui.h | 4 +
pan/gui/my-valgrind.sh | 2 +-
pan/gui/pan-ui.h | 7 +
pan/gui/pan.cc | 375 ++-
pan/gui/pan.ui.h | 22 +-
pan/gui/post-ui.cc | 1394 +++++++-
pan/gui/post-ui.h | 154 +-
pan/gui/post.ui.h | 27 +-
pan/gui/prefs-ui.cc | 122 +-
pan/gui/prefs-ui.h | 4 +-
pan/gui/prefs.cc | 19 +
pan/gui/prefs.h | 8 +-
pan/gui/profiles-dialog.cc | 105 +-
pan/gui/profiles-dialog.h | 17 +-
pan/gui/save-attach-ui.cc | 320 ++
pan/gui/save-attach-ui.h | 82 +
pan/gui/save-ui.cc | 11 +-
pan/gui/score-add-ui.cc | 30 +-
pan/gui/server-ui.cc | 456 +++-
pan/gui/server-ui.h | 18 +
pan/gui/task-pane.cc | 317 ++-
pan/gui/task-pane.h | 22 +
pan/gui/taskpane.ui.h | 18 +
pan/tasks/Makefile.am | 42 +-
pan/tasks/decoder.cc | 24 +-
pan/tasks/decoder.h | 6 +-
pan/tasks/encoder.cc | 292 ++
pan/tasks/encoder.h | 111 +
pan/tasks/nntp-pool.cc | 43 +-
pan/tasks/nntp-pool.h | 26 +-
pan/tasks/nntp.cc | 152 +-
pan/tasks/nntp.h | 82 +-
pan/tasks/nzb-test.cc | 4 +-
pan/tasks/nzb.cc | 145 +-
pan/tasks/nzb.h | 13 +-
pan/tasks/queue.cc | 157 +-
pan/tasks/queue.h | 37 +-
pan/tasks/socket-impl-gio.cc | 131 +-
pan/tasks/socket-impl-gio.h | 12 +-
pan/tasks/socket-impl-main.cc | 158 +
pan/tasks/socket-impl-main.h | 155 +
pan/tasks/socket-impl-openssl.cc | 845 +++++
pan/tasks/socket-impl-openssl.h | 114 +
pan/tasks/socket.h | 9 +-
pan/tasks/task-article.cc | 46 +-
pan/tasks/task-article.h | 20 +-
pan/tasks/task-groups.cc | 3 +-
pan/tasks/task-groups.h | 5 +-
pan/tasks/task-post.cc | 11 +-
pan/tasks/task-upload.cc | 466 +++
pan/tasks/task-upload.h | 171 +
pan/tasks/task-weak-ordering.h | 19 +-
pan/tasks/task-xover.cc | 47 +-
pan/tasks/task-xover.h | 4 +
pan/tasks/task-xoverinfo.cc | 208 ++
pan/tasks/task-xoverinfo.h | 90 +
pan/tasks/task.cc | 30 +-
pan/tasks/task.h | 30 +-
pan/tasks/upload-queue.cc | 180 +
pan/tasks/upload-queue.h | 109 +
pan/usenet-utils/Makefile.am | 54 +-
pan/usenet-utils/MersenneTwister.h | 461 +++
pan/usenet-utils/blowfish.cc | 229 ++
pan/usenet-utils/blowfish.h | 79 +
pan/usenet-utils/blowfish_cyphers.h | 268 ++
pan/usenet-utils/filter-info.cc | 1 +
pan/usenet-utils/filter-info.h | 2 +-
pan/usenet-utils/gpg.cc | 136 +
pan/usenet-utils/gpg.h | 136 +
pan/usenet-utils/message-check.cc | 32 +-
pan/usenet-utils/message-check.h | 5 +-
pan/usenet-utils/mime-utils.cc | 893 ++++--
pan/usenet-utils/mime-utils.h | 49 +-
pan/usenet-utils/rules-info.cc | 115 +
pan/usenet-utils/rules-info.h | 88 +
pan/usenet-utils/ssl-utils.h | 249 ++
pan/usenet-utils/text-massager-test.cc | 920 +++---
pan/usenet-utils/text-massager.cc | 38 +-
pan/usenet-utils/text-massager.h | 2 +-
pan/usenet-utils/url-find.cc | 6 +-
po/am.po | 3126 ++++++++++-------
po/ar.po | 1846 +++++++----
po/az.po | 2937 ++++++++++-------
po/bg.po | 1955 ++++++++----
po/ca.po | 1951 +++++++----
po/cs.po | 1855 +++++++----
po/da.po | 1675 +++++++---
po/dz.po | 2706 ++++++++++------
po/el.po | 3964 +++++++++++++---------
po/en_CA.po | 3277 ++++++++++++-------
po/en_GB.po | 2026 ++++++++----
po/eo.po | 1609 ++++++---
po/es.po | 1647 ++++++----
po/et.po | 3798 +++++++++++++---------
po/eu.po | 1804 +++++++----
po/fi.po | 1956 ++++++++----
po/fr.po | 1736 +++++++----
po/ga.po | 3197 +++++++++++--------
po/gl.po | 3594 ++++++++++++---------
po/hr.po | 3709 ++++++++++++---------
po/hu.po | 3649 ++++++++++++---------
po/it.po | 3651 ++++++++++++--------
po/ja.po | 5735 ++++++++++++++++++++++++++++----
po/ko.po | 3678 ++++++++++++---------
po/lt.po | 3585 ++++++++++++---------
po/lv.po | 3663 ++++++++++++---------
po/ms.po | 3690 ++++++++++++---------
po/nb.po | 1963 ++++++++----
po/nl.po | 3716 ++++++++++++---------
po/oc.po | 1893 +++++++----
po/pl.po | 3701 ++++++++++++---------
po/pt.po | 1900 +++++++----
po/pt_BR.po | 2841 ++++++++++------
po/ro.po | 3693 ++++++++++++---------
po/ru.po | 5480 +++++++++++++++++++++++-------
po/sk.po | 3719 ++++++++++++---------
po/sq.po | 3683 ++++++++++++---------
po/sr.po | 3699 ++++++++++++---------
po/sr Latn po | 3685 ++++++++++++---------
po/sv.po | 2220 +++++++++----
po/tr.po | 3710 ++++++++++++---------
po/uk.po | 3688 ++++++++++++---------
po/vi.po | 2164 ++++++++-----
po/zh_CN.po | 1891 +++++++----
po/zh_TW.po | 3679 ++++++++++++---------
uulib/uudeview.h | 29 +-
uulib/uuencode.c | 3128 +++++++++++-------
uulib/uulib.c | 32 +-
uulib/uunconc.c | 46 +-
uulib/uuscan.c | 70 +-
190 files changed, 102008 insertions(+), 52886 deletions(-)
---
diff --cc pan/gui/body-pane.cc
index c6b7b46,1f432b4..84a914f
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@@ -24,7 -25,7 +25,6 @@@
extern "C" {
#include <glib/gi18n.h>
#include <pan/gui/gtk-compat.h>
- #include <gdk/gdkkeysyms.h>
- #include "gtk-compat.h"
#include <gmime/gmime.h>
}
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --cc pan/gui/gui.cc
index 99e89a8,16d772e..0b12152
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@@ -1639,7 -1860,7 +1860,6 @@@ void GUI :: do_read_selected_group (
char buf[256];
g_snprintf(buf, sizeof(buf), "%s//IGNORE", _prefs.get_string("default-charset", "UTF-8").c_str());
const char * to = g_mime_charset_iconv_name(buf);
--// if (strncmp (from, buf, strlen(from)) != 0)
{
if (iconv_inited)
iconv_close(conv);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
