[Xfce4-commits] [xfce/xfdesktop] 01/01: Don't show infobar when there's only 1 workspace (Bug 11134)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfdesktop.

commit ad3b91b34fbb014ce93e337eaf6df493513e489a
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Sep 8 14:54:20 2014 +0300

    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 0a28913..e3d234b 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"));
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.