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

fix startup error on flatpak

VERSION

@@ -1 +1 @@
-2.19.1
+2.19.0

data/misc/meson.build

@@ -2,7 +2,6 @@ appdir = join_paths(get_option('datadir'), 'applications')
 metainfodir = join_paths(get_option('datadir'), 'metainfo')
 mimedir = join_paths(get_option('datadir'), 'mime', 'packages')
 desktop_utils = find_program('desktop-file-validate', required: false)
-appstreamcli = find_program('appstreamcli', required: false)
 
 if get_option('gtk-frontend')
   if get_option('install-appdata')
@@ -14,6 +13,7 @@ if get_option('gtk-frontend')
       install_dir: metainfodir
     )
 
+    appstreamcli = find_program('appstreamcli', required: false)
     if appstreamcli.found()
       test('Validate net.zoite.Zoitechat.appdata.xml', appstreamcli,
         args: ['validate', zoitechat_appdata]

meson.build

@@ -1,6 +1,6 @@
 project('zoitechat', 'c',
   version: run_command('cat', 'VERSION', check: true).stdout().strip(),
-  meson_version: '>= 0.59.0',
+  meson_version: '>= 0.55.0',
   default_options: [
     'c_std=c17',
     'buildtype=debugoptimized',

src/common/ctcp.c

@@ -126,21 +126,7 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 		if (ctcp_check (sess, nick, word, word_eol, word[4] + ctcp_offset))
 			goto generic;
 
-		{
+		inbound_action (sess, to, nick, ip, msg + 7, FALSE, tags_data->identified, tags_data);
-			gboolean private_fromme = !serv->p_cmp (nick, serv->nick) && !is_channel (serv, to);
-
-			if (private_fromme)
-			{
-				session *target = find_dialog (serv, to);
-
-				if (target)
-					sess = target;
-				else if (serv->front_session)
-					sess = serv->front_session;
-			}
-
-			inbound_action (sess, to, nick, ip, msg + 7, private_fromme, tags_data->identified, tags_data);
-		}
 		return;
 	}
 

src/common/gtk3-theme-service.c

@@ -858,10 +858,8 @@ path_depth_from_root (const char *base, const char *path)
 static gint
 theme_root_candidate_compare (gconstpointer a, gconstpointer b)
 {
-	/* g_ptr_array_sort() passes pointers to the array slots, not the values
+	const ThemeRootCandidate *ca = a;
-	 * stored in those slots. Dereference once before comparing candidates. */
+	const ThemeRootCandidate *cb = b;
-	const ThemeRootCandidate *ca = *(ThemeRootCandidate * const *) a;
-	const ThemeRootCandidate *cb = *(ThemeRootCandidate * const *) b;
 	if (ca->has_index_theme != cb->has_index_theme)
 		return ca->has_index_theme ? -1 : 1;
 	if (ca->depth != cb->depth)

src/common/proto-irc.c

@@ -1368,7 +1368,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 						{
 							if (ignore_check (word[1], IG_PRIV))
 								return;
-							if (!serv->p_cmp (nick, serv->nick))
+							if (serv->have_echo_message && !serv->p_cmp (nick, serv->nick))
 							{
 								session *target_sess = find_dialog (serv, to);
 

src/common/zoitechat.c

@@ -463,6 +463,7 @@ doover:
 		while (list)
 		{
 			sess = list->data;
+			if (!sess->server->have_awaynotify)
 				sess->done_away_check = FALSE;
 			list = list->next;
 		}

src/fe-gtk/chanview-tree.c

@@ -300,14 +300,6 @@ cv_tree_focus (chan *ch)
 
 	path = gtk_tree_model_get_path (model, &ch->iter);
 	if (path)
-	{
-		if (!gtk_widget_get_realized (GTK_WIDGET (tree)))
-		{
-			/* Layout changes can restore focus before the new tree is realized.
-			 * Let GTK track the row and scroll once its geometry is available. */
-			gtk_tree_view_scroll_to_cell (tree, path, NULL, TRUE, 0.5, 0.5);
-		}
-		else
 	{
 		/* This full section does what
 		 * gtk_tree_view_scroll_to_cell (tree, path, NULL, TRUE, 0.5, 0.5);
@@ -330,7 +322,6 @@ cv_tree_focus (chan *ch)
 				dest_y = 0;
 			gtk_tree_view_scroll_to_point (tree, -1, dest_y);
 		}
-		}
 		/* theft done, now make it focused like */
 		gtk_tree_view_set_cursor (tree, path, NULL, FALSE);
 		gtk_tree_path_free (path);

win32/installer/zoitechat.iss.tt

@@ -373,10 +373,10 @@ begin
     idpClearFiles;
 
 	if WizardIsComponentSelected('themes\windows10') then
-		idpAddFile('https://dl.zoitechat.org/themes/GTK3Themes/Windows-10-3.2.1.zip', ExpandConstant('{tmp}\Windows-10-3.2.1.zip'));
+		idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-3.2.1.zip', ExpandConstant('{tmp}\Windows-10-3.2.1.zip'));
 
 	if WizardIsComponentSelected('themes\windows10dark') then
-		idpAddFile('https://dl.zoitechat.org/themes/GTK3Themes/Windows-10-Dark-3.2.1-dark.zip', ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip'));
+		idpAddFile('https://dl.zoitechat.zoite.net/themes/GTK3Themes/Windows-10-Dark-3.2.1-dark.zip', ExpandConstant('{tmp}\Windows-10-Dark-3.2.1-dark.zip'));
 
 	if not WizardIsTaskSelected('portable') then
 	begin