Migrate from gtk_widget_is_composited to gdk_screen_is_composited.

gtk_widget_is_composited is gone in GTK 3.

po/ru.po

@@ -18,7 +18,6 @@
 # Aleksey <aleksdem@aleksdem.com>, 2016
 # Артем Малофеев <79067635919@yandex.ru>, 2019
 # Магретов Никита <huku111a@gmail.com>, 2016
-# Alexander Popov <iiiypuk@fastmail.fm>, 2023
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
@@ -283,15 +282,15 @@ msgstr "Диалог"
 
 #: src/common/hexchat.c:948
 msgid "WhoIs"
-msgstr "WhoIs"
+msgstr "Кто "
 
 #: src/common/hexchat.c:949
 msgid "Send"
-msgstr "Отправить файл"
+msgstr "Послать"
 
 #: src/common/hexchat.c:950
 msgid "Chat"
-msgstr "Чат"
+msgstr "Разговор"
 
 #: src/common/hexchat.c:951 src/fe-gtk/banlist.c:847 src/fe-gtk/dccgui.c:889
 #: src/fe-gtk/ignoregui.c:387 src/fe-gtk/urlgrab.c:214
@@ -3260,7 +3259,7 @@ msgstr "Выберите файл для вывода"
 
 #: src/fe-gtk/chanlist.c:624 src/fe-gtk/chanlist.c:812
 msgid "_Join Channel"
-msgstr "_Войти на канал"
+msgstr "Зайти на канал"
 
 #: src/fe-gtk/chanlist.c:626
 msgid "_Copy Channel Name"
@@ -3725,7 +3724,7 @@ msgstr "_Ничего, я войду на канал позднее."
 
 #: src/fe-gtk/joind.c:191
 msgid "_Join this channel:"
-msgstr "Войти на канал:"
+msgstr "Зайти на канал:"
 
 #: src/fe-gtk/joind.c:203
 msgid "If you know the name of the channel you want to join, enter it here."
@@ -3854,11 +3853,11 @@ msgstr "Мерцание _окна"
 
 #: src/fe-gtk/maingui.c:1566 src/fe-gtk/menu.c:2351
 msgid "_Detach"
-msgstr "Отсо_единить окно"
+msgstr "Отсо_единить"
 
 #: src/fe-gtk/maingui.c:1568 src/fe-gtk/menu.c:2352 src/fe-gtk/menu.c:2357
 msgid "_Close"
-msgstr "_Закрыть"
+msgstr "Закрыть"
 
 #: src/fe-gtk/maingui.c:1908 src/fe-gtk/maingui.c:2021
 msgid "User limit must be a number!\n"
@@ -4193,35 +4192,35 @@ msgstr "He_xChat"
 
 #: src/fe-gtk/menu.c:1758
 msgid "Network Li_st"
-msgstr "_Список сетей"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1761
 msgid "_New"
-msgstr "_Новое..."
+msgstr "Новая..."
 
 #: src/fe-gtk/menu.c:1762
 msgid "Server Tab"
-msgstr "Вкладка сервера"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1763
 msgid "Channel Tab"
-msgstr "Вкладка канала"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1764
 msgid "Server Window"
-msgstr "Окно сервера"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1765
 msgid "Channel Window"
-msgstr "Окно канала"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1769
 msgid "_Load Plugin or Script"
-msgstr "Загрузить плагин или _скрипт"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1776 src/fe-gtk/plugin-tray.c:579
 msgid "_Quit"
-msgstr "_Выход"
+msgstr "Выход"
 
 #. 15
 #: src/fe-gtk/menu.c:1778
@@ -4234,7 +4233,7 @@ msgstr "Панел_ь меню"
 
 #: src/fe-gtk/menu.c:1781
 msgid "_Topic Bar"
-msgstr "Т_ема канала"
+msgstr "Т_ема"
 
 #: src/fe-gtk/menu.c:1782
 msgid "_User List"
@@ -4242,7 +4241,7 @@ msgstr "Список _пользователей"
 
 #: src/fe-gtk/menu.c:1783
 msgid "U_ser List Buttons"
