Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'partly-revert-pr-87' into fix-proper-activate-via-rules 

This reverts PR #87, except for f562b4a ("luaA_object_emit_signal: check
for valid object").
This commit is contained in:
Daniel Hahler 2015-02-14 14:37:25 +01:00
parent b4d677797a 76ede0ef45
commit b77e23c047
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awesome.c
View File

@ -545,10 +545,6 @@ main(int argc, char **argv)
g_main_context_set_poll_func(g_main_context_default(), &a_glib_poll); g_main_context_set_poll_func(g_main_context_default(), &a_glib_poll);
gettimeofday(&last_wakeup, NULL); gettimeofday(&last_wakeup, NULL);
/* Do all deferred work now once outside of the loop to get awesome.startup
* right. */
awesome_refresh();
/* main event loop */ /* main event loop */
globalconf.loop = g_main_loop_new(NULL, FALSE); globalconf.loop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(globalconf.loop); g_main_loop_run(globalconf.loop);

6
lib/awful/rules.lua.in
View File

@ -12,7 +12,6 @@ local ipairs = ipairs
local pairs = pairs local pairs = pairs
local aclient = require("awful.client") local aclient = require("awful.client")
local atag = require("awful.tag") local atag = require("awful.tag")
local timer = require("gears.timer")
--- Apply rules to clients at startup. --- Apply rules to clients at startup.
-- awful.rules -- awful.rules
@ -235,10 +234,7 @@ function rules.execute(c, props, callbacks)
-- Do this at last so we do not erase things done by the focus -- Do this at last so we do not erase things done by the focus
-- signal. -- signal.
if props.focus and (type(props.focus) ~= "function" or props.focus(c)) then if props.focus and (type(props.focus) ~= "function" or props.focus(c)) then
local cb = function(c) c:emit_signal('request::activate',"rules")
c:emit_signal('request::activate', "rules")
end
timer.delayed_call(cb, c)
end end
end end

4
lib/awful/tag.lua.in
View File

@ -630,9 +630,7 @@ capi.client.connect_signal("manage", function(c)
c:connect_signal("property::screen", tag.withcurrent) c:connect_signal("property::screen", tag.withcurrent)
end) end)
capi.client.connect_signal("manage", function(c) capi.client.connect_signal("manage", tag.withcurrent)
timer.delayed_call(tag.withcurrent, c)
end)
capi.tag.connect_signal("request::select", tag.viewonly) capi.tag.connect_signal("request::select", tag.viewonly)
capi.tag.add_signal("property::hide") capi.tag.add_signal("property::hide")