<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/90a2f391a51069ec41b1c052a465702277769682">https://github.com/macports/macports-ports/commit/90a2f391a51069ec41b1c052a465702277769682</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 90a2f391a51 claws-mail: update to 4.3.0
</span>90a2f391a51 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 90a2f391a51069ec41b1c052a465702277769682
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Wed Sep 18 10:37:44 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> claws-mail: update to 4.3.0
</span>---
mail/claws-mail/Portfile | 14 +-
mail/claws-mail/files/patch-no-cpp-precomp.diff | 11 --
mail/claws-mail/files/patch-no-x11.diff | 211 ------------------------
3 files changed, 6 insertions(+), 230 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/claws-mail/Portfile b/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b968221b220..8186fdf276a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
name claws-mail
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories mail news
license GPL-3+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,9 @@ long_description \
</span> homepage https://www.claws-mail.org
master_sites ${homepage}/releases/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dd78607d9894d961528ddd6b72fa869278fc2400 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7c8ab1732d74197df06d61a6b7ebc7c580ecf6e92eb1ef6ae5b0107533f1af07 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6674872
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3336dfa0f2b9c7d92363cab1a583b62ba0aaa396 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 95dc1d888eb916f028467fa0c3cbf45baff6678793b7bfb35fabba029d581ce1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6831980
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,9 +51,7 @@ depends_run port:bogofilter \
</span> port:ghostscript
# https://trac.macports.org/ticket/69665
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-no-cpp-precomp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-no-x11.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pdf-viewer.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-pdf-viewer.diff
</span>
if {${os.platform} eq "darwin" && ${os.major} < 12} {
# the ld on older systems doesn't understand the -export_dynamic flag
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/claws-mail/files/patch-no-cpp-precomp.diff b/mail/claws-mail/files/patch-no-cpp-precomp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 18cb1cf7e31..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/claws-mail/files/patch-no-cpp-precomp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2023-11-20 15:48:19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2024-05-24 15:27:35
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20736,7 +20736,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_name=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$target" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AM_CFLAGS="$AM_CFLAGS -no-cpp-precomp -fno-common"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AM_CFLAGS="$AM_CFLAGS -fno-common"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-*-mingw*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that we need to link to pthread in all cases. This
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/claws-mail/files/patch-no-x11.diff b/mail/claws-mail/files/patch-no-x11.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1f4a327368e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/claws-mail/files/patch-no-x11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,211 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From dd4c4e5152235f9f4f319cc9fdad9227ebf688c9 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Jonathan Boeing <jonathan@claws-mail.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 18 Nov 2023 18:51:30 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix building on non-X11 systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Gtk Sockets and the GDK_IS_X11_DISPLAY() macro are only available when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GDK_WINDOWING_X11 is defined
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/action.c | 3 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/compose.c | 78 ++++++++++++++++++--------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/plugins/dillo/dillo_viewer.c | 5 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 53 insertions(+), 33 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/action.c src/action.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d86294fbc..0c459aab6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/action.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/action.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <gdk/gdkx.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* GDK_WINDOWING_X11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef GDK_WINDOWING_QUARTZ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <gdk/gdkquartz.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* GDK_WINDOWING_QUARTZ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/compose.c src/compose.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 574d89be1..b32fa6bc7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/compose.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/compose.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -375,11 +375,11 @@ static void compose_set_ext_editor_sensitive (Compose *compose,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gboolean sensitive);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gboolean compose_get_ext_editor_cmd_valid();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gboolean compose_get_ext_editor_uses_socket();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gboolean compose_ext_editor_plug_removed_cb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (GtkSocket *socket,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Compose *compose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* G_OS_WIN32 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* GDK_WINDOWING_X11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void compose_undo_state_changed (UndoMain *undostruct,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint undo_state,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9623,11 +9623,11 @@ static gboolean compose_can_autosave(Compose *compose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void compose_exec_ext_editor(Compose *compose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *tmp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GtkWidget *socket;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Window socket_wid = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *p, *s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* G_OS_WIN32 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* GDK_WINDOWING_X11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GPid pid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GError *error = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *cmd = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9643,39 +9643,43 @@ static void compose_exec_ext_editor(Compose *compose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (compose_get_ext_editor_uses_socket() && GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Only allow one socket */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (compose->exteditor_socket != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (gtk_widget_is_focus(compose->exteditor_socket)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Move the focus off of the socket */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_widget_child_focus(compose->window, GTK_DIR_TAB_BACKWARD);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (compose_get_ext_editor_uses_socket()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Only allow one socket */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (compose->exteditor_socket != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (gtk_widget_is_focus(compose->exteditor_socket)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Move the focus off of the socket */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_widget_child_focus(compose->window, GTK_DIR_TAB_BACKWARD);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_free(tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_free(tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Create the receiving GtkSocket */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- socket = gtk_socket_new ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_signal_connect (G_OBJECT(socket), "plug-removed",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- G_CALLBACK(compose_ext_editor_plug_removed_cb),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- compose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_box_pack_start(GTK_BOX(compose->edit_vbox), socket, TRUE, TRUE, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_widget_set_size_request(socket, prefs_common.compose_width, -1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Realize the socket so that we can use its ID */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gtk_widget_realize(socket);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- socket_wid = gtk_socket_get_id(GTK_SOCKET (socket));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- compose->exteditor_socket = socket;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Create the receiving GtkSocket */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ socket = gtk_socket_new ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ g_signal_connect (G_OBJECT(socket), "plug-removed",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ G_CALLBACK(compose_ext_editor_plug_removed_cb),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ compose);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_box_pack_start(GTK_BOX(compose->edit_vbox), socket, TRUE, TRUE, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_widget_set_size_request(socket, prefs_common.compose_width, -1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Realize the socket so that we can use its ID */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_widget_realize(socket);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ socket_wid = gtk_socket_get_id(GTK_SOCKET (socket));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ compose->exteditor_socket = socket;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ debug_print("Socket communication with an external editor is only available on X11.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- alertpanel_error(_("Socket communication with an external editor is not available on Windows."));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (compose_get_ext_editor_uses_socket()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ alertpanel_error(_("Socket communication with an external editor is only available on X11."));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_free(tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* G_OS_WIN32 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- debug_print("Socket communication with an external editor is only available on X11.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* GDK_WINDOWING_X11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (compose_get_ext_editor_cmd_valid()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (compose_get_ext_editor_uses_socket() && GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p = g_strdup(prefs_common_get_ext_editor_cmd());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s = strstr(p, "%w");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- s[1] = 'u';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9684,10 +9688,12 @@ static void compose_exec_ext_editor(Compose *compose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmd = g_strdup_printf(p, socket_wid, tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_free(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* G_OS_WIN32 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmd = g_strdup_printf(prefs_common_get_ext_editor_cmd(), tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cmd = g_strdup_printf(prefs_common_get_ext_editor_cmd(), tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* GDK_WINDOWING_X11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (prefs_common_get_ext_editor_cmd())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_warning("external editor command-line is invalid: '%s'",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9776,10 +9782,12 @@ static void compose_ext_editor_closed_cb(GPid pid, gint exit_status, gpointer da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compose->exteditor_file = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compose->exteditor_pid = INVALID_PID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compose->exteditor_tag = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (compose->exteditor_socket && GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_widget_destroy(compose->exteditor_socket);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compose->exteditor_socket = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* GDK_WINDOWING_X11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9887,6 +9895,7 @@ static void compose_set_ext_editor_sensitive(Compose *compose,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext_editor_menu_entries[i], sensitive);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (compose_get_ext_editor_uses_socket() && GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (sensitive) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (compose->exteditor_socket)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9910,6 +9919,9 @@ static void compose_set_ext_editor_sensitive(Compose *compose,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_widget_set_sensitive(compose->text, sensitive);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gtk_widget_set_sensitive(compose->text, sensitive);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* GDK_WINDOWING_X11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (compose->toolbar->send_btn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gtk_widget_set_sensitive(compose->toolbar->send_btn, sensitive);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (compose->toolbar->sendl_btn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9934,14 +9946,14 @@ static gboolean compose_get_ext_editor_uses_socket()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- strstr(prefs_common_get_ext_editor_cmd(), "%w"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef G_OS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gboolean compose_ext_editor_plug_removed_cb(GtkSocket *socket, Compose *compose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compose->exteditor_socket = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* returning FALSE allows destruction of the socket */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif /* G_OS_WIN32 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* GDK_WINDOWING_X11 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * compose_undo_state_changed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/plugins/dillo/dillo_viewer.c src/plugins/dillo/dillo_viewer.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d2690bff6..8a93511d7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/plugins/dillo/dillo_viewer.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/plugins/dillo/dillo_viewer.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,10 +125,15 @@ static void dillo_show_mimepart(MimeViewer *_viewer,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_free(viewer->filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- debug_print("dillo viewer only works on X11\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ debug_print("dillo viewer only works on X11\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- viewer->filename = procmime_get_tmp_file_name(partinfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>