Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Merge requests
!1229
mate-panel: apply selected fixes from v1.26.3
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
mate-panel: apply selected fixes from v1.26.3
Ark74/package-helpers:bpo_fixes_mate-panel_11.0
into
aramo
Overview
4
Commits
4
Changes
5
Merged
Luis Guzmán
requested to merge
Ark74/package-helpers:bpo_fixes_mate-panel_11.0
into
aramo
1 year ago
Overview
4
Commits
4
Changes
5
Expand
prevents mate-panel memory leaks and crashes.
1
0
Merge request reports
Compare
aramo
version 3
6e826232
1 year ago
version 2
614d9c70
1 year ago
version 1
0047fc3c
1 year ago
aramo (base)
and
latest version
latest version
f705dcd2
4 commits,
1 year ago
version 3
6e826232
3 commits,
1 year ago
version 2
614d9c70
2 commits,
1 year ago
version 1
0047fc3c
1 commit,
1 year ago
5 files
+
138
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
Search (e.g. *.vue) (Ctrl+P)
helpers/DATA/mate-panel/01_7eed6c94204de780e7248fa711da03f72f900080.patch
0 → 100644
+
39
−
0
Options
From 7eed6c94204de780e7248fa711da03f72f900080 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Wed, 26 Jan 2022 15:09:45 +0100
Subject: [PATCH] wncklet: do not exceed workspace number when setting n_rows
---
applets/wncklet/workspace-switcher.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
index a58abce21..f908ffe1c 100644
--- a/applets/wncklet/workspace-switcher.c
+++ b/applets/wncklet/workspace-switcher.c
@@ -490,11 +490,12 @@
static const GtkActionEntry pager_menu_actions[] = {
static void num_rows_changed(GSettings* settings, gchar* key, PagerData* pager)
{
- int n_rows = DEFAULT_ROWS;
+ int n_rows;
- n_rows = g_settings_get_int (settings, key);
-
- n_rows = CLAMP(n_rows, 1, MAX_REASONABLE_ROWS);
+ n_rows = CLAMP (g_settings_get_int (settings, key),
+ 1,
+ MIN (wnck_screen_get_workspace_count (pager->screen),
+ MAX_REASONABLE_ROWS));
pager->n_rows = n_rows;
pager_update(pager);
@@ -823,6 +824,8 @@
on_num_workspaces_value_changed (GtkSpinButton *button,
{
int workspace_count = gtk_spin_button_get_value_as_int (button);
wnck_screen_change_workspace_count(pager->screen, workspace_count);
+ if (workspace_count < pager->n_rows)
+ g_settings_set_int (pager->settings, "num-rows", workspace_count);
}
#endif /* HAVE_X11 */
}
Loading