-msgstr "_Кнопки списка пользователей"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1784
 msgid "M_ode Buttons"
@@ -4270,11 +4269,11 @@ msgstr "Выключено"
 
 #: src/fe-gtk/menu.c:1794
 msgid "Graph"
-msgstr "График"
+msgstr "График:"
 
 #: src/fe-gtk/menu.c:1799
 msgid "_Fullscreen"
-msgstr "_Полноэкранный режим"
+msgstr "_Полноэкранка"
 
 #: src/fe-gtk/menu.c:1801
 msgid "_Server"
@@ -4286,19 +4285,19 @@ msgstr "Отключиться"
 
 #: src/fe-gtk/menu.c:1803
 msgid "_Reconnect"
-msgstr "_Пересоединиться"
+msgstr "Пересоединиться"
 
 #: src/fe-gtk/menu.c:1804
 msgid "_Join a Channel"
-msgstr "_Войти на канал"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1805
 msgid "Channel _List"
-msgstr "Список каналов"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1808
 msgid "Marked _Away"
-msgstr "Пометить как _Отошёл"
+msgstr "Помечен как _Отошёл"
 
 #: src/fe-gtk/menu.c:1810
 msgid "_Usermenu"
@@ -4311,11 +4310,11 @@ msgstr "Настройка"
 
 #: src/fe-gtk/menu.c:1813 src/fe-gtk/plugin-tray.c:577
 msgid "_Preferences"
-msgstr "Параметры"
+msgstr "Установки"
 
 #: src/fe-gtk/menu.c:1815
 msgid "Auto Replace"
-msgstr "Автозамена"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1816
 msgid "CTCP Replies"
@@ -4335,7 +4334,7 @@ msgstr ""
 
 #: src/fe-gtk/menu.c:1820
 msgid "URL Handlers"
-msgstr "Обработчики URL"
+msgstr ""
 
 #: src/fe-gtk/menu.c:1821
 msgid "User Commands"
@@ -4793,7 +4792,7 @@ msgstr "Не показывать список сетей при запуске"
 
 #: src/fe-gtk/servlistgui.c:2130
 msgid "Show favorites only"
-msgstr "Показывать только избранные"
+msgstr "Показывать только фавориты"
 
 #: src/fe-gtk/servlistgui.c:2160
 msgid "_Edit..."
@@ -4811,7 +4810,7 @@ msgstr ""
 
 #: src/fe-gtk/servlistgui.c:2176
 msgid "_Favor"
-msgstr "_В избранное"
+msgstr "_В фавориты"
 
 #: src/fe-gtk/servlistgui.c:2177
 msgid "Mark or unmark this network as a favorite."
@@ -5031,7 +5030,7 @@ msgstr "Валлонский"
 
 #: src/fe-gtk/setup.c:149 src/fe-gtk/setup.c:1880
 msgid "General"
-msgstr "Основные"
+msgstr "Главный"
 
 #: src/fe-gtk/setup.c:151
 msgid "Language:"
@@ -5083,19 +5082,19 @@ msgstr "Настройки прозрачности"
 
 #: src/fe-gtk/setup.c:164
 msgid "Window opacity:"
-msgstr "Прозрачность окна:"
+msgstr ""
 
 #: src/fe-gtk/setup.c:166 src/fe-gtk/setup.c:593
 msgid "Timestamps"
-msgstr "Временная метка"
+msgstr ""
 
 #: src/fe-gtk/setup.c:167
 msgid "Enable timestamps"
-msgstr "Включить временные метки"
+msgstr ""
 
 #: src/fe-gtk/setup.c:168
 msgid "Timestamp format:"
-msgstr "Формат временной метки:"
+msgstr ""
 
 #: src/fe-gtk/setup.c:170 src/fe-gtk/setup.c:597
 msgid "See the strftime MSDN article for details."
@@ -5107,7 +5106,7 @@ msgstr "См. страницу руководства по strftime."
 
 #: src/fe-gtk/setup.c:175
 msgid "Title Bar"
-msgstr "Строка заголовка"
+msgstr ""
 
 #: src/fe-gtk/setup.c:176
 msgid "Show channel modes"
