[svn-upgrade] Integrating new upstream version, ion3 (20070506)

[ion3.git] / mod_statusbar / main.c

diff --git a/mod_statusbar/main.c b/mod_statusbar/main.c
index 9ec4f20c0aac1a91ac5f346a38c8bc5f6a7dbbe5..b6a0e7310f29b11a2bc9f4163cd2d26f26e53e52 100644 (file)
--- a/mod_statusbar/main.c
+++ b/mod_statusbar/main.c
@@ -1,12 +1,9 @@
 /*
  * ion/mod_statusbar/main.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
 #include <sys/time.h>
@@ -94,7 +91,6 @@ static bool wait_statusd_init(int outfd, int errfd, ExtlFn dh, ExtlFn eh)
     int nfds=maxof(outfd, errfd);
     int retval;
     bool dummy, doneseen, eagain=FALSE;
-    const char *timeout_msg=TR("ion-statusd launch timeout.");
     
     if(gettimeofday(&endtime, NULL)!=0){
         warn_err();
@@ -255,7 +251,7 @@ static bool clientwin_do_manage_hook(WClientWin *cwin, const WManageParams *para
         return FALSE;
 
     return region_manage_clientwin((WRegion*)sb, cwin, param,
-                                   MANAGE_REDIR_PREFER_NO);
+                                   MANAGE_PRIORITY_NONE);
 }