fix: compatibility updates

Correct syntax errors raised by newer compiler versions. Update SDK to
43.
This commit is contained in:
Link Dupont 2022-11-17 21:55:11 -05:00
parent 02f918d637
commit fbacc09a6c
14 changed files with 24 additions and 23 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ build.sh
subprojects/libhandy-* subprojects/libhandy-*
subprojects/packagecache subprojects/packagecache
*~ *~
.flatpak

View File

@ -2,7 +2,7 @@
"app-id" : "com.github.bleakgrey.tootle", "app-id" : "com.github.bleakgrey.tootle",
"runtime" : "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"sdk" : "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",
"runtime-version" : "40", "runtime-version" : "43",
"command" : "com.github.bleakgrey.tootle", "command" : "com.github.bleakgrey.tootle",
"finish-args" : [ "finish-args" : [
"--device=dri", "--device=dri",
@ -11,7 +11,6 @@
"--socket=fallback-x11", "--socket=fallback-x11",
"--socket=wayland", "--socket=wayland",
"--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs",
"--talk-name=org.gtk.vfs.*",
"--filesystem=xdg-run/gvfsd" "--filesystem=xdg-run/gvfsd"
], ],
"cleanup" : [ "cleanup" : [

View File

@ -103,7 +103,7 @@
<property name="revealed">0</property> <property name="revealed">0</property>
<signal name="response" handler="infobar_response" swapped="no"/> <signal name="response" handler="infobar_response" swapped="no"/>
<child internal-child="action_area"> <child internal-child="action_area">
<object class="GtkButtonBox"> <object class="GtkBox">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk" version="4.0"/>
<requires lib="libhandy" version="1.0"/> <requires lib="libadwaita" version="1.0"/>
<template class="TootleDialogsMainWindow" parent="AdwApplicationWindow"> <template class="TootleDialogsMainWindow" parent="AdwApplicationWindow">
<property name="width_request">360</property> <property name="width_request">360</property>
<property name="height_request">600</property> <property name="height_request">600</property>
@ -10,6 +10,9 @@
<object class="AdwFlap" id="flap"> <object class="AdwFlap" id="flap">
<child type="flap"> <child type="flap">
<object class="TootleViewsSidebar" id="sidebar"> <object class="TootleViewsSidebar" id="sidebar">
<style>
<class name="background"/>
</style>
</object> </object>
</child> </child>
<!-- <child type="separator"> --> <!-- <child type="separator"> -->
@ -19,10 +22,9 @@
<!-- </child> --> <!-- </child> -->
<child type="content"> <child type="content">
<object class="AdwLeaflet" id="leaflet"> <object class="AdwLeaflet" id="leaflet">
<property name="can-swipe-back">1</property> <property name="can-navigate-back">1</property>
<property name="can-unfold">0</property> <property name="can-unfold">0</property>
<property name="hhomogeneous-folded">0</property> <property name="homogeneous">1</property>
<property name="hhomogeneous-unfolded">1</property>
<signal name="notify::child-transition-running" handler="on_child_transition"/> <signal name="notify::child-transition-running" handler="on_child_transition"/>
<signal name="notify::visible-child" handler="on_view_changed"/> <signal name="notify::visible-child" handler="on_view_changed"/>
</object> </object>

View File

@ -8,7 +8,7 @@
<property name="title" translatable="yes">Add Account</property> <property name="title" translatable="yes">Add Account</property>
<child> <child>
<object class="AdwLeaflet" id="deck"> <object class="AdwLeaflet" id="deck">
<property name="can_swipe_back">1</property> <property name="can_navigate_back">1</property>
<property name="can_unfold">0</property> <property name="can_unfold">0</property>
<signal name="notify::visible_child" handler="on_visible_child_notify" swapped="no"/> <signal name="notify::visible_child" handler="on_visible_child_notify" swapped="no"/>
<child> <child>

View File

@ -4,10 +4,9 @@ public class Tootle.API.Attachment : Entity, Widgetizable {
public string kind { get; set; default = "unknown"; } public string kind { get; set; default = "unknown"; }
public string url { get; set; } public string url { get; set; }
public string? description { get; set; } public string? description { get; set; }
public string? _preview_url { get; set; }
public string? preview_url { public string? preview_url {
set { this._preview_url = value; } set { this.preview_url = value; }
get { return (this._preview_url == null || this._preview_url == "") ? url : _preview_url; } get { return (this.preview_url == null || this.preview_url == "") ? url : preview_url; }
} }
public File? source_file { get; set; } public File? source_file { get; set; }

View File

@ -21,7 +21,7 @@ public class Tootle.API.Mention : Entity, Widgetizable {
} }
public override void open () { public override void open () {
Views.Profile.open_from_id (id); Views.Profile.open_from_id (this.id);
} }
} }