@@ -5709,7 +5708,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:561
 msgid "Automatically include timestamps"
-msgstr "Автоматически добавлять временные метки"
+msgstr ""
 
 #: src/fe-gtk/setup.c:562
 msgid ""
@@ -5767,7 +5766,7 @@ msgstr "Задержка авто восстановления соединен
 
 #: src/fe-gtk/setup.c:578
 msgid "Auto join delay:"
-msgstr "Задержка автоматического входа:"
+msgstr ""
 
 #: src/fe-gtk/setup.c:579
 msgid "Ban Type:"
@@ -6090,7 +6089,7 @@ msgstr "Цвета"
 
 #: src/fe-gtk/setup.c:1879
 msgid "Chatting"
-msgstr "Чат"
+msgstr "Общение"
 
 #: src/fe-gtk/setup.c:1882
 msgid "Sounds"

src/common/servlist.c

@@ -305,9 +305,6 @@ static const struct defaultserver def[] =
 	{"Techtronix",	0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.techtronix.net"},
 	
-	{"TechNet", 0, 0, 0, LOGIN_SASL, 0, TRUE},
-	{0,			"irc.technet.chat"},
-	
 	{"tilde.chat", 0, 0, 0, LOGIN_SASL, 0, TRUE},
 	{0,			"irc.tilde.chat"},
 

src/fe-gtk/chanlist.c

@@ -459,7 +459,7 @@ chanlist_join (GtkWidget * wid, server *serv)
 			g_snprintf (tbuf, sizeof (tbuf), "join %s", chan);
 			handle_command (serv->server_session, tbuf, FALSE);
 		} else
-			gdk_beep ();
+			gdk_display_beep (gdk_display_get_default ());
 		g_free (chan);
 	}
 }
@@ -777,7 +777,6 @@ chanlist_opengui (server *serv, int do_refresh)
 	chanlist_add_column (view, COL_CHANNEL, 96, _("Channel"), FALSE);
 	chanlist_add_column (view, COL_USERS,   50, _("Users"),   TRUE);
 	chanlist_add_column (view, COL_TOPIC,   50, _("Topic"),   FALSE);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 	/* this is a speed up, but no horizontal scrollbar :( */
 	/*gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (view), TRUE);*/
 	gtk_widget_show (view);

src/fe-gtk/dccgui.c

@@ -812,7 +812,6 @@ fe_dcc_open_recv_win (int passive)
 										 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
 										 G_TYPE_STRING, G_TYPE_POINTER, GDK_TYPE_COLOR);
 	view = gtkutil_treeview_new (vbox, GTK_TREE_MODEL (store), NULL, -1);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 	/* Up/Down Icon column */
 	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (view), -1, NULL,
 																gtk_cell_renderer_pixbuf_new (),
@@ -1067,7 +1066,6 @@ fe_dcc_open_chat_win (int passive)
 	dcc_add_column (view, CCOL_START,  CCOL_COLOR, _("Start Time"), FALSE);
 
 	gtk_tree_view_column_set_expand (gtk_tree_view_get_column (GTK_TREE_VIEW (view), 1), TRUE);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 
 	dcccwin.list = view;
 	dcccwin.store = store;

src/fe-gtk/editlist.c

@@ -288,8 +288,6 @@ editlist_treeview_new (GtkWidget *box, char *title1, char *title2)
 	g_signal_connect (G_OBJECT (view), "key_press_event",
 						G_CALLBACK (editlist_keypress), NULL);
 
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
-
 	render = gtk_cell_renderer_text_new ();
 	g_object_set (render, "editable", TRUE, NULL);
 	g_signal_connect (G_OBJECT (render), "edited",

src/fe-gtk/fe-gtk.c

@@ -698,7 +698,7 @@ fe_beep (session *sess)
 
 	if (ca_context_play (ca_con, 0, CA_PROP_EVENT_ID, "message-new-instant", NULL) != 0)
 #endif
-	gdk_beep ();
+	gdk_display_beep (gdk_display_get_default ());
 #endif
 }
 
