From 1789d4564514c4cefe3d2e9d2b7b65119784b53c Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 11 Jan 2008 15:18:04 -0500 Subject: fix a warning from crappy libc apis --- openbox/openbox.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'openbox/openbox.c') diff --git a/openbox/openbox.c b/openbox/openbox.c index 6f47fbd0..ff226af4 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -512,7 +512,9 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num) static void parse_env() { /* unset this so we don't pass it on unknowingly */ - putenv("DESKTOP_STARTUP_ID"); + gchar *s = g_strdup("DESKTOP_STARTUP_ID"); + putenv(s); + g_free(s); } static void parse_args(gint *argc, gchar **argv) -- cgit v1.2.3 From d7b25da169d0a466e3fd88bec9344e25d64584f6 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 11 Jan 2008 19:05:04 -0500 Subject: make the window_startup happen before the focus_cycle_popup startup, so that the popups can be added to the window map properly --- openbox/openbox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openbox/openbox.c') diff --git a/openbox/openbox.c b/openbox/openbox.c index ff226af4..c7e28324 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -292,12 +292,12 @@ gint main(gint argc, gchar **argv) event_startup(reconfigure); /* focus_backup is used for stacking, so this needs to come before anything that calls stacking_add */ + sn_startup(reconfigure); + window_startup(reconfigure); focus_startup(reconfigure); focus_cycle_startup(reconfigure); focus_cycle_indicator_startup(reconfigure); focus_cycle_popup_startup(reconfigure); - window_startup(reconfigure); - sn_startup(reconfigure); screen_startup(reconfigure); grab_startup(reconfigure); group_startup(reconfigure); @@ -367,8 +367,8 @@ gint main(gint argc, gchar **argv) focus_cycle_indicator_shutdown(reconfigure); focus_cycle_shutdown(reconfigure); focus_shutdown(reconfigure); - sn_shutdown(reconfigure); window_shutdown(reconfigure); + sn_shutdown(reconfigure); event_shutdown(reconfigure); config_shutdown(); actions_shutdown(reconfigure); -- cgit v1.2.3 From 64905704e92deca4caa7e63954f236860418d370 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Sat, 12 Jan 2008 18:36:49 +0100 Subject: Update --version output copyright year to 2008. --- openbox/openbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openbox/openbox.c') diff --git a/openbox/openbox.c b/openbox/openbox.c index c7e28324..30a26609 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -470,9 +470,9 @@ static void print_version() { g_print("Openbox %s\n", PACKAGE_VERSION); g_print(_("Copyright (c)")); - g_print(" 2007 Mikael Magnusson\n"); + g_print(" 2008 Mikael Magnusson\n"); g_print(_("Copyright (c)")); - g_print(" 2003-2007 Dana Jansens\n\n"); + g_print(" 2003-2006 Dana Jansens\n\n"); g_print("This program comes with ABSOLUTELY NO WARRANTY.\n"); g_print("This is free software, and you are welcome to redistribute it\n"); g_print("under certain conditions. See the file COPYING for details.\n\n"); -- cgit v1.2.3 From 299687110d478a4928932f72031c345b27a01840 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 16 Jan 2008 18:44:22 -0500 Subject: use hash tables in ping.[ch] instead of a list. we're pinging every window, not just windows youre trying to close, so don't use datastructures that suck with lots of windows.. --- openbox/openbox.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'openbox/openbox.c') diff --git a/openbox/openbox.c b/openbox/openbox.c index 30a26609..48f31f91 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -43,6 +43,7 @@ #include "grab.h" #include "group.h" #include "config.h" +#include "ping.h" #include "mainloop.h" #include "gettext.h" #include "parser/parse.h" @@ -301,6 +302,7 @@ gint main(gint argc, gchar **argv) screen_startup(reconfigure); grab_startup(reconfigure); group_startup(reconfigure); + ping_startup(reconfigure); client_startup(reconfigure); dock_startup(reconfigure); moveresize_startup(reconfigure); @@ -360,6 +362,7 @@ gint main(gint argc, gchar **argv) moveresize_shutdown(reconfigure); dock_shutdown(reconfigure); client_shutdown(reconfigure); + ping_shutdown(reconfigure); group_shutdown(reconfigure); grab_shutdown(reconfigure); screen_shutdown(reconfigure); -- cgit v1.2.3