Hello community, here is the log from the commit of package budgie-desktop for openSUSE:Factory checked in at 2020-11-03 15:32:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/budgie-desktop (Old) and /work/SRC/openSUSE:Factory/.budgie-desktop.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "budgie-desktop" Tue Nov 3 15:32:05 2020 rev:12 rq:845528 version:10.5.1+21060898 Changes: -------- --- /work/SRC/openSUSE:Factory/budgie-desktop/budgie-desktop.changes 2020-10-24 15:18:34.320292908 +0200 +++ /work/SRC/openSUSE:Factory/.budgie-desktop.new.3463/budgie-desktop.changes 2020-11-03 15:32:05.856930305 +0100 @@ -1,0 +2,7 @@ +Mon Nov 2 19:30:54 UTC 2020 - Callum Farmer <callumjfarme...@gmail.com> + +- Update to version 10.5.1+21060898: + * Consolidate WindowType checking code into Abomination. +- Cleaned nemo-instead-of-nautilus.patch + +------------------------------------------------------------------- Old: ---- budgie-desktop-10.5.1+9197f3f0.tar.xz New: ---- budgie-desktop-10.5.1+21060898.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ budgie-desktop.spec ++++++ --- /var/tmp/diff_new_pack.un4kXt/_old 2020-11-03 15:32:06.656930952 +0100 +++ /var/tmp/diff_new_pack.un4kXt/_new 2020-11-03 15:32:06.660930956 +0100 @@ -16,7 +16,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: budgie-desktop -Version: 10.5.1+9197f3f0 +Version: 10.5.1+21060898 Release: 0 Summary: GTK3 Desktop Environment License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ budgie-desktop-10.5.1+9197f3f0.tar.xz -> budgie-desktop-10.5.1+21060898.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-desktop-10.5.1+9197f3f0/src/abomination/abomination.vala new/budgie-desktop-10.5.1+21060898/src/abomination/abomination.vala --- old/budgie-desktop-10.5.1+9197f3f0/src/abomination/abomination.vala 2020-10-19 14:55:41.000000000 +0200 +++ new/budgie-desktop-10.5.1+21060898/src/abomination/abomination.vala 2020-10-20 15:47:36.000000000 +0200 @@ -91,14 +91,11 @@ * add_app will add a running application based on the provided window */ public void add_app(Wnck.Window window) { - if ( - (window.get_window_type() == Wnck.WindowType.DESKTOP) || // Desktop-mode (like Nautilus' Desktop Icons) - (window.get_window_type() == Wnck.WindowType.DOCK) // Like Budgie Panel - ) { + if (is_disallowed_window_type(window)) { // Disallowed type return; } - if (window.is_skip_tasklist()) { + if (window.is_skip_pager() || window.is_skip_tasklist()) { // Skip pager or tasklist return; } @@ -147,6 +144,23 @@ }); } + // is_disallowed_window_type will check if this specified window is a disallowed type + public bool is_disallowed_window_type(Wnck.Window window) { + Wnck.WindowType win_type = window.get_window_type(); // Get the window type + + if ( + (win_type == Wnck.WindowType.DESKTOP) || // Desktop-mode (like Nautilus' Desktop Icons) + (win_type == Wnck.WindowType.DIALOG) || // Dialogs + (win_type == Wnck.WindowType.DOCK) || // Like Budgie Panel + (win_type == Wnck.WindowType.SPLASHSCREEN) || // Splash screens + (win_type == Wnck.WindowType.UTILITY) // Utility like a control on an emulator + ) { + return true; + } else { + return false; + } + } + /** * remove_app will remove a running application based on the provided window */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/DesktopHelper.vala new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/DesktopHelper.vala --- old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/DesktopHelper.vala 2020-10-19 14:55:41.000000000 +0200 +++ new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/DesktopHelper.vala 2020-10-20 15:47:36.000000000 +0200 @@ -70,7 +70,7 @@ public List<unowned Wnck.Window> get_stacked_for_classgroup(Wnck.ClassGroup class_group) { List<unowned Wnck.Window> list = new List<unowned Wnck.Window>(); screen.get_windows_stacked().foreach((window) => { - if (window.get_class_group() == class_group && !window.is_skip_tasklist()) { + if (window.get_class_group() == class_group && !window.is_skip_pager() && !window.is_skip_tasklist()) { var workspace = window.get_workspace(); if (workspace == null) { return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/IconButton.vala new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/IconButton.vala --- old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/IconButton.vala 2020-10-19 14:55:41.000000000 +0200 +++ new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/IconButton.vala 2020-10-20 15:47:36.000000000 +0200 @@ -39,12 +39,13 @@ private bool needs_attention = false; public signal void became_empty(); + public unowned Budgie.Abomination? abomination { public set; public get; default = null; } public unowned Budgie.AppSystem? app_system { public set; public get; default = null; } public unowned DesktopHelper? desktop_helper { public set; public get; default = null; } public unowned Budgie.PopoverManager? popover_manager { public set; public get; default = null; } - public IconButton(Budgie.AppSystem? appsys, Settings? c_settings, DesktopHelper? helper, Budgie.PopoverManager? manager, DesktopAppInfo info, bool pinned) { - Object(app_system: appsys, desktop_helper: helper, popover_manager: manager); + public IconButton(Budgie.Abomination? ab, Budgie.AppSystem? appsys, Settings? c_settings, DesktopHelper? helper, Budgie.PopoverManager? manager, DesktopAppInfo info, bool pinned) { + Object(abomination: ab, app_system: appsys, desktop_helper: helper, popover_manager: manager); this.settings = c_settings; this.app_info = info; this.pinned = pinned; @@ -59,8 +60,8 @@ } } - public IconButton.from_window(Budgie.AppSystem? appsys, Settings? c_settings, DesktopHelper? helper, Budgie.PopoverManager? manager, Wnck.Window window, DesktopAppInfo? info, bool pinned = false) { - Object(app_system: appsys, desktop_helper: helper, popover_manager: manager); + public IconButton.from_window(Budgie.Abomination? ab, Budgie.AppSystem? appsys, Settings? c_settings, DesktopHelper? helper, Budgie.PopoverManager? manager, Wnck.Window window, DesktopAppInfo? info, bool pinned = false) { + Object(abomination: ab, app_system: appsys, desktop_helper: helper, popover_manager: manager); this.settings = c_settings; this.app_info = info; this.is_from_window = true; @@ -94,8 +95,8 @@ this.set_wnck_window(window); } - public IconButton.from_group(Budgie.AppSystem? appsys, Settings? c_settings, DesktopHelper? helper, Budgie.PopoverManager? manager, Wnck.ClassGroup class_group, DesktopAppInfo? info) { - Object(app_system: appsys, desktop_helper: helper, popover_manager: manager); + public IconButton.from_group(Budgie.Abomination? ab, Budgie.AppSystem? appsys, Settings? c_settings, DesktopHelper? helper, Budgie.PopoverManager? manager, Wnck.ClassGroup class_group, DesktopAppInfo? info) { + Object(abomination: ab, app_system: appsys, desktop_helper: helper, popover_manager: manager); this.settings = c_settings; this.class_group = class_group; @@ -268,7 +269,7 @@ return; } - if (is_disallowed_window_type(new_window)) { + if (abomination.is_disallowed_window_type(new_window)) { return; } @@ -306,23 +307,6 @@ this.popover_manager.register_popover(this, popover); // Register } - /** - * is_disallowed_window_type will check if this specified window is a disallowed type - */ - private bool is_disallowed_window_type(Wnck.Window new_window) { - Wnck.WindowType win_type = new_window.get_window_type(); // Get the window type - - if ( - (win_type == Wnck.WindowType.DESKTOP) || // Desktop-mode (like Nautilus' Desktop Icons) - (win_type == Wnck.WindowType.DIALOG) || // Dialogs - (win_type == Wnck.WindowType.SPLASHSCREEN) // Splash screens - ) { - return true; - } else { - return false; - } - } - public void set_class_group(Wnck.ClassGroup? class_group) { this.class_group = class_group; @@ -345,7 +329,7 @@ return; } - if (is_disallowed_window_type(window)) { + if (abomination.is_disallowed_window_type(window)) { return; } @@ -500,7 +484,7 @@ return (!this.window.is_skip_tasklist() && this.window.is_on_workspace(workspace)); } else if (class_group != null) { foreach (Wnck.Window win in class_group.get_windows()) { - if (!win.is_skip_tasklist() && win.is_on_workspace(workspace)) { + if (!win.is_skip_pager() && !win.is_skip_tasklist() && win.is_on_workspace(workspace)) { return true; } } @@ -627,7 +611,7 @@ break; } - if (!window.is_skip_tasklist()) { + if (!window.is_skip_pager() && !window.is_skip_tasklist()) { int indicator_x = 0; int indicator_y = 0; switch (this.desktop_helper.panel_position) { @@ -863,7 +847,7 @@ foreach (unowned Wnck.Window window in this.class_group.get_windows()) { if (window != null) { - if (!is_disallowed_window_type(window)) { // Not a disallowed window type + if (!abomination.is_disallowed_window_type(window)) { // Not a disallowed window type if (should_add_window(window)) { // Should add this window ulong xid = window.get_xid(); string name = window.get_name(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/IconPopover.vala new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/IconPopover.vala --- old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/IconPopover.vala 2020-10-19 14:55:41.000000000 +0200 +++ new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/IconPopover.vala 2020-10-20 15:47:36.000000000 +0200 @@ -214,13 +214,6 @@ return; } - if ( - (window.get_window_type() == Wnck.WindowType.DESKTOP) || // Desktop-mode (like Nautilus' Desktop Icons) - (window.get_window_type() == Wnck.WindowType.DOCK) // Like Budgie Panel - ) { - return; - } - if (window.get_class_instance_name() == "budgie-panel") { // Likely a NORMAL type window of budgie-panel, which is Budgie Desktop Settings is_budgie_desktop_settings = true; acquire_settings_remote(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/IconTasklistApplet.vala new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/IconTasklistApplet.vala --- old/budgie-desktop-10.5.1+9197f3f0/src/applets/icon-tasklist/IconTasklistApplet.vala 2020-10-19 14:55:41.000000000 +0200 +++ new/budgie-desktop-10.5.1+21060898/src/applets/icon-tasklist/IconTasklistApplet.vala 2020-10-20 15:47:36.000000000 +0200 @@ -142,7 +142,7 @@ if (info == null) { continue; } - IconButton button = new IconButton(this.app_system, this.settings, this.desktop_helper, this.manager, info, true); + IconButton button = new IconButton(this.abomination, this.app_system, this.settings, this.desktop_helper, this.manager, info, true); button.update(); ButtonWrapper wrapper = new ButtonWrapper(button); wrapper.orient = this.get_orientation(); @@ -273,7 +273,7 @@ if (buttons.contains(app_id)) { original_button = (buttons[app_id].get_parent() as ButtonWrapper); } else { - IconButton button = new IconButton(this.app_system, this.settings, this.desktop_helper, this.manager, info, true); + IconButton button = new IconButton(this.abomination, this.app_system, this.settings, this.desktop_helper, this.manager, info, true); button.update(); buttons.set(app_id, button); @@ -400,7 +400,7 @@ return; } - IconButton button = new IconButton.from_group(this.app_system, this.settings, this.desktop_helper, this.manager, first_app.group_object, app_info); + IconButton button = new IconButton.from_group(this.abomination, this.app_system, this.settings, this.desktop_helper, this.manager, first_app.group_object, app_info); ButtonWrapper wrapper = new ButtonWrapper(button); wrapper.orient = this.get_orientation(); @@ -482,7 +482,7 @@ return; } - button = new IconButton.from_window(this.app_system, this.settings, this.desktop_helper, this.manager, app.window, app.app, false); + button = new IconButton.from_window(this.abomination, this.app_system, this.settings, this.desktop_helper, this.manager, app.window, app.app, false); ButtonWrapper wrapper = new ButtonWrapper(button); wrapper.orient = this.get_orientation(); @@ -502,7 +502,7 @@ } private void on_window_closed(Wnck.Window window) { - if (window.is_skip_tasklist()) { + if (window.is_skip_pager() || window.is_skip_tasklist()) { return; } ++++++ nemo-instead-of-nautilus.patch ++++++ --- /var/tmp/diff_new_pack.un4kXt/_old 2020-11-03 15:32:07.032931257 +0100 +++ /var/tmp/diff_new_pack.un4kXt/_new 2020-11-03 15:32:07.032931257 +0100 @@ -1,16 +1,45 @@ -From b5a7f3e3890f050ed4b76923abda5459652c3338 Mon Sep 17 00:00:00 2001 +From 39b046fb57d744ac33244aacb53fdb15096860d6 Mon Sep 17 00:00:00 2001 From: Callum Farmer <callumjfarme...@gmail.com> -Date: Thu, 22 Oct 2020 19:35:27 +0100 +Date: Mon, 2 Nov 2020 19:14:07 +0000 Subject: [PATCH] patch update --- + meson.build | 4 ++-- + meson_options.txt | 2 +- .../icon-tasklist/IconTasklistApplet.vala | 2 +- src/panel/meson.build | 4 ++-- src/panel/settings/settings_desktop.vala | 20 +++++++++---------- - 3 files changed, 13 insertions(+), 13 deletions(-) + src/panel/settings/settings_main.vala | 4 ++-- + 6 files changed, 18 insertions(+), 18 deletions(-) +diff --git a/meson.build b/meson.build +index dea589fc..655b22f4 100644 +--- a/meson.build ++++ b/meson.build +@@ -101,8 +101,8 @@ cdata.set_quoted('LOCALEDIR', localedir) + cdata.set_quoted('PACKAGE_URL', 'https://budgie-desktop.org') + + with_desktop_icons = get_option('with-desktop-icons') +-if with_desktop_icons == 'nautilus' +- warning('You must have Nautilus 3.26 or older for desktop icons with Budgie') ++if with_desktop_icons == 'nemo' ++ warning('You must have Nemo for desktop icons with Budgie') + endif + + with_stateless = get_option('with-stateless') +diff --git a/meson_options.txt b/meson_options.txt +index e6ac4d36..ae8ad40c 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,5 +1,5 @@ + option('with-stateless', type: 'boolean', value: false, description: 'Enable stateless XDG paths') + option('with-polkit', type: 'boolean', value: true, description: 'Enable PolKit support') + option('with-gtk-doc', type: 'boolean', value: true, description: 'Build gtk-doc documentation') +-option('with-desktop-icons', type: 'combo', choices: ['nautilus', 'none'], value: 'nautilus', description: 'Desktop icon handling') ++option('with-desktop-icons', type: 'combo', choices: ['nemo', 'none'], value: 'nemo', description: 'Desktop icon handling') + option('xdg-appdir', type: 'string', description: 'XDG autostart path') diff --git a/src/applets/icon-tasklist/IconTasklistApplet.vala b/src/applets/icon-tasklist/IconTasklistApplet.vala -index ef056683..47ecb4bc 100644 +index e23610e6..d2962257 100644 --- a/src/applets/icon-tasklist/IconTasklistApplet.vala +++ b/src/applets/icon-tasklist/IconTasklistApplet.vala @@ -255,7 +255,7 @@ public class IconTasklistApplet : Budgie.Applet { @@ -97,18 +126,6 @@ void update_switches() { bool b = bg_settings.get_boolean("show-desktop-icons"); switch_home.sensitive = b; --- - - -From 84eadfbdb629f6c040e2c21604500d35ae1d9f52 Mon Sep 17 00:00:00 2001 -From: Callum Farmer <callumjfarme...@gmail.com> -Date: Thu, 22 Oct 2020 19:23:08 +0100 -Subject: [PATCH] patch update - ---- - src/panel/settings/settings_main.vala | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - diff --git a/src/panel/settings/settings_main.vala b/src/panel/settings/settings_main.vala index dc68ae99..f73542aa 100644 --- a/src/panel/settings/settings_main.vala @@ -124,56 +141,3 @@ this.add_page(new Budgie.DesktopPage()); } #endif --- - - -From 13453baef09a081ea157cc3e16b22ccf77d317b2 Mon Sep 17 00:00:00 2001 -From: Callum Farmer <callumjfarme...@gmail.com> -Date: Mon, 31 Aug 2020 17:04:41 +0100 -Subject: [PATCH] Update meson_options.txt - ---- - meson_options.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson_options.txt b/meson_options.txt -index e6ac4d36..ae8ad40c 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -1,5 +1,5 @@ - option('with-stateless', type: 'boolean', value: false, description: 'Enable stateless XDG paths') - option('with-polkit', type: 'boolean', value: true, description: 'Enable PolKit support') - option('with-gtk-doc', type: 'boolean', value: true, description: 'Build gtk-doc documentation') --option('with-desktop-icons', type: 'combo', choices: ['nautilus', 'none'], value: 'nautilus', description: 'Desktop icon handling') -+option('with-desktop-icons', type: 'combo', choices: ['nemo', 'none'], value: 'nemo', description: 'Desktop icon handling') - option('xdg-appdir', type: 'string', description: 'XDG autostart path') --- - - -From 4aa6070cc472a77d89d5238050fde077844478d4 Mon Sep 17 00:00:00 2001 -From: Callum Farmer <callumjfarme...@gmail.com> -Date: Mon, 31 Aug 2020 17:04:09 +0100 -Subject: [PATCH] Update meson.build - ---- - meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index dea589fc..655b22f4 100644 ---- a/meson.build -+++ b/meson.build -@@ -101,8 +101,8 @@ cdata.set_quoted('LOCALEDIR', localedir) - cdata.set_quoted('PACKAGE_URL', 'https://budgie-desktop.org') - - with_desktop_icons = get_option('with-desktop-icons') --if with_desktop_icons == 'nautilus' -- warning('You must have Nautilus 3.26 or older for desktop icons with Budgie') -+if with_desktop_icons == 'nemo' -+ warning('You must have Nemo for desktop icons with Budgie') - endif - - with_stateless = get_option('with-stateless') --- - -
