Imported Upstream version 20090110

[ion3.git] / pwm / pwm.c

diff --git a/pwm/pwm.c b/pwm/pwm.c
index bbb042f792dfb9fcbf294cb33b03e77ae713e6d8..0159ccef8ecccff04fb472dc65cd7ee2894b57c8 100644 (file)
--- a/pwm/pwm.c
+++ b/pwm/pwm.c
@@ -1,12 +1,9 @@
 /*
  * ion/pwm/pwm.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2007. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 
  *
- * 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 <stdlib.h>
@@ -22,6 +19,7 @@
 #include <libtu/util.h>
 #include <libtu/optparser.h>
 #include <libtu/errorlog.h>
+#include <libtu/prefix.h>
 #include <libextl/readconfig.h>
 #include <libmainloop/exec.h>
 
@@ -76,7 +74,7 @@ static OptParserOpt pwm_opts[]={
 static void help()
 {
     int i;
-    printf(TR("Usage: %s [options]\n\n"), prog_execname());
+    printf(TR("Usage: %s [options]\n\n"), libtu_progname());
     for(i=0; pwm_opts[i].descr!=NULL; i++)
         pwm_opts[i].descr=TR(pwm_opts[i].descr);
     optparser_printhelp(OPTP_MIDLONG, pwm_opts);
@@ -96,20 +94,30 @@ int main(int argc, char*argv[])
     char *efnam=NULL;
     bool may_continue=FALSE;
     bool noerrorlog=FALSE;
-
+    char *localedir;
+    
     libtu_init(argv[0]);
 
-    if(!ioncore_init("pwm3", argc, argv, LOCALEDIR))
+#ifdef CF_RELOCATABLE_BIN_LOCATION
+    prefix_set(argv[0], CF_RELOCATABLE_BIN_LOCATION);
+#endif
+
+    localedir=prefix_add(LOCALEDIR);
+    
+    if(!ioncore_init("pwm3", argc, argv, localedir))
         return EXIT_FAILURE;
 
-    extl_add_searchdir(EXTRABINDIR); /* ion-completefile */
-    extl_add_searchdir(MODULEDIR);
-    extl_add_searchdir(ETCDIR);
+    if(localedir!=NULL)
+        free(localedir);
+    
+    prefix_wrap_simple(extl_add_searchdir, EXTRABINDIR); /* ion-completefile */
+    prefix_wrap_simple(extl_add_searchdir, MODULEDIR);
+    prefix_wrap_simple(extl_add_searchdir, ETCDIR);
 #ifdef PWM_ETCDIR    
-    extl_add_searchdir(PWM_ETCDIR);
+    prefix_wrap_simple(extl_add_searchdir, PWM_ETCDIR);
 #endif
-    extl_add_searchdir(SHAREDIR);
-    extl_add_searchdir(LCDIR);
+    prefix_wrap_simple(extl_add_searchdir, SHAREDIR);
+    prefix_wrap_simple(extl_add_searchdir, LCDIR);
     extl_set_userdirs("pwm3");
 
     optparser_init(argc, argv, OPTP_MIDLONG, pwm_opts);
@@ -188,7 +196,7 @@ fail:
             fclose(ef);
             pid=fork();
             if(pid==0){
-                ioncore_setup_environ(DefaultScreen(ioncore_g.dpy));
+                ioncore_setup_display(DefaultScreen(ioncore_g.dpy));
                 if(!may_continue)
                     XCloseDisplay(ioncore_g.dpy);
                 else