talons

commit 864f6ad6e078e6bb17ab5963586c0af1c0711656
parent c79a52334e9cb36273182aea79db6d99a2f09e8a
Author: Michael Rasmussen <mir@datanom.net>
Date:   Fri, 19 Mar 2021 21:46:23 +0100

Merge branch 'master' into oauth2

Diffstat:
M
src/compose.c
 | 
10
++++++++++
M
src/plugins/libravatar/claws.def
 | 
1
+
M
src/plugins/managesieve/claws.def
 | 
1
+
M
src/plugins/pgpinline/claws.def
 | 
1
+
M
src/quote_fmt_parse.y
 | 
4
++--

5 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/compose.c b/src/compose.c
@@ -374,9 +374,11 @@ static void compose_set_ext_editor_sensitive	(Compose	*compose,
 						 gboolean	 sensitive);
 static gboolean compose_get_ext_editor_cmd_valid();
 static gboolean compose_get_ext_editor_uses_socket();
+#ifndef G_OS_WIN32
 static gboolean compose_ext_editor_plug_removed_cb
 						(GtkSocket      *socket,
 						 Compose        *compose);
+#endif /* G_OS_WIN32 */
 
 static void compose_undo_state_changed		(UndoMain	*undostruct,
 						 gint		 undo_state,
@@ -9628,7 +9630,9 @@ static void compose_exec_ext_editor(Compose *compose)
 {
 	gchar *tmp;
 	GtkWidget *socket;
+#ifndef G_OS_WIN32
 	GdkNativeWindow socket_wid = 0;
+#endif /* G_OS_WIN32 */
 	GPid pid;
 	GError *error = NULL;
 	gchar *cmd;
@@ -9646,6 +9650,7 @@ static void compose_exec_ext_editor(Compose *compose)
 	}
 
 	if (compose_get_ext_editor_uses_socket()) {
+#ifndef G_OS_WIN32
 		/* Only allow one socket */
 		if (compose->exteditor_socket != NULL) {
 			if (gtk_widget_is_focus(compose->exteditor_socket)) {
@@ -9666,10 +9671,12 @@ static void compose_exec_ext_editor(Compose *compose)
 		gtk_widget_realize(socket);
 		socket_wid = gtk_socket_get_id(GTK_SOCKET (socket));
 		compose->exteditor_socket = socket;
+#endif /* G_OS_WIN32 */
 	}
 
 	if (compose_get_ext_editor_cmd_valid()) {
 		if (compose_get_ext_editor_uses_socket()) {
+#ifndef G_OS_WIN32
 			p = g_strdup(prefs_common_get_ext_editor_cmd());
 			s = strstr(p, "%w");
 			s[1] = 'u';
@@ -9678,6 +9685,7 @@ static void compose_exec_ext_editor(Compose *compose)
 			else
 				cmd = g_strdup_printf(p, socket_wid, tmp);
 			g_free(p);
+#endif /* G_OS_WIN32 */
 		} else {
 			cmd = g_strdup_printf(prefs_common_get_ext_editor_cmd(), tmp);
 		}
@@ -9917,12 +9925,14 @@ static gboolean compose_get_ext_editor_uses_socket()
 	        strstr(prefs_common_get_ext_editor_cmd(), "%w"));
 }
 
+#ifndef G_OS_WIN32
 static gboolean compose_ext_editor_plug_removed_cb(GtkSocket *socket, Compose *compose)
 {
 	compose->exteditor_socket = NULL;
 	/* returning FALSE allows destruction of the socket */
 	return FALSE;
 }
+#endif /* G_OS_WIN32 */
 
 /**
  * compose_undo_state_changed:
diff --git a/src/plugins/libravatar/claws.def b/src/plugins/libravatar/claws.def
@@ -19,6 +19,7 @@ debug_print_real
 debug_srcname
 file_exist
 get_rc_dir
+gtkut_stock_button
 hooks_register_hook
 hooks_unregister_hook
 is_dir_exist
diff --git a/src/plugins/managesieve/claws.def b/src/plugins/managesieve/claws.def
@@ -15,6 +15,7 @@ debug_srcname
 get_rc_dir
 gtkut_get_options_frame
 gtkut_sc_combobox_create
+gtkut_stock_button
 gtkut_stock_button_set_create
 gtkut_stock_with_text_button_set_create
 gtkut_text_view_search_string
diff --git a/src/plugins/pgpinline/claws.def b/src/plugins/pgpinline/claws.def
@@ -11,6 +11,7 @@ conv_codeset_strdup
 conv_get_locale_charset_str_no_utf8
 debug_print_real
 debug_srcname
+file_read_stream_to_str_no_recode
 get_mime_tmp_dir
 file_read_stream_to_str_no_recode
 my_tmpfile
diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
@@ -528,7 +528,7 @@ static void quote_fmt_insert_program_output(const gchar *progname)
 		while (fgets(buffer, sizeof(buffer), file)) {
 			INSERT(buffer);
 		}
-		close(file);
+		fclose(file);
 	}
 }
 
@@ -575,7 +575,7 @@ static void quote_fmt_attach_file_program_output(const gchar *progname)
 			strretchomp(buffer);
 			attachments = g_list_append(attachments, g_strdup(buffer));
 		}
-		close(file);
+		fclose(file);
 	}
 }