Hello community, here is the log from the commit of package dconf-editor for openSUSE:Factory checked in at 2016-05-05 08:12:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dconf-editor (Old) and /work/SRC/openSUSE:Factory/.dconf-editor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dconf-editor" Changes: -------- --- /work/SRC/openSUSE:Factory/dconf-editor/dconf-editor.changes 2016-04-15 19:07:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dconf-editor.new/dconf-editor.changes 2016-05-05 08:12:47.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 25 23:55:45 UTC 2016 - [email protected] + +- Add dconf-editor-quit-app-correctly.patch: Correctly quit with + app-menu action, patch from upstream git. +- Stop passing V=1 to make, we do debugging locally. + +------------------------------------------------------------------- New: ---- dconf-editor-quit-app-correctly.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dconf-editor.spec ++++++ --- /var/tmp/diff_new_pack.5yRUEz/_old 2016-05-05 08:12:48.000000000 +0200 +++ /var/tmp/diff_new_pack.5yRUEz/_new 2016-05-05 08:12:48.000000000 +0200 @@ -24,6 +24,8 @@ Group: System/GUI/GNOME Url: http://live.gnome.org/dconf Source: http://download.gnome.org/sources/dconf-editor/3.20/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM dconf-editor-quit-app-correctly.patch [email protected] -- Correctly quit with app-menu action. +Patch0: dconf-editor-quit-app-correctly.patch BuildRequires: intltool >= 0.50.0 BuildRequires: update-desktop-files BuildRequires: vala >= 0.25.1 @@ -47,10 +49,11 @@ %prep %setup -q +%patch0 -p1 %build %configure -make V=1 %{?_smp_mflags} +make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} ++++++ dconf-editor-quit-app-correctly.patch ++++++ >From 1f142bef396ef5129aa118bf476b16a750fa407e Mon Sep 17 00:00:00 2001 From: Arnaud Bonatti <[email protected]> Date: Sun, 24 Apr 2016 17:26:06 +0200 Subject: Cannot-be-null indications. --- editor/key-list-box-row.vala | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/editor/key-list-box-row.vala b/editor/key-list-box-row.vala index 7739725..fa169ed 100644 --- a/editor/key-list-box-row.vala +++ b/editor/key-list-box-row.vala @@ -75,7 +75,11 @@ private class KeyListBoxRowEditableNoSchema : KeyListBoxRow key_value_label.label = cool_text_value (key); key_info_label.set_markup ("<i>" + _("No Schema Found") + "</i>"); - key.value_changed.connect (() => { key_value_label.label = cool_text_value (key); if (nullable_popover != null) nullable_popover.destroy (); }); + key.value_changed.connect (() => { + key_value_label.label = cool_text_value (key); + if (nullable_popover != null) + ((!) nullable_popover).destroy (); + }); } protected override string get_text () @@ -93,7 +97,11 @@ private class KeyListBoxRowEditableNoSchema : KeyListBoxRow popover.new_section (); popover.create_buttons_list (key, false); - popover.value_changed.connect ((gvariant) => { nullable_popover.destroy (); key.value = gvariant; }); + popover.value_changed.connect ((gvariant) => { + if (nullable_popover != null) // shouldn't be needed here (1/4) + ((!) nullable_popover).destroy (); + key.value = gvariant; + }); } return true; } @@ -114,7 +122,11 @@ private class KeyListBoxRowEditable : KeyListBoxRow key_name_label.label = key.name; key_info_label.label = key.summary; - key.value_changed.connect (() => { update (); if (nullable_popover != null) nullable_popover.destroy (); }); + key.value_changed.connect (() => { + update (); + if (nullable_popover != null) + ((!) nullable_popover).destroy (); + }); } protected override string get_text () @@ -132,15 +144,27 @@ private class KeyListBoxRowEditable : KeyListBoxRow popover.new_section (); popover.create_buttons_list (key, true); - popover.set_to_default.connect (() => { nullable_popover.destroy (); key.set_to_default (); }); - popover.value_changed.connect ((gvariant) => { nullable_popover.destroy (); key.value = gvariant; }); + popover.set_to_default.connect (() => { + if (nullable_popover != null) // shouldn't be needed here (2/4) + ((!) nullable_popover).destroy (); + key.set_to_default (); + }); + popover.value_changed.connect ((gvariant) => { + if (nullable_popover != null) // shouldn't be needed here (3/4) + ((!) nullable_popover).destroy (); + key.value = gvariant; + }); } else if (key.type_string == "<flags>") { popover.new_section (); if (!key.is_default) - popover.new_action ("default2", () => { nullable_popover.destroy (); key.set_to_default (); }); + popover.new_action ("default2", () => { + if (nullable_popover != null) // shouldn't be needed here (4/4) + ((!) nullable_popover).destroy (); + key.set_to_default (); + }); popover.set_group ("flags"); // ensures a flag called "customize" or "default2" won't cause problems popover.create_flags_list ((GSettingsKey) key); @@ -260,11 +284,11 @@ private class ContextPopover : Popover flags_actions += simple_action; simple_action.change_state.connect ((gaction, gvariant) => { - gaction.set_state (gvariant); + gaction.set_state ((!) gvariant); string [] new_flags = new string [0]; foreach (SimpleAction action in flags_actions) - if (action.state.get_boolean ()) + if (((!) action.state).get_boolean ()) new_flags += action.name; Variant variant = new Variant.strv (new_flags); value_changed (variant); -- cgit v0.12 >From c586509ef7a6e311ba7f16b8e47780b8801c0a8d Mon Sep 17 00:00:00 2001 From: Arnaud Bonatti <[email protected]> Date: Mon, 25 Apr 2016 00:40:26 +0200 Subject: Correctly quit with app-menu action. --- editor/dconf-editor.vala | 2 ++ editor/dconf-window.vala | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/editor/dconf-editor.vala b/editor/dconf-editor.vala index 856f83d..5060b04 100644 --- a/editor/dconf-editor.vala +++ b/editor/dconf-editor.vala @@ -156,5 +156,7 @@ class ConfigurationEditor : Gtk.Application private void quit_cb () { get_active_window ().destroy (); + + base.quit (); } } diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala index a1d9dcd..70cc525 100644 --- a/editor/dconf-window.vala +++ b/editor/dconf-window.vala @@ -120,13 +120,15 @@ class DConfWindow : ApplicationWindow [GtkCallback] private void on_destroy () { - ((Window) this).get_application ().withdraw_notification ("copy"); + get_application ().withdraw_notification ("copy"); settings.set_string ("saved-view", current_path); settings.set_int ("window-width", window_width); settings.set_int ("window-height", window_height); settings.set_boolean ("window-is-maximized", window_is_maximized); settings.set_boolean ("window-is-fullscreen", window_is_fullscreen); + + base.destroy (); } /*\ @@ -250,7 +252,7 @@ class DConfWindow : ApplicationWindow { for (uint position = 0;; position++) { - Object? object = key_model.get_object (position); + Object? object = objects.get_object (position); if (object == null) return; -- cgit v0.12
