From a0f5bf14946f6c227fe9ce558629dd4ffe3d7834 Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Mon, 8 Sep 2014 14:54:20 +0300 Subject: [PATCH] Don't show infobar when there's only 1 workspace (Bug 11134) --- settings/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/settings/main.c b/settings/main.c index 6312be1..1f1d67f 100644 --- a/settings/main.c +++ b/settings/main.c @@ -697,9 +697,10 @@ xfdesktop_settings_update_iconview_frame_name(AppearancePanel *panel, g_return_if_fail(panel->monitor >= 0 && panel->workspace >= 0); + screen = wnck_window_get_screen(panel->wnck_window); + /* If it's a pinned window get the active workspace */ if(wnck_workspace == NULL) { - screen = wnck_window_get_screen(panel->wnck_window); workspace = wnck_screen_get_workspace(screen, panel->active_workspace); } else { workspace = wnck_workspace; @@ -744,7 +745,8 @@ xfdesktop_settings_update_iconview_frame_name(AppearancePanel *panel, gtk_widget_set_visible(panel->infobar, TRUE); } } else { - if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel->chk_apply_to_all))) { + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel->chk_apply_to_all)) || + (wnck_screen_get_workspace_count(screen) == 1)) { /* Single monitor and single workspace */ g_snprintf(buf, sizeof(buf), _("Wallpaper for my desktop")); -- 2.1.0