awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused argument to systray_request_handle() 

It always had the value NULL.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2016-05-29 14:29:23 +02:00
parent a42762493a
commit 0b64c8987d
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objects/client.c
View File

@ -1113,7 +1113,7 @@ client_manage(xcb_window_t w, xcb_get_geometry_reply_t *wgeom, xcb_get_window_at
if(systray_iskdedockapp(w)) if(systray_iskdedockapp(w))
{ {
systray_request_handle(w, NULL); systray_request_handle(w);
return; return;
} }

13
systray.c
View File

@ -124,11 +124,10 @@ systray_cleanup(void)
/** Handle a systray request. /** Handle a systray request.
* \param embed_win The window to embed. * \param embed_win The window to embed.
* \param info The embedding info
* \return 0 on no error. * \return 0 on no error.
*/ */
int int
systray_request_handle(xcb_window_t embed_win, xembed_info_t *info) systray_request_handle(xcb_window_t embed_win)
{ {
xembed_window_t em; xembed_window_t em;
xcb_get_property_cookie_t em_cookie; xcb_get_property_cookie_t em_cookie;
@ -145,8 +144,7 @@ systray_request_handle(xcb_window_t embed_win, xembed_info_t *info)
p_clear(&em_cookie, 1); p_clear(&em_cookie, 1);
if(!info) em_cookie = xembed_info_get_unchecked(globalconf.connection, embed_win);
em_cookie = xembed_info_get_unchecked(globalconf.connection, embed_win);
xcb_change_window_attributes(globalconf.connection, embed_win, XCB_CW_EVENT_MASK, xcb_change_window_attributes(globalconf.connection, embed_win, XCB_CW_EVENT_MASK,
select_input_val); select_input_val);
@ -161,10 +159,7 @@ systray_request_handle(xcb_window_t embed_win, xembed_info_t *info)
em.win = embed_win; em.win = embed_win;
if(info) xembed_info_get_reply(globalconf.connection, em_cookie, &em.info);
em.info = *info;
else
xembed_info_get_reply(globalconf.connection, em_cookie, &em.info);
xembed_embedded_notify(globalconf.connection, em.win, xembed_embedded_notify(globalconf.connection, em.win,
globalconf.systray.window, globalconf.systray.window,
@ -196,7 +191,7 @@ systray_process_client_message(xcb_client_message_event_t *ev)
return -1; return -1;
if(globalconf.screen->root == geom_r->root) if(globalconf.screen->root == geom_r->root)
ret = systray_request_handle(ev->data.data32[2], NULL); ret = systray_request_handle(ev->data.data32[2]);
p_delete(&geom_r); p_delete(&geom_r);
break; break;

2
systray.h
View File

@ -28,7 +28,7 @@
void systray_init(void); void systray_init(void);
void systray_cleanup(void); void systray_cleanup(void);
int systray_request_handle(xcb_window_t, xembed_info_t *); int systray_request_handle(xcb_window_t);
bool systray_iskdedockapp(xcb_window_t); bool systray_iskdedockapp(xcb_window_t);
int systray_process_client_message(xcb_client_message_event_t *); int systray_process_client_message(xcb_client_message_event_t *);
int xembed_process_client_message(xcb_client_message_event_t *); int xembed_process_client_message(xcb_client_message_event_t *);