Fri Nov 12 16:50:11 GMT 1999

(gilbertt)

Changes to E-Clock.c E-Areas.c Emix.x E-Sys.c E-Mountbox.c E-Load.c
E-Memwatch.c

Using atexit(Epplet_cleanup) prevents all those "mulitple spawning on
startup problems" people get.


SVN revision: 1269

epplets/E-Areas.c

@@ -45,7 +45,6 @@ close_cb(void *data)
 {
    Epplet_unremember();
    Esync();
-   Epplet_cleanup();
    data = NULL;
    exit(0);
 }
@@ -91,6 +90,7 @@ int
 main(int argc, char **argv)
 {
     Epplet_gadget b_up,b_down,b_left,b_right;
+    atexit(Epplet_cleanup);
     Epplet_Init("E-Areas", "0.1", 
                 "A desktop areas navigator; John Slee <john@chirp.com.au>",
 	            3, 3, argc, argv, 0);

epplets/E-Clock.c

@@ -41,7 +41,6 @@ cb_close(void *data)
 {
    Epplet_unremember();
    Esync();
-   Epplet_cleanup();
    data = NULL;
    exit(0);
 }
@@ -114,6 +113,7 @@ draw_arms(void)
 int
 main(int argc, char **argv)
 {
+   atexit(Epplet_cleanup);
    Epplet_Init("E-Clock", "0.1", "Enlightenment Clock Epplet",
 	       3, 3, argc, argv, 0);
    Epplet_timer(cb_timer, NULL, 0.5, "TIMER");

epplets/E-Load.c

@@ -50,7 +50,6 @@ cb_close(void *data)
 {
    Epplet_unremember();
    Esync();
-   Epplet_cleanup();
    data = NULL;
    exit(0);
 }
@@ -92,6 +91,7 @@ main(int argc, char **argv)
 {
    int i;
    
+   atexit(Epplet_cleanup);
    cpus = count_cpus();
    load_val = malloc(sizeof(int) * cpus);
    prev_val = malloc(sizeof(double) * cpus);

epplets/E-MemWatch.c

@@ -108,6 +108,7 @@ main(int argc, char **argv) {
 
   int prio;
 
+  atexit(Epplet_cleanup);
   prio = getpriority(PRIO_PROCESS, getpid());
   setpriority(PRIO_PROCESS, getpid(), prio + 10);
   Epplet_Init("E-MemWatch", "0.1", "Enlightenment RAM/Swap Monitor Epplet", 3, 3, argc, argv, 0);

epplets/E-Mountbox.c

@@ -840,6 +840,7 @@ SetupGraphx(void)
 int
 main(int argc, char** argv)
  {
+   atexit(Epplet_cleanup);
    Epplet_Init("E-Mountbox", "0.1", "Enlightenment Mount Epplet",
 	       3, 3, argc, argv, 0);
    Epplet_load_config();

epplets/E-Power.c

@@ -114,7 +114,6 @@ cb_close(void *data)
 {
    Epplet_unremember();
    Esync();
-   Epplet_cleanup();
    data = NULL;
    exit(0);
 }
@@ -150,6 +149,7 @@ cb_help(void *data)
 int
 main(int argc, char **argv)
 {
+   atexit(Epplet_cleanup);
    Epplet_Init("E-Power", "0.1", "Enlightenment Laptop Power Epplet",
 	       3, 3, argc, argv, 0);
    Epplet_timer(cb_timer, NULL, 30.0, "TIMER");

epplets/E-Sys.c

@@ -95,6 +95,7 @@ main(int argc, char **argv) {
 
   int prio;
 
+  atexit(Epplet_cleanup);
   prio = getpriority(PRIO_PROCESS, getpid());
   setpriority(PRIO_PROCESS, getpid(), prio + 10);
   Epplet_Init("E-Sys", "0.1", "Enlightenment Uptime Epplet", 3, 3, argc, argv, 0);

epplets/Emix.c

@@ -30,7 +30,6 @@ static void cb_close(void *data)
 {
    Epplet_unremember();
    close(fd_mixer);
-   Epplet_cleanup();
    data = NULL;
    exit(0);
 }
@@ -117,6 +116,7 @@ int main(int argc, char *argv[])
       return 1;
    initialize_channels();
    
+   atexit(Epplet_cleanup);
    Epplet_Init("Emix", "0.9", "Audio mixer Epplet", 3, 3, argc, argv, 0);   
    vs_master = Epplet_create_vslider(2, 2, 44, 0, 20, 1, 5,
 				     &channels[0].value, set_volume, &channels[0]);