tootle: fix build with vala 0.56
This commit is contained in:
parent
ed573933ce
commit
45d3754905
1 changed files with 69 additions and 0 deletions
69
srcpkgs/tootle/patches/vala-0.56b.patch
Normal file
69
srcpkgs/tootle/patches/vala-0.56b.patch
Normal file
|
@ -0,0 +1,69 @@
|
|||
diff --git a/src/API/NotificationType.vala b/src/API/NotificationType.vala
|
||||
index c3f4420..15ba2ae 100644
|
||||
--- a/src/API/NotificationType.vala
|
||||
+++ b/src/API/NotificationType.vala
|
||||
@@ -5,7 +5,8 @@ public enum Tootle.API.NotificationType {
|
||||
FAVOURITE,
|
||||
FOLLOW,
|
||||
FOLLOW_REQUEST, // Internal
|
||||
- WATCHLIST; // Internal
|
||||
+ WATCHLIST, // Internal
|
||||
+ NONE; // Internal
|
||||
|
||||
public string to_string () {
|
||||
switch (this) {
|
||||
diff --git a/src/Widgets/Notification.vala b/src/Widgets/Notification.vala
|
||||
index 3e2fe54..41ed71f 100644
|
||||
--- a/src/Widgets/Notification.vala
|
||||
+++ b/src/Widgets/Notification.vala
|
||||
@@ -16,7 +16,7 @@ public class Tootle.Widgets.Notification : Widgets.Status {
|
||||
}
|
||||
|
||||
protected override void on_kind_changed () {
|
||||
- if (kind == null)
|
||||
+ if (kind == API.NotificationType.NONE)
|
||||
return;
|
||||
|
||||
header_icon.visible = header_label.visible = true;
|
||||
diff --git a/src/Widgets/Status.vala b/src/Widgets/Status.vala
|
||||
index ef51340..ce1c951 100644
|
||||
--- a/src/Widgets/Status.vala
|
||||
+++ b/src/Widgets/Status.vala
|
||||
@@ -5,7 +5,7 @@ using Gdk;
|
||||
public class Tootle.Widgets.Status : ListBoxRow {
|
||||
|
||||
public API.Status status { get; construct set; }
|
||||
- public API.NotificationType? kind { get; construct set; }
|
||||
+ public API.NotificationType kind { get; construct set; }
|
||||
|
||||
public enum ThreadRole {
|
||||
NONE,
|
||||
@@ -113,7 +113,7 @@ public class Tootle.Widgets.Status : ListBoxRow {
|
||||
notify["kind"].connect (on_kind_changed);
|
||||
open.connect (on_open);
|
||||
|
||||
- if (kind == null) {
|
||||
+ if (kind == API.NotificationType.NONE) {
|
||||
if (status.reblog != null)
|
||||
kind = API.NotificationType.REBLOG_REMOTE_USER;
|
||||
}
|
||||
@@ -164,7 +164,7 @@ public class Tootle.Widgets.Status : ListBoxRow {
|
||||
menu_button.clicked.connect (open_menu);
|
||||
}
|
||||
|
||||
- public Status (owned API.Status status, API.NotificationType? kind = null) {
|
||||
+ public Status (owned API.Status status, API.NotificationType kind = API.NotificationType.NONE) {
|
||||
Object (
|
||||
status: status,
|
||||
kind: kind
|
||||
@@ -180,8 +180,8 @@ public class Tootle.Widgets.Status : ListBoxRow {
|
||||
}
|
||||
|
||||
protected virtual void on_kind_changed () {
|
||||
- header_icon.visible = header_label.visible = (kind != null);
|
||||
- if (kind == null)
|
||||
+ header_icon.visible = header_label.visible = (kind != API.NotificationType.NONE);
|
||||
+ if (kind == API.NotificationType.NONE)
|
||||
return;
|
||||
|
||||
header_icon.icon_name = kind.get_icon ();
|
Loading…
Add table
Add a link
Reference in a new issue