View File

@ -28,7 +28,7 @@ public class Tootle.API.Status : Entity, Widgetizable {
public ArrayList<API.Mention>? mentions { get; set; default = null; } public ArrayList<API.Mention>? mentions { get; set; default = null; }
public ArrayList<API.Attachment>? media_attachments { get; set; default = null; } public ArrayList<API.Attachment>? media_attachments { get; set; default = null; }
public string? _url { get; set; } private string? _url;
public string url { public string url {
owned get { return this.get_modified_url (); } owned get { return this.get_modified_url (); }
set { this._url = value; } set { this._url = value; }

View File

@ -43,7 +43,7 @@ namespace Tootle {
{ null } { null }
}; };
public const GLib.ActionEntry[] app_entries = { private const GLib.ActionEntry[] app_entries = {
{ "about", about_activated }, { "about", about_activated },
{ "compose", compose_activated }, { "compose", compose_activated },
{ "back", back_activated }, { "back", back_activated },

View File

@ -211,7 +211,7 @@ public class Tootle.Dialogs.NewAccount: Adw.Window {
if (!deck.child_transition_running && deck.visible_child == instance_step) if (!deck.child_transition_running && deck.visible_child == instance_step)
reset (); reset ();
deck.can_swipe_back = deck.visible_child != done_step; deck.can_navigate_back = deck.visible_child != done_step;
} }
} }

View File

@ -177,7 +177,7 @@ public class Tootle.InstanceAccount : API.Account, Streamable {
// Streamable // Streamable
public string? _connection_url { get; set; } public string? connection_url { get; set; }
public bool subscribed { get; set; } public bool subscribed { get; set; }
public virtual string? get_stream_url () { public virtual string? get_stream_url () {

View File

@ -20,7 +20,7 @@ public abstract interface Tootle.Streamable : Object {
} }
} }
public abstract string? _connection_url { get; set; } private abstract string? connection_url { get; set; }
public abstract bool subscribed { get; set; default = false; } public abstract bool subscribed { get; set; default = false; }
public abstract string? get_stream_url (); public abstract string? get_stream_url ();
@ -29,14 +29,14 @@ public abstract interface Tootle.Streamable : Object {
public signal void stream_event (Event ev); public signal void stream_event (Event ev);
void subscribe () { void subscribe () {
streams.unsubscribe (_connection_url, this); streams.unsubscribe (connection_url, this);
streams.subscribe (get_stream_url (), this); streams.subscribe (get_stream_url (), this);
_connection_url = get_stream_url (); connection_url = get_stream_url ();
} }
void unsubscribe () { void unsubscribe () {
streams.unsubscribe (get_stream_url (), this); streams.unsubscribe (get_stream_url (), this);
_connection_url = null; connection_url = null;
} }
public string get_subscriber_name () { public string get_subscriber_name () {

View File

@ -61,7 +61,7 @@ public class Tootle.Views.Base : Box {
protected virtual void build_actions () {} protected virtual void build_actions () {}
protected virtual void build_header () { protected virtual void build_header () {
var title = new Adw.WindowTitle (null, null); var title = new Adw.WindowTitle ("Tootle", "");
bind_property ("label", title, "title", BindingFlags.SYNC_CREATE); bind_property ("label", title, "title", BindingFlags.SYNC_CREATE);
header.title_widget = title; header.title_widget = title;
} }

View File

@ -132,7 +132,7 @@ public class Tootle.Views.Timeline : AccountHolder, Streamable, Views.ContentBas
// Streamable // Streamable
public string? _connection_url { get; set; } public string? connection_url { get; set; }
public bool subscribed { get; set; } public bool subscribed { get; set; }
protected override void on_streaming_policy_changed () { protected override void on_streaming_policy_changed () {