Hello community,
here is the log from the commit of package Srain for openSUSE:Factory checked
in at 2020-06-27 23:23:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Srain (Old)
and /work/SRC/openSUSE:Factory/.Srain.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Srain"
Sat Jun 27 23:23:03 2020 rev:5 rq:817379 version:1.1.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/Srain/Srain.changes 2020-05-26
17:22:37.336400722 +0200
+++ /work/SRC/openSUSE:Factory/.Srain.new.3060/Srain.changes 2020-06-27
23:23:09.821937367 +0200
@@ -1,0 +2,11 @@
+Sat Jun 27 08:02:25 UTC 2020 - Luigi Baldoni <aloi...@gmx.com>
+
+- Update to version 1.1.1
+ Changes:
+ * Improve auto-scroll policy of message list
+ Bug fixes:
+ * Fix TLS certificate verification error on glib-networking
+ 2.64.3
+ * Fix crash when connecting to an invalid host
+
+-------------------------------------------------------------------
Old:
----
Srain-1.1.0.tar.gz
New:
----
Srain-1.1.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Srain.spec ++++++
--- /var/tmp/diff_new_pack.s20CSQ/_old 2020-06-27 23:23:10.505939616 +0200
+++ /var/tmp/diff_new_pack.s20CSQ/_new 2020-06-27 23:23:10.509939629 +0200
@@ -17,7 +17,7 @@
Name: Srain
-Version: 1.1.0
+Version: 1.1.1
Release: 0
Summary: An IRC client
License: GPL-3.0-or-later AND ISC
++++++ Srain-1.1.0.tar.gz -> Srain-1.1.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/.github/workflows/build.yml
new/srain-1.1.1/.github/workflows/build.yml
--- old/srain-1.1.0/.github/workflows/build.yml 2020-05-24 06:53:14.000000000
+0200
+++ new/srain-1.1.1/.github/workflows/build.yml 2020-06-27 06:31:18.000000000
+0200
@@ -19,10 +19,9 @@
- uses: actions/checkout@v2
- name: Install the dependencies
run: |
- # Install make dependencies
- sudo apt-get install pkg-config gettext libgtk-3-dev libsoup2.4-dev
libconfig-dev libssl-dev libsecret-1-dev;
- # Install runtime dependencies
- sudo apt-get install glib-networking libgtk3.0 libsoup2.4 libconfig9
libsecret-1-0;
+ sudo apt-get update;
+ sudo apt-get install pkg-config gettext libgtk-3-dev libsoup2.4-dev
libconfig-dev libssl-dev libsecret-1-dev \
+ glib-networking libgtk3.0 libsoup2.4 libconfig9 libsecret-1-0;
- name: Build
run: |
./configure \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/Makefile.in new/srain-1.1.1/Makefile.in
--- old/srain-1.1.0/Makefile.in 2020-05-24 06:53:14.000000000 +0200
+++ new/srain-1.1.1/Makefile.in 2020-06-27 06:31:18.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_BUILD = $(shell [ -d .git ] && \
git rev-parse --git-dir > /dev/null 2>&1 && \
echo -n -git@0.`git rev-list --count HEAD`.`git
describe --always`)
-PACKAGE_VERSION = 1.1
+PACKAGE_VERSION = 1.1.1
PACKAGE_AUTHOR = Shengyu Zhang
PACKAGE_EMAIL = i...@silverrainz.me
PACKAGE_DESC = Modern IRC client written in GTK
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/doc/changelog.rst
new/srain-1.1.1/doc/changelog.rst
--- old/srain-1.1.0/doc/changelog.rst 2020-05-24 06:53:14.000000000 +0200
+++ new/srain-1.1.1/doc/changelog.rst 2020-06-27 06:31:18.000000000 +0200
@@ -30,7 +30,21 @@
.. _version-latest:
-.. _version-x.x.x:
+.. _version-1.1.1:
+
+2020-06-27 Version 1.1.1
+========================
+
+- Changes:
+
+ - Improve auto-scroll policy of message list (:pull:`255`)
+
+- Bug fixes:
+
+ - Fix TLS certificate verification error on glib-networking 2.64.3
(:issue:`251`)
+ - Fix crash when connecting to an invalid host (:issue:`234`)
+
+.. _version-1.1.0:
2020-05-24 Version 1.1.0
========================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/doc/conf.py new/srain-1.1.1/doc/conf.py
--- old/srain-1.1.0/doc/conf.py 2020-05-24 06:53:14.000000000 +0200
+++ new/srain-1.1.1/doc/conf.py 2020-06-27 06:31:18.000000000 +0200
@@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
-version = '1.1'
+version = '1.1.1'
# The full version, including alpha/beta/rc tags.
-release = '1.1'
+release = '1.1.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/doc/install.rst
new/srain-1.1.1/doc/install.rst
--- old/srain-1.1.0/doc/install.rst 2020-05-24 06:53:14.000000000 +0200
+++ new/srain-1.1.1/doc/install.rst 2020-06-27 06:31:18.000000000 +0200
@@ -46,9 +46,9 @@
.. code-block:: console
- $ wget https://github.com/SrainApp/srain/archive/1.1.tar.gz
- $ tar -xvzf 1.1.tar.gz
- $ cd srain-1.1
+ $ wget https://github.com/SrainApp/srain/archive/1.1.1.tar.gz
+ $ tar -xvzf 1.1.1.tar.gz
+ $ cd srain-1.1.1
Or get git version:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/po/nl.po new/srain-1.1.1/po/nl.po
--- old/srain-1.1.0/po/nl.po 2020-05-24 06:53:14.000000000 +0200
+++ new/srain-1.1.1/po/nl.po 2020-06-27 06:31:18.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Srain 1.0.0\n"
"Report-Msgid-Bugs-To: i...@silverrainz.me\n"
-"POT-Creation-Date: 2020-05-03 23:26+0800\n"
+"POT-Creation-Date: 2020-06-27 12:05+0800\n"
"PO-Revision-Date: 2020-03-07 20:14+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -618,7 +618,7 @@
msgid "Latency between %1$s: %2$lums"
msgstr "Vertraging tussen %1$s: %2$lums"
-#: ../src/sirc/sirc.c:186
+#: ../src/sirc/sirc.c:196
msgid "Local connection closed"
msgstr "Lokale verbinding afgesloten"
@@ -829,7 +829,7 @@
msgid "Remember password"
msgstr "Wachtwoord onthouden"
-#: ../src/sirc/sirc.c:199
+#: ../src/sirc/sirc.c:209
msgid "Remote connection closed"
msgstr "Externe verbinding afgesloten"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/po/ru.po new/srain-1.1.1/po/ru.po
--- old/srain-1.1.0/po/ru.po 2020-05-24 06:53:14.000000000 +0200
+++ new/srain-1.1.1/po/ru.po 2020-06-27 06:31:18.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Srain 1.0.0\n"
"Report-Msgid-Bugs-To: i...@silverrainz.me\n"
-"POT-Creation-Date: 2020-05-03 23:26+0800\n"
+"POT-Creation-Date: 2020-06-27 12:05+0800\n"
"PO-Revision-Date: 2019-04-17 16:14+0300\n"
"Last-Translator: Artem Polishchuk <ego.corda...@gmail.com>\n"
"Language-Team: \n"
@@ -625,7 +625,7 @@
msgid "Latency between %1$s: %2$lums"
msgstr "Задержка между %1$s: %2$luмс"
-#: ../src/sirc/sirc.c:186
+#: ../src/sirc/sirc.c:196
msgid "Local connection closed"
msgstr "Локальное соединение закрыто"
@@ -839,7 +839,7 @@
msgid "Remember password"
msgstr ""
-#: ../src/sirc/sirc.c:199
+#: ../src/sirc/sirc.c:209
msgid "Remote connection closed"
msgstr "Удаленное соединение закрыто"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/po/srain.pot new/srain-1.1.1/po/srain.pot
--- old/srain-1.1.0/po/srain.pot 2020-05-24 06:53:14.000000000 +0200
+++ new/srain-1.1.1/po/srain.pot 2020-06-27 06:31:18.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Srain 1.0.1\n"
"Report-Msgid-Bugs-To: i...@silverrainz.me\n"
-"POT-Creation-Date: 2020-05-24 12:47+0800\n"
+"POT-Creation-Date: 2020-06-27 12:05+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -608,7 +608,7 @@
msgid "Latency between %1$s: %2$lums"
msgstr ""
-#: ../src/sirc/sirc.c:186
+#: ../src/sirc/sirc.c:196
msgid "Local connection closed"
msgstr ""
@@ -818,7 +818,7 @@
msgid "Remember password"
msgstr ""
-#: ../src/sirc/sirc.c:199
+#: ../src/sirc/sirc.c:209
msgid "Remote connection closed"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/po/zh_CN.po new/srain-1.1.1/po/zh_CN.po
--- old/srain-1.1.0/po/zh_CN.po 2020-05-24 06:53:14.000000000 +0200
+++ new/srain-1.1.1/po/zh_CN.po 2020-06-27 06:31:18.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: Srain 1.0.0\n"
"Report-Msgid-Bugs-To: i...@silverrainz.me\n"
-"POT-Creation-Date: 2020-05-03 23:26+0800\n"
+"POT-Creation-Date: 2020-06-27 12:05+0800\n"
"PO-Revision-Date: 2016-12-18 01:44+0800\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -615,7 +615,7 @@
msgid "Latency between %1$s: %2$lums"
msgstr "到 %1$s 的延迟为 %2$lu 毫秒"
-#: ../src/sirc/sirc.c:186
+#: ../src/sirc/sirc.c:196
msgid "Local connection closed"
msgstr "本地链接已关闭"
@@ -825,7 +825,7 @@
msgid "Remember password"
msgstr "记住密码"
-#: ../src/sirc/sirc.c:199
+#: ../src/sirc/sirc.c:209
msgid "Remote connection closed"
msgstr "远程连接已断开"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/src/sirc/sirc.c
new/srain-1.1.1/src/sirc/sirc.c
--- old/srain-1.1.0/src/sirc/sirc.c 2020-05-24 06:53:14.000000000 +0200
+++ new/srain-1.1.1/src/sirc/sirc.c 2020-06-27 06:31:18.000000000 +0200
@@ -37,6 +37,7 @@
#include "srain.h"
#include "log.h"
#include "i18n.h"
+#include "utils.h"
struct _SircSession {
int bufptr;
@@ -44,6 +45,8 @@
GSocketClient *client;
GIOStream *stream;
GCancellable *cancel;
+ char *host;
+ int port;
SircEvents *events; // Event callbacks
SircConfig *cfg;
@@ -97,6 +100,7 @@
g_object_unref(sirc->client);
g_object_unref(sirc->cancel);
+ str_assign(&sirc->host, NULL);
g_free(sirc);
}
@@ -142,13 +146,19 @@
}
void sirc_connect(SircSession *sirc, const char *host, int port){
+ char *escaped_host;
+
g_return_if_fail(sirc);
g_return_if_fail(host);
g_return_if_fail(port > 0);
+ escaped_host = g_uri_escape_string(host, NULL, FALSE);
g_cancellable_reset(sirc->cancel);
- g_socket_client_connect_to_host_async (sirc->client, host,
+ str_assign(&sirc->host, escaped_host);
+ sirc->port = port;
+ g_socket_client_connect_to_host_async (sirc->client, escaped_host,
port, sirc->cancel, on_connect_ready, sirc);
+ g_free(escaped_host);
}
void sirc_cancel_connect(SircSession *sirc){
@@ -289,7 +299,6 @@
GError *err;
GSocketClient *client;
GSocketConnection *conn;
- GSocketAddress *addr;
SircSession *sirc;
client = G_SOCKET_CLIENT(obj);
@@ -302,22 +311,14 @@
return;
}
- err = NULL;
- addr = g_socket_connection_get_remote_address(conn, &err);
- if (err){
- ERR_FR("Get remote address : %d, %s", err->code, err->message);
- g_error_free(err);
- } else {
- // DBG_FR("Remote address: %");
- // TODO: show remote address
- g_object_unref(addr);
- }
-
if (sirc->cfg->tls){
+ GSocketConnectable *addr;
GIOStream *tls_conn;
err = NULL;
- tls_conn = g_tls_client_connection_new(G_IO_STREAM(conn), NULL, &err);
+ addr = g_network_address_new(sirc->host, sirc->port);
+ tls_conn = g_tls_client_connection_new(G_IO_STREAM(conn), addr, &err);
+ g_object_unref(addr);
g_object_unref(conn);
if (err){
on_connect_fail(sirc, err->message);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/srain-1.1.0/src/sui/sui_message_list.c
new/srain-1.1.1/src/sui/sui_message_list.c
--- old/srain-1.1.0/src/sui/sui_message_list.c 2020-05-24 06:53:14.000000000
+0200
+++ new/srain-1.1.1/src/sui/sui_message_list.c 2020-06-27 06:31:18.000000000
+0200
@@ -69,8 +69,6 @@
GtkPositionType pos, gpointer user_data);
static void scrolled_window_on_edge_overshot(GtkScrolledWindow *swin,
GtkPositionType pos, gpointer user_data);
-static void scrolled_window_vadjustment_on_value_changed(
- GtkAdjustment *adjustment, gpointer user_data);
static void clear_selection_button_on_click(GtkButton *button, gpointer
user_data);
static void go_prev_mention_button_on_click(GtkButton *button, gpointer
user_data);
static void go_next_mention_button_on_click(GtkButton *button, gpointer
user_data);
@@ -97,10 +95,6 @@
G_CALLBACK(go_next_mention_button_on_click), self);
g_signal_connect_swapped(self->go_bottom_button, "clicked",
G_CALLBACK(scroll_to_bottom), self);
- g_signal_connect(
- gtk_scrolled_window_get_vadjustment(self->scrolled_window),
- "value-changed",
- G_CALLBACK(scrolled_window_vadjustment_on_value_changed), self);
g_signal_connect(self->list_box, "selected-rows-changed",
G_CALLBACK(list_box_on_selected_rows_changed), self);
@@ -282,7 +276,7 @@
*
* This function called when a message added to ``SuiMessageList``.
* If:
- * - The top-level window is visiable;
+ * - The top-level window is active;
* - And the SuiMessageList itself is child of current ``SuiBuffer``;
* - The scroll bar is near the bottom of the list box
* (If not, the user may be browsing previous messages).
@@ -298,10 +292,10 @@
buf = sui_window_get_cur_buffer(win);
g_return_if_fail(SUI_IS_BUFFER(buf));
- if (sui_buffer_get_message_list(buf) != self){
+ if (!sui_window_is_active(win)) {
return;
}
- if (!gtk_widget_get_visible(GTK_WIDGET(win))){
+ if (sui_buffer_get_message_list(buf) != self){
return;
}
@@ -361,19 +355,6 @@
return (max_val - val) / page_size;
}
-static void scrolled_window_vadjustment_on_value_changed(
- GtkAdjustment *adj, gpointer user_data){
- SuiMessageList *self;
-
- self = SUI_MESSAGE_LIST((user_data));
-
- // The toolbar appears each time the distance from current
- // position to bottom is greater than 0.5 page (we think user is browsing
- // message now).
- gtk_revealer_set_reveal_child(self->tool_bar_revealer,
- get_page_count_to_bottom(self) > 0.5);
-}
-
static void clear_selection_button_on_click(GtkButton *button, gpointer
user_data) {
SuiMessageList *self;