@@ -1065,7 +1065,8 @@ uri_contains_forbidden_characters (const char *uri)
 {
 	while (*uri)
 	{
-		if (!g_ascii_isalnum (*uri) && !strchr ("-._~:/?#[]@!$&'()*+,;=", *uri))
+		/* This is not an exhaustive list, the full URI has segments that allow characters like "[]:" for example. */
+		if (strchr ("`<> ${}\"+", *uri) != NULL || (*uri & 0x80) /* non-ascii */)
 			return TRUE;
 		uri++;
 	}

src/fe-gtk/fkeys.c

@@ -674,8 +674,6 @@ key_dialog_treeview_new (GtkWidget *box)
 	g_signal_connect (G_OBJECT (gtk_tree_view_get_selection (GTK_TREE_VIEW(view))),
 					"changed", G_CALLBACK (key_dialog_selection_changed), NULL);
 
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
-
 	render = gtk_cell_renderer_accel_new ();
 	g_object_set (render, "editable", TRUE,
 #ifndef WIN32

src/fe-gtk/ignoregui.c

@@ -165,7 +165,6 @@ ignore_treeview_new (GtkWidget *box)
 	                             UNIGNORE_COLUMN, _("Unignore"),
 	                             -1);
 
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 	gtk_tree_view_column_set_expand (gtk_tree_view_get_column (GTK_TREE_VIEW (view), 0), TRUE);
 
 	/* attach to signals and customise columns */

src/fe-gtk/plugingui.c

@@ -66,7 +66,6 @@ plugingui_treeview_new (GtkWidget *box)
 	                             FILE_COLUMN, _("File"),
 	                             DESC_COLUMN, _("Description"),
 	                             FILEPATH_COLUMN, NULL, -1);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 	for (col_id=0; (col = gtk_tree_view_get_column (GTK_TREE_VIEW (view), col_id));
 	     col_id++)
 			gtk_tree_view_column_set_alignment (col, 0.5);

src/fe-gtk/setup.c

@@ -909,7 +909,7 @@ setup_create_hscale (GtkWidget *table, int row, const setting *set)
 
 #ifndef WIN32 /* Windows always supports this */
 	/* Only used for transparency currently */
-	if (!gtk_widget_is_composited (current_sess->gui->window))
+	if (!gdk_screen_is_composited (gdk_window_get_screen (GDK_WINDOW (current_sess->gui->window))))
 		gtk_widget_set_sensitive (wid, FALSE);
 #endif
 }
@@ -1794,7 +1794,6 @@ setup_create_sound_page (void)
 							G_CALLBACK (setup_snd_row_cb), NULL);
 	gtk_widget_show (sound_tree);
 	gtk_container_add (GTK_CONTAINER (scrolledwindow1), sound_tree);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (sound_tree), TRUE);
 
 	table1 = gtk_table_new (2, 3, FALSE);
 	gtk_widget_show (table1);

src/fe-gtk/textgui.c

@@ -131,7 +131,7 @@ PrintTextRaw (void *xtbuf, unsigned char *text, int indent, time_t stamp)
 			{
 				beep_done = TRUE;
 				if (!prefs.hex_input_filter_beep)
-					gdk_beep ();
+					gdk_display_beep (gdk_display_get_default ());
 			}
 		default:
 			text++;
@@ -356,7 +356,6 @@ pevent_treeview_new (GtkWidget *box)
 	view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
 	gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (view), TRUE);
 	gtk_tree_view_set_enable_search (GTK_TREE_VIEW (view), TRUE);
-	gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (view), TRUE);
 
 	sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
 	g_signal_connect (G_OBJECT (sel), "changed",

src/fe-gtk/xtext.c

@@ -3811,7 +3811,8 @@ gtk_xtext_render_page (GtkXText * xtext)
 	if (xtext->buffer->indent < MARGIN)
 		xtext->buffer->indent = MARGIN;	  /* 2 pixels is our left margin */
 
-	gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &width, &height);
+	width = gdk_window_get_width (GTK_WIDGET (xtext)->window);
+	height = gdk_window_get_height (GTK_WIDGET (xtext)->window);
 
 	if (width < 34 || height < xtext->fontsize || width < xtext->buffer->indent + 32)
 		return;