[M-git] Mahogany sources repository. branch master updated. v0.67-931-g9e5043ff

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Mahogany sources repository.".

The branch, master has been updated
       via  9e5043ff2d67eff759e7dd0ce9b4caf56c85444e (commit)
       via  f051bb8a87b033fbb2d49827fa18e748a5e1c3de (commit)
      from  2bb5a98f2900548f99b893f07e40f4809c2a48ff (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9e5043ff2d67eff759e7dd0ce9b4caf56c85444e
Author: Vadim Zeitlin <[email protected]>
Date:   Sun May 3 00:32:49 2026 +0200

    Use gettext_noop() for default MOption values
    
    Using _() was wrong as it could never return the translated string when
    it was called during static initialization, i.e. long time before the
    message catalogs could be loaded.
    
    The code is still wrong because these strings are never actually
    translated, but this could be fixed later.

diff --git a/include/Moptions.h b/include/Moptions.h
index 8a33a1d3..61b0a641 100644
--- a/include/Moptions.h
+++ b/include/Moptions.h
@@ -1509,11 +1509,11 @@ extern const MOption MP_OPTION_ORIGIN_INHERITED;
 #define MP_COMPOSETEMPLATEPATH_GLOBAL_DEFVAL   ""
 
 /// the format string for the folder tree display
-#define MP_FOLDERSTATUS_TREE_DEFVAL _("%f (%t, %u)")
+#define MP_FOLDERSTATUS_TREE_DEFVAL gettext_noop("%f (%t, %u)")
 /// the format string for status bar folder status display
-#define MP_FOLDERSTATUS_STATBAR_DEFVAL _("%f (%t messages, %u unread, %n new)")
+#define MP_FOLDERSTATUS_STATBAR_DEFVAL gettext_noop("%f (%t messages, %u unread, %n new)")
 /// the format string for title bar folder status display
-#define MP_FOLDERSTATUS_TITLEBAR_DEFVAL _("%f (%u unread, %n new)")
+#define MP_FOLDERSTATUS_TITLEBAR_DEFVAL gettext_noop("%f (%u unread, %n new)")
 
 /**@name Printer settings */
 //@{
@@ -1703,7 +1703,7 @@ extern const MOption MP_OPTION_ORIGIN_INHERITED;
 /// prefix for subject in replies
 #define   MP_REPLY_PREFIX_DEFVAL      "Re: "
 /// prefix for subject in forwards
-#define   MP_FORWARD_PREFIX_DEFVAL      _("Forwarded message: ")
+#define   MP_FORWARD_PREFIX_DEFVAL      gettext_noop("Forwarded message: ")
 /// collapse reply prefixes? 0=no, 1=replace "Re"s with one, 2=use reply level
 #define   MP_REPLY_COLLAPSE_PREFIX_DEFVAL 2L
 /// include the original message in the reply [no,ask,yes]
@@ -1944,7 +1944,7 @@ extern const MOption MP_OPTION_ORIGIN_INHERITED;
 /**@name  Font settings for message view */
 //@{
 /// message view title
-#define   MP_MVIEW_TITLE_FMT_DEFVAL   _("from $from about \"$subject\"")
+#define   MP_MVIEW_TITLE_FMT_DEFVAL   gettext_noop("from $from about \"$subject\"")
 /// which font to use
 #define   MP_MVIEW_FONT_DEFVAL         0L
 /// which font size
@@ -2014,7 +2014,7 @@ extern const MOption MP_OPTION_ORIGIN_INHERITED;
 /// update the folder view status bar to show the msg info?
 #define   MP_FVIEW_STATUS_UPDATE_DEFVAL 0L
 /// folder view status bar string
-#define   MP_FVIEW_STATUS_FMT_DEFVAL _("Date: $date, Subject: $subject, From: $from")
+#define   MP_FVIEW_STATUS_FMT_DEFVAL gettext_noop("Date: $date, Subject: $subject, From: $from")
 /// delay before previewing the selected item in the folder view (0 to disable)
 #define MP_FVIEW_PREVIEW_DELAY_DEFVAL 500L
 /// split folder view vertically (or horizontally)?

commit f051bb8a87b033fbb2d49827fa18e748a5e1c3de
Author: Vadim Zeitlin <[email protected]>
Date:   Sun May 3 00:04:51 2026 +0200

    Define M_TOP_{SOURCE,BUILD}DIR in CMake build too
    
    This is required to find different support files, e.g. icons.

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 631a25f2..eeb36914 100644
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -16,6 +16,9 @@
 #define USE_MODULES 1
 #define USE_MODULES_STATIC 1
 
+#define M_TOP_SOURCEDIR "@CMAKE_SOURCE_DIR@"
+#define M_TOP_BUILDDIR "@CMAKE_BINARY_DIR@"
+
 #define M_PREFIX "@CMAKE_INSTALL_PREFIX@"
 
 #define M_CANONICAL_HOST "@CMAKE_LIBRARY_ARCHITECTURE@"

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

Summary of changes:
 build/cmake/config.h.in |  3 +++
 include/Moptions.h      | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Mahogany sources repository.