[Commits] [SCM] claws branch, gtk3tree, updated. 4.0.0-429-g38b44fa53

thorsten at claws-mail.org thorsten at claws-mail.org
Mon Nov 8 11:01:24 CET 2021


The branch, gtk3tree has been updated
       via  38b44fa531a334840fae2b48f2c183816b955ffd (commit)
       via  1b9711497fb9caf525bd513abbe64bc2eb34963c (commit)
       via  4967f15fd57f7e48ae5f3bd749ee6665ebdafb9d (commit)
       via  c2fa37c1923d553c81fbdceeb023a0bd8f4491f6 (commit)
       via  7e9e3dc1d266f12a317d7b2b7f3299f710457307 (commit)
       via  1af27911f461538f492be1d5b32aafac5ec5c361 (commit)
       via  f54996a2a98aa1ea9072f3678c7ecc35d80e7c79 (commit)
       via  1a59bfc48a858aba259bb14c6cc3c901650c761c (commit)
       via  2d5fca2a39f97a2e6b0865ea9480ae0baa7e7b23 (commit)
       via  f9c2a443074f2c54f6fba1c54af6b53a8dc410aa (commit)
       via  86fcec37b5085d309276978f527ed78314b06608 (commit)
       via  2abc7b175058e182cf3e4b3fde36329497c9ff0c (commit)
       via  7eb44fab06cca53ccd8af89b00e75ed2e8e41f8d (commit)
       via  da970984adaeb7b5c31dd5b025bd4d3c0ca455b1 (commit)
       via  4dc91617c4114b78825c51069c923d410b9dc16b (commit)
       via  f958752b2977e2ed0d43dc9766dd74f69e8fff18 (commit)
       via  e700a32e8f79308d289e1e3c9bea9d482da2ca6c (commit)
       via  f6eff41a7d3f0368198a671fd4b4e79089cbd066 (commit)
       via  cb6b97b6c43027330d2cbc19af86f53487cfecf2 (commit)
       via  993bb4afaaee499946d5f7f7785293a225ae08e7 (commit)
       via  617596d534c39e1d523bccb2d0019b23bfce17c4 (commit)
       via  1559337f7c5b42a54e824cf21bd39835998c5a35 (commit)
       via  6df5a3adb6da715fa136a41c4f81ce4c2b079c27 (commit)
       via  78de2d36bee076116e2ce45f55318ddfe81d5d1b (commit)
       via  5082e914b7afdc9b211ae0c4cc0347f8a933e0ad (commit)
       via  e26fd7e6d4604d6e1dce78cfcdaa8be1cc7d9fc7 (commit)
       via  c64353ee158b1cc4447cb23bde4d803af6e61153 (commit)
      from  d02ea2c207e41a46791e211cb975fd6434e3f220 (commit)

