Merge branch 'master' of sc:awesome into desktop

Conflicts:
	tags.lua
This commit is contained in:
crater2150 2010-09-07 17:21:09 +02:00
commit e752dadd0c
21 changed files with 105 additions and 172 deletions

View file

@ -24,11 +24,19 @@ awful.rules.rules = {
properties = { floating = true } },
-- Set Firefox to always map on tags number 2 of screen 1.
{ rule = { class = "Firefox" },
properties = { tag = tags[1][2] } },
properties = { tag = tags[1][2],
floating = false } },
{ rule = { class = "Pidgin" },
properties = { tag = tags[1][3] } },
properties = { tag = tags[1][3]} },
{ rule = { role = "buddy_list" },
properties = { master = true } },
{ rule = { role = "conversation" },
callback = awful.client.setslave},
{ rule = { class = "Irssi"},
properties = { tag = tags[1][3]} ,
callback = awful.client.setslave},
{ rule = { class = "Claws-mail" },
properties = { tag = tags[1][4] } },
{ rule = { class = "Thunderbird" },
properties = { tag = tags[1][4] } },
{ rule = { class = "Claws-mail" },
@ -43,5 +51,13 @@ awful.rules.rules = {
properties = { tag = tags[1][22] } },
--{ rule = { class = "OpenOffice.org 3.2" },
--properties = { floating = false } },
{ rule = { class = "Cellwriter" },
properties = { tag = tags[1][1],
ontop = true,
size_hints_honor = true,
float = true,
sticky = true,
fullscreen = true
} },
}
-- }}}