Fix some leaks for GTK 4.3

data/app.css

@@ -69,9 +69,20 @@
  margin-bottom: 32px;
 }
 
-.header-image {
+
+
+
+/*
+ Profile
+*/
+
+.ttl-profile-cover .header-image {
  background:grey;
 }
+.ttl-profile-cover avatar {
+ border: 6px solid @theme_base_color;
+ background: @theme_base_color;
+}
 .large .header-image {
  border-radius:6px 6px 0 0;
 }

data/ui/dialogs/main.ui

@@ -19,7 +19,8 @@
  <!-- </child> -->
  <child type="content">
  <object class="AdwLeaflet" id="leaflet">
- <property name="can_swipe_back">True</property>
+ <property name="can-swipe-back">1</property>
+ <property name="can-unfold">0</property>
  <property name="hhomogeneous-folded">0</property>
  <property name="hhomogeneous-unfolded">1</property>
  <signal name="notify::child-transition-running" handler="on_child_transition"/>

data/ui/views/profile_header.ui

@@ -15,64 +15,41 @@
  <child>
 
 <object class="GtkListBoxRow">
- <property name="can-target">0</property>
  <child>
 
  <object class="GtkGrid">
  <property name="row_homogeneous">0</property>
  <child>
- <object class="GtkImage" id="background">
+ <object class="GtkPicture" id="background">
  <property name="hexpand">1</property>
- <property name="icon_name">gtk-missing-image</property>
+ <property name="keep-aspect-ratio">0</property>
  <property name="height-request">200</property>
- <property name="margin-bottom">18</property>
+ <property name="margin-bottom">50</property>
  <style>
  <class name="header-image"/>
  </style>
  <layout>
  <property name="column">0</property>
- <property name="row">0</property>
  <property name="column-span">2</property>
- <property name="row-span">3</property>
+ <property name="row">0</property>
+ <property name="row-span">1</property>
  </layout>
  </object>
  </child>
  <child>
  <object class="TootleWidgetsAvatar" id="avatar">
  <property name="halign">start</property>
- <property name="valign">center</property>
+ <property name="valign">end</property>
  <property name="margin-start">12</property>
- <property name="size">90</property>
- <property name="sensitive">0</property>
+ <property name="margin-end">12</property>
+ <property name="size">100</property>
  <layout>
  <property name="column">0</property>
- <property name="row">2</property>
- <property name="row-span">2</property>
+ <property name="row">0</property>
+ <property name="row-span">1</property>
  </layout>
  </object>
  </child>
- <!-- <child> -->
- <!-- <object class="GtkBox" id="actions"> -->
- <!-- <property name="halign">end</property> -->
- <!-- <property name="margin-end">12</property> -->
- <!-- <property name="margin_top">12</property> -->
- <!-- <property name="margin_bottom">12</property> -->
- <!-- <property name="hexpand">1</property> -->
- <!-- <child> -->
- <!-- <placeholder/> -->
- <!-- </child> -->
- <!-- <child> -->
- <!-- <placeholder/> -->
- <!-- </child> -->
- <!-- <child> -->
- <!-- <placeholder/> -->
- <!-- </child> -->
- <!-- <layout> -->
- <!-- <property name="column">1</property> -->
- <!-- <property name="row">3</property> -->
- <!-- </layout> -->
- <!-- </object> -->
- <!-- </child> -->
  <child>
  <object class="GtkBox">
  <property name="margin_top">12</property>
@@ -137,7 +114,6 @@
 
  <child>
  <object class="GtkListBoxRow">
- <property name="can-target">0</property>
  <child>
  <object class="TootleWidgetsMarkupView" id="note">
  <property name="margin-top">12</property>
@@ -153,5 +129,9 @@
  </object>
  </child>
 
+ <style>
+ <class name="ttl-profile-cover"/>
+ </style>
+
  </template>
 </interface>

data/ui/widgets/status.ui

@@ -205,59 +205,59 @@
  </child>
  <child>
  <object class="GtkBox" id="actions">
- <property name="can_focus">0</property>
+ <property name="homogeneous">1</property>
  <property name="spacing">8</property>
- <child>
-  <object class="GtkButton" id="reply_button">
- <property name="hexpand">1</property>
- <property name="icon_name">mail-reply-sender-symbolic</property>
- <style>
- <class name="flat"/>
- </style>
-  </object>
- </child>
- <child>
-  <object class="GtkToggleButton" id="reblog_button">
- <property name="hexpand">1</property>
- <property name="icon_name">reblog_icon</property>
- <style>
- <class name="flat"/>
- </style>
-  </object>
- </child>
- <child>
-  <object class="GtkToggleButton" id="favorite_button">
- <property name="hexpand">1</property>
- <property name="icon_name">image2</property>
- <style>
- <class name="flat"/>
- </style>
-  </object>
- </child>
- <child>
-  <object class="GtkToggleButton" id="bookmark_button">
- <property name="hexpand">1</property>
- <property name="icon_name">image1</property>
- <style>
- <class name="flat"/>
- </style>
-  </object>
- </child>
- <child>
-  <object class="GtkButton" id="menu_button">
- <property name="hexpand">1</property>
- <property name="receives_default">1</property>
- <child>
- <object class="GtkImage">
- <property name="can_focus">0</property>
- <property name="icon_name">view-more-symbolic</property>
- </object>
- </child>
- <style>
- <class name="flat"/>
- </style>
-  </object>
- </child>
+ <!-- <child> -->
+ <!-- <object class="GtkButton" id="reply_button"> -->
+ <!--  <property name="hexpand">1</property> -->
+ <!--  <property name="icon_name">mail-reply-sender-symbolic</property> -->
+ <!--  <style> -->
+ <!--  <class name="flat"/> -->
+ <!--  </style> -->
+ <!-- </object> -->
+ <!-- </child> -->
+ <!-- <child> -->
+ <!-- <object class="GtkToggleButton" id="reblog_button"> -->
+ <!--  <property name="hexpand">1</property> -->
+ <!--  <property name="icon_name">reblog_icon</property> -->
+ <!--  <style> -->
+ <!--  <class name="flat"/> -->
+ <!--  </style> -->
+ <!-- </object> -->
+ <!-- </child> -->
+ <!-- <child> -->
+ <!-- <object class="GtkToggleButton" id="favorite_button"> -->
+ <!--  <property name="hexpand">1</property> -->
+ <!--  <property name="icon_name">image2</property> -->
+ <!--  <style> -->
+ <!--  <class name="flat"/> -->
+ <!--  </style> -->
+ <!-- </object> -->
+ <!-- </child> -->
+ <!-- <child> -->
+ <!-- <object class="GtkToggleButton" id="bookmark_button"> -->
+ <!--  <property name="hexpand">1</property> -->
+ <!--  <property name="icon_name">image1</property> -->
+ <!--  <style> -->
+ <!--  <class name="flat"/> -->
+ <!--  </style> -->
+ <!-- </object> -->
+ <!-- </child> -->
+ <!-- <child> -->
+ <!-- <object class="GtkButton" id="menu_button"> -->
+ <!--  <property name="hexpand">1</property> -->
+ <!--  <property name="receives_default">1</property> -->
+ <!--  <child> -->
+ <!--  <object class="GtkImage"> -->
+ <!--  <property name="can_focus">0</property> -->
+ <!--  <property name="icon_name">view-more-symbolic</property> -->
+ <!--  </object> -->
+ <!--  </child> -->
+ <!--  <style> -->
+ <!--  <class name="flat"/> -->
+ <!--  </style> -->
+ <!-- </object> -->
+ <!-- </child> -->
  </object>
  </child>
  <layout>

meson.build

@@ -26,8 +26,8 @@ asresources = gnome.compile_resources(
  c_name: 'as'
 )
 
-libgtk_dep = dependency('gtk4', version: '>=4.0.0', required: true)
-libadwaita_dep = dependency('libadwaita-1')
+libgtk_dep = dependency('gtk4', version: '>=4.3.0', required: true)
+libadwaita_dep = dependency('libadwaita-1', version: '>=1.0.0', required: true)
 
 sources = files(
  'src/Application.vala',
@@ -62,7 +62,6 @@ sources = files(
  'src/API/SearchResults.vala',
  'src/API/Entity.vala',
  'src/Widgets/Widgetizable.vala',
- 'src/Widgets/Disposable.vala',
  'src/Widgets/Avatar.vala',
  'src/Widgets/RichLabel.vala',
  'src/Widgets/Status.vala',

src/Application.vala

@@ -178,7 +178,8 @@ namespace Tootle {
  website = Build.SUPPORT_WEBSITE,
  website_label = _("Report an issue"),
  license_type = License.GPL_3_0_ONLY,
- copyright = Build.COPYRIGHT
+ copyright = Build.COPYRIGHT,
+ system_information = Build.SYSTEM_INFO
  };
 
  // For some obscure reason, const arrays produce duplicates in the credits.

src/Build.vala.in

@@ -9,6 +9,8 @@ public class Build {
  public const string COPYRIGHT = "@COPYRIGHT@";
  public const string PREFIX = "@PREFIX@";
 
+ public static string SYSTEM_INFO;
+
  // Please do not remove the credits below. You may add your own, but keep the existing ones intact.
 
  // TRANSLATORS: Replace this with your name. It will be displayed in the About dialog.
@@ -26,13 +28,21 @@ public class Build {
  };
  }
 
- public static void print_info () {
- var os_name = get_os_info ("NAME");
- var os_ver = get_os_info ("VERSION");
- message (@"$NAME $VERSION");
- message (@"Running on: $os_name $os_ver");
- message (@"Build prefix: \"$PREFIX\"");
- }
+ public static string print_info () {
+ var os_name = get_os_info ("NAME");
+ var os_ver = get_os_info ("VERSION");
+
+ SYSTEM_INFO = @"$NAME $VERSION";
+ SYSTEM_INFO += @"\nRunning on: $os_name $os_ver";
+ SYSTEM_INFO += @"\nBuild prefix: \"$PREFIX\"";
+
+ var lines = SYSTEM_INFO.split ("\n");
+ foreach (unowned string line in lines) {
+ message (line);
+ }
+
+ return SYSTEM_INFO;
+ }
 
  static string get_os_info (string key) {
  return GLib.Environment.get_os_info (key) ?? "Unknown";

src/Dialogs/MainWindow.vala

@@ -102,7 +102,7 @@ public class Tootle.Dialogs.MainWindow: Adw.ApplicationWindow, Saveable {
  if (leaflet.child_transition_running)
  return;
 
- Widget unused_child;
+ Widget unused_child = null;
  while ((unused_child = leaflet.get_adjacent_child (Adw.NavigationDirection.FORWARD)) != null) {
  leaflet.remove (unused_child);
  unused_child.dispose ();

src/Services/Cache/AbstractCache.vala

@@ -7,7 +7,7 @@ public class Tootle.AbstractCache : Object {
  protected Map<string, Object> items;
  protected Map<string, Soup.Message> items_in_progress;
 
- public int maintenance_secs { get; set; default = 10; }
+ public int maintenance_secs { get; set; default = 5; }
  public uint size {
  get { return items.size; }
  }
@@ -34,7 +34,7 @@ public class Tootle.AbstractCache : Object {
  // if ("jpg" in iter.get_key ()) {
  // warning (@"Key \"$(iter.get_key ())\": $(obj.ref_count)/$(min_ref_count)");
  // }
- if (obj.ref_count <= min_ref_count) {
+ if (obj.ref_count < min_ref_count) {
  cleared++;
  message (@"Freeing: $(iter.get_key ())");
  iter.unset ();
@@ -62,7 +62,7 @@ public class Tootle.AbstractCache : Object {
  return items.has_key (get_key (id));
  }
 
- public string insert (string id, owned Object obj) {
+ protected string insert (string id, owned Object obj) {
  var key = get_key (id);
  message ("Inserting: "+key);
  items.@set (key, (owned) obj);

src/Views/Base.vala

@@ -10,7 +10,7 @@ public class Tootle.Views.Base : Box {
  public string label { get; set; default = ""; }
  public bool needs_attention { get; set; default = false; }
  public bool current { get; set; default = false; }
- public SimpleActionGroup? actions { get; set; }
+ protected SimpleActionGroup actions { get; set; default = new SimpleActionGroup (); }
 
  [GtkChild] protected unowned Adw.HeaderBar header;
  [GtkChild] protected unowned Button back_button;
@@ -29,6 +29,9 @@ public class Tootle.Views.Base : Box {
  public string status_message { get; set; default = STATUS_EMPTY; }
 
  construct {
+ build_actions ();
+ build_header ();
+
  status_button.label = _("Reload");
  bind_property ("state", states, "visible-child-name", BindingFlags.SYNC_CREATE);
 
@@ -45,14 +48,19 @@ public class Tootle.Views.Base : Box {
  });
 
  scrolled.get_style_context ().add_class (Dialogs.MainWindow.ZOOM_CLASS);
-
- build_header ();
  }
  ~Base () {
  message ("Destroying base "+label);
  }
 
- public virtual void build_header () {
+ public override void dispose () {
+ actions.dispose ();
+ base.dispose ();
+ }
+
+ protected virtual void build_actions () {}
+
+ protected virtual void build_header () {
  var title = new Adw.WindowTitle (null, null);
  bind_property ("label", title, "title", BindingFlags.SYNC_CREATE);
  header.title_widget = title;
@@ -63,12 +71,10 @@ public class Tootle.Views.Base : Box {
  }
 
  public virtual void on_shown () {
- if (actions != null)
- app.main_window.insert_action_group ("view", actions);
+ app.main_window.insert_action_group ("view", actions);
  }
  public virtual void on_hidden () {
- if (actions != null)
- app.main_window.insert_action_group ("view", null);
+ app.main_window.insert_action_group ("view", null);
  }
 
  public virtual void on_content_changed () {}