Summary of changes:
 configure.ac                                       | 63 +++++++++++-----------
 src/Makefile.am                                    |  3 ++
 src/addrcache.c                                    |  2 +
 src/addrclip.c                                     |  2 +
 src/addressbook.c                                  |  5 --
 src/addritem.c                                     |  2 +
 src/addrquery.c                                    |  2 +
 src/addrselect.c                                   |  2 +
 src/common/file-utils.h                            |  1 -
 src/common/mgutils.c                               |  2 +
 src/common/passcrypt.c                             |  6 +--
 src/common/pkcs5_pbkdf2.c                          |  2 +
 src/common/progressindicator.c                     |  2 +
 src/common/proxy.h                                 |  4 --
 src/common/quoted-printable.c                      |  2 +
 src/common/socket.c                                |  6 +--
 src/common/socket.h                                |  4 --
 src/common/stringtable.c                           |  2 +
 src/common/template.c                              |  1 +
 src/common/tests/codeconv_test.c                   |  2 +
 src/common/tests/md5_test.c                        |  2 +
 src/common/tests/pkcs5_pbkdf2_test.c               |  2 +
 src/common/tests/unmime_test.c                     |  2 +
 .../utils_get_serverportfp_from_filename_test.c    |  2 +
 src/common/tests/utils_get_uri_part_test.c         |  2 +
 src/common/tests/xml_test.c                        |  2 +
 src/common/utils.c                                 | 32 ++++++-----
 src/common/utils.h                                 |  5 +-
 src/common/uuencode.c                              |  2 +
 src/common/w32_reg.c                               |  2 +
 src/etpan/etpan-ssl.h                              |  1 -
 src/etpan/imap-thread.c                            |  4 --
 src/filtering.c                                    |  1 +
 src/foldersel.c                                    |  1 +
 src/folderutils.c                                  |  2 +
 src/folderview.c                                   |  4 ++
 src/gtk/colorlabel.c                               |  1 +
 src/gtk/foldersort.c                               |  1 +
 src/gtk/gtksctree.c                                |  2 +
 src/gtk/gtkutils.c                                 | 61 ---------------------
 src/gtk/manage_window.c                            |  2 +
 src/ldif.c                                         |  2 +
 src/localfolder.c                                  |  2 +
 src/main.c                                         | 11 ++--
 src/mainwindow.c                                   |  9 ++--
 src/messageview.c                                  |  1 +
 src/mutt.c                                         |  2 +
 src/password.h                                     |  4 --
 src/password_gtk.h                                 |  4 --
 src/pine.c                                         |  2 +
 src/plugins/demo/demo.c                            |  2 +
 src/plugins/fancy/fancy_viewer.c                   |  2 +
 src/plugins/libravatar/libravatar_cache.c          |  2 +
 src/plugins/libravatar/libravatar_federation.c     |  2 +
 src/plugins/libravatar/libravatar_missing.c        |  2 +
 src/plugins/litehtml_viewer/lh_viewer.c            | 40 +-------------
 src/plugins/litehtml_viewer/lh_widget_text.cpp     |  2 +
 src/plugins/mailmbox/carray.c                      |  2 +
 src/plugins/mailmbox/chash.c                       |  2 +
 src/plugins/mailmbox/clist.c                       |  2 +
 src/plugins/mailmbox/mailimf_types.c               |  2 +
 src/plugins/mailmbox/mailimf_types_helper.c        |  2 +
 src/plugins/mailmbox/maillock.c                    |  2 +
 src/plugins/mailmbox/mailmbox_parse.c              |  2 +
 src/plugins/mailmbox/mailmbox_types.c              |  2 +
 src/plugins/mailmbox/mmapstring.c                  |  2 +
 src/plugins/managesieve/managesieve.c              |  2 +
 src/plugins/managesieve/sieve_plugin.c             |  2 +
 src/plugins/newmail/newmail.c                      |  2 +
 .../notification/gtkhotkey/gtk-hotkey-error.c      |  2 +
 .../notification/gtkhotkey/gtk-hotkey-info.c       |  2 +
 .../gtkhotkey/gtk-hotkey-key-file-registry.c       |  2 +
 .../notification/gtkhotkey/gtk-hotkey-listener.c   |  2 +
 .../notification/gtkhotkey/gtk-hotkey-marshal.c    |  2 +
 .../notification/gtkhotkey/gtk-hotkey-registry.c   |  2 +
 .../notification/gtkhotkey/gtk-hotkey-utils.c      |  2 +
 .../gtkhotkey/gtk-hotkey-x11-listener.c            |  2 +
 .../notification/gtkhotkey/x11/eggaccelerators.c   |  2 +
 .../notification/gtkhotkey/x11/tomboykeybinder.c   |  2 +
 src/plugins/notification/notification_banner.h     |  1 -
 src/plugins/notification/notification_command.h    |  1 -
 .../notification/notification_foldercheck.h        |  1 -
 src/plugins/notification/notification_hotkeys.h    |  1 -
 src/plugins/notification/notification_indicator.h  |  1 -
 src/plugins/notification/notification_lcdproc.h    |  1 -
 src/plugins/notification/notification_pixbuf.c     |  2 +
 src/plugins/notification/notification_plugin.h     |  1 -
 src/plugins/notification/notification_popup.h      |  1 -
 src/plugins/notification/notification_prefs.c      | 18 -------
 src/plugins/notification/notification_prefs.h      |  1 -
 src/plugins/notification/notification_trayicon.h   |  1 -
 src/plugins/pdf_viewer/poppler_viewer.h            |  4 --
 src/plugins/pgpcore/tests/pgp_utils_test.c         |  2 +
 src/plugins/pgpinline/pgpinline.c                  |  2 -
 src/plugins/python/accounttype.c                   | 10 ----
 src/plugins/python/clawsmailmodule.c               |  3 +-
 src/plugins/python/python-shell.c                  |  3 ++
 src/plugins/python/python_plugin.c                 | 38 -------------
 src/plugins/rssyl/libfeed/date.c                   |  3 --
 src/plugins/rssyl/libfeed/feed.c                   |  2 +-
 src/plugins/rssyl/libfeed/feeditem.c               |  2 +-
 src/plugins/rssyl/libfeed/feeditemenclosure.c      |  2 +-
 src/plugins/rssyl/libfeed/parser_atom10.c          |  3 +-
 src/plugins/rssyl/libfeed/parser_opml.c            |  2 +
 src/plugins/rssyl/libfeed/parser_rdf.c             |  3 +-
 src/plugins/rssyl/libfeed/parser_rss20.c           |  3 +-
 src/plugins/rssyl/libfeed/tests/date_test.c        |  2 +
 src/plugins/rssyl/libfeed/tests/feed_test.c        |  2 +
 src/plugins/rssyl/old_feeds.c                      |  2 +
 src/plugins/rssyl/tests/strutils_test.c            |  2 +
 src/plugins/spamassassin/utils.c                   |  2 +
 src/plugins/vcalendar/claws.def                    |  1 +
 src/plugins/vcalendar/vcal_folder.c                | 11 +---
 src/prefs_common.h                                 |  1 -
 src/prefs_proxy.c                                  |  2 +
 src/prefs_template.c                               |  1 +
 src/privacy.c                                      |  2 +
 src/procmime.c                                     |  4 ++
 src/procmsg.c                                      |  1 +
 src/remotefolder.c                                 |  2 +
 src/sourcewindow.c                                 |  1 +
 src/summaryview.c                                  |  1 +
 src/summaryview.h                                  |  4 --
 src/tests/entity_test.c                            |  2 +
 124 files changed, 233 insertions(+), 303 deletions(-)


- Log -----------------------------------------------------------------
commit 38b44fa531a334840fae2b48f2c183816b955ffd
Merge: d02ea2c20 1b9711497
Author: Thorsten Maerz <info at netztorte.de>
Date:   Mon Nov 8 11:00:12 2021 +0100

    Merge remote-tracking branch 'origin/gtk3' into gtk3tree

diff --cc src/folderview.c
index c953ced7b,53a301de0..bd8e9d3f4
--- a/src/folderview.c
+++ b/src/folderview.c
@@@ -16,32 -16,56 +16,36 @@@
   * along with this program. If not, see <http://www.gnu.org/licenses/>.
   */
  
+ #include "config.h"
+ #include "defs.h"
+ 
+ #include <glib.h>
  #include <glib/gi18n.h>
 -#include <gdk/gdkkeysyms.h>
  #include <gtk/gtk.h>
 -#include <stdio.h>
 -#include <string.h>
 -#include <stdlib.h>
  
 -#include "main.h"
 -#include "mainwindow.h"
 -#include "folderview.h"
 -#include "summaryview.h"
 -#include "summary_search.h"
 -#include "inputdialog.h"
 -#include "manage_window.h"
 -#include "alertpanel.h"
 -#include "menu.h"
 -#include "stock_pixmap.h"
 -#include "procmsg.h"
 -#include "utils.h"
 -#include "gtkutils.h"
 -#include "prefs_common.h"
 -#include "prefs_account.h"
 -#include "prefs_filtering.h"
 -#include "prefs_folder_item.h"
  #include "account.h"
 -#include "folder.h"
 -#include "foldersel.h"
 -#include "inc.h"
 -#include "statusbar.h"
 -#include "hooks.h"
 +#include "alertpanel.h"
 +#include "folder_item_prefs.h"
  #include "folderutils.h"
 +#include "folderview.h"
 +#include "inc.h"
 +#include "manual.h"
  #include "partial_download.h"
 +#include "prefs_common.h"
 +#include "prefs_folder_item.h"
  #include "prefs_folder_column.h"
 -#include "filtering.h"
 -#include "quicksearch.h"
 -#include "manual.h"
 -#include "timing.h"
 -#include "log.h"
 -#include "gtkcmctree.h"
 +#include "statusbar.h"
 +#include "stock_pixmap.h"
 +#include "summary_search.h"
  
 -#define COL_FOLDER_WIDTH	150
 -#define COL_NUM_WIDTH		32
 +#include "common/defs.h"
 +#include "common/hooks.h"
 +#include "common/timing.h"
 +#include "common/utils.h"
  
 -static GList *folderview_list = NULL;
 +#include "gtk/menu.h"
  
 -static GtkStyle *bold_style;
 +static GList *folderview_list = NULL;
  
  static GdkPixbuf *inboxxpm;
  static GdkPixbuf *inboxhrmxpm;

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list