[G15daemon-commits] SF.net SVN: g15daemon: [445] trunk/g15daemon-clients/g15macro/g15macro.c

[<mla...@us...>]

Revision: 445
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=445&view=rev
Author:   mlampard
Date:     2008-01-23 00:26:23 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
g15macro: small cleanup.

Modified Paths:
--------------
    trunk/g15daemon-clients/g15macro/g15macro.c

Modified: trunk/g15daemon-clients/g15macro/g15macro.c
===================================================================
--- trunk/g15daemon-clients/g15macro/g15macro.c	2008-01-23 08:05:30 UTC (rev 444)
+++ trunk/g15daemon-clients/g15macro/g15macro.c	2008-01-23 08:26:23 UTC (rev 445)
@@ -984,8 +984,9 @@
         if(display_timeout<=0){
             int fg_check = g15_send_cmd (g15screen_fd, G15DAEMON_IS_FOREGROUND, dummy);
             if (fg_check==1) { // foreground 
-                    g15_send_cmd (g15screen_fd, G15DAEMON_SWITCH_PRIORITIES, dummy);
-            	    g15r_loadWbmpSplash(canvas, splashpath);
+                    do {
+                      g15_send_cmd (g15screen_fd, G15DAEMON_SWITCH_PRIORITIES, dummy);
+                    } while(g15_send_cmd (g15screen_fd, G15DAEMON_IS_FOREGROUND, dummy)==1);
             }
 
            usleep(500*1000);
@@ -1008,6 +1009,6 @@
     change_keymap(0);
     close(g15screen_fd);
 close_and_exit:
-    XCloseDisplay(dpy);    
+    /*    XCloseDisplay(dpy);  */
     return 0;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.