summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2021-03-17 13:39:30 +0000
committerRico Tzschichholz <ricotz@ubuntu.com>2021-03-17 13:39:30 +0000
commit087890143ac53395b45eda47896064fdeb8bdb32 (patch)
treec4dbc578aff8e015b6cb66c3198155e376682a2c
parent03ff3bbc5cb5194de8b410096e7580490e8b022f (diff)
parent5e0adec6ca718c5d0af8601d1b1317f6563e9787 (diff)
downloadbaobab-087890143ac53395b45eda47896064fdeb8bdb32.tar.gz
Merge branch 'ricotz/vala' into 'master'
Reference of [GtkChild] field is handled by GtkBuilder, type must be unowned See merge request GNOME/baobab!30
-rw-r--r--src/baobab-folder-display.vala10
-rw-r--r--src/baobab-location-list.vala18
-rw-r--r--src/baobab-pathbar.vala4
-rw-r--r--src/baobab-preferences-dialog.vala6
-rw-r--r--src/baobab-window.vala58
5 files changed, 48 insertions, 48 deletions
diff --git a/src/baobab-folder-display.vala b/src/baobab-folder-display.vala
index a16fde8..bdac71b 100644
--- a/src/baobab-folder-display.vala
+++ b/src/baobab-folder-display.vala
@@ -22,15 +22,15 @@ namespace Baobab {
[GtkTemplate (ui = "/org/gnome/baobab/ui/baobab-folder-display.ui")]
public class FolderDisplay : Gtk.TreeView {
[GtkChild]
- public Gtk.TreeViewColumn folder_column;
+ public unowned Gtk.TreeViewColumn folder_column;
[GtkChild]
- public Gtk.TreeViewColumn size_column;
+ public unowned Gtk.TreeViewColumn size_column;
[GtkChild]
- public Gtk.TreeViewColumn contents_column;
+ public unowned Gtk.TreeViewColumn contents_column;
[GtkChild]
- public Gtk.TreeViewColumn time_modified_column;
+ public unowned Gtk.TreeViewColumn time_modified_column;
[GtkChild]
- private Gtk.CellRendererPixbuf folder_column_icon_renderer;
+ private unowned Gtk.CellRendererPixbuf folder_column_icon_renderer;
construct {
row_activated.connect (() => { activated (); });
diff --git a/src/baobab-location-list.vala b/src/baobab-location-list.vala
index 5287ddc..43b0ed4 100644
--- a/src/baobab-location-list.vala
+++ b/src/baobab-location-list.vala
@@ -23,17 +23,17 @@ namespace Baobab {
[GtkTemplate (ui = "/org/gnome/baobab/ui/baobab-location-row.ui")]
private class LocationRow : Gtk.ListBoxRow {
[GtkChild]
- private Gtk.Image image;
+ private unowned Gtk.Image image;
[GtkChild]
- private Gtk.Label name_label;
+ private unowned Gtk.Label name_label;
[GtkChild]
- private Gtk.Label path_label;
+ private unowned Gtk.Label path_label;
[GtkChild]
- private Gtk.Label available_label;
+ private unowned Gtk.Label available_label;
[GtkChild]
- private Gtk.Label total_size_label;
+ private unowned Gtk.Label total_size_label;
[GtkChild]
- private Gtk.LevelBar usage_bar;
+ private unowned Gtk.LevelBar usage_bar;
public Location? location { get; private set; }
@@ -93,11 +93,11 @@ namespace Baobab {
[GtkTemplate (ui = "/org/gnome/baobab/ui/baobab-location-list.ui")]
public class LocationList : Gtk.Box {
[GtkChild]
- private Gtk.ListBox local_list_box;
+ private unowned Gtk.ListBox local_list_box;
[GtkChild]
- private Gtk.ListBox remote_list_box;
+ private unowned Gtk.ListBox remote_list_box;
[GtkChild]
- private Gtk.Box remote_box;
+ private unowned Gtk.Box remote_box;
public signal void location_activated (Location location);
diff --git a/src/baobab-pathbar.vala b/src/baobab-pathbar.vala
index 0ce910d..ad39f6c 100644
--- a/src/baobab-pathbar.vala
+++ b/src/baobab-pathbar.vala
@@ -22,9 +22,9 @@ namespace Baobab {
[GtkTemplate (ui = "/org/gnome/baobab/ui/baobab-pathbutton.ui")]
public class PathButton : Gtk.Button {
[GtkChild]
- new Gtk.Label label;
+ new unowned Gtk.Label label;
[GtkChild]
- Gtk.Image icon;
+ unowned Gtk.Image icon;
public PathButton (string name, Icon? gicon) {
label.label = name;
diff --git a/src/baobab-preferences-dialog.vala b/src/baobab-preferences-dialog.vala
index 91327f0..5a324e1 100644
--- a/src/baobab-preferences-dialog.vala
+++ b/src/baobab-preferences-dialog.vala
@@ -22,9 +22,9 @@ namespace Baobab {
[GtkTemplate (ui = "/org/gnome/baobab/ui/baobab-excluded-row.ui")]
class ExcludedRow : Gtk.ListBoxRow {
[GtkChild]
- private Gtk.Label name_label;
+ private unowned Gtk.Label name_label;
[GtkChild]
- private Gtk.Button remove_button;
+ private unowned Gtk.Button remove_button;
public signal void removed ();
@@ -41,7 +41,7 @@ namespace Baobab {
[GtkTemplate (ui = "/org/gnome/baobab/ui/baobab-preferences-dialog.ui")]
public class PreferencesDialog : Hdy.PreferencesWindow {
[GtkChild]
- private Gtk.ListBox excluded_list_box;
+ private unowned Gtk.ListBox excluded_list_box;
private Settings prefs_settings;
diff --git a/src/baobab-window.vala b/src/baobab-window.vala
index 265fbec..26c5ff5 100644
--- a/src/baobab-window.vala
+++ b/src/baobab-window.vala
@@ -25,63 +25,63 @@ namespace Baobab {
[GtkTemplate (ui = "/org/gnome/baobab/ui/baobab-main-window.ui")]
public class Window : Hdy.ApplicationWindow {
[GtkChild]
- private Gtk.Box vbox;
+ private unowned Gtk.Box vbox;
[GtkChild]
- private Hdy.HeaderBar header_bar;
+ private unowned Hdy.HeaderBar header_bar;
[GtkChild]
- private Pathbar pathbar;
+ private unowned Pathbar pathbar;
[GtkChild]
- private Gtk.Button back_button;
+ private unowned Gtk.Button back_button;
[GtkChild]
- private Gtk.Button reload_button;
+ private unowned Gtk.Button reload_button;
[GtkChild]
- private Gtk.MenuButton menu_button;
+ private unowned Gtk.MenuButton menu_button;
[GtkChild]
- private Gtk.Stack main_stack;
+ private unowned Gtk.Stack main_stack;
[GtkChild]
- private Gtk.Widget home_page;
+ private unowned Gtk.Widget home_page;
[GtkChild]
- private Gtk.Widget result_page;
+ private unowned Gtk.Widget result_page;
[GtkChild]
- private Gtk.InfoBar infobar;
+ private unowned Gtk.InfoBar infobar;
[GtkChild]
- private Gtk.Label infobar_primary_label;
+ private unowned Gtk.Label infobar_primary_label;
[GtkChild]
- private Gtk.Label infobar_secondary_label;
+ private unowned Gtk.Label infobar_secondary_label;
[GtkChild]
- private Gtk.Button infobar_close_button;
+ private unowned Gtk.Button infobar_close_button;
[GtkChild]
- private LocationList location_list;
+ private unowned LocationList location_list;
[GtkChild]
- private FolderDisplay folder_display;
+ private unowned FolderDisplay folder_display;
[GtkChild]
- private Gtk.TreeView treeview;
+ private unowned Gtk.TreeView treeview;
[GtkChild]
- private Gtk.Menu treeview_popup_menu;
+ private unowned Gtk.Menu treeview_popup_menu;
[GtkChild]
- private Gtk.MenuItem treeview_popup_open;
+ private unowned Gtk.MenuItem treeview_popup_open;
[GtkChild]
- private Gtk.MenuItem treeview_popup_copy;
+ private unowned Gtk.MenuItem treeview_popup_copy;
[GtkChild]
- private Gtk.MenuItem treeview_popup_trash;
+ private unowned Gtk.MenuItem treeview_popup_trash;
[GtkChild]
- private Gtk.TreeViewColumn size_column;
+ private unowned Gtk.TreeViewColumn size_column;
[GtkChild]
- private Gtk.TreeViewColumn contents_column;
+ private unowned Gtk.TreeViewColumn contents_column;
[GtkChild]
- private Gtk.TreeViewColumn time_modified_column;
+ private unowned Gtk.TreeViewColumn time_modified_column;
[GtkChild]
- private Gtk.Stack chart_stack;
+ private unowned Gtk.Stack chart_stack;
[GtkChild]
- private Gtk.Stack spinner_stack;
+ private unowned Gtk.Stack spinner_stack;
[GtkChild]
- private Gtk.StackSwitcher chart_stack_switcher;
+ private unowned Gtk.StackSwitcher chart_stack_switcher;
[GtkChild]
- private Chart rings_chart;
+ private unowned Chart rings_chart;
[GtkChild]
- private Chart treemap_chart;
+ private unowned Chart treemap_chart;
[GtkChild]
- private Gtk.Spinner spinner;
+ private unowned Gtk.Spinner spinner;
private Location? active_location = null;
private ulong scan_completed_handler = 0;