Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-19 19:45:15 +00:00
Code Issues Releases Activity

Remove a redundant copy of arg[cv]

Browse Source
This commit is contained in:
Pavel Labath 2010-03-19 20:33:49 +01:00
parent d3723e727c
commit 939985042a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/conky.cc
View File

@ -2755,20 +2755,17 @@ static void X11_initialisation(void)
#endif /* DEBUG */ #endif /* DEBUG */
} }
static char **xargv = 0;
static int xargc = 0;
static void X11_create_window(void) static void X11_create_window(void)
{ {
if (output_methods & TO_X) { if (output_methods & TO_X) {
#ifdef OWN_WINDOW #ifdef OWN_WINDOW
init_window(own_window, text_width + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2, init_window(own_window, text_width + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2,
text_height + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2, set_transparent, background_colour, text_height + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2, set_transparent, background_colour,
xargv, xargc); argv_copy, argc_copy);
#else /* OWN_WINDOW */ #else /* OWN_WINDOW */
init_window(0, text_width + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2, init_window(0, text_width + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2,
text_height + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2, set_transparent, 0, text_height + window.border_inner_margin * 2 + window.border_outer_margin * 2 + window.border_width * 2, set_transparent, 0,
xargv, xargc); argv_copy, argc_copy);
#endif /* OWN_WINDOW */ #endif /* OWN_WINDOW */
setup_fonts(); setup_fonts();
@ -4174,8 +4171,6 @@ void initialisation(int argc, char **argv) {
memset(tmpstring2, 0, text_buffer_size); memset(tmpstring2, 0, text_buffer_size);
#ifdef BUILD_X11 #ifdef BUILD_X11
xargc = argc;
xargv = argv;
X11_create_window(); X11_create_window();
#endif /* BUILD_X11 */ #endif /* BUILD_X11 */
#ifdef BUILD_LUA #ifdef BUILD_LUA