Enlightenment CVS committal

Author  : mej
Project : eterm
Module  : Eterm

Dir     : eterm/Eterm/src


Modified Files:
        startup.c 


Log Message:
Fri Feb 24 16:58:43 2006                        Michael Jennings (mej)

Add fallback attempt to open display in case NEED_LINUX_HACK is set
and shouldn't be.
----------------------------------------------------------------------

===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/startup.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- startup.c   13 Feb 2006 19:52:45 -0000      1.55
+++ startup.c   24 Feb 2006 21:58:58 -0000      1.56
@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-static const char cvs_ident[] = "$Id: startup.c,v 1.55 2006/02/13 19:52:45 mej 
Exp $";
+static const char cvs_ident[] = "$Id: startup.c,v 1.56 2006/02/24 21:58:58 mej 
Exp $";
 
 #include "config.h"
 #include "feature.h"
@@ -73,7 +73,6 @@
 int
 eterm_bootstrap(int argc, char *argv[])
 {
-
     int i;
     char *val;
 
@@ -81,7 +80,7 @@
     static char windowid_string[20], *display_string, *term_string;
 
     orig_argv0 = argv[0];
-
+    
     /* Security enhancements -- mej */
     putenv("IFS= \t\n");
     my_ruid = getuid();
@@ -116,7 +115,7 @@
 #ifdef NEED_LINUX_HACK
     privileges(REVERT);
 #endif
-    if (!Xdisplay) {
+    if (!Xdisplay && !(Xdisplay = XOpenDisplay(display_name))) {
         libast_print_error("can't open display %s\n", display_name);
         exit(EXIT_FAILURE);
     }




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to