Merge pull request bioe007#1 from grimpy/master

Fix for setting image icons on tag
grimpy · Jan 3, 2013 · 8d92e9f · 8d92e9f
2 parents da3b2ae + c6a4d9b
commit 8d92e9f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/example.rc.lua b/example.rc.lua
@@ -356,7 +356,7 @@ globalkeys = awful.util.table.join(
               "n",
               function()
                   local t = awful.tag.selected()
-                  local s = awful.util.cycle(screen.count(), t.screen + 1)
+                  local s = awful.util.cycle(screen.count(), awful.tag.getscreen(t) + 1)
                   awful.tag.history.restore()
                   t = shifty.tagtoscr(s, t)
                   awful.tag.viewonly(t)

diff --git a/init.lua b/init.lua
@@ -20,7 +20,6 @@ local dbg= dbg
 local capi = {
     client = client,
     tag = tag,
-    image = image,
     screen = screen,
     button = button,
     mouse = mouse,
@@ -284,10 +283,10 @@ function set(t, args)
                         shifty.config.defaults.max_clients},
         position = select{args.position, preset.position, guessed_position,
                         awful.tag.getproperty(t, "position")},
-        icon = select{args.icon and capi.image(args.icon),
-                        preset.icon and capi.image(preset.icon),
+        icon = select{args.icon and args.icon,
+                        preset.icon and preset.icon,
                         awful.tag.getproperty(t, "icon"),
-                    shifty.config.defaults.icon and capi.image(shifty.config.defaults.icon)},
+                    shifty.config.defaults.icon and shifty.config.defaults.icon},
         icon_only = select{args.icon_only, preset.icon_only,
                         awful.tag.getproperty(t, "icon_only"),
                         shifty.config.defaults.icon_only},