The package rpms/newsflash.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/newsflash.git/commit/?id=72a69369....
Change:
-ExcludeArch: %{ix86} %{arm}
Thanks.
Full change:
============
commit 72a69369d6013a41e5cab31a4fef7d7ed6bc296a
Author: Igor Raits <ignatenkobrain(a)fedoraproject.org>
Date: Fri Jun 12 11:34:15 2020 +0200
Fix for 32bit platforms + update of fix for missing icon
Signed-off-by: Igor Raits <ignatenkobrain(a)fedoraproject.org>
diff --git a/0001-dont-call-show_all-in-app-constructor.patch
b/0001-dont-call-show_all-in-app-constructor.patch
new file mode 100644
index 0000000..49cddf1
--- /dev/null
+++ b/0001-dont-call-show_all-in-app-constructor.patch
@@ -0,0 +1,2801 @@
+From 2a9405ea8148329fa8973b7d7098a8b6ba6495a8 Mon Sep 17 00:00:00 2001
+From: Jan Lukas Gernert <jangernert(a)gmail.com>
+Date: Fri, 12 Jun 2020 10:07:54 +0200
+Subject: [PATCH] dont call show_all in app constructor
+
+---
+ data/resources/ui/main_window.ui | 2336 +++++++++++++++---------------
+ src/app.rs | 1 -
+ 2 files changed, 1169 insertions(+), 1168 deletions(-)
+
+diff --git a/data/resources/ui/main_window.ui b/data/resources/ui/main_window.ui
+index 700a91e..a2d7aef 100644
+--- a/data/resources/ui/main_window.ui
++++ b/data/resources/ui/main_window.ui
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!-- Generated with glade 3.22.2 -->
++<!-- Generated with glade 3.36.0 -->
+ <interface>
+ <requires lib="gtk+" version="3.20"/>
+ <requires lib="libhandy" version="0.0"/>
+@@ -9,749 +9,830 @@
+ <property name="window_position">center</property>
+ <property name="default_width">1200</property>
+ <property name="default_height">600</property>
+- <child type="titlebar">
+- <object class="HdyTitleBar">
++ <child>
++ <object class="GtkStack" id="main_stack">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
++ <property name="transition_type">slide-left</property>
+ <child>
+- <object class="GtkStack" id="header_stack">
++ <object class="GtkBox" id="welcome_page">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property name="transition_duration">50</property>
+- <property name="transition_type">crossfade</property>
++ <property name="halign">center</property>
++ <property name="margin_start">20</property>
++ <property name="margin_end">20</property>
++ <property name="margin_top">50</property>
++ <property name="margin_bottom">50</property>
++ <property name="orientation">vertical</property>
+ <child>
+- <object class="HdyLeaflet" id="header_leaflet">
++ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property
name="visible_child">left_headerbar</property>
+- <property name="transition_type">over</property>
++ <property name="label"
translatable="yes">Where are your feeds?</property>
++ <property name="justify">center</property>
++ <style>
++ <class name="h1"/>
++ </style>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label"
translatable="yes">Please select the RSS service you are using and log in to
get going.</property>
++ <property name="justify">center</property>
++ <property name="wrap">True</property>
++ <property name="ellipsize">end</property>
++ <property name="lines">3</property>
++ <style>
++ <class name="h2"/>
++ </style>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="padding">2</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkScrolledWindow">
++ <property name="width_request">350</property>
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="halign">center</property>
++ <property name="shadow_type">in</property>
+ <child>
+- <object class="GtkHeaderBar"
id="left_headerbar">
++ <object class="GtkViewport">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property
name="has_subtitle">False</property>
+- <property name="spacing">5</property>
+- <property
name="show_close_button">True</property>
+ <child>
+- <object class="GtkButton"
id="left_back_button">
++ <object class="GtkListBox" id="list">
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="selection_mode">none</property>
++ <style>
++ <class name="list-separated"/>
++ </style>
++ </object>
++ </child>
++ </object>
++ </child>
++ <style>
++ <class name="frame"/>
++ </style>
++ </object>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="padding">20</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="name">welcome</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkBox" id="password_login">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
++ <child>
++ <object class="GtkInfoBar" id="pw_info_bar">
++ <property name="can_focus">False</property>
++ <property name="no_show_all">True</property>
++ <property name="homogeneous">True</property>
++ <property name="message_type">error</property>
++ <property
name="show_close_button">True</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox">
++ <property name="can_focus">False</property>
++ <property name="spacing">6</property>
++ <property name="layout_style">end</property>
++ <child>
++ <object class="GtkButton"
id="ignore_button">
++ <property name="label"
translatable="yes">Ignore</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+- <property
name="no_show_all">True</property>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">go-previous-symbolic</property>
+- </object>
+- </child>
+ </object>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
++ </packing>
+ </child>
+ <child>
+- <object class="GtkMenuButton"
id="mode_switch_button">
++ <object class="GtkButton"
id="pw_details_button">
++ <property name="label"
translatable="yes">Details</property>
++ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+- <property
name="no_show_all">True</property>
+- <child>
+- <object class="GtkBox">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="spacing">5</property>
+- <child>
+- <object class="GtkStack"
id="mode_switch_stack">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="transition_duration">50</property>
+- <property
name="transition_type">crossfade</property>
+- <child>
+- <object class="GtkLabel">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">All</property>
+- <property
name="xalign">0</property>
+- </object>
+- <packing>
+- <property
name="name">all</property>
+- <property name="title"
translatable="yes">all</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkLabel">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">Unread</property>
+- <property
name="xalign">0</property>
+- </object>
+- <packing>
+- <property
name="name">unread</property>
+- <property name="title"
translatable="yes">unread</property>
+- <property
name="position">1</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkLabel">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">Starred</property>
+- <property
name="xalign">0</property>
+- </object>
+- <packing>
+- <property
name="name">marked</property>
+- <property name="title"
translatable="yes">marked</property>
+- <property
name="position">2</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property
name="expand">False</property>
+- <property
name="fill">True</property>
+- <property
name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">go-down-symbolic</property>
+- </object>
+- <packing>
+- <property
name="expand">False</property>
+- <property
name="fill">True</property>
+- <property
name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- </child>
+ </object>
+ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child internal-child="content_area">
++ <object class="GtkBox">
++ <property name="can_focus">False</property>
++ <property name="spacing">16</property>
+ <child>
+- <object class="GtkBox"
id="mode_switch_box">
++ <object class="GtkLabel"
id="pw_info_bar_label">
+ <property name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="homogeneous">True</property>
+- <child>
+- <object class="GtkToggleButton"
id="all_button">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="focus_on_click">False</property>
+- <property
name="receives_default">True</property>
+- <property
name="active">True</property>
+- <child>
+- <object class="GtkLabel">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">All</property>
+- </object>
+- </child>
+- </object>
+- <packing>
+- <property
name="expand">False</property>
+- <property name="fill">True</property>
+- <property
name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkToggleButton"
id="unread_button">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="focus_on_click">False</property>
+- <property
name="receives_default">True</property>
+- <child>
+- <object class="GtkLabel">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">Unread</property>
+- </object>
+- </child>
+- </object>
+- <packing>
+- <property
name="expand">False</property>
+- <property name="fill">True</property>
+- <property
name="position">1</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkToggleButton"
id="marked_button">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="focus_on_click">False</property>
+- <property
name="receives_default">True</property>
+- <child>
+- <object class="GtkLabel">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">Starred</property>
+- </object>
+- </child>
+- </object>
+- <packing>
+- <property
name="expand">False</property>
+- <property name="fill">True</property>
+- <property
name="position">2</property>
+- </packing>
+- </child>
+- <style>
+- <class name="linked"/>
+- </style>
++ <property
name="margin_start">20</property>
++ <property name="margin_end">20</property>
++ <property name="hexpand">True</property>
++ <property name="label"
translatable="yes">label</property>
++ <property name="xalign">0</property>
+ </object>
+ <packing>
+- <property name="position">2</property>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
+ </packing>
+ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkBox">
++ <property name="width_request">350</property>
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="halign">center</property>
++ <property name="valign">center</property>
++ <property name="hexpand">True</property>
++ <property name="vexpand">True</property>
++ <property name="orientation">vertical</property>
++ <child>
++ <object class="GtkLabel" id="headline">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="label"
translatable="yes">Headline</property>
++ <property name="ellipsize">end</property>
++ <style>
++ <class name="h2"/>
++ </style>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkImage" id="logo">
++ <property name="width_request">64</property>
++ <property name="height_request">64</property>
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="margin_top">30</property>
++ <property name="margin_bottom">30</property>
++ <property
name="stock">gtk-missing-image</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkGrid">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
+ <child>
+- <object class="GtkButton"
id="update_button">
++ <object class="GtkLabel"
id="url_label">
+ <property name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <property name="tooltip_text"
translatable="yes">Refresh Content</property>
+- <child>
+- <object class="GtkStack"
id="update_stack">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="transition_type">crossfade</property>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">view-refresh-symbolic</property>
+- </object>
+- <packing>
+- <property
name="name">icon</property>
+- <property name="title"
translatable="yes">icon</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkSpinner">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="active">True</property>
+- </object>
+- <packing>
+- <property
name="name">spinner</property>
+- <property name="title"
translatable="yes">spinner</property>
+- <property
name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- </child>
++ <property
name="can_focus">False</property>
++ <property
name="margin_start">40</property>
++ <property name="label"
translatable="yes">Url:</property>
++ <property name="xalign">1</property>
+ </object>
+ <packing>
+- <property name="position">3</property>
++ <property name="left_attach">0</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkButton"
id="offline_status_button">
++ <object class="GtkLabel">
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="margin_start">40</property>
++ <property name="label"
translatable="yes">Username:</property>
++ <property name="xalign">1</property>
++ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel">
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="margin_start">42</property>
++ <property name="label"
translatable="yes">Password:</property>
++ <property name="xalign">1</property>
++ </object>
++ <packing>
++ <property name="left_attach">0</property>
++ <property name="top_attach">2</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkEntry"
id="url_entry">
++ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <property
name="no_show_all">True</property>
+- <property name="tooltip_text"
translatable="yes">Go back to online mode</property>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">network-offline-symbolic</property>
+- </object>
+- </child>
++ <property
name="margin_start">15</property>
++ <property name="margin_end">15</property>
++ <property name="margin_top">2</property>
++ <property
name="margin_bottom">2</property>
++ <property name="hexpand">True</property>
++ <property
name="input_purpose">url</property>
+ </object>
+ <packing>
+- <property name="position">5</property>
++ <property name="left_attach">1</property>
++ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkToggleButton"
id="search_button">
++ <object class="GtkEntry"
id="user_entry">
+ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <property name="tooltip_text"
translatable="yes">Search Articles</property>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">system-search-symbolic</property>
+- </object>
+- </child>
++ <property
name="margin_start">15</property>
++ <property name="margin_end">15</property>
++ <property name="margin_top">2</property>
++ <property
name="margin_bottom">2</property>
++ <property name="hexpand">True</property>
+ </object>
+ <packing>
+- <property name="position">5</property>
++ <property name="left_attach">1</property>
++ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkButton"
id="mark_all_button">
++ <object class="GtkEntry"
id="pass_entry">
+ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <property name="tooltip_text"
translatable="yes">Set All/Feed/Category as read</property>
++ <property
name="margin_start">15</property>
++ <property name="margin_end">15</property>
++ <property name="margin_top">2</property>
++ <property
name="margin_bottom">2</property>
++ <property
name="visibility">False</property>
++ <property
name="input_purpose">password</property>
++ </object>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="top_attach">2</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkRevealer"
id="http_auth_revealer">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property
name="transition_type">slide-up</property>
++ <child>
++ <object class="GtkBox">
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="orientation">vertical</property>
++ <child>
++ <object class="GtkLabel">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="margin_top">20</property>
++ <property
name="margin_bottom">10</property>
++ <property name="label"
translatable="yes">HTTP Basic Auth</property>
++ <style>
++ <class name="h3"/>
++ </style>
++ </object>
++ <packing>
++ <property
name="expand">False</property>
++ <property name="fill">True</property>
++ <property
name="position">0</property>
++ </packing>
++ </child>
+ <child>
+- <object class="GtkStack"
id="mark_all_stack">
++ <object class="GtkGrid">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <child>
+- <object class="GtkImage">
++ <object class="GtkLabel">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="icon_name">emblem-ok-symbolic</property>
++ <property
name="margin_start">40</property>
++ <property name="label"
translatable="yes">Username:</property>
++ <property
name="xalign">1</property>
+ </object>
+ <packing>
+- <property
name="name">image</property>
+- <property name="title"
translatable="yes">image</property>
++ <property
name="left_attach">0</property>
++ <property
name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkSpinner">
++ <object class="GtkLabel">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="active">True</property>
++ <property
name="margin_start">40</property>
++ <property name="label"
translatable="yes">Password:</property>
++ <property
name="xalign">1</property>
+ </object>
+ <packing>
+- <property
name="name">spinner</property>
+- <property name="title"
translatable="yes">spinner</property>
+- <property
name="position">1</property>
++ <property
name="left_attach">0</property>
++ <property
name="top_attach">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkEntry"
id="http_user_entry">
++ <property
name="visible">True</property>
++ <property
name="can_focus">True</property>
++ <property
name="margin_start">15</property>
++ <property
name="margin_end">15</property>
++ <property
name="margin_top">2</property>
++ <property
name="margin_bottom">2</property>
++ <property
name="hexpand">True</property>
++ </object>
++ <packing>
++ <property
name="left_attach">1</property>
++ <property
name="top_attach">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkEntry"
id="http_pass_entry">
++ <property
name="visible">True</property>
++ <property
name="can_focus">True</property>
++ <property
name="margin_start">15</property>
++ <property
name="margin_end">15</property>
++ <property
name="margin_top">2</property>
++ <property
name="margin_bottom">2</property>
++ <property
name="hexpand">True</property>
++ <property
name="visibility">False</property>
++ <property
name="input_purpose">password</property>
++ </object>
++ <packing>
++ <property
name="left_attach">1</property>
++ <property
name="top_attach">1</property>
+ </packing>
+ </child>
+ </object>
++ <packing>
++ <property
name="expand">False</property>
++ <property name="fill">True</property>
++ <property
name="position">1</property>
++ </packing>
+ </child>
+ </object>
+- <packing>
+- <property name="position">7</property>
+- </packing>
+ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton"
id="login_button">
++ <property name="label"
translatable="yes">Login</property>
++ <property name="visible">True</property>
++ <property name="sensitive">False</property>
++ <property name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property name="halign">end</property>
++ <property name="margin_end">15</property>
++ <property name="margin_top">2</property>
++ <property name="margin_bottom">2</property>
++ <style>
++ <class name="suggested-action"/>
++ </style>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">4</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="name">password_login</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkBox" id="oauth_box">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
++ <child>
++ <object class="GtkInfoBar" id="oauth_info_bar">
++ <property name="can_focus">False</property>
++ <property name="no_show_all">True</property>
++ <property name="message_type">warning</property>
++ <property
name="show_close_button">True</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox">
++ <property name="can_focus">False</property>
++ <property name="spacing">6</property>
++ <property name="layout_style">end</property>
+ <child>
+- <object class="GtkMenuButton"
id="menu_button">
++ <object class="GtkButton"
id="oauth_details_button">
++ <property name="label"
translatable="yes">Details</property>
+ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">open-menu-symbolic</property>
+- </object>
+- </child>
+ </object>
+ <packing>
+- <property name="pack_type">end</property>
+- <property name="position">3</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
+ </child>
+- <child>
+- <object class="GtkSeparator">
+- <property name="visible">True</property>
++ <child internal-child="content_area">
++ <object class="GtkBox">
+ <property name="can_focus">False</property>
+- <property name="vexpand">True</property>
+- <property
name="orientation">vertical</property>
++ <property name="spacing">16</property>
++ <child>
++ <object class="GtkLabel"
id="oauth_info_bar_label">
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property name="label"
translatable="yes">label</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
+ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
+ </child>
+- <child>
+- <object class="GtkHeaderBar"
id="right_headerbar">
+- <property name="width_request">300</property>
+- <property name="visible">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <placeholder/>
++ </child>
++ </object>
++ <packing>
++ <property name="name">oauth_login</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkBox" id="page">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="orientation">vertical</property>
++ <child>
++ <object class="GtkInfoBar" id="undo_bar">
++ <property name="can_focus">False</property>
++ <property name="no_show_all">True</property>
++ <property name="message_type">warning</property>
++ <property
name="show_close_button">True</property>
++ <property name="revealed">False</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox">
+ <property name="can_focus">False</property>
+- <property name="hexpand">True</property>
+- <property
name="has_subtitle">False</property>
+- <property name="spacing">5</property>
+- <property
name="show_close_button">True</property>
++ <property name="spacing">6</property>
++ <property name="layout_style">end</property>
+ <child>
+- <object class="GtkButton"
id="right_back_button">
++ <object class="GtkButton"
id="undo_button">
++ <property name="label"
translatable="yes">Undo</property>
++ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+- <property
name="no_show_all">True</property>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">go-previous-symbolic</property>
+- </object>
+- </child>
+ </object>
+ <packing>
+- <property name="position">1</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child internal-child="content_area">
++ <object class="GtkBox">
++ <property name="can_focus">False</property>
++ <property name="spacing">16</property>
++ <child>
++ <object class="GtkLabel"
id="undo_label">
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property name="label"
translatable="yes">Delte Feed/Category</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
+ </packing>
+ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkInfoBar" id="error_bar">
++ <property name="can_focus">False</property>
++ <property name="no_show_all">True</property>
++ <property name="message_type">error</property>
++ <property
name="show_close_button">True</property>
++ <child internal-child="action_area">
++ <object class="GtkButtonBox">
++ <property name="can_focus">False</property>
++ <property name="spacing">6</property>
++ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property
name="can_focus">False</property>
++ <property name="spacing">6</property>
+ <child>
+- <object class="GtkToggleButton"
id="mark_article_button">
++ <object class="GtkButton"
id="relogin_button">
++ <property name="label"
translatable="yes">Login</property>
+ <property
name="visible">True</property>
+- <property
name="sensitive">False</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+- <property name="tooltip_text"
translatable="yes">Toggle Starred</property>
+- <child>
+- <object class="GtkStack"
id="mark_article_stack">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="transition_duration">50</property>
+- <property
name="transition_type">crossfade</property>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">unmarked-symbolic</property>
+- </object>
+- <packing>
+- <property
name="name">unmarked</property>
+- <property name="title"
translatable="yes">unmarked</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">marked-symbolic</property>
+- </object>
+- <packing>
+- <property
name="name">marked</property>
+- <property name="title"
translatable="yes">marked</property>
+- <property
name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- </child>
++ <style>
++ <class name="suggested-action"/>
++ </style>
+ </object>
+ <packing>
+- <property
name="expand">False</property>
++ <property
name="expand">True</property>
+ <property name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkToggleButton"
id="mark_article_read_button">
++ <object class="GtkButton"
id="offline_button">
++ <property name="label"
translatable="yes">Go Offline</property>
+ <property
name="visible">True</property>
+- <property
name="sensitive">False</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+- <property name="tooltip_text"
translatable="yes">Toggle Read</property>
+- <child>
+- <object class="GtkStack"
id="mark_article_read_stack">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="transition_duration">50</property>
+- <property
name="transition_type">crossfade</property>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">read-symbolic</property>
+- </object>
+- <packing>
+- <property
name="name">read</property>
+- <property name="title"
translatable="yes">read</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">unread-symbolic</property>
+- </object>
+- <packing>
+- <property
name="name">unread</property>
+- <property name="title"
translatable="yes">unread</property>
+- <property
name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- </child>
++ <property
name="always_show_image">True</property>
+ </object>
+ <packing>
+- <property
name="expand">False</property>
++ <property
name="expand">True</property>
+ <property name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+- <style>
+- <class name="linked"/>
+- </style>
+- </object>
+- <packing>
+- <property name="position">2</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkMenuButton"
id="more_actions_button">
+- <property name="visible">True</property>
+- <property
name="sensitive">False</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+ <child>
+- <object class="GtkStack"
id="more_actions_stack">
++ <object class="GtkButton"
id="info_button">
+ <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
+ <child>
+ <object class="GtkImage">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="icon_name">view-more-symbolic</property>
+- </object>
+- <packing>
+- <property
name="name">image</property>
+- <property name="title"
translatable="yes">image</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkSpinner">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="active">True</property>
++ <property
name="icon_name">dialog-question-symbolic</property>
+ </object>
+- <packing>
+- <property
name="name">spinner</property>
+- <property name="title"
translatable="yes">spinner</property>
+- <property
name="position">1</property>
+- </packing>
+ </child>
+ </object>
++ <packing>
++ <property
name="expand">False</property>
++ <property
name="fill">False</property>
++ <property
name="pack_type">end</property>
++ <property
name="position">2</property>
++ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="pack_type">end</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkMenuButton"
id="tag_button">
+- <property name="visible">True</property>
+- <property
name="sensitive">False</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <child>
+- <object class="GtkImage"
id="tag_image">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">tag-symbolic</property>
+- </object>
+- </child>
+- </object>
+- <packing>
+- <property name="pack_type">end</property>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+- <child>
+- <object class="GtkToggleButton"
id="scrap_content_button">
+- <property name="visible">True</property>
+- <property
name="sensitive">False</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <property name="tooltip_text"
translatable="yes">Try to show full content</property>
+- <child>
+- <object class="GtkStack"
id="scrap_article_stack">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="transition_duration">50</property>
+- <property
name="transition_type">crossfade</property>
+- <child>
+- <object class="GtkImage">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="icon_name">accessories-dictionary-symbolic</property>
+- </object>
+- <packing>
+- <property
name="name">image</property>
+- <property name="title"
translatable="yes">image</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkSpinner">
+- <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="active">True</property>
+- </object>
+- <packing>
+- <property
name="name">spinner</property>
+- <property name="title"
translatable="yes">spinner</property>
+- <property
name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- </child>
+- </object>
+- <packing>
+- <property name="pack_type">end</property>
+- <property name="position">4</property>
+- </packing>
+- </child>
+ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
+ </child>
+- </object>
+- <packing>
+- <property name="name">content</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkHeaderBar"
id="welcome_headerbar">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="title"
translatable="yes">NewsFlash</property>
+- <property name="has_subtitle">False</property>
+- <property
name="show_close_button">True</property>
+- <child>
+- <placeholder/>
+- </child>
+- </object>
+- <packing>
+- <property name="name">welcome</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkHeaderBar"
id="login_headerbar">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="title"
translatable="yes">NewsFlash</property>
+- <property
name="show_close_button">True</property>
+- <child>
+- <object class="GtkButton" id="back_button">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <property
name="always_show_image">True</property>
++ <child internal-child="content_area">
++ <object class="GtkBox">
++ <property name="can_focus">False</property>
++ <property name="spacing">16</property>
+ <child>
+- <object class="GtkImage">
++ <object class="GtkLabel"
id="error_label">
+ <property name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="icon_name">go-previous-symbolic</property>
++ <property name="label"
translatable="yes">label</property>
+ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
++ </packing>
+ </child>
+ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">0</property>
++ </packing>
+ </child>
+ </object>
+- <packing>
+- <property name="name">login</property>
+- <property name="position">2</property>
+- </packing>
+- </child>
+- </object>
+- </child>
+- </object>
+- </child>
+- <child>
+- <object class="GtkStack" id="main_stack">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="transition_type">slide-left</property>
+- <child>
+- <object class="GtkBox" id="welcome_page">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="halign">center</property>
+- <property name="margin_left">20</property>
+- <property name="margin_right">20</property>
+- <property name="margin_top">50</property>
+- <property name="margin_bottom">50</property>
+- <property name="orientation">vertical</property>
+- <child>
+- <object class="GtkLabel">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="label"
translatable="yes">Where are your feeds?</property>
+- <property name="justify">center</property>
+- <style>
+- <class name="h1"/>
+- </style>
+- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkLabel">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="label"
translatable="yes">Please select the RSS service you are using and log in to
get going.</property>
+- <property name="justify">center</property>
+- <property name="wrap">True</property>
+- <property name="ellipsize">end</property>
+- <property name="lines">3</property>
+- <style>
+- <class name="h2"/>
+- </style>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkScrolledWindow">
+- <property name="width_request">350</property>
++ <object class="HdyLeaflet" id="major_leaflet">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property name="halign">center</property>
+- <property name="shadow_type">in</property>
++ <property name="hexpand">True</property>
++ <property name="vexpand">True</property>
++ <property
name="visible_child">minor_leaflet</property>
++ <property name="transition_type">over</property>
+ <child>
+- <object class="GtkViewport">
++ <object class="HdyLeaflet"
id="minor_leaflet">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
++ <property
name="visible_child">feedlist_box</property>
++ <property
name="transition_type">over</property>
+ <child>
+- <object class="GtkListBox" id="list">
++ <object class="GtkBox"
id="feedlist_box">
++ <property
name="width_request">220</property>
+ <property name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="selection_mode">none</property>
++ <property name="hexpand">True</property>
++ <property
name="orientation">vertical</property>
++ <child>
++ <placeholder/>
++ </child>
++ </object>
++ </child>
++ <child>
++ <object class="GtkSeparator">
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="orientation">vertical</property>
+ <style>
+- <class name="list-separated"/>
++ <class name="dark-separator"/>
+ </style>
+ </object>
+ </child>
++ <child>
++ <object class="GtkBox"
id="articlelist_box">
++ <property
name="width_request">380</property>
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property name="hexpand">True</property>
++ <property
name="orientation">vertical</property>
++ <child>
++ <object class="HdySearchBar"
id="search_bar">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <child>
++ <object class="GtkSearchEntry"
id="search_entry">
++ <property
name="visible">True</property>
++ <property
name="can_focus">True</property>
++ <property
name="primary_icon_name">edit-find-symbolic</property>
++ <property
name="primary_icon_activatable">False</property>
++ <property
name="primary_icon_sensitive">False</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property
name="expand">False</property>
++ <property name="fill">True</property>
++ <property
name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <placeholder/>
++ </child>
++ </object>
++ </child>
++ </object>
++ </child>
++ <child>
++ <object class="GtkSeparator">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property
name="orientation">vertical</property>
++ </object>
++ </child>
++ <child>
++ <object class="GtkBox"
id="articleview_box">
++ <property name="width_request">300</property>
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="hexpand">True</property>
++ <property
name="orientation">vertical</property>
++ <child>
++ <placeholder/>
++ </child>
+ </object>
+ </child>
+- <style>
+- <class name="frame"/>
+- </style>
+ </object>
+ <packing>
+- <property name="expand">True</property>
++ <property name="expand">False</property>
+ <property name="fill">True</property>
+- <property name="padding">20</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="name">welcome</property>
++ <property name="name">content</property>
++ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkBox" id="password_login">
++ <object class="GtkBox" id="reset_page">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkInfoBar" id="pw_info_bar">
++ <object class="GtkInfoBar" id="reset_info_bar">
++ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property name="no_show_all">True</property>
+- <property name="homogeneous">True</property>
+- <property name="message_type">error</property>
++ <property name="hexpand">True</property>
+ <property
name="show_close_button">True</property>
++ <property name="revealed">False</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox">
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">end</property>
+ <child>
+- <object class="GtkButton"
id="ignore_button">
+- <property name="label"
translatable="yes">Ignore</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- </object>
+- <packing>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton"
id="pw_details_button">
++ <object class="GtkButton"
id="details_button">
+ <property name="label"
translatable="yes">Details</property>
+ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+@@ -760,7 +841,7 @@
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+- <property name="position">1</property>
++ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+@@ -775,14 +856,10 @@
+ <property name="can_focus">False</property>
+ <property name="spacing">16</property>
+ <child>
+- <object class="GtkLabel"
id="pw_info_bar_label">
++ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="margin_left">20</property>
+- <property
name="margin_right">20</property>
+- <property name="hexpand">True</property>
+- <property name="label"
translatable="yes">label</property>
+- <property name="xalign">0</property>
++ <property name="label"
translatable="yes">Resetting Account failed</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+@@ -806,20 +883,19 @@
+ </child>
+ <child>
+ <object class="GtkBox">
+- <property name="width_request">350</property>
+- <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+- <property name="valign">center</property>
+- <property name="hexpand">True</property>
+- <property name="vexpand">True</property>
++ <property name="margin_start">20</property>
++ <property name="margin_end">20</property>
++ <property name="margin_top">50</property>
++ <property name="margin_bottom">50</property>
+ <property name="orientation">vertical</property>
+ <child>
+- <object class="GtkLabel" id="headline">
++ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property name="label"
translatable="yes">Headline</property>
+- <property name="ellipsize">end</property>
++ <property name="vexpand">True</property>
++ <property name="label"
translatable="yes">Resetting leads to all local data being
lost</property>
+ <style>
+ <class name="h2"/>
+ </style>
+@@ -831,784 +907,710 @@
+ </packing>
+ </child>
+ <child>
+- <object class="GtkImage" id="logo">
+- <property name="width_request">64</property>
+- <property name="height_request">64</property>
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="margin_top">30</property>
+- <property name="margin_bottom">30</property>
+- <property
name="stock">gtk-missing-image</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkGrid">
++ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+- <object class="GtkLabel"
id="url_label">
+- <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="margin_left">40</property>
+- <property name="label"
translatable="yes">Url:</property>
+- <property name="xalign">1</property>
+- </object>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="top_attach">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkLabel">
+- <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="margin_left">40</property>
+- <property name="label"
translatable="yes">Username:</property>
+- <property name="xalign">1</property>
+- </object>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="top_attach">1</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkLabel">
+- <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="margin_left">42</property>
+- <property name="label"
translatable="yes">Password:</property>
+- <property name="xalign">1</property>
+- </object>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="top_attach">2</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkEntry"
id="url_entry">
+- <property name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="margin_left">15</property>
+- <property
name="margin_right">15</property>
+- <property name="margin_top">2</property>
+- <property
name="margin_bottom">2</property>
+- <property name="hexpand">True</property>
+- <property
name="input_purpose">url</property>
+- </object>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="top_attach">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkEntry"
id="user_entry">
++ <object class="GtkButton"
id="cancel_button">
++ <property name="label"
translatable="yes">I changed my mind</property>
+ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+- <property
name="margin_left">15</property>
+- <property
name="margin_right">15</property>
+- <property name="margin_top">2</property>
+- <property
name="margin_bottom">2</property>
+- <property name="hexpand">True</property>
++ <property
name="receives_default">True</property>
+ </object>
+ <packing>
+- <property name="left_attach">1</property>
+- <property name="top_attach">1</property>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkEntry"
id="pass_entry">
++ <object class="GtkButton"
id="reset_button">
+ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+- <property
name="margin_left">15</property>
+- <property
name="margin_right">15</property>
+- <property name="margin_top">2</property>
+- <property
name="margin_bottom">2</property>
+- <property
name="visibility">False</property>
+- <property
name="input_purpose">password</property>
++ <property
name="receives_default">True</property>
++ <child>
++ <object class="GtkStack"
id="reset_stack">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="transition_duration">50</property>
++ <property
name="transition_type">crossfade</property>
++ <child>
++ <object class="GtkLabel"
id="reset_label">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property name="label"
translatable="yes">Reset</property>
++ </object>
++ <packing>
++ <property
name="name">reset_label</property>
++ <property name="title"
translatable="yes">page0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkSpinner"
id="reset_spinner">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="active">True</property>
++ </object>
++ <packing>
++ <property
name="name">reset_spinner</property>
++ <property name="title"
translatable="yes">page1</property>
++ <property
name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ <style>
++ <class name="destructive-action"/>
++ </style>
+ </object>
+ <packing>
+- <property name="left_attach">1</property>
+- <property name="top_attach">2</property>
++ <property name="expand">False</property>
++ <property name="fill">True</property>
++ <property name="pack_type">end</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+- <property name="position">2</property>
++ <property name="position">1</property>
+ </packing>
+ </child>
++ </object>
++ <packing>
++ <property name="expand">True</property>
++ <property name="fill">True</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ <packing>
++ <property name="name">reset_page</property>
++ <property name="position">4</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ <child type="titlebar">
++ <object class="HdyTitleBar">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <child>
++ <object class="GtkStack" id="header_stack">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="transition_duration">50</property>
++ <property name="transition_type">crossfade</property>
++ <child>
++ <object class="HdyLeaflet" id="header_leaflet">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property
name="visible_child">left_headerbar</property>
++ <property name="transition_type">over</property>
+ <child>
+- <object class="GtkRevealer"
id="http_auth_revealer">
++ <object class="GtkHeaderBar"
id="left_headerbar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property
name="transition_type">slide-up</property>
++ <property
name="has_subtitle">False</property>
++ <property name="spacing">5</property>
++ <property
name="show_close_button">True</property>
+ <child>
+- <object class="GtkBox">
+- <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property
name="orientation">vertical</property>
++ <object class="GtkButton"
id="left_back_button">
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property
name="no_show_all">True</property>
+ <child>
+- <object class="GtkLabel">
++ <object class="GtkImage">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="margin_top">20</property>
+- <property
name="margin_bottom">10</property>
+- <property name="label"
translatable="yes">HTTP Basic Auth</property>
+- <style>
+- <class name="h3"/>
+- </style>
++ <property
name="icon_name">go-previous-symbolic</property>
+ </object>
+- <packing>
+- <property
name="expand">False</property>
+- <property name="fill">True</property>
+- <property
name="position">0</property>
+- </packing>
+ </child>
++ </object>
++ </child>
++ <child>
++ <object class="GtkMenuButton"
id="mode_switch_button">
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property
name="no_show_all">True</property>
+ <child>
+- <object class="GtkGrid">
++ <object class="GtkBox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
++ <property name="spacing">5</property>
+ <child>
+- <object class="GtkLabel">
++ <object class="GtkStack"
id="mode_switch_stack">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="margin_left">40</property>
+- <property name="label"
translatable="yes">Username:</property>
+- <property
name="xalign">1</property>
++ <property
name="transition_duration">50</property>
++ <property
name="transition_type">crossfade</property>
++ <child>
++ <object class="GtkLabel">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property name="label"
translatable="yes">All</property>
++ <property
name="xalign">0</property>
++ </object>
++ <packing>
++ <property
name="name">all</property>
++ <property name="title"
translatable="yes">all</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property name="label"
translatable="yes">Unread</property>
++ <property
name="xalign">0</property>
++ </object>
++ <packing>
++ <property
name="name">unread</property>
++ <property name="title"
translatable="yes">unread</property>
++ <property
name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkLabel">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property name="label"
translatable="yes">Starred</property>
++ <property
name="xalign">0</property>
++ </object>
++ <packing>
++ <property
name="name">marked</property>
++ <property name="title"
translatable="yes">marked</property>
++ <property
name="position">2</property>
++ </packing>
++ </child>
+ </object>
+ <packing>
+- <property
name="left_attach">0</property>
+- <property
name="top_attach">0</property>
++ <property
name="expand">False</property>
++ <property
name="fill">True</property>
++ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkLabel">
++ <object class="GtkImage">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="margin_left">40</property>
+- <property name="label"
translatable="yes">Password:</property>
+- <property
name="xalign">1</property>
++ <property
name="icon_name">go-down-symbolic</property>
+ </object>
+ <packing>
+- <property
name="left_attach">0</property>
+- <property
name="top_attach">1</property>
++ <property
name="expand">False</property>
++ <property
name="fill">True</property>
++ <property
name="position">1</property>
+ </packing>
+ </child>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkBox"
id="mode_switch_box">
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="homogeneous">True</property>
++ <child>
++ <object class="GtkToggleButton"
id="all_button">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="focus_on_click">False</property>
++ <property
name="receives_default">True</property>
++ <property
name="active">True</property>
+ <child>
+- <object class="GtkEntry"
id="http_user_entry">
++ <object class="GtkLabel">
+ <property
name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="margin_left">15</property>
+- <property
name="margin_right">15</property>
+- <property
name="margin_top">2</property>
+- <property
name="margin_bottom">2</property>
+- <property
name="hexpand">True</property>
++ <property
name="can_focus">False</property>
++ <property name="label"
translatable="yes">All</property>
+ </object>
+- <packing>
+- <property
name="left_attach">1</property>
+- <property
name="top_attach">0</property>
+- </packing>
+ </child>
++ </object>
++ <packing>
++ <property
name="expand">False</property>
++ <property name="fill">True</property>
++ <property
name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkToggleButton"
id="unread_button">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="focus_on_click">False</property>
++ <property
name="receives_default">True</property>
+ <child>
+- <object class="GtkEntry"
id="http_pass_entry">
++ <object class="GtkLabel">
+ <property
name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="margin_left">15</property>
+- <property
name="margin_right">15</property>
+- <property
name="margin_top">2</property>
+- <property
name="margin_bottom">2</property>
+- <property
name="hexpand">True</property>
+- <property
name="visibility">False</property>
+- <property
name="input_purpose">password</property>
++ <property
name="can_focus">False</property>
++ <property name="label"
translatable="yes">Unread</property>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property
name="expand">False</property>
++ <property name="fill">True</property>
++ <property
name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkToggleButton"
id="marked_button">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="focus_on_click">False</property>
++ <property
name="receives_default">True</property>
++ <child>
++ <object class="GtkLabel">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property name="label"
translatable="yes">Starred</property>
+ </object>
+- <packing>
+- <property
name="left_attach">1</property>
+- <property
name="top_attach">1</property>
+- </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+- <property
name="position">1</property>
++ <property
name="position">2</property>
+ </packing>
+ </child>
+- </object>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">3</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkButton"
id="login_button">
+- <property name="label"
translatable="yes">Login</property>
+- <property name="visible">True</property>
+- <property name="sensitive">False</property>
+- <property name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <property name="halign">end</property>
+- <property name="margin_right">15</property>
+- <property name="margin_top">2</property>
+- <property name="margin_bottom">2</property>
+- <style>
+- <class name="suggested-action"/>
+- </style>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">4</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="name">password_login</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkBox" id="oauth_box">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="orientation">vertical</property>
+- <child>
+- <object class="GtkInfoBar" id="oauth_info_bar">
+- <property name="can_focus">False</property>
+- <property name="no_show_all">True</property>
+- <property name="message_type">warning</property>
+- <property
name="show_close_button">True</property>
+- <child internal-child="action_area">
+- <object class="GtkButtonBox">
+- <property name="can_focus">False</property>
+- <property name="spacing">6</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton"
id="oauth_details_button">
+- <property name="label"
translatable="yes">Details</property>
+- <property name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- </object>
+- <packing>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child internal-child="content_area">
+- <object class="GtkBox">
+- <property name="can_focus">False</property>
+- <property name="spacing">16</property>
+- <child>
+- <object class="GtkLabel"
id="oauth_info_bar_label">
+- <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">label</property>
++ <style>
++ <class name="linked"/>
++ </style>
+ </object>
+ <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
++ <property name="position">2</property>
+ </packing>
+ </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <placeholder/>
+- </child>
+- </object>
+- <packing>
+- <property name="name">oauth_login</property>
+- <property name="position">2</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkBox" id="page">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="orientation">vertical</property>
+- <child>
+- <object class="GtkInfoBar" id="undo_bar">
+- <property name="can_focus">False</property>
+- <property name="no_show_all">True</property>
+- <property name="message_type">warning</property>
+- <property
name="show_close_button">True</property>
+- <property name="revealed">False</property>
+- <child internal-child="action_area">
+- <object class="GtkButtonBox">
+- <property name="can_focus">False</property>
+- <property name="spacing">6</property>
+- <property name="layout_style">end</property>
+ <child>
+- <object class="GtkButton"
id="undo_button">
+- <property name="label"
translatable="yes">Undo</property>
++ <object class="GtkMenuButton"
id="menu_button">
+ <property name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
++ <child>
++ <object class="GtkImage">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">open-menu-symbolic</property>
++ </object>
++ </child>
+ </object>
+ <packing>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
++ <property name="pack_type">end</property>
++ <property name="position">3</property>
+ </packing>
+ </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child internal-child="content_area">
+- <object class="GtkBox">
+- <property name="can_focus">False</property>
+- <property name="spacing">16</property>
+ <child>
+- <object class="GtkLabel"
id="undo_label">
++ <object class="GtkButton"
id="update_button">
+ <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">Delte Feed/Category</property>
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property name="tooltip_text"
translatable="yes">Refresh Content</property>
++ <child>
++ <object class="GtkStack"
id="update_stack">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="transition_type">crossfade</property>
++ <child>
++ <object class="GtkImage">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">view-refresh-symbolic</property>
++ </object>
++ <packing>
++ <property
name="name">icon</property>
++ <property name="title"
translatable="yes">icon</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkSpinner">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="active">True</property>
++ </object>
++ <packing>
++ <property
name="name">spinner</property>
++ <property name="title"
translatable="yes">spinner</property>
++ <property
name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ </child>
+ </object>
+ <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
++ <property name="position">3</property>
+ </packing>
+ </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkInfoBar" id="error_bar">
+- <property name="can_focus">False</property>
+- <property name="no_show_all">True</property>
+- <property name="message_type">error</property>
+- <property
name="show_close_button">True</property>
+- <child internal-child="action_area">
+- <object class="GtkButtonBox">
+- <property name="can_focus">False</property>
+- <property name="spacing">6</property>
+- <property name="layout_style">end</property>
+ <child>
+- <object class="GtkBox">
+- <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="spacing">6</property>
++ <object class="GtkButton"
id="offline_status_button">
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property
name="no_show_all">True</property>
++ <property name="tooltip_text"
translatable="yes">Go back to online mode</property>
+ <child>
+- <object class="GtkButton"
id="relogin_button">
+- <property name="label"
translatable="yes">Login</property>
+- <property
name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <style>
+- <class name="suggested-action"/>
+- </style>
++ <object class="GtkImage">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">network-offline-symbolic</property>
+ </object>
+- <packing>
+- <property
name="expand">True</property>
+- <property name="fill">True</property>
+- <property
name="position">0</property>
+- </packing>
+ </child>
++ </object>
++ <packing>
++ <property name="position">5</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkToggleButton"
id="search_button">
++ <property name="visible">True</property>
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property name="tooltip_text"
translatable="yes">Search Articles</property>
+ <child>
+- <object class="GtkButton"
id="offline_button">
+- <property name="label"
translatable="yes">Go Offline</property>
++ <object class="GtkImage">
+ <property
name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- <property
name="always_show_image">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">system-search-symbolic</property>
+ </object>
+- <packing>
+- <property
name="expand">True</property>
+- <property name="fill">True</property>
+- <property
name="position">1</property>
+- </packing>
+ </child>
++ </object>
++ <packing>
++ <property name="position">5</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkButton"
id="mark_all_button">
++ <property name="visible">True</property>
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property name="tooltip_text"
translatable="yes">Set All/Feed/Category as read</property>
+ <child>
+- <object class="GtkButton"
id="info_button">
++ <object class="GtkStack"
id="mark_all_stack">
+ <property
name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
++ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkImage">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property
name="icon_name">dialog-question-symbolic</property>
++ <property
name="icon_name">emblem-ok-symbolic</property>
++ </object>
++ <packing>
++ <property
name="name">image</property>
++ <property name="title"
translatable="yes">image</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkSpinner">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="active">True</property>
+ </object>
++ <packing>
++ <property
name="name">spinner</property>
++ <property name="title"
translatable="yes">spinner</property>
++ <property
name="position">1</property>
++ </packing>
+ </child>
+ </object>
+- <packing>
+- <property
name="expand">False</property>
+- <property
name="fill">False</property>
+- <property
name="pack_type">end</property>
+- <property
name="position">2</property>
+- </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- <property name="position">3</property>
++ <property name="position">7</property>
+ </packing>
+ </child>
+ </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+ </child>
+- <child internal-child="content_area">
+- <object class="GtkBox">
++ <child>
++ <object class="GtkSeparator">
++ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property name="spacing">16</property>
+- <child>
+- <object class="GtkLabel"
id="error_label">
+- <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">label</property>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
++ <property name="vexpand">True</property>
++ <property
name="orientation">vertical</property>
+ </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+ </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">1</property>
+- </packing>
+- </child>
+- <child>
+- <object class="HdyLeaflet" id="major_leaflet">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="hexpand">True</property>
+- <property name="vexpand">True</property>
+- <property
name="visible_child">minor_leaflet</property>
+- <property name="transition_type">over</property>
+ <child>
+- <object class="HdyLeaflet"
id="minor_leaflet">
++ <object class="GtkHeaderBar"
id="right_headerbar">
++ <property name="width_request">300</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property
name="visible_child">feedlist_box</property>
+- <property
name="transition_type">over</property>
++ <property name="hexpand">True</property>
++ <property
name="has_subtitle">False</property>
++ <property name="spacing">5</property>
++ <property
name="show_close_button">True</property>
+ <child>
+- <object class="GtkBox"
id="feedlist_box">
+- <property
name="width_request">220</property>
++ <object class="GtkMenuButton"
id="more_actions_button">
+ <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="hexpand">True</property>
+- <property
name="orientation">vertical</property>
++ <property
name="sensitive">False</property>
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
+ <child>
+- <placeholder/>
++ <object class="GtkStack"
id="more_actions_stack">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <child>
++ <object class="GtkImage">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">view-more-symbolic</property>
++ </object>
++ <packing>
++ <property
name="name">image</property>
++ <property name="title"
translatable="yes">image</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkSpinner">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="active">True</property>
++ </object>
++ <packing>
++ <property
name="name">spinner</property>
++ <property name="title"
translatable="yes">spinner</property>
++ <property
name="position">1</property>
++ </packing>
++ </child>
++ </object>
+ </child>
+ </object>
++ <packing>
++ <property name="pack_type">end</property>
++ <property name="position">1</property>
++ </packing>
+ </child>
+ <child>
+- <object class="GtkSeparator">
+- <property
name="can_focus">False</property>
+- <property
name="orientation">vertical</property>
+- <style>
+- <class name="dark-separator"/>
+- </style>
++ <object class="GtkButton"
id="right_back_button">
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property
name="no_show_all">True</property>
++ <child>
++ <object class="GtkImage">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">go-previous-symbolic</property>
++ </object>
++ </child>
+ </object>
++ <packing>
++ <property name="position">1</property>
++ </packing>
+ </child>
+ <child>
+- <object class="GtkBox"
id="articlelist_box">
+- <property
name="width_request">380</property>
++ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property name="hexpand">True</property>
+- <property
name="orientation">vertical</property>
+ <child>
+- <object class="HdySearchBar"
id="search_bar">
++ <object class="GtkToggleButton"
id="mark_article_button">
+ <property
name="visible">True</property>
+- <property
name="can_focus">False</property>
++ <property
name="sensitive">False</property>
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property name="tooltip_text"
translatable="yes">Toggle Starred</property>
+ <child>
+- <object class="GtkSearchEntry"
id="search_entry">
++ <object class="GtkStack"
id="mark_article_stack">
+ <property
name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="primary_icon_name">edit-find-symbolic</property>
+- <property
name="primary_icon_activatable">False</property>
+- <property
name="primary_icon_sensitive">False</property>
++ <property
name="can_focus">False</property>
++ <property
name="transition_duration">50</property>
++ <property
name="transition_type">crossfade</property>
++ <child>
++ <object class="GtkImage">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">unmarked-symbolic</property>
++ </object>
++ <packing>
++ <property
name="name">unmarked</property>
++ <property name="title"
translatable="yes">unmarked</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkImage">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">marked-symbolic</property>
++ </object>
++ <packing>
++ <property
name="name">marked</property>
++ <property name="title"
translatable="yes">marked</property>
++ <property
name="position">1</property>
++ </packing>
++ </child>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property
name="expand">False</property>
++ <property name="fill">True</property>
++ <property
name="position">0</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkToggleButton"
id="mark_article_read_button">
++ <property
name="visible">True</property>
++ <property
name="sensitive">False</property>
++ <property
name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property name="tooltip_text"
translatable="yes">Toggle Read</property>
++ <child>
++ <object class="GtkStack"
id="mark_article_read_stack">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="transition_duration">50</property>
++ <property
name="transition_type">crossfade</property>
++ <child>
++ <object class="GtkImage">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">read-symbolic</property>
++ </object>
++ <packing>
++ <property
name="name">read</property>
++ <property name="title"
translatable="yes">read</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkImage">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">unread-symbolic</property>
++ </object>
++ <packing>
++ <property
name="name">unread</property>
++ <property name="title"
translatable="yes">unread</property>
++ <property
name="position">1</property>
++ </packing>
++ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+- <property
name="position">0</property>
++ <property
name="position">1</property>
+ </packing>
+ </child>
+- <child>
+- <placeholder/>
+- </child>
+- </object>
+- </child>
+- </object>
+- </child>
+- <child>
+- <object class="GtkSeparator">
+- <property name="can_focus">False</property>
+- <property
name="orientation">vertical</property>
+- </object>
+- </child>
+- <child>
+- <object class="GtkBox"
id="articleview_box">
+- <property name="width_request">300</property>
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="hexpand">True</property>
+- <property
name="orientation">vertical</property>
+- <child>
+- <placeholder/>
+- </child>
+- </object>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">2</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="name">content</property>
+- <property name="position">3</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkBox" id="reset_page">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="orientation">vertical</property>
+- <child>
+- <object class="GtkInfoBar" id="reset_info_bar">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="hexpand">True</property>
+- <property
name="show_close_button">True</property>
+- <property name="revealed">False</property>
+- <child internal-child="action_area">
+- <object class="GtkButtonBox">
+- <property name="can_focus">False</property>
+- <property name="spacing">6</property>
+- <property name="layout_style">end</property>
+- <child>
+- <object class="GtkButton"
id="details_button">
+- <property name="label"
translatable="yes">Details</property>
+- <property name="visible">True</property>
+- <property
name="can_focus">True</property>
+- <property
name="receives_default">True</property>
+- </object>
+- <packing>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child internal-child="content_area">
+- <object class="GtkBox">
+- <property name="can_focus">False</property>
+- <property name="spacing">16</property>
+- <child>
+- <object class="GtkLabel">
+- <property name="visible">True</property>
+- <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">Resetting Account failed</property>
++ <style>
++ <class name="linked"/>
++ </style>
+ </object>
+ <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
++ <property name="position">2</property>
+ </packing>
+ </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkBox">
+- <property name="can_focus">False</property>
+- <property name="halign">center</property>
+- <property name="margin_left">20</property>
+- <property name="margin_right">20</property>
+- <property name="margin_top">50</property>
+- <property name="margin_bottom">50</property>
+- <property name="orientation">vertical</property>
+- <child>
+- <object class="GtkLabel">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+- <property name="vexpand">True</property>
+- <property name="label"
translatable="yes">Resetting leads to all local data being
lost</property>
+- <style>
+- <class name="h2"/>
+- </style>
+- </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
+- </packing>
+- </child>
+- <child>
+- <object class="GtkBox">
+- <property name="visible">True</property>
+- <property name="can_focus">False</property>
+ <child>
+- <object class="GtkButton"
id="cancel_button">
+- <property name="label"
translatable="yes">I changed my mind</property>
++ <object class="GtkMenuButton"
id="tag_button">
+ <property name="visible">True</property>
++ <property
name="sensitive">False</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
++ <child>
++ <object class="GtkImage"
id="tag_image">
++ <property
name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">tag-symbolic</property>
++ </object>
++ </child>
+ </object>
+ <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">0</property>
++ <property name="pack_type">end</property>
++ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkButton"
id="reset_button">
++ <object class="GtkToggleButton"
id="scrap_content_button">
+ <property name="visible">True</property>
++ <property
name="sensitive">False</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
++ <property name="tooltip_text"
translatable="yes">Try to show full content</property>
+ <child>
+- <object class="GtkStack"
id="reset_stack">
++ <object class="GtkStack"
id="scrap_article_stack">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="transition_duration">50</property>
+ <property
name="transition_type">crossfade</property>
+ <child>
+- <object class="GtkLabel"
id="reset_label">
++ <object class="GtkImage">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+- <property name="label"
translatable="yes">Reset</property>
++ <property
name="icon_name">accessories-dictionary-symbolic</property>
+ </object>
+ <packing>
+- <property
name="name">reset_label</property>
+- <property name="title"
translatable="yes">page0</property>
++ <property
name="name">image</property>
++ <property name="title"
translatable="yes">image</property>
+ </packing>
+ </child>
+ <child>
+- <object class="GtkSpinner"
id="reset_spinner">
++ <object class="GtkSpinner">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="active">True</property>
+ </object>
+ <packing>
+- <property
name="name">reset_spinner</property>
+- <property name="title"
translatable="yes">page1</property>
++ <property
name="name">spinner</property>
++ <property name="title"
translatable="yes">spinner</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+- <style>
+- <class name="destructive-action"/>
+- </style>
+ </object>
+ <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+ <property name="pack_type">end</property>
+- <property name="position">1</property>
++ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+- <packing>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- <property name="position">1</property>
+- </packing>
+ </child>
+ </object>
+ <packing>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
++ <property name="name">content</property>
++ </packing>
++ </child>
++ <child>
++ <object class="GtkHeaderBar"
id="welcome_headerbar">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="title"
translatable="yes">NewsFlash</property>
++ <property name="has_subtitle">False</property>
++ <property
name="show_close_button">True</property>
++ <child>
++ <placeholder/>
++ </child>
++ </object>
++ <packing>
++ <property name="name">welcome</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
++ <child>
++ <object class="GtkHeaderBar"
id="login_headerbar">
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="title"
translatable="yes">NewsFlash</property>
++ <property
name="show_close_button">True</property>
++ <child>
++ <object class="GtkButton" id="back_button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property
name="receives_default">True</property>
++ <property
name="always_show_image">True</property>
++ <child>
++ <object class="GtkImage">
++ <property name="visible">True</property>
++ <property
name="can_focus">False</property>
++ <property
name="icon_name">go-previous-symbolic</property>
++ </object>
++ </child>
++ </object>
++ </child>
++ </object>
++ <packing>
++ <property name="name">login</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
+ </object>
+- <packing>
+- <property name="name">reset_page</property>
+- <property name="position">4</property>
+- </packing>
+ </child>
+ </object>
+ </child>
+@@ -1633,8 +1635,8 @@
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property name="margin_left">10</property>
+- <property name="margin_right">10</property>
++ <property name="margin_start">10</property>
++ <property name="margin_end">10</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">10</property>
+ <property name="label" translatable="yes">You are now
offline.
+@@ -1650,8 +1652,8 @@ Click here to go back online.</property>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property name="margin_left">10</property>
+- <property name="margin_right">10</property>
++ <property name="margin_start">10</property>
++ <property name="margin_end">10</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">10</property>
+ <property name="label" translatable="yes">You are back
online.</property>
+diff --git a/src/app.rs b/src/app.rs
+index 7dfb76e..88bfc37 100644
+--- a/src/app.rs
++++ b/src/app.rs
+@@ -202,7 +202,6 @@ impl App {
+ }
+
+ app.window.init(&app.news_flash, app.threadpool.clone(),
&app.features);
+- app.window.widget.show_all();
+ app
+ }
+
+--
+2.27.0
+
diff --git a/0001-use-usize-where-possible.patch b/0001-use-usize-where-possible.patch
new file mode 100644
index 0000000..d39d206
--- /dev/null
+++ b/0001-use-usize-where-possible.patch
@@ -0,0 +1,791 @@
+From 38361e7c8d644b10d9b6747c26eeec2b50d42845 Mon Sep 17 00:00:00 2001
+From: Jan Lukas Gernert <jangernert(a)gmail.com>
+Date: Sun, 7 Jun 2020 18:55:59 +0200
+Subject: [PATCH] use usize where possible
+
+---
+ src/article_list/article_row.rs | 24 ++++++------
+ src/article_list/mod.rs | 4 +-
+ src/article_view/mod.rs | 56 +++++++++++++--------------
+ src/content_page/content_header.rs | 12 +++---
+ src/error_bar.rs | 18 ++++-----
+ src/login_screen/password_login.rs | 38 +++++++++---------
+ src/login_screen/web_login.rs | 30 +++++---------
+ src/reset_page.rs | 4 +-
+ src/sidebar/feed_list/category_row.rs | 12 +++---
+ src/sidebar/feed_list/feed_row.rs | 10 ++---
+ src/tag_popover/mod.rs | 20 +++++-----
+ src/util/gtk_util.rs | 7 +++-
+ 12 files changed, 114 insertions(+), 121 deletions(-)
+
+diff --git a/src/article_list/article_row.rs b/src/article_list/article_row.rs
+index 255665b..ca3ebf6 100644
+--- a/src/article_list/article_row.rs
++++ b/src/article_list/article_row.rs
+@@ -24,7 +24,7 @@ pub struct ArticleRow {
+ unread_stack: Stack,
+ title_label: Label,
+ row_hovered: Arc<RwLock<bool>>,
+- connected_signals: Vec<(u64, Widget)>,
++ connected_signals: Vec<(usize, Widget)>,
+ }
+
+ impl ArticleRow {
+@@ -175,7 +175,7 @@ impl ArticleRow {
+ title_label: &Label,
+ article_id: &ArticleID,
+ list_model: &Arc<RwLock<ArticleListModel>>,
+- ) -> Vec<(u64, Widget)> {
++ ) -> Vec<(usize, Widget)> {
+ let mut vec = Vec::new();
+ vec.push((
+ eventbox
+@@ -192,7 +192,7 @@ impl ArticleRow {
+ }
+ Inhibit(false)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ eventbox.clone().upcast::<Widget>(),
+ ));
+
+@@ -211,7 +211,7 @@ impl ArticleRow {
+ }
+ Inhibit(false)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ eventbox.clone().upcast::<Widget>(),
+ ));
+
+@@ -249,7 +249,7 @@ impl ArticleRow {
+ Util::send(&sender, Action::MarkArticleRead(update));
+ Inhibit(true)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ eventbox.clone().upcast::<Widget>(),
+ ));
+
+@@ -264,7 +264,7 @@ impl ArticleRow {
+ marked_stack: &Stack,
+ article_id: &ArticleID,
+ list_model: &Arc<RwLock<ArticleListModel>>,
+- ) -> Vec<(u64, Widget)> {
++ ) -> Vec<(usize, Widget)> {
+ let mut vec = Vec::new();
+
+ vec.push((
+@@ -282,7 +282,7 @@ impl ArticleRow {
+ }
+ Inhibit(false)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ eventbox.clone().upcast::<Widget>(),
+ ));
+
+@@ -301,7 +301,7 @@ impl ArticleRow {
+ }
+ Inhibit(false)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ eventbox.clone().upcast::<Widget>(),
+ ));
+
+@@ -337,7 +337,7 @@ impl ArticleRow {
+ Util::send(&sender, Action::MarkArticle(update));
+ Inhibit(true)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ eventbox.clone().upcast::<Widget>(),
+ ));
+
+@@ -352,7 +352,7 @@ impl ArticleRow {
+ marked_stack: &Stack,
+ title_label: &Label,
+ row_hovered: &Arc<RwLock<bool>>,
+- ) -> Vec<(u64, Widget)> {
++ ) -> Vec<(usize, Widget)> {
+ Self::update_title_label(&title_label, *read.read());
+ Self::update_unread_stack(&unread_stack, *read.read(),
*row_hovered.read());
+ Self::update_marked_stack(&marked_stack, *marked.read());
+@@ -382,7 +382,7 @@ impl ArticleRow {
+ }
+ Inhibit(true)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ eventbox.clone().upcast::<Widget>(),
+ ));
+
+@@ -409,7 +409,7 @@ impl ArticleRow {
+ }
+ Inhibit(true)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ eventbox.clone().upcast::<Widget>(),
+ ));
+
+diff --git a/src/article_list/mod.rs b/src/article_list/mod.rs
+index 86cbbd6..1122367 100644
+--- a/src/article_list/mod.rs
++++ b/src/article_list/mod.rs
+@@ -33,7 +33,7 @@ pub struct ArticleList {
+ list_1: Arc<RwLock<SingleArticleList>>,
+ list_2: Arc<RwLock<SingleArticleList>>,
+ list_model: Arc<RwLock<ArticleListModel>>,
+- list_activate_signal: Option<u64>,
++ list_activate_signal: Option<usize>,
+ local_state: MainWindowState,
+ global_state: Arc<RwLock<MainWindowState>>,
+ current_list: Arc<RwLock<CurrentList>>,
+@@ -263,7 +263,7 @@ impl ArticleList {
+ }
+ }))
+ .to_glib();
+- self.list_activate_signal = Some(activate_signal_id);
++ self.list_activate_signal = Some(activate_signal_id as usize);
+ }
+
+ fn require_new_list(&self, new_state: &RwLock<MainWindowState>) ->
bool {
+diff --git a/src/article_view/mod.rs b/src/article_view/mod.rs
+index b29edb2..f43c487 100644
+--- a/src/article_view/mod.rs
++++ b/src/article_view/mod.rs
+@@ -59,16 +59,16 @@ pub struct ArticleView {
+ visible_feed_name: Arc<RwLock<Option<String>>>,
+ widnow_state: Arc<RwLock<MainWindowState>>,
+ internal_state: Arc<RwLock<InternalState>>,
+- load_changed_signal: Arc<RwLock<Option<u64>>>,
+- decide_policy_signal: Arc<RwLock<Option<u64>>>,
+- mouse_over_signal: Arc<RwLock<Option<u64>>>,
+- scroll_signal: Arc<RwLock<Option<u64>>>,
+- key_press_signal: Arc<RwLock<Option<u64>>>,
+- ctx_menu_signal: Arc<RwLock<Option<u64>>>,
+- load_signal: Arc<RwLock<Option<u64>>>,
+- click_signal: Arc<RwLock<Option<u64>>>,
+- click_release_signal: Arc<RwLock<Option<u64>>>,
+- drag_motion_notify_signal: Arc<RwLock<Option<u64>>>,
++ load_changed_signal: Arc<RwLock<Option<usize>>>,
++ decide_policy_signal: Arc<RwLock<Option<usize>>>,
++ mouse_over_signal: Arc<RwLock<Option<usize>>>,
++ scroll_signal: Arc<RwLock<Option<usize>>>,
++ key_press_signal: Arc<RwLock<Option<usize>>>,
++ ctx_menu_signal: Arc<RwLock<Option<usize>>>,
++ load_signal: Arc<RwLock<Option<usize>>>,
++ click_signal: Arc<RwLock<Option<usize>>>,
++ click_release_signal: Arc<RwLock<Option<usize>>>,
++ drag_motion_notify_signal: Arc<RwLock<Option<usize>>>,
+ drag_released_motion_signal: Arc<RwLock<Option<u32>>>,
+ drag_buffer_update_signal: Arc<RwLock<Option<u32>>>,
+ progress_overlay_delay_signal: Arc<RwLock<Option<u32>>>,
+@@ -303,15 +303,15 @@ impl ArticleView {
+ progress_overlay_label: &Arc<RwLock<ProgressOverlay>>,
+ old_state: &Arc<RwLock<InternalState>>,
+ stack: >k::Stack,
+- load_changed_signal: &Arc<RwLock<Option<u64>>>,
+- decide_policy_signal: &Arc<RwLock<Option<u64>>>,
+- mouse_over_signal: &Arc<RwLock<Option<u64>>>,
+- scroll_signal: &Arc<RwLock<Option<u64>>>,
+- key_press_signal: &Arc<RwLock<Option<u64>>>,
+- ctx_menu_signal: &Arc<RwLock<Option<u64>>>,
+- load_signal: &Arc<RwLock<Option<u64>>>,
+- click_signal: &Arc<RwLock<Option<u64>>>,
+- click_release_signal: &Arc<RwLock<Option<u64>>>,
++ load_changed_signal: &Arc<RwLock<Option<usize>>>,
++ decide_policy_signal: &Arc<RwLock<Option<usize>>>,
++ mouse_over_signal: &Arc<RwLock<Option<usize>>>,
++ scroll_signal: &Arc<RwLock<Option<usize>>>,
++ key_press_signal: &Arc<RwLock<Option<usize>>>,
++ ctx_menu_signal: &Arc<RwLock<Option<usize>>>,
++ load_signal: &Arc<RwLock<Option<usize>>>,
++ click_signal: &Arc<RwLock<Option<usize>>>,
++ click_release_signal: &Arc<RwLock<Option<usize>>>,
+ drag_released_motion_signal: &Arc<RwLock<Option<u32>>>,
+ drag_buffer_update_signal: &Arc<RwLock<Option<u32>>>,
+ progress_overlay_delay_signal: &Arc<RwLock<Option<u32>>>,
+@@ -431,7 +431,7 @@ impl ArticleView {
+ }
+ false
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ //----------------------------------
+@@ -463,7 +463,7 @@ impl ArticleView {
+ url_overlay_label.read().reveal(false);
+ }
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ //----------------------------------
+@@ -489,7 +489,7 @@ impl ArticleView {
+ }
+ Inhibit(false)
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ //------------------------------------------------
+@@ -509,7 +509,7 @@ impl ArticleView {
+ }
+ Inhibit(true)
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ //----------------------------------
+@@ -542,7 +542,7 @@ impl ArticleView {
+
+ false
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ //----------------------------------
+@@ -571,7 +571,7 @@ impl ArticleView {
+ progress_handle.read().reveal(true);
+ progress_handle.read().set_percentage(progress);
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+ Continue(false)
+ }))
+@@ -652,7 +652,7 @@ impl ArticleView {
+ Self::set_scroll_pos_static(view,
scroll_pos + scroll);
+ Inhibit(false)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+ }
+ }
+@@ -662,7 +662,7 @@ impl ArticleView {
+ }
+ Inhibit(false)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ self.click_release_signal.write().replace(
+@@ -724,7 +724,7 @@ impl ArticleView {
+ }
+ Inhibit(false)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ //----------------------------------
+diff --git a/src/content_page/content_header.rs b/src/content_page/content_header.rs
+index e3bd5e3..8d828c9 100644
+--- a/src/content_page/content_header.rs
++++ b/src/content_page/content_header.rs
+@@ -33,7 +33,7 @@ pub struct ContentHeader {
+ marked_button: ToggleButton,
+ scrap_content_button: ToggleButton,
+ scrap_content_stack: Stack,
+- scrap_content_event: RwLock<Option<u64>>,
++ scrap_content_event: RwLock<Option<usize>>,
+ tag_button: MenuButton,
+ tag_popover: RwLock<Option<TagPopover>>,
+ more_actions_button: MenuButton,
+@@ -43,8 +43,8 @@ pub struct ContentHeader {
+ mark_article_read_button: ToggleButton,
+ mark_article_stack: Stack,
+ mark_article_read_stack: Stack,
+- mark_article_event: RwLock<Option<u64>>,
+- mark_article_read_event: RwLock<Option<u64>>,
++ mark_article_event: RwLock<Option<usize>>,
++ mark_article_read_event: RwLock<Option<usize>>,
+ }
+
+ impl ContentHeader {
+@@ -557,7 +557,7 @@ impl ContentHeader {
+ }
+ Util::send(&sender, Action::ToggleArticleMarked);
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ self.mark_article_read_event.write().replace(
+@@ -573,7 +573,7 @@ impl ContentHeader {
+ }
+ Util::send(&sender, Action::ToggleArticleRead);
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ self.scrap_content_event.write().replace(
+@@ -590,7 +590,7 @@ impl ContentHeader {
+ Util::send(&sender, Action::RedrawArticle);
+ }
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ self.more_actions_button.set_sensitive(sensitive);
+diff --git a/src/error_bar.rs b/src/error_bar.rs
+index cf24d98..48761c9 100644
+--- a/src/error_bar.rs
++++ b/src/error_bar.rs
+@@ -15,9 +15,9 @@ pub struct ErrorBar {
+ detail_button: Button,
+ login_button: Button,
+ offline_button: Button,
+- detail_signal: Arc<RwLock<Option<u64>>>,
+- relogin_signal: Arc<RwLock<Option<u64>>>,
+- offline_signal: Arc<RwLock<Option<u64>>>,
++ detail_signal: Arc<RwLock<Option<usize>>>,
++ relogin_signal: Arc<RwLock<Option<usize>>>,
++ offline_signal: Arc<RwLock<Option<usize>>>,
+ sender: Sender<Action>,
+ }
+
+@@ -71,9 +71,9 @@ impl ErrorBar {
+ detail_button: &Button,
+ login_button: &Button,
+ offline_button: &Button,
+- detail_signal: &Arc<RwLock<Option<u64>>>,
+- relogin_signal: &Arc<RwLock<Option<u64>>>,
+- offline_signal: &Arc<RwLock<Option<u64>>>,
++ detail_signal: &Arc<RwLock<Option<usize>>>,
++ relogin_signal: &Arc<RwLock<Option<usize>>>,
++ offline_signal: &Arc<RwLock<Option<usize>>>,
+ ) {
+ info_bar.set_revealed(false);
+ GtkUtil::disconnect_signal(*detail_signal.read(), detail_button);
+@@ -114,7 +114,7 @@ impl ErrorBar {
+ log::info!("retry login");
+ Util::send(&sender, Action::RetryLogin);
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ *self.offline_signal.write() = Some(
+@@ -141,7 +141,7 @@ impl ErrorBar {
+ );
+ Util::send(&sender, Action::SetOfflineMode(true));
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+ }
+
+@@ -155,7 +155,7 @@ impl ErrorBar {
+ error!("Failed to spawn ErrorDialog. Parent window not
found.");
+ }
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+ }
+ }
+diff --git a/src/login_screen/password_login.rs b/src/login_screen/password_login.rs
+index be1e1fd..683d3e9 100644
+--- a/src/login_screen/password_login.rs
++++ b/src/login_screen/password_login.rs
+@@ -34,16 +34,16 @@ pub struct PasswordLogin {
+ login_button: gtk::Button,
+ ignore_tls_button: gtk::Button,
+ error_details_button: gtk::Button,
+- info_bar_close_signal: RwLock<Option<u64>>,
+- info_bar_response_signal: RwLock<Option<u64>>,
+- url_entry_signal: RwLock<Option<u64>>,
+- user_entry_signal: RwLock<Option<u64>>,
+- pass_entry_signal: RwLock<Option<u64>>,
+- http_user_entry_signal: RwLock<Option<u64>>,
+- http_pass_entry_signal: RwLock<Option<u64>>,
+- login_button_signal: RwLock<Option<u64>>,
+- ignore_tls_signal: RwLock<Option<u64>>,
+- error_details_signal: RwLock<Option<u64>>,
++ info_bar_close_signal: RwLock<Option<usize>>,
++ info_bar_response_signal: RwLock<Option<usize>>,
++ url_entry_signal: RwLock<Option<usize>>,
++ user_entry_signal: RwLock<Option<usize>>,
++ pass_entry_signal: RwLock<Option<usize>>,
++ http_user_entry_signal: RwLock<Option<usize>>,
++ http_pass_entry_signal: RwLock<Option<usize>>,
++ login_button_signal: RwLock<Option<usize>>,
++ ignore_tls_signal: RwLock<Option<usize>>,
++ error_details_signal: RwLock<Option<usize>>,
+ }
+
+ impl PasswordLogin {
+@@ -129,7 +129,7 @@ impl PasswordLogin {
+ .connect_close(|info_bar| {
+ PasswordLogin::hide_info_bar(info_bar);
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+ self.info_bar_response_signal.write().replace(
+ self.info_bar
+@@ -138,7 +138,7 @@ impl PasswordLogin {
+ PasswordLogin::hide_info_bar(info_bar);
+ }
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ if let LoginGUI::Password(pw_gui_desc) = &info.login_gui {
+@@ -157,19 +157,19 @@ impl PasswordLogin {
+ // check if 'login' should be clickable
+ self.url_entry_signal
+ .write()
+- .replace(self.setup_entry(&self.url_entry,
&pw_gui_desc).to_glib());
++ .replace(self.setup_entry(&self.url_entry,
&pw_gui_desc).to_glib() as usize);
+ self.user_entry_signal
+ .write()
+- .replace(self.setup_entry(&self.user_entry,
&pw_gui_desc).to_glib());
++ .replace(self.setup_entry(&self.user_entry,
&pw_gui_desc).to_glib() as usize);
+ self.pass_entry_signal
+ .write()
+- .replace(self.setup_entry(&self.pass_entry,
&pw_gui_desc).to_glib());
++ .replace(self.setup_entry(&self.pass_entry,
&pw_gui_desc).to_glib() as usize);
+ self.http_user_entry_signal
+ .write()
+- .replace(self.setup_entry(&self.http_user_entry,
&pw_gui_desc).to_glib());
++ .replace(self.setup_entry(&self.http_user_entry,
&pw_gui_desc).to_glib() as usize);
+ self.http_pass_entry_signal
+ .write()
+- .replace(self.setup_entry(&self.http_pass_entry,
&pw_gui_desc).to_glib());
++ .replace(self.setup_entry(&self.http_pass_entry,
&pw_gui_desc).to_glib() as usize);
+
+ // harvest login data
+ self.login_button_signal.write().replace(
+@@ -231,7 +231,7 @@ impl PasswordLogin {
+ let login_data = LoginData::Password(login_data);
+ Util::send(&sender, Action::Login(login_data));
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ return Ok(());
+@@ -324,7 +324,7 @@ impl PasswordLogin {
+ .expect("MainWindow is not a parent of password login error
details button.");
+ let _dialog = ErrorDialog::new(&error, &parent);
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+ self.info_bar.set_visible(true);
+ self.info_bar.set_revealed(true);
+diff --git a/src/login_screen/web_login.rs b/src/login_screen/web_login.rs
+index 641415e..274c4fc 100644
+--- a/src/login_screen/web_login.rs
++++ b/src/login_screen/web_login.rs
+@@ -3,14 +3,7 @@ use crate::app::Action;
+ use crate::error_dialog::ErrorDialog;
+ use crate::i18n::i18n;
+ use crate::util::{BuilderHelper, GtkUtil, Util, GTK_BUILDER_ERROR};
+-use glib::{
+- clone,
+- object::ObjectExt,
+- signal::SignalHandlerId,
+- source::Continue,
+- translate::{FromGlib, ToGlib},
+- Sender,
+-};
++use glib::{clone, source::Continue, translate::ToGlib, Sender};
+ use gtk::{Box, BoxExt, Button, ButtonExt, InfoBar, InfoBarExt, Label, LabelExt,
ResponseType, WidgetExt};
+ use news_flash::models::{LoginData, LoginGUI, OAuthData, PluginInfo};
+ use news_flash::{NewsFlashError, NewsFlashErrorKind};
+@@ -26,10 +19,10 @@ pub struct WebLogin {
+ info_bar: gtk::InfoBar,
+ info_bar_label: gtk::Label,
+ error_details_button: gtk::Button,
+- redirect_signal_id: Rc<RwLock<Option<u64>>>,
+- info_bar_close_signal: RwLock<Option<u64>>,
+- info_bar_response_signal: RwLock<Option<u64>>,
+- error_details_signal: RwLock<Option<u64>>,
++ redirect_signal_id: Rc<RwLock<Option<usize>>>,
++ info_bar_close_signal: RwLock<Option<usize>>,
++ info_bar_response_signal: RwLock<Option<usize>>,
++ error_details_signal: RwLock<Option<usize>>,
+ }
+
+ impl WebLogin {
+@@ -86,7 +79,7 @@ impl WebLogin {
+ let parent =
GtkUtil::get_main_window(button).expect("MainWindow is not parent of details
button.");
+ let _dialog = ErrorDialog::new(&error, &parent);
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ self.info_bar.set_visible(true);
+@@ -100,7 +93,7 @@ impl WebLogin {
+ .connect_close(|info_bar| {
+ WebLogin::hide_info_bar(info_bar);
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+ self.info_bar_response_signal.write().replace(
+ self.info_bar
+@@ -109,7 +102,7 @@ impl WebLogin {
+ WebLogin::hide_info_bar(info_bar);
+ }
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ if let LoginGUI::OAuth(web_login_desc) = info.login_gui.clone() {
+@@ -129,10 +122,7 @@ impl WebLogin {
+ url: uri.as_str().to_owned(),
+ };
+ let oauth_data = LoginData::OAuth(oauth_data);
+- if let Some(signal_id) =
*redirect_signal_id.read() {
+- let signal_id =
SignalHandlerId::from_glib(signal_id);
+- webview.disconnect(signal_id);
+- }
++
GtkUtil::disconnect_signal(*redirect_signal_id.read(), webview);
+ webview.stop_loading();
+ Util::send(&sender,
Action::Login(oauth_data));
+ }
+@@ -145,7 +135,7 @@ impl WebLogin {
+ }
+ }));
+
+- self.redirect_signal_id.write().replace(signal_id.to_glib());
++ self.redirect_signal_id.write().replace(signal_id.to_glib() as usize);
+ return Ok(());
+ }
+
+diff --git a/src/reset_page.rs b/src/reset_page.rs
+index 6382cac..f088ff2 100644
+--- a/src/reset_page.rs
++++ b/src/reset_page.rs
+@@ -12,7 +12,7 @@ pub struct ResetPage {
+ reset_button: Button,
+ info_bar: InfoBar,
+ error_details_button: Button,
+- error_details_signal: RwLock<Option<u64>>,
++ error_details_signal: RwLock<Option<usize>>,
+ }
+
+ impl ResetPage {
+@@ -72,7 +72,7 @@ impl ResetPage {
+ .expect("MainWindow is not a parent of password login error
details button.");
+ let _dialog = ErrorDialog::new(&error, &parent);
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ self.info_bar.set_revealed(true);
+diff --git a/src/sidebar/feed_list/category_row.rs
b/src/sidebar/feed_list/category_row.rs
+index b33e694..0b6f580 100644
+--- a/src/sidebar/feed_list/category_row.rs
++++ b/src/sidebar/feed_list/category_row.rs
+@@ -32,7 +32,7 @@ pub struct CategoryRow {
+ item_count_event: EventBox,
+ title: Label,
+ expanded: bool,
+- connected_signals: Vec<(u64, Widget)>,
++ connected_signals: Vec<(usize, Widget)>,
+ }
+
+ impl CategoryRow {
+@@ -96,7 +96,7 @@ impl CategoryRow {
+ arrow_image.set_opacity(1.0);
+ Inhibit(false)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ arrow_event.clone().upcast::<Widget>(),
+ ));
+
+@@ -106,7 +106,7 @@ impl CategoryRow {
+ arrow_image.set_opacity(0.8);
+ Inhibit(false)
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ arrow_event.clone().upcast::<Widget>(),
+ ));
+
+@@ -127,7 +127,7 @@ impl CategoryRow {
+ Inhibit(false)
+ }),
+ )
+- .to_glib(),
++ .to_glib() as usize,
+ arrow_event.clone().upcast::<Widget>(),
+ ));
+
+@@ -155,7 +155,7 @@ impl CategoryRow {
+ features: &Arc<RwLock<Option<PluginCapabilities>>>,
+ label: String,
+ sender: Sender<Action>,
+- ) -> Option<(u64, Widget)> {
++ ) -> Option<(usize, Widget)> {
+ row.set_activatable(true);
+ row.set_can_focus(false);
+ row.get_style_context().remove_class("activatable");
+@@ -240,7 +240,7 @@ impl CategoryRow {
+ row.set_state_flags(StateFlags::PRELIGHT, false);
+
+ Inhibit(true)
+- })).to_glib(), eventbox.clone().upcast::<Widget>()))
++ })).to_glib() as usize, eventbox.clone().upcast::<Widget>()))
+ } else {
+ None
+ }
+diff --git a/src/sidebar/feed_list/feed_row.rs b/src/sidebar/feed_list/feed_row.rs
+index 86529ad..248332b 100644
+--- a/src/sidebar/feed_list/feed_row.rs
++++ b/src/sidebar/feed_list/feed_row.rs
+@@ -39,7 +39,7 @@ pub struct FeedRow {
+ revealer: Revealer,
+ hide_timeout: Arc<RwLock<Option<u32>>>,
+ favicon: Image,
+- connected_signals: Vec<(u64, Widget)>,
++ connected_signals: Vec<(usize, Widget)>,
+ }
+
+ impl FeedRow {
+@@ -100,7 +100,7 @@ impl FeedRow {
+ id: &FeedID,
+ parent_id: &CategoryID,
+ label: String,
+- ) -> Vec<(u64, Widget)> {
++ ) -> Vec<(usize, Widget)> {
+ let mut vec = Vec::new();
+
+ row.set_activatable(true);
+@@ -135,7 +135,7 @@ impl FeedRow {
+ }
+ }
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ revealer.clone().upcast::<Widget>(),
+ ));
+
+@@ -152,7 +152,7 @@ impl FeedRow {
+ style_context.remove_class("drag-icon");
+ drag_context.drag_set_icon_surface(&surface);
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ revealer.clone().upcast::<Widget>(),
+ ));
+
+@@ -231,7 +231,7 @@ impl FeedRow {
+ row.set_state_flags(StateFlags::PRELIGHT, false);
+
+ Inhibit(true)
+- })).to_glib(), row.clone().upcast::<Widget>()));
++ })).to_glib() as usize, row.clone().upcast::<Widget>()));
+ }
+
+ vec
+diff --git a/src/tag_popover/mod.rs b/src/tag_popover/mod.rs
+index af0905e..9b6a38e 100644
+--- a/src/tag_popover/mod.rs
++++ b/src/tag_popover/mod.rs
+@@ -28,11 +28,11 @@ pub struct TagPopover {
+ unassigned_tags_list_stack: Stack,
+ assigned_tags: Arc<RwLock<Vec<Tag>>>,
+ unassigned_tags: Arc<RwLock<Vec<Tag>>>,
+- add_button_signal: Option<u64>,
+- back_button_signal: Option<u64>,
+- popover_close_signal: Option<u64>,
+- assigned_click_signal: Option<u64>,
+- unassigned_click_signal: Option<u64>,
++ add_button_signal: Option<usize>,
++ back_button_signal: Option<usize>,
++ popover_close_signal: Option<usize>,
++ assigned_click_signal: Option<usize>,
++ unassigned_click_signal: Option<usize>,
+ }
+
+ impl TagPopover {
+@@ -55,7 +55,7 @@ impl TagPopover {
+ .connect_clicked(clone!(@weak main_stack => @default-panic, move
|_button| {
+ main_stack.set_visible_child_full("possible_tags",
StackTransitionType::SlideLeft);
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ let back_button_signal = Some(
+@@ -63,7 +63,7 @@ impl TagPopover {
+ .connect_clicked(clone!(@weak main_stack => @default-panic, move
|_button| {
+ main_stack.set_visible_child_full("assigned_tags",
StackTransitionType::SlideRight);
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ let popover_close_signal = Some(
+@@ -71,7 +71,7 @@ impl TagPopover {
+ .connect_closed(clone!(@weak main_stack => @default-panic, move
|_button| {
+ main_stack.set_visible_child_full("assigned_tags",
StackTransitionType::None);
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ let assigned_click_signal = Some(
+@@ -79,7 +79,7 @@ impl TagPopover {
+ .connect_row_activated(|_list, _row| {
+ info!("click");
+ })
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ let unassigned_click_signal = Some(
+@@ -130,7 +130,7 @@ impl TagPopover {
+ main_stack.set_visible_child_full("assigned_tags",
StackTransitionType::SlideRight);
+ list.remove(row);
+ }))
+- .to_glib(),
++ .to_glib() as usize,
+ );
+
+ let popover = TagPopover {
+diff --git a/src/util/gtk_util.rs b/src/util/gtk_util.rs
+index d8ec0f0..7189533 100644
+--- a/src/util/gtk_util.rs
++++ b/src/util/gtk_util.rs
+@@ -155,9 +155,12 @@ impl GtkUtil {
+ None
+ }
+
+- pub fn disconnect_signal<T: ObjectExt>(signal_id: Option<u64>, widget:
&T) {
++ pub fn disconnect_signal<T: ObjectExt>(signal_id: Option<usize>, widget:
&T) {
+ if let Some(signal_id) = signal_id {
+- let signal_id = SignalHandlerId::from_glib(signal_id);
++ #[cfg(target_pointer_width = "64")]
++ let signal_id = SignalHandlerId::from_glib(signal_id as u64);
++ #[cfg(target_pointer_width = "32")]
++ let signal_id = SignalHandlerId::from_glib(signal_id as u32);
+ widget.disconnect(signal_id);
+ }
+ //warn!("Signal ID to disconnect is NONE");
+--
+2.27.0
+
diff --git a/newsflash.spec b/newsflash.spec
index 084a0f7..d2e60c5 100644
--- a/newsflash.spec
+++ b/newsflash.spec
@@ -2,7 +2,7 @@
Name: newsflash
Version: 1.0~rc1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Modern feed reader
# (MIT or ASL 2.0) and BSD
@@ -19,10 +19,14 @@ Summary: Modern feed reader
License: GPLv3+ and BSD and ASL 2.0 and MIT and Unlicense and zlib
URL:
https://gitlab.com/news-flash/news_flash_gtk
Source0:
https://gitlab.com/news-flash/news_flash_gtk/-/archive/%{version_no_tilde...
+#
https://gitlab.com/news-flash/news_flash_gtk/-/issues/66
+#
https://gitlab.com/news-flash/news_flash_gtk/-/commit/38361e7c8d644b10d9b...
+Patch0001: 0001-use-usize-where-possible.patch
+#
https://gitlab.com/news-flash/news_flash_gtk/-/issues/77
+#
https://gitlab.com/news-flash/news_flash_gtk/-/commit/2a9405ea8148329fa89...
+Patch0002: 0001-dont-call-show_all-in-app-constructor.patch
ExclusiveArch: %{rust_arches}
-#
https://gitlab.com/news-flash/news_flash_gtk/-/issues/66
-ExcludeArch: %{ix86} %{arm}
BuildRequires: rust-packaging
BuildRequires: meson
@@ -48,8 +52,6 @@ sed -i \
# We will build by cargo ourselves
sed -i -e '/\(build_by_default\|install\)/s/true/false/' src/meson.build
sed -i -e '/dependency/d' meson.build
-#
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2893
-sed -i -e '/app.window.widget.show_all/d' src/app.rs
%cargo_prep
%generate_buildrequires
@@ -79,6 +81,10 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/metainfo/com.gitla
%{_datadir}/metainfo/com.gitlab.newsflash.appdata.xml
%changelog
+* Fri Jun 12 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> - 1.0~rc1-3
+- Backport fix for 32bit platforms
+- Update fix for missing icon in GNOME Shell
+
* Fri Jun 12 2020 Igor Raits <ignatenkobrain(a)fedoraproject.org> - 1.0~rc1-2
- Fixup showing icon