Merge pull request #366 from ZoiteChat/release/2.19-flatpak-error-startup

fix startup error on flatpak

.github/workflows/appimage-build.yml

@@ -2,7 +2,7 @@ name: AppImage Build
 
 on:
   push:
-    branches: [master]
+    branches: [master, 'release/**']
   pull_request:
     branches: [master]
 

.github/workflows/flatpak-build.yml

@@ -2,7 +2,7 @@ name: Flatpak Build
 
 on:
   push:
-    branches: [master]
+    branches: [master, 'release/**']
   pull_request:
     branches: [master]
 

.github/workflows/windows-build.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - 'release/**'
   pull_request:
     branches:
       - master

src/common/dbus/meson.build

@@ -13,9 +13,9 @@ dbus_includes = [
 dbus_service_dir = join_paths(get_option('datadir'), 'dbus-1/services')
 
 if get_option('dbus-service-use-appid')
-  dbus_service_name = 'io.github.Hexchat'
+  dbus_service_name = 'net.zoite.Zoitechat'
-  dbus_output_file = 'io.github.Hexchat.service'
+  dbus_output_file = 'net.zoite.Zoitechat.service'
-  dbus_cargs = '-DDBUS_SERVICE="io.github.Hexchat"'
+  dbus_cargs = '-DDBUS_SERVICE="net.zoite.Zoitechat"'
 else
   dbus_service_name = 'org.zoitechat.service'
   dbus_output_file = 'org.zoitechat.service.service'

src/common/inbound.c

@@ -675,7 +675,8 @@ inbound_chanmsg (server *serv, session *sess, char *chan, char *from,
 
 	if (fromme)
 	{
-		if (prefs.hex_away_auto_unmark && serv->is_away && !tags_data->timestamp)
+		if (prefs.hex_away_auto_unmark && serv->is_away &&
+			 (!tags_data->timestamp || serv->have_echo_message))
 			sess->server->p_set_back (sess->server);
 		reply_context_print (sess, tags_data);
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_UCHANMSG, sess, from, text, nickchar, NULL,

src/common/outbound.c

@@ -3025,7 +3025,7 @@ cmd_msg (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 									  newsess->server->nick, msg + offset, TRUE, FALSE,
 									  &no_tags);
 			}
-			else
+			else if (!sess->server->have_echo_message)
 			{
 				/* mask out passwords */
 				if (g_ascii_strcasecmp (nick, "nickserv") == 0)
@@ -5058,6 +5058,11 @@ handle_user_input (session *sess, char *text, int history, int nocommand)
 		handle_say (sess, text, TRUE);
 		return 1;
 	}
+	if (text[0] == cmd_char && text[1] == cmd_char)
+	{
+		handle_say (sess, text + 1, TRUE);
+		return 1;
+	}
 
 	for (i = 1; text[i]; i++)
 	{