[Xfce4-commits] <xfdesktop:master> Allow workspace names that start with a number (bug #6318).

Nick Schermer noreply at xfce.org
Mon Nov 15 19:44:01 CET 2010


Updating branch refs/heads/master
         to 379abcd6991650fdcba6d36ce813ac6177a4288f (commit)
       from 6dbd07e89bf85d096595a823ba7fb6171f71f493 (commit)

commit 379abcd6991650fdcba6d36ce813ac6177a4288f
Author: Nick Schermer <nick at xfce.org>
Date:   Mon Nov 15 19:43:07 2010 +0100

    Allow workspace names that start with a number (bug #6318).

 src/windowlist.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/windowlist.c b/src/windowlist.c
index deaa341..0f8dbb5 100644
--- a/src/windowlist.c
+++ b/src/windowlist.c
@@ -258,7 +258,7 @@ windowlist_populate(XfceDesktop *desktop,
             ws_name = wnck_workspace_get_name(wnck_workspace);
             
             if(wnck_workspace == active_workspace) {
-                if(!ws_name || atoi(ws_name) == i+1)
+                if(ws_name == NULL || *ws_name == '\0')
                     ws_label = g_strdup_printf(_("<b>Workspace %d</b>"), i+1);
                 else {
                     gchar *ws_name_esc = g_markup_escape_text(ws_name, strlen(ws_name));
@@ -266,7 +266,7 @@ windowlist_populate(XfceDesktop *desktop,
                     g_free(ws_name_esc);
                 }
             } else {  /* don't italicise if we're showing stuff in submenus */
-                if(!ws_name || atoi(ws_name) == i+1) {
+                if(ws_name == NULL || *ws_name == '\0') {
                     if(wl_submenus)
                         ws_label = g_strdup_printf(_("Workspace %d"), i+1);
                     else



More information about the Xfce4-commits mailing list