[balsa] (511 commits) Non-fast-forward update to branch wip/gtk4

[Peter Bloomfield <peterb src gnome org>]

The branch 'wip/gtk4' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  85baf00... First cut at porting to Gtk version 4
  2560555... Fix one more file
  0f71224... Another fix
  259942e... Another fix
  b82b252... Another fix
  855aa5c... and another
  b69455b... Update German translation
  9fd2134... Fix gpgme-related files
  c08e04d... Adapt to new "size-allocate" signal
  83b7e13... Do not report a horizontal baseline
  7cb19a7... Color button signal changed
  94505dd... Fix quitting
  c3a023f... Fix quitting
  91d1f97... One-click mailbox selection
  3e0eba7... Fix tree coords
  3c1c344... More mblist fixes
  61f1c19... 1
  8dec58c... Use single_click activation for the mblist
  b28455b... tree_view is undefined
  6173355... Variable set but not used
  6b7969c... Use single-click in the address-view
  908776c... Align strings correctly in preference manager
  d99ca10... Make sure progress bar is visible
  a6c40b0... Fix identity dialog string alignments
  8663609... Fix the toolbar prefs dialog
  87d7dfc... Make main window's menubar visible
  f3d25e7... Bump gtk-required to 4.0
  b2543a3... Update Spanish translation
  4a20a3a... Clean up meson.build
  75bc8e1... Updated Danish translation
  4099b71... Make default meson options buildable and runnable
  49a679f... Remove unused conditionally compiled code
  a5b7505... Update German translation
  a3a8219... Update German translation
  fd7beaf... Update GtkSourceView dependency to 4.0
  56e73c9... Fix GtkSourceView dependency
  62f5151... Correctly document default values of options
  6ef0c6f... Improve layout of address book dialog
  2c3d347... Update German translation
  b866cb8... GTK_IMAGE_PIXBUF has been removed
  7deda7e... gtk_image_get_pixbuf is deprecated
  db1f7e2... Export cairo_print_surface
  cb1fd9e... Fix function name
  075a8ac... Fix errors
  a00d4d8... Deconstify
  378d9a1... Use cairo_print_surface to print a pixbuf
  2d09176... Add semicolon
  c62f59a... Use gdk_cairo_surface_create_from_pixbuf
  a4419f1... Bump glib dependency to 2.54
  64e9a5d... Use a GtkLabel to measure character width
  21ead5a... Streamline code
  1ae4cfa... Use gdk_cursor_new_from_name
  4e73f77... New API for gdk_cursor_new_from_name
  d127ca8... Remove unused variable
  6648a07... gtk_text_view_get_window has been removed
  971471a... Use G_N_ELEMENTS macro
  366f9e3... Fix pixmaps install path
  44c3251... Install appstream metadata to recommended location
  af5fe49... Fix some icon issues
  a906842... Do not connect to NULL widget
  4c98f57... Streamline code in balsa-mime-widget-image.c
  f290203... Fix the build
  cc32fc9... The logo in the "about" dialog is now a GdkTexture
  5dfaef4... Fix XML tags in po file
  63c992a... Let canberra find the default screen
  54f9958... Updated Danish translation
  23a863d... Gtk icon and drag-and-drop updates
  1dfa5ac... Map the pixmap id
  67883ea... More drag-and-drop changes
  4fdf2c7... Use gdk_atom_intern_static_string
  8be951f... Do not use g_list_next or g_list_first
  8672224... Prettify the summary
  4fe0792... The border-width property has gone
  6da002e... Put margin on box
  943e31e... Do not crash with no spell-checker dictionaries
  fc8f7ac... Yet more drag-and-drop changes
  bc0263e... Expand lists in address book window
  d3784f0... Fix documentation
  5e7f9f0... Remove a webkitgtk workaround
  c94ea17... Clipboard API changed
  383ee78... Get pointer coords from the GdkEvent if possible
  1a6e00b... Simplify making the over-url popup menu
  92a86bd... Make BalsaMimeWidgetText a subclass
  9219f32... Change progress dialog geometry
  cf6486b... Cast g_object_ref() arguments
  9064f76... Revise configuration of enchant spell-checking lib
  a3392f8... Remove "delete" argument from gtk_drag_finish()
  6eb03dd... Avoid possible repeated dynamic cast
  eb86fc4... GdkAtom is no more
  1c3e023... Use GtkEventController API() to get a widget
  cc26b23... Fix the remaining "size-allocate" callbacks
  b53e6d3... Fix the build
  d138e51... Use a GtkGesture instead of "button-press-event"
  a12336a... Do not limit the gesture to GDK_BUTTON_SECONDARY
  4848042... Use a GtkGesture instead of "button-press-event"
  67ebc30... Use a GtkGesture instead of "button-press-event"
  d9f1770... Use a GtkGesture instead of "button-press-event"
  ef77b71... Use a GtkGesture instead of "button-press-event"
  4fc8205... Use a GtkGesture instead of "button-press-event"
  b07eed4... Use the same data name for all gestures
  ff03cf7... Do not try to implement a shift-f10 popup menu
  34ae71b... Use the gesture's "released" signal
  3d13ef7... Use GtkEventControllerMotion's signals
  4f268b4... Update Spanish translation
  9080540... Use a tree-view's "row-activated" signal
  ef46810... Emit "rows-reordered" directly
  ce43cf4... Set the log-domain to "Balsa"
  8832901... gtk_font_button_get_font_name is no more
  ea15ac1... Replace gtk_font_button_set_show_size()
  92be986... Update Spanish translation
  a1772da... Fix a use-after-free bug
  4eacdda... pref-manager: Use GtkFontChooser API better
  ae56182... Enable multi-threaded POP3 retrieval
  9fb060a... Use g_{clear,set}_object
  ee48174... Use g_set_object to store icons
  6814a92... Cleanup some dispose and finalize methods
  56000fc... Use libbalsa_clear_source_id()
  e840ab8... Make libbalsa_clear_source_id() gboolean
  bfcebb6... mailbox: store the attach icons correctly
  f2bfd1a... Use various convenience functions
  7ec211a... net-client-smtp: Move the "QUIT" command
  1dcec52... Update Polish translation
  73aaa5a... Update Brazilian Portuguese translation
  cab81e4... mailbox-pop3: Fix progress dialogue on error
  3bb4f73... Various events have been removed
  3aa647f... cell-renderer-button: Drop a redundant variable
  328fec4... Improve low-level network library
  94ed2ed... libnetclient: Restore the dispose/finalize split
  59790d0... Improve replying to html-only messages
  1885ab0... Meson build system changes
  d45eacc... Meson build system changes
  999b741... Do not set global log domain
  630cc03... Reimplement LabBalsaAddressView
  a38b4ee... address-view: Grab focus only for blank row
  efa0fa9... address-view: Clean up
  c2ab1d1... Implement LibBalsaAddressViewEntry
  cd301b0... Test for <locale.h> and set HAVE_LOCALE_H if found
  47aea6b... meson.build: Fix the definition of HAVE_CTIME_R
  7d9f525... Use Unicode quotation marks
  23e52c0... Rewrite the class definitions of BalsaMimeWidget*
  871f68a... Updated Czech translation
  b9db4b1... libbalsa-progress: gdk_threads_* have gone away
  e7ccb6a... Update German translation
  7fdc152... mblist: Use single-click mode on all mailbox lists
  2cb7e8b... mime-widget-image: No longer a subclass
  755590d... libbalsa-progress: Add a margin
  3133c0e... mime-widget: Use getter for private data
  2998d9c... Fix a use-after-free bug
  9d19753... Fix two use-after-free false positives
  2f82ff6... Check for zero-length array
  ce05b6f... mailbox: Assign MailboxView structure explicitly
  8801684... print-object-text: Assign PhraseRegion explicitly
  610ee65... balsa-index: Plug a leak
  667eb8a... Do not leak cbdata
  5395172... Do not leak new_item
  ae7a694... Avoid a spurious use-after-free warning
  c88be42... Assert that class getters do not return NULL
  7fd5647... More g_object_ref fallout
  a380eda... mime-widget-image: simplify showing the image
  28a7a3d... mime-widget-image: Make it subclass BalsaMimeWidget
  bd518b3... Remove stray blank line
  b911580... mime-widget-text: use the object better
  f0b3228... mime-widgets: Drop some queuing of resizes
  56fa22d... Clean up generated marshalling files
  6af0b2d... Remove obsolete comment
  60d3828... Crypto performance improvements
  9c4f745... Fix the build
  97a2fbc... Update POTFILES.in
  ea76592... Update Polish translation
  e968b93... Albrecht Dreß authored the earlier crypto commit
  7f82f32... address-book: Declare it derivable
  a725326... address-book-text: Declare it derivable
  467a81e... address-book-extern: Declare it final
  415cb82... address-book-gpe: Declare it final
  1c87650... address-book-ldap: Declare it final
  8f6435c... address-book-ldif: Declare it final
  fb996bf... Fix the build
  89b2189... address-book-osmo: Declare it final
  a40117d... address-book-rubrica: Declare it final
  9e7ae90... address-book-vcard: Declare it final
  4362a43... address: Declare it final
  800b304... address-book: set-status no longer takes ownership
  c020f97... build: Use get_supported_arguments()
  c01bd66... Remove now inaccurate comment about set-status
  0510c5a... Updated Czech translation
  f9db9b6... Updated Spanish translation
  1979fae... Update German translation
  3b4027e... Update Hungarian translation
  ba17b04... Updated Serbian translation
  e466cf5... Use g_strcmp0() to avoid NULL string guards
  87a24ef... g_strdup(NULL) returns NULL
  2637c24... Use gtk_editable_get_chars()
  ed6377b... * NEWS: release balsa-2.5.5 * images/Makefile.am: uninstall
  e788f8d... Update version strings
  9f7f5bf... 2.5.5 changelog
  7bdba93... Fix XML tags
  50afca4... cite-bar: Use snapshot method instead of draw
  696cd3b... cite-bar: Use graphene_rect_init
  2984fdd... Remove LibBalsaCellRendererButton
  e09af06... LibBalsaCellRendererButton has gone away
  275cbe2... Update Brazilian Portuguese translation
  02147c0... mime-widget-text: Simplify cite-bar code
  f4ebc88... Return FALSE, not G_SOURCE_REMOVE
  08f2bf8... address: Use g_strv_length()
  e555c4e... libbalsa-message: streamline some list freeing
  6923e88... Use gtk_box_pack_start()
  56766ad... libalsa-progress: Use gtk_container_foreach()
  e5886f9... Use gtk_container_foreach
  924cb29... Widgets are visible by default
  9855081... Clean up LibBalsaIdentity
  63a029c... Uncrustify src and libbalsa:
  ea0d6ae... Revert the uncrustify
  07d38b0... Align function prototype names
  0e9fd8e... Uncrustify identity.h
  4d0f4c0... identity: Add and use the getters
  9bae10c... Change one dummy argument, for consistency
  dbe8ec1... Frame: Erase the now-useless property label-yalign
  1a61cb5... gmime-gpgme-signature: Declare it final
  f7f2aa5... Updated Danish translation
  585119d... server: Declare it derivable
  1207aa1... server: do not free a string constant
  4e39dc7... Do not leak strings
  2f8ba4d... server: Rename some functions
  8a2e8b3... imap-server: declare it final
  5d7f705... smtp-server: declare it final
  9dd47db... citebar: declare it final
  82f82e6... libblsa-vfs: declare it final
  33e34d1... mime-widget-image: use GtkPaintable API
  e3f9302... cite-bar: correct the parent class
  25cef0f... face headers: add API to get the pixbufs
  067573d... Update POTFILES.in
  f116117... Update Polish translation
  bee684e... Silence a gcc gripe about strncpy
  8c61835... Silence a gcc gripe about snprintf
  4a2eb18... Fix the build with compface
  66698a9... Fix fallout from making BalsaMimeWidget opaque
  8754215... GdkWindow has been renamed GdkSurface
  0a600ad... More GdkWindow rename fallout
  7b3ae47... Use gtkwidget_get_realized
  9750c67... address-view: check for NULL combo-box
  6ce8083... address-view: more checks for NULL combo-box
  227e4b5... sendmsg-window: do not set addresses twice
  9edbf2c... mailbox: Declare it derivable
  832c94a... Update German translation
  9251b2f... Update Brazilian Portuguese translation
  7909a5f... Updated Czech translation
  9f0f7d7... mailbox local: Declare it derivable
  b42dd3a... mailbox maildir: Declare it final
  bf7c8cd... mailbox mbox: Declare it final
  4302f75... mailbox mh: Declare it final
  ac83fff... mailbox remote: Declare it derivable
  4ac403f... mailbox imap: Declare it final
  347f024... mailbox pop3: Declare it final
  7326f71... Align adjacent assignment statements
  a4998f1... Uncrustify mailbox_*.[ch]
  37fe2a6... Uncrustify mailbox.[ch]
  c7b005b... mime-widget-image: get paintable from the image
  07bd09e... mailbox: Clear the mutex at finalize time
  a1bcb3e... mailbox: Do not use our own parent_class
  35d0998... pref manager: The GtkFontChooserLevel enum changed
  1ba8c3a... uncrustify.cfg: Change 'if' braces
  af79159... message: Declare it final
  b734995... rfc 2445: Declare types final
  ff66e85... Clean up…
  1c30c6a... gmime filter header: make structs private
  f0abe13... mime-stream-shared: Use G_DEFINE_TYPE
  2b0dd39... balsa index: store gesture in the object
  98a529a... balsa-index: Use gtk_gesture_single API
  a95f8c8... mailbox local: Do not dereference NULL pointer
  6069d33... index: Gesture fix-ups
  d92011c... mime-widget-text: Grab the focus when realized
  e77de19... Remove clip from size-allocate vfunc
  62dc098... Revert d92011cb2d14dfd48e7fbaa63b66a76c5eb1e31c
  d500a67... mime-widget-text: handle an URL click early
  be0726c... Fix the "scroll on click" issue
  4aceec8... Revert #d500a67f7da036c75d1326b86c29874128799de5
  787b088... balsa-print-object: create_from_pixbuf is no more
  8745814... mime-widget-text: The "draw" signal has gone away
  2afa701... mime-widget-text: Do not static cast to GFunc
  428092d... Store GtkGestures in objects
  78e00c3... Parent's dispose method is always non-NULL
  92a269f... net-client and friends: Use G_DECLARE_*_TYPE
  4eb7b40... net-client-*: Use G_DEFINE_TYPE_WITH_PRIVATE
  3cda6bd... net-client: Simplify calling parent methods
  8285878... mime-widget-text: Rename controller
  bc5ad6b... ab-main: Use a GtkEventControllerKey
  8c4c4d5... cite-bar: gtk_snapshot_append_color API change
  2bad82c... address-view: Use a GtkEventControllerKey
  88092a6... balsa-message et al: Use GtkEventControllerKey
  f8264ec... application-helpers: New function to block accels
  49b0e64... balsa-message: Block accels when using find
  b9626ec... balsa-message: Use GtkEventControllerKey
  11d680e... balsa-message et al: Use GtkEventControllerKey
  f6d8bf5... main-window: Simplify the SoS code
  1d2a7f6... message: Store the signal handler id
  8fbbe38... ab-window: Use G_DECLARE and G_DEFINE
  5bf7a7e... Do not define _FooClass when Foo is declared final
  f76ca17... balsa-index: Use G_DECLARE_FINAL_TYPE
  2875df2... balsa-mblist: Use G_DECLARE_FINAL_TYPE
  931fea3... address-book-osmo: Do not declare _get_type
  18e69fa... libbalsa-vfs: Do not declare _get_type
  50a7ab4... balsa-index: Do not declare _get_type
  d970811... balsa-message: Use G_DECLARE_FINAL_TYPE
  fd2ca3a... print-object: declare it final and private
  da83a04... balsa-print-object-decor: declare it final
  86dc015... balsa-print-object-default: declare it final
  57d3689... balsa-print-object-header: declare it final
  36b265c... balsa-print-object-image: Declare it final
  ce2ec46... balsa-print-object-text: Declare it final
  ee1e5b4... Uncrustify balsa-print-object*.[ch]
  7cf4a66... Header files: Add ';' after G_DECLARE_*_TYPE
  4b7f251... More header files: Add ';' after G_DECLARE_*_TYPE
  d13bc72... filter-run-dialog: Declare it final
  b4cc027... utf8-sanitize: Use g_utf8_make_valid
  824b174... mailbox-node: Declare it final
  3c72609... Port to new GtkGesture/GtkEventController API
  8feac99... balsa-mime-widget-text: extend previous commit
  5ed5d82... Display time stamps of date-only iCalendar events
  9452e26... sendmsg-window: Declare it final
  a50109b... toolbar-model: Declare it final
  8cd9a35... uncrustify.cfg: Align struct members
  b2edfa2... Uncrustify toolbar-factory
  cc8b1dd... gmime-filter-header: Declare it final
  f5adf0c... mime-stream-shared: Declare it final.
  4f44520... main-window: Declare it derivable
  7288d80... spell-check: Declare it final, and uncrustify it
  d15b0b6... address-book: Make sure Boolean values are Boolean
  50c4376... address-book-ldap: Make sure Bool values are Bool
  b646bb2... uncrustify.cfg: Align struct initializers
  214148b... SendmsgWindow: Take it private, and uncrustify it
  a1151f4... Move some BalsaMailboxNode methods
  69fe6e9... mailbox-node: Make it private
  ffbd45e... mailbox-node: Do not use tloc argument of time()
  2372b58... balsa-index: Add convenience functions
  39eb6a5... main-window: Use the convenience functions
  3780d81... Clean up some BalsaMailboxNode code
  9d29916... Do not use tloc argument of time()
  9e3cce2... Fix a typo, and fallout from previous commit
  22851c2... balsa-index: Make it private
  a866de2... balsa-mblist: Make it private
  8f18003... print-object-decor: Make it private
  343adf7... print-object-header: Make it private
  075b957... balsa-message: Make it private
  fb7a41a... Remove some duplicative typedefs
  d995bcd... filter-run: Document the private nature
  523df27... message-window: Code cleanup
  b861b2e... Use GResource instead of installed files
  093f09f... Continue the cherry-pick
  deb77c1... Use GResource instead of installed files
  11577e5... Complete the cherry-pick
  f284498... address-book-text: Use g_clear_pointer()
  c4e64e4... net-client: Do not use g_type_class_add_private()
  0748529... net-client: Use an enum for the signals
  86d0248... toolbar-factory and -prefs: Simplify API
  14d8303... toolbar-factory: Fix the build
  4fc0573... COPYING: Add to the repo
  6fbd3c5... Add contribution guide
  2db6f9a... address-book: Remove two redundant declarations
  c93a741... address-book-extern: Remove redundant declarations
  6a3ca06... address-book-gpe: Remove redundant declarations
  a9d2fb0... address-book-ldap: Remove redundant declarations
  e875308... address-book-ldif: Remove redundant declaration
  bd22fa1... address-book-rubrica: Remove redundant declarations
  50e44d1... address-book-text: Remove redundant declarations
  6117148... address-book-vcard: Remove redundant declarations
  8263a98... address: Remove redundant declarations
  e50c9b5... gmime-filter-header: Remove redundant declaration
  18fd682... gmime-gpgme-signature: Drop redundant declarations
  d867772... libbalsa-vfs: Drop redundant declarations
  b668b2a... mailbox: Drop redundant declarations
  2864ca1... mailbox-imap: Drop redundant declarations
  09e199a... mailbox-mbox: Drop redundant declarations
  04941c7... mailbox-mh: Drop redundant declarations
  e3c12d8... mailbox-pop3: Drop redundant declarations
  1ccde01... mailbox-remote: Drop redundant declarations
  86b7679... libbalsa-message: Drop redundant declarations
  b734212... rfc2445: Drop redundant declarations
  0396c14... server: Drop redundant declarations
  638a9d6... ab-window: Drop redundant declarations
  ce607f6... print-object-decor: Drop redundant declaration
  690278f... main-window: Drop redundant declarations
  4ce39f2... spell-check: Drop redundant declarations
  5d6c683... mime-stream-shared: Drop gmime_parent_class
  9ea930a... sendmsg-window: Use balsa_attach_info_parent_class
  e6860b4... balsa-mime-widget-text: Use new GtkGesture API
  f60ce00... configure.ac: Fix the build
  94085aa... main-window: Manage "reply to group" action
  54a47dd... sendmsg-window: Check when replying to a list
  e303c6e... balsa-index: Emit "index-changed" more often
  d9ac7cf... various: gdk_event_free() has gone away
  fa20cda... message-window.c: Manage "Reply to Group" action
  e74c0aa... balsa-index.c: Count and report skipped messages
  f379f5a... Fix the build
  508c73b... Update Polish translation
  9f91762... balsa-index: Count skipped messages only for list
  a1d5435... Mitigate EFail vulnerability for Webkit2
  0ae0e0f... imap-handle.c: Do not leak ImapEnvelope.
  d1a9b5f... mailbox_imap: Do not leak ImapSearchData.
  521685a... balsa-index: Do not leak PipeData
  94c2445... filter-edit-callbacks: Do not leak new_item
  f267c3a... Use g_strcmp0() for NULL-safe comparisons
  1446bdd... mailbox-imap: Fix the build
  bfb96cf... gmime-gpgme-signature: Fix the build
  8d1b34a... balsa-index: Fix the build
  422da89... mailbox-node: Fix the build
  1545b9b... Continue when icons are missing
  ac65d09... Release balsa-2.5.6
  ad6713d... balsa-icons: Revert to previous logic
  ad0916c... Use g_str_has_prefix()
  57118d8... Reimplement libbalsa_clear_source_id()
  e4fa756... Do not seg fault on delayed exit
  c803c23... address-book-rubrica: Fix a typo
  7740d64... Bump glib dependency to >= 2.56
  6f47b65... IMAP goes GIO
  b514681... libbalsa/imap: Fix the meson build
  d2da9d3... imap-server: Unconditionally set the user and host
  370e200... Use Unicode apostrophes in new translatable strings
  0eaf6fa... New files for 'IMAP goes GIO'
  7f0661f... Remove some debugging prints
  7ef792f... Various: Split set-security from set-host
  71e45a2... source-viewer: Subclass GtkApplicationWindow
  e01a638... main and main-window: Pass the GtkApplication
  73850eb... message-window: Subclass GtkApplicationWindow
  60cf249... compose-window: Subclass GtkApplicationWindow
  9fa97bf... Fix fallout from renaming sendmsg* to compose*
  4482236... Make GResource paths static as well as const
  10aaa4b... main-window: On 'quit', use gtk_window_close()

Commits added to the branch:

  c003a7b... Update German translation (*)
  64b7757... Update Spanish translation (*)
  853fed5... Clean up meson.build (*)
  11a8be6... Updated Danish translation (*)
  2456220... Update German translation (*)
  5fb8329... Update German translation (*)
  4de750b... Update German translation (*)
  cc36b23... Old glib-genmarshal has no --output option (*)
  c9b163d... Drop deprecated 'languages' option of gnome.yelp() (*)
  4d2060e... Fix pixmaps install path (*)
  5187164... Install appstream metadata to recommended location (*)
  e4f7060... Fix XML tags in po file (*)
  d3a15a0... Fix some icon issues (*)
  0396247... Updated Danish translation (*)
  38ea0b1... Map the pixmap id (*)
  a1c36cf... Do not crash with no spell-checker dictionaries (*)
  ba9ec2d... Expand lists in address book window (*)
  a1a761a... Fix documentation (*)
  1820021... Remove a webkitgtk workaround (*)
  3a9924b... Cast g_object_ref() arguments (*)
  188512b... Revise configuration of enchant spell-checking lib (*)
  81fa0cd... Avoid possible repeated dynamic cast (*)
  e7382b3... Update Spanish translation (*)
  505cfdb... gtk_font_button_get_font_name is no more (*)
  719de5a... Update Spanish translation (*)
  75bb638... Fix a use-after-free bug (*)
  ba20669... Enable multi-threaded POP3 retrieval (*)
  4f2e267... Fix the meson build (*)
  4921659... Update Polish translation (*)
  cee20ea... Update Brazilian Portuguese translation (*)
  f2b5eb0... mailbox-pop3: Fix progress dialogue on error (*)
  864549c... Improve low-level network library (*)
  389e70b...    Meson build system changes (*)
  873aed7... Improve replying to html-only messages (*)
  01302b6... Meson build system changes (*)
  14595c8... Test for <locale.h> and set HAVE_LOCALE_H if found (*)
  50cdfb3... meson.build: Fix the definition of HAVE_CTIME_R (*)
  1419a7e... Use Unicode quotation marks (*)
  cbc3eaa... Updated Czech translation (*)
  c76da36... Update German translation (*)
  23ab89b... Fix a use-after-free bug (*)
  4dbad7c... Fix two use-after-free false positives (*)
  9e4882d... Check for zero-length array (*)
  73f3574... More g_object_ref fallout (*)
  2cc2de5... Clean up generated marshalling files (*)
  f262908... Crypto performance improvements (*)
  92bb723... Update POTFILES.in (*)
  ef53e29... Update Polish translation (*)
  9ae5622... Albrecht Dreß authored the earlier crypto commit (*)
  1325c94... Updated Czech translation (*)
  b81bfa0... Updated Spanish translation (*)
  66458d8... Update German translation (*)
  91436bc... Update Hungarian translation (*)
  bd24737... Updated Serbian translation (*)
  4e177b5... * NEWS: release balsa-2.5.5 * images/Makefile.am: uninstall (*)
  ddb0112... Update version strings (*)
  a6b53d4... 2.5.5 changelog (*)
  4832784... Fix XML tags (*)
  2e431eb... Update Brazilian Portuguese translation (*)
  3f5024b... Updated Danish translation (*)
  5ef2edd... Update POTFILES.in (*)
  14d9b92... Update Polish translation (*)
  6baa13b... Silence a gcc gripe about strncpy (*)
  056a5e3... Silence a gcc gripe about snprintf (*)
  fa80280... Update German translation (*)
  608d673... Update Brazilian Portuguese translation (*)
  2c19d3a... Updated Czech translation (*)
  97bf83f... Fix the "scroll on click" issue (*)
  b7021b7... Display time stamps of date-only iCalendar events (*)
  3daecc9... Use GResource instead of installed files (*)
  28285f6... toolbar-factory and -prefs: Simplify API (*)
  e526a68... COPYING: Add to the repo (*)
  910f3b1... Add contribution guide (*)
  a7854ed... main-window: Manage "reply to group" action (*)
  a530938... sendmsg-window: Check when replying to a list (*)
  88f31d7... balsa-index: Emit "index-changed" more often (*)
  506bfc9... message-window.c: Manage "Reply to Group" action (*)
  1ba79a9... balsa-index.c: Count and report skipped messages (*)
  9a54af0... Update Polish translation (*)
  e6a952e... balsa-index: Count skipped messages only for list (*)
  93727ce... Mitigate EFail vulnerability for Webkit2 (*)
  4178a42... imap-handle.c: Do not leak ImapEnvelope. (*)
  90be134... mailbox_imap: Do not leak ImapSearchData. (*)
  102ed47... balsa-index: Do not leak PipeData (*)
  5aeab69... filter-edit-callbacks: Do not leak new_item (*)
  0a846e0... Use g_strcmp0() for NULL-safe comparisons (*)
  c4e9837... Continue when icons are missing (*)
  61886d2... Release balsa-2.5.6 (*)
  1f1d4d7... Do not seg fault on delayed exit (*)
  55aac75... address-book-rubrica: Fix a typo (*)
  d964df6... IMAP goes GIO (*)
  bd95221... Use Unicode apostrophes in new translatable strings (*)
  5ddce76... Add the new libnetclient files to the repo (*)
  422ba8b...  libbalsa/imap/meson.build: Fix the meson build (*)
  a4b25e8... First cut at porting to Gtk version 4
  e927d41... Fix one more file
  f47dee2... Another fix
  0415a8d... Another fix
  1101526... Another fix
  b4c77a3... and another
  062ace2... Update German translation
  2cd67d5... Fix gpgme-related files
  0ebe5ee... Adapt to new "size-allocate" signal
  d7927a0... Do not report a horizontal baseline
  8578d18... Color button signal changed
  f594ee4... Fix quitting
  08bb2ec... Fix quitting
  80c10e5... One-click mailbox selection
  642bf44... Fix tree coords
  a7f06d4... More mblist fixes
  d3b1711... 1
  cac44dc... Use single_click activation for the mblist
  d781078... tree_view is undefined
  3276a80... Variable set but not used
  8cb22a0... Use single-click in the address-view
  d2409e0... Align strings correctly in preference manager
  b5228a5... Make sure progress bar is visible
  917d275... Fix identity dialog string alignments
  9462696... Fix the toolbar prefs dialog
  ffdc54a... Make main window's menubar visible
  3a2ce2d... Bump gtk-required to 4.0
  e66c3ff... Update Spanish translation
  d9f3fd4... Clean up meson.build
  dfb59fc... Updated Danish translation
  4f1b0d7... Make default meson options buildable and runnable
  66e34a3... Remove unused conditionally compiled code
  a3bb8af... Update German translation
  2baba85... Update German translation
  b41ede4... Update GtkSourceView dependency to 4.0
  4abf00a... Fix GtkSourceView dependency
  6e036d0... Correctly document default values of options
  1312ad7... Improve layout of address book dialog
  e73094e... Update German translation
  bcec166... GTK_IMAGE_PIXBUF has been removed
  5899ba6... gtk_image_get_pixbuf is deprecated
  7adfca9... Export cairo_print_surface
  64f5c46... Fix function name
  4ff2e57... Fix errors
  d1e8146... Deconstify
  27d1889... Use cairo_print_surface to print a pixbuf
  0e8b8c6... Add semicolon
  19c763b... Use gdk_cairo_surface_create_from_pixbuf
  ab034bf... Bump glib dependency to 2.54
  ab937bc... Use a GtkLabel to measure character width
  152fe96... Streamline code
  396e115... Use gdk_cursor_new_from_name
  1b85531... New API for gdk_cursor_new_from_name
  7f13e5e... Remove unused variable
  b0a4e54... gtk_text_view_get_window has been removed
  adce184... Use G_N_ELEMENTS macro
  44825ed... Install appstream metadata to recommended location
  2d2e7c5... Fix some icon issues
  c97dfd0... Do not connect to NULL widget
  9327313... Streamline code in balsa-mime-widget-image.c
  bbff82f... Fix the build
  0a35ff6... The logo in the "about" dialog is now a GdkTexture
  d7de174... Fix XML tags in po file
  d0321f5... Let canberra find the default screen
  f46faf6... Updated Danish translation
  fd45f4d... Gtk icon and drag-and-drop updates
  f38c319... Map the pixmap id
  57a06e2... More drag-and-drop changes
  5c4bf58... Use gdk_atom_intern_static_string
  8ddd3ae... Do not use g_list_next or g_list_first
  dae2a7f... Prettify the summary
  d7596d0... The border-width property has gone
  8acad6e... Put margin on box
  5a762de... Do not crash with no spell-checker dictionaries
  f92f729... Yet more drag-and-drop changes
  873e2c7... Expand lists in address book window
  2cf7f8f... Fix documentation
  09fc2ff... Remove a webkitgtk workaround
  071a0b5... Clipboard API changed
  26d8070... Get pointer coords from the GdkEvent if possible
  37cf8b7... Simplify making the over-url popup menu
  d1169bd... Make BalsaMimeWidgetText a subclass
  4cd98f2... Change progress dialog geometry
  5e15529... Cast g_object_ref() arguments
  61a653a... Revise configuration of enchant spell-checking lib
  5ff86f2... Remove "delete" argument from gtk_drag_finish()
  b66b017... Avoid possible repeated dynamic cast
  9faaa06... GdkAtom is no more
  9a3f3fe... Use GtkEventController API() to get a widget
  1d26000... Fix the remaining "size-allocate" callbacks
  284556d... Fix the build
  dcea7c7... Use a GtkGesture instead of "button-press-event"
  d0cd6cd... Do not limit the gesture to GDK_BUTTON_SECONDARY
  a2dfddf... Use a GtkGesture instead of "button-press-event"
  8190f34... Use a GtkGesture instead of "button-press-event"
  37e7d0c... Use a GtkGesture instead of "button-press-event"
  01b698a... Use a GtkGesture instead of "button-press-event"
  6c62d53... Use a GtkGesture instead of "button-press-event"
  d31b094... Use the same data name for all gestures
  b0b0298... Do not try to implement a shift-f10 popup menu
  67d3361... Use the gesture's "released" signal
  796ea91... Use GtkEventControllerMotion's signals
  0800859... Update Spanish translation
  5b68404... Use a tree-view's "row-activated" signal
  581a94a... Emit "rows-reordered" directly
  90ed7cc... Set the log-domain to "Balsa"
  d7f5d9e... Replace gtk_font_button_set_show_size()
  522b2fb... Update Spanish translation
  6323f56... Fix a use-after-free bug
  8641007... pref-manager: Use GtkFontChooser API better
  6e2e99d... Enable multi-threaded POP3 retrieval
  5715a87... Use g_{clear,set}_object
  7748875... Use g_set_object to store icons
  5413c9d... Cleanup some dispose and finalize methods
  aacc80d... Use libbalsa_clear_source_id()
  4a434c8... Make libbalsa_clear_source_id() gboolean
  c53b214... mailbox: store the attach icons correctly
  09ec93f... Use various convenience functions
  22935b5... net-client-smtp: Move the "QUIT" command
  417aa16... Update Polish translation
  5f0312a... Update Brazilian Portuguese translation
  01fae9b... mailbox-pop3: Fix progress dialogue on error
  97a31e7... Various events have been removed
  33a7621... cell-renderer-button: Drop a redundant variable
  266020f... Improve low-level network library
  373b3c5... libnetclient: Restore the dispose/finalize split
  a1ec753... Improve replying to html-only messages
  7a26144... Meson build system changes
  48d401a... Do not set global log domain
  bce4117... Reimplement LabBalsaAddressView
  9c0764a... address-view: Grab focus only for blank row
  3b730e1... address-view: Clean up
  af50eb7... Implement LibBalsaAddressViewEntry
  7025be3... Test for <locale.h> and set HAVE_LOCALE_H if found
  93d729c... meson.build: Fix the definition of HAVE_CTIME_R
  a5c81d5... Use Unicode quotation marks
  2513984... Rewrite the class definitions of BalsaMimeWidget*
  693f522... Updated Czech translation
  566b925... libbalsa-progress: gdk_threads_* have gone away
  0e87ca6... Update German translation
  7138e8a... mblist: Use single-click mode on all mailbox lists
  23ffd06... mime-widget-image: No longer a subclass
  22e4a4e... libbalsa-progress: Add a margin
  4852999... mime-widget: Use getter for private data
  530c25c... Fix a use-after-free bug
  ea069d0... Fix two use-after-free false positives
  4269a18... Check for zero-length array
  006fedd... mailbox: Assign MailboxView structure explicitly
  47a3941... print-object-text: Assign PhraseRegion explicitly
  5458084... balsa-index: Plug a leak
  bcc7cfa... Do not leak cbdata
  a051bd0... Do not leak new_item
  05b5a1b... Avoid a spurious use-after-free warning
  db00941... Assert that class getters do not return NULL
  b0f3881... More g_object_ref fallout
  9c4abaa... mime-widget-image: simplify showing the image
  3acfc6f... mime-widget-image: Make it subclass BalsaMimeWidget
  6874965... Remove stray blank line
  4b0514f... mime-widget-text: use the object better
  c22d47f... mime-widgets: Drop some queuing of resizes
  d72b123... Clean up generated marshalling files
  931b563... Remove obsolete comment
  1f73896... Crypto performance improvements
  28a7736... Fix the build
  ccc9348... Update Polish translation
  4cdab20... Albrecht Dreß authored the earlier crypto commit
  79ef75e... address-book: Declare it derivable
  a4552f1... address-book-text: Declare it derivable
  1f667ea... address-book-extern: Declare it final
  da873fb... address-book-gpe: Declare it final
  4d4db9a... address-book-ldap: Declare it final
  7736175... address-book-ldif: Declare it final
  64753d3... Fix the build
  d3c8d92... address-book-osmo: Declare it final
  1786f38... address-book-rubrica: Declare it final
  68a5e13... address-book-vcard: Declare it final
  2519fbf... address: Declare it final
  8339f9e... address-book: set-status no longer takes ownership
  650532b... build: Use get_supported_arguments()
  fc289b1... Remove now inaccurate comment about set-status
  01eaa95... Updated Czech translation
  6506740... Updated Spanish translation
  22d3a26... Update German translation
  31f25a4... Use g_strcmp0() to avoid NULL string guards
  bcebcf9... g_strdup(NULL) returns NULL
  02fa2de... Use gtk_editable_get_chars()
  8291136... * NEWS: release balsa-2.5.5 * images/Makefile.am: uninstall
  32d670b... Update version strings
  d1ea7f5... 2.5.5 changelog
  9a7ee6e... Fix XML tags
  a9fdf65... cite-bar: Use snapshot method instead of draw
  1a48f88... cite-bar: Use graphene_rect_init
  4325bd2... Remove LibBalsaCellRendererButton
  3d8848f... LibBalsaCellRendererButton has gone away
  d1fe809... Update Brazilian Portuguese translation
  a76c536... mime-widget-text: Simplify cite-bar code
  7c06178... Return FALSE, not G_SOURCE_REMOVE
  4f430be... address: Use g_strv_length()
  824704a... libbalsa-message: streamline some list freeing
  afb1555... Use gtk_box_pack_start()
  5759c82... libalsa-progress: Use gtk_container_foreach()
  60b2690... Use gtk_container_foreach
  9894895... Widgets are visible by default
  cb1319a... Clean up LibBalsaIdentity
  483fa75... Uncrustify src and libbalsa:
  d5496ef... Revert the uncrustify
  e7ac2f0... Align function prototype names
  14386f0... Uncrustify identity.h
  c3bd286... identity: Add and use the getters
  c5cb295... Change one dummy argument, for consistency
  f12383e... Frame: Erase the now-useless property label-yalign
  81185a6... gmime-gpgme-signature: Declare it final
  24441cd... Updated Danish translation
  df9cc9c... server: Declare it derivable
  1164922... server: do not free a string constant
  2980c79... Do not leak strings
  c6ab2cd... server: Rename some functions
  9b0df48... imap-server: declare it final
  495f251... smtp-server: declare it final
  161bff8... citebar: declare it final
  ea343ac... libblsa-vfs: declare it final
  1b53f32... mime-widget-image: use GtkPaintable API
  980d78f... cite-bar: correct the parent class
  71e7d1e... face headers: add API to get the pixbufs
  35fe2bf... Update Polish translation
  c89733a... Silence a gcc gripe about strncpy
  6dafe48... Silence a gcc gripe about snprintf
  fc186f8... Fix the build with compface
  23f125d... Fix fallout from making BalsaMimeWidget opaque
  fc1642f... GdkWindow has been renamed GdkSurface
  78ce962... More GdkWindow rename fallout
  f219f10... Use gtkwidget_get_realized
  cd98458... address-view: check for NULL combo-box
  6e867f5... address-view: more checks for NULL combo-box
  3a42ffa... sendmsg-window: do not set addresses twice
  d32b233... mailbox: Declare it derivable
  2b962f2... Update German translation
  ab823c9... Update Brazilian Portuguese translation
  4d5f45f... Updated Czech translation
  03a7be3... mailbox local: Declare it derivable
  45d3ac5... mailbox maildir: Declare it final
  fba5da5... mailbox mbox: Declare it final
  96a1739... mailbox mh: Declare it final
  def7471... mailbox remote: Declare it derivable
  db86bd2... mailbox imap: Declare it final
  0539115... mailbox pop3: Declare it final
  47e49dc... Align adjacent assignment statements
  a330b5a... Uncrustify mailbox_*.[ch]
  b425efb... Uncrustify mailbox.[ch]
  8f3f2a4... mime-widget-image: get paintable from the image
  07fa3b5... mailbox: Clear the mutex at finalize time
  cf41c2d... mailbox: Do not use our own parent_class
  ac328db... pref manager: The GtkFontChooserLevel enum changed
  2071303... uncrustify.cfg: Change 'if' braces
  5c5bbcd... message: Declare it final
  e4589e0... rfc 2445: Declare types final
  d676bdd... Clean up…
  3b64124... gmime filter header: make structs private
  9fdf92c... mime-stream-shared: Use G_DEFINE_TYPE
  a6c5143... balsa index: store gesture in the object
  d15f784... balsa-index: Use gtk_gesture_single API
  dfc69d3... mailbox local: Do not dereference NULL pointer
  9edc88d... index: Gesture fix-ups
  5312dab... mime-widget-text: Grab the focus when realized
  deaaf7d... Remove clip from size-allocate vfunc
  0946a37... Revert d92011cb2d14dfd48e7fbaa63b66a76c5eb1e31c
  9279718... mime-widget-text: handle an URL click early
  76bf43d... Fix the "scroll on click" issue
  712b2f5... Revert #d500a67f7da036c75d1326b86c29874128799de5
  f68998b... balsa-print-object: create_from_pixbuf is no more
  5719f88... mime-widget-text: The "draw" signal has gone away
  f1d846b... mime-widget-text: Do not static cast to GFunc
  e149a79... Store GtkGestures in objects
  9d7dc0f... Parent's dispose method is always non-NULL
  5f9a242... net-client and friends: Use G_DECLARE_*_TYPE
  4ca6040... net-client-*: Use G_DEFINE_TYPE_WITH_PRIVATE
  302d9da... net-client: Simplify calling parent methods
  04b4f1b... mime-widget-text: Rename controller
  bf89953... ab-main: Use a GtkEventControllerKey
  861608d... cite-bar: gtk_snapshot_append_color API change
  d79d6eb... address-view: Use a GtkEventControllerKey
  66dab3b... balsa-message et al: Use GtkEventControllerKey
  1e4f96f... application-helpers: New function to block accels
  f36918d... balsa-message: Block accels when using find
  84f76a6... balsa-message: Use GtkEventControllerKey
  e2a069e... balsa-message et al: Use GtkEventControllerKey
  40fe4d9... main-window: Simplify the SoS code
  1f39471... message: Store the signal handler id
  a6bf029... ab-window: Use G_DECLARE and G_DEFINE
  945a024... Do not define _FooClass when Foo is declared final
  c642a1c... balsa-index: Use G_DECLARE_FINAL_TYPE
  29bce76... balsa-mblist: Use G_DECLARE_FINAL_TYPE
  266af1e... address-book-osmo: Do not declare _get_type
  1923a62... libbalsa-vfs: Do not declare _get_type
  5225539... balsa-index: Do not declare _get_type
  a6b4e08... balsa-message: Use G_DECLARE_FINAL_TYPE
  d116db0... print-object: declare it final and private
  5c3d012... balsa-print-object-decor: declare it final
  9e57417... balsa-print-object-default: declare it final
  831621b... balsa-print-object-header: declare it final
  f59fe2d... balsa-print-object-image: Declare it final
  0faf4f3... balsa-print-object-text: Declare it final
  f3391fc... Uncrustify balsa-print-object*.[ch]
  4b3b152... Header files: Add ';' after G_DECLARE_*_TYPE
  33a2ce1... More header files: Add ';' after G_DECLARE_*_TYPE
  adf5c8b... filter-run-dialog: Declare it final
  3249831... utf8-sanitize: Use g_utf8_make_valid
  7e98fca... mailbox-node: Declare it final
  5022f64... Port to new GtkGesture/GtkEventController API
  daff9a5... balsa-mime-widget-text: extend previous commit
  9072898... Display time stamps of date-only iCalendar events
  17124a0... sendmsg-window: Declare it final
  7314437... toolbar-model: Declare it final
  eb9bec5... uncrustify.cfg: Align struct members
  fe76fab... Uncrustify toolbar-factory
  0c5730d... gmime-filter-header: Declare it final
  6baed18... mime-stream-shared: Declare it final.
  fd1246d... main-window: Declare it derivable
  b73bbad... spell-check: Declare it final, and uncrustify it
  c142487... address-book: Make sure Boolean values are Boolean
  52193d6... address-book-ldap: Make sure Bool values are Bool
  ffd0db1... uncrustify.cfg: Align struct initializers
  829c87d... SendmsgWindow: Take it private, and uncrustify it
  62c0277... Move some BalsaMailboxNode methods
  c93b604... mailbox-node: Make it private
  61a63b1... mailbox-node: Do not use tloc argument of time()
  f05bd39... balsa-index: Add convenience functions
  8c0f9d4... main-window: Use the convenience functions
  13d377f... Clean up some BalsaMailboxNode code
  4a7e531... Do not use tloc argument of time()
  3581463... Fix a typo, and fallout from previous commit
  b06af86... balsa-index: Make it private
  edd8562... balsa-mblist: Make it private
  3191dab... print-object-decor: Make it private
  3ea1594... print-object-header: Make it private
  f1dc02b... balsa-message: Make it private
  c91253b... Remove some duplicative typedefs
  bf71fa8... filter-run: Document the private nature
  f1cdb95... message-window: Code cleanup
  16a2888... Use GResource instead of installed files
  2fbaa6c... Continue the cherry-pick
  331304c... Use GResource instead of installed files
  f24193d... Complete the cherry-pick
  8fc969f... address-book-text: Use g_clear_pointer()
  89dfabb... net-client: Do not use g_type_class_add_private()
  2362ebf... net-client: Use an enum for the signals
  09b149b... toolbar-factory and -prefs: Simplify API
  fd20902... toolbar-factory: Fix the build
  e86e77d... address-book: Remove two redundant declarations
  8444bbf... address-book-extern: Remove redundant declarations
  d651301... address-book-gpe: Remove redundant declarations
  afae266... address-book-ldap: Remove redundant declarations
  d27b147... address-book-ldif: Remove redundant declaration
  e309184... address-book-rubrica: Remove redundant declarations
  7bdc742... address-book-text: Remove redundant declarations
  8f68fc2... address-book-vcard: Remove redundant declarations
  ba590b7... address: Remove redundant declarations
  780a328... gmime-filter-header: Remove redundant declaration
  f17c44a... gmime-gpgme-signature: Drop redundant declarations
  39e9994... libbalsa-vfs: Drop redundant declarations
  eb226c6... mailbox: Drop redundant declarations
  cd6c71e... mailbox-imap: Drop redundant declarations
  d10edec... mailbox-mbox: Drop redundant declarations
  316b0e3... mailbox-mh: Drop redundant declarations
  82e6e62... mailbox-pop3: Drop redundant declarations
  a7bf153... mailbox-remote: Drop redundant declarations
  a2611f7... libbalsa-message: Drop redundant declarations
  dadadfc... rfc2445: Drop redundant declarations
  35fd829... server: Drop redundant declarations
  396ff2d... ab-window: Drop redundant declarations
  662f0dd... print-object-decor: Drop redundant declaration
  1b4f7d9... main-window: Drop redundant declarations
  4715aab... spell-check: Drop redundant declarations
  fc8c094... mime-stream-shared: Drop gmime_parent_class
  0b42b2a... sendmsg-window: Use balsa_attach_info_parent_class
  0748627... balsa-mime-widget-text: Use new GtkGesture API
  5152626... configure.ac: Fix the build
  e162469... main-window: Manage "reply to group" action
  84c0850... sendmsg-window: Check when replying to a list
  a4409e1... balsa-index: Emit "index-changed" more often
  e036d50... various: gdk_event_free() has gone away
  36dcafd... message-window.c: Manage "Reply to Group" action
  778a153... balsa-index.c: Count and report skipped messages
  ffebf82... Fix the build
  2034160... Update Polish translation
  2963be0... balsa-index: Count skipped messages only for list
  0c9a60e... Mitigate EFail vulnerability for Webkit2
  95c0937... imap-handle.c: Do not leak ImapEnvelope.
  8aac30b... mailbox_imap: Do not leak ImapSearchData.
  288de5c... balsa-index: Do not leak PipeData
  ffb32fe... filter-edit-callbacks: Do not leak new_item
  a2d8e01... Use g_strcmp0() for NULL-safe comparisons
  4d4bd96... mailbox-imap: Fix the build
  453a181... gmime-gpgme-signature: Fix the build
  213ebc1... balsa-index: Fix the build
  6a05496... mailbox-node: Fix the build
  136a9f2... Continue when icons are missing
  afd0b0b... Release balsa-2.5.6
  d73f5cc... balsa-icons: Revert to previous logic
  15b9972... Use g_str_has_prefix()
  3f4fb49... Reimplement libbalsa_clear_source_id()
  7fe5dab... Do not seg fault on delayed exit
  51401e4... address-book-rubrica: Fix a typo
  aa7e4da... Bump glib dependency to >= 2.56
  e56fbee... IMAP goes GIO
  677fd20... libbalsa/imap: Fix the meson build
  9e5ad84... imap-server: Unconditionally set the user and host
  9a14bbb... Use Unicode apostrophes in new translatable strings
  3fef0ab... Remove some debugging prints
  e7620d0... Various: Split set-security from set-host
  a6744bf... source-viewer: Subclass GtkApplicationWindow
  c1160f8... main and main-window: Pass the GtkApplication
  a2f861e... message-window: Subclass GtkApplicationWindow
  b30e5d8... compose-window: Subclass GtkApplicationWindow
  a764c05... Fix fallout from renaming sendmsg* to compose*
  4de09e0... Make GResource paths static as well as const
  92584aa... main-window: On 'quit', use gtk_window_close()

(*) This commit already existed in another branch; no separate mail sent