GNOME.org
 

[sabayon/use-xephyr: 2/2] Replace Xnest with Xephyr strings everywhere

commit 2ed62a549afd57e633462604ce9dbae5392a4f4a
Author: Federico Mena Quintero <federico novell com>
Date:   Thu Apr 16 15:05:02 2009 -0500

    Replace Xnest with Xephyr strings everywhere
    
    Signed-off-by: Federico Mena Quintero <federico novell com>
---
 configure.ac        |    8 ++--
 doc/flat.html       |    2 +-
 doc/index.html      |    2 +-
 lib/Makefile.am     |    2 +-
 lib/config.py.in    |    6 ++--
 lib/protosession.py |   78 +++++++++++++++++++++++++-------------------------
 6 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0084701..f4e230a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,11 +256,11 @@ else
   SABAYON_DIR_TMP="$bindir"
 fi
 
-AC_PATH_PROG(XNEST_PATH,Xephyr,no)
-if test "x$XNEST_PATH" = "xno" ; then
-  AC_MSG_ERROR(Xnest binary not found)
+AC_PATH_PROG(XEPHYR_PATH,Xephyr,no)
+if test "x$XEPHYR_PATH" = "xno" ; then
+  AC_MSG_ERROR(Xephyr binary not found)
 fi
-AC_SUBST(XNEST_PATH)
+AC_SUBST(XEPHYR_PATH)
 
 
 EXPANDED_SABAYON_DIR=`eval echo $SABAYON_DIR_TMP`
diff --git a/doc/flat.html b/doc/flat.html
index f7f9ee7..21247ed 100644
--- a/doc/flat.html
+++ b/doc/flat.html
@@ -3,7 +3,7 @@
   <body>
     <h1>Sabayon: User profiles made simple</h1>
     <h3>What is Sabayon?</h3>
-    <p>Sabayon is a system administration tool to manage GNOME desktop settings. Sabayon provides a sane way to edit GConf defaults and GConf mandatory keys: the same way you edit your desktop. Sabayon launches profiles in an Xnest window. Any changes you make in the Xnest window are saved back to the profile file, which can then be applied to user's accounts.</p>
+    <p>Sabayon is a system administration tool to manage GNOME desktop settings. Sabayon provides a sane way to edit GConf defaults and GConf mandatory keys: the same way you edit your desktop. Sabayon launches profiles in an Xephyr window. Any changes you make in the Xephyr window are saved back to the profile file, which can then be applied to user's accounts.</p>
     <p>More screenshots and a step by step example are available from Seth Nickell <a href="http://www.gnome.org/~seth/blog/sabayon";>blog about sabayon 0.12</a>.</p>
     <h3>Features</h3>
     <p>Currently Sabayon is limited to the creation and update of user preference profiles. It does not deal with the very large problem of actually populating target system with those preferences.</p>
diff --git a/doc/index.html b/doc/index.html
index 45348f1..f00daa7 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml";><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /><link rel="stylesheet" type="text/css" href="sabayon.css" /><title>User profiles made simple</title></head>
   <body><div id="main"><div id="top"><img src="title01.jpg" border="0" height="229" width="432" alt="Sabayon: user profiles made simple" /><img src="title02.jpg" border="0" height="229" alt="Small screenshot of sabayon" /></div><div id="left"><div class="box"><h2 class="box_title">Download</h2><h4 class="box_header">RPMs</h4><ul><li>RPMs for Fedora Core 4 are available from <a href="http://download.fedora.redhat.com/pub/fedora/linux/extras/";>Fedora Extras</a></li></ul><h4 class="box_header">Source</h4><ul><li><a href="http://ftp.gnome.org/pub/GNOME/sources/sabayon/";>tarball</a></li><li><a href="http://cvs.gnome.org/viewcvs/sabayon/";>CVS Repository</a></li></ul></div><div class="box"><h2 class="box_title">Contribute</h2><p>There are several ways to contribute to the Sabayon project.</p><p><a href="testing.html">Testing</a>, go here if you want to install sabayon and try it out.</p><p><a href="developing.html">Developing</a>, get the code and try to fix errors and send patches
  to the maintainers.</p><p><a href="helping.html">Helping out</a> on the <a href="http://mail.gnome.org/mailman/listinfo/sabayon-list/";>mailing list</a> and <a href="irc://irc.gnome.org/sabayon">IRC</a> for people having problems, letting them know where to go and what to do.</p></div><div class="box"><h2 class="box_title">Contact</h2><p>You can contact developers <a href="mailto:sabayon-list gnome org">sending a mail</a> to the <a href="http://mail.gnome.org/mailman/listinfo/sabayon-list/";>Sabayon mailing list</a>. You do not need to be subscribed.</p><p>We are also often available to <a href="irc://irc.gnome.org/sabayon">chat on IRC</a>.</p><p><strong>Server:</strong> irc.gnome.org<br /><strong>Channel:</strong> #sabayon</p></div><div class="box"><h2 class="box_title">Documentation</h2><p>Format and deployement of the <a href="config.html">config
          files</a></p><p>Technical informations on the <a href="format.html">profile
-         format</a></p></div></div><div id="right"><h3>What is Sabayon?</h3><p>Sabayon is a system administration tool to manage GNOME desktop settings. Sabayon provides a sane way to edit GConf defaults and GConf mandatory keys: the same way you edit your desktop. Sabayon launches profiles in an Xnest window. Any changes you make in the Xnest window are saved back to the profile file, which can then be applied to user's accounts.</p><p>More screenshots and a step by step example are available from Seth Nickell <a href="http://www.gnome.org/~seth/blog/sabayon";>blog about sabayon 0.12</a>.</p><h3>Features</h3><p>Currently Sabayon is limited to the creation and update of user preference profiles. It does not deal with the very large problem of actually populating target system with those preferences.</p><h3>Supported configuration backend</h3><p> So far Sabayon supports complete files and the configuration format for:</p><ul class="left">
+         format</a></p></div></div><div id="right"><h3>What is Sabayon?</h3><p>Sabayon is a system administration tool to manage GNOME desktop settings. Sabayon provides a sane way to edit GConf defaults and GConf mandatory keys: the same way you edit your desktop. Sabayon launches profiles in an Xephyr window. Any changes you make in the Xephyr window are saved back to the profile file, which can then be applied to user's accounts.</p><p>More screenshots and a step by step example are available from Seth Nickell <a href="http://www.gnome.org/~seth/blog/sabayon";>blog about sabayon 0.12</a>.</p><h3>Features</h3><p>Currently Sabayon is limited to the creation and update of user preference profiles. It does not deal with the very large problem of actually populating target system with those preferences.</p><h3>Supported configuration backend</h3><p> So far Sabayon supports complete files and the configuration format for:</p><ul class="left">
       <li>GConf</li>
       <li>Mozilla/Firefox</li>
     </ul><p> We are looking into or planning on adding support for the following: </p><ul class="left">
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5292326..764e991 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -65,7 +65,7 @@ config.py: config.py.in Makefile
                 -e s!\ PACKAGE_NAME\@!$(PACKAGE_NAME)!		\
                 -e s!\ PACKAGE_VERSION\@!$(PACKAGE_VERSION)!	\
 		-e s!\ XSESSION\@!$(XSESSION)!			\
-		-e s!\ XNEST_PATH\@!$(XNEST_PATH)!		\
+		-e s!\ XEPHYR_PATH\@!$(XEPHYR_PATH)!		\
 		-e s!\ SESSION_NAME\@!$(SESSION_NAME)!		\
 		-e s!\ PROTOTYPE_USER\@!$(PROTOTYPE_USER)!	\
                 < $< > $@
diff --git a/lib/config.py.in b/lib/config.py.in
index 83154bb..482073c 100755
--- a/lib/config.py.in
+++ b/lib/config.py.in
@@ -36,8 +36,8 @@ APPLY_TOOL_ARGV   = [ os.path.join (SBINDIR,    "sabayon-apply") ]
 # FIXME: this is too big a hammer
 CLOBBER_USER_PROCESSES_ARGV = [ "/usr/bin/pkill", "-u" ]
 
-# No. of seconds to wait for USR1 from Xnest before giving up
-XNEST_USR1_TIMEOUT = 10
+# No. of seconds to wait for USR1 from Xephyr before giving up
+XEPHYR_USR1_TIMEOUT = 10
 
 #
 # This is the user which we run the prototype sessions
@@ -52,7 +52,7 @@ DEFAULT_SHELL = "/bin/bash"
 NOLOGIN_SHELL = "/sbin/nologin"
 SKEL_HOMEDIR  = "/etc/skel"
 
-XNEST_ARGV   = [ "@XNEST_PATH@", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
+XEPHYR_ARGV  = [ "@XEPHYR_PATH@", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
 SESSION_ARGV = [ "@XSESSION@", "@SESSION_NAME@" ]
 USERMOD_ARGV = [ "/usr/sbin/usermod" ]
 
diff --git a/lib/protosession.py b/lib/protosession.py
index 2632d6c..81e2b3c 100644
--- a/lib/protosession.py
+++ b/lib/protosession.py
@@ -175,9 +175,9 @@ class ProtoSession (gobject.GObject):
         self.usr1_pipe_r = 0
         self.usr1_pipe_w = 0
         
-        self.xnest_pid = 0
-        self.xnest_child_watch = 0
-        self.xnest_xauth_file = None
+        self.xephyr_pid = 0
+        self.xephyr_child_watch = 0
+        self.xephyr_xauth_file = None
         
         self.session_pid = 0
         self.session_child_watch = 0
@@ -189,14 +189,14 @@ class ProtoSession (gobject.GObject):
 
         self.pw = pwd.getpwuid (os.getuid ())
         
-    def __kill_xnest (self):
-        if self.xnest_child_watch:
-            gobject.source_remove (self.xnest_child_watch)
-            self.xnest_child_watch = 0
+    def __kill_xephyr (self):
+        if self.xephyr_child_watch:
+            gobject.source_remove (self.xephyr_child_watch)
+            self.xephyr_child_watch = 0
         
-        if self.xnest_pid:
-            safe_kill (self.xnest_pid, signal.SIGTERM)
-            self.xnest_pid = 0
+        if self.xephyr_pid:
+            safe_kill (self.xephyr_pid, signal.SIGTERM)
+            self.xephyr_pid = 0
 
     def __kill_session (self):
         if self.session_child_watch:
@@ -221,8 +221,8 @@ class ProtoSession (gobject.GObject):
             self.admin_tool_pid = 0
 
     def __del__ (self):
-        if self.xnest_xauth_file:
-            os.remove (self.xnest_xauth_file)
+        if self.xephyr_xauth_file:
+            os.remove (self.xephyr_xauth_file)
         if self.session_xauth_file:
             os.remove (self.session_xauth_file)
         if self.usr1_pipe_r:
@@ -240,11 +240,11 @@ class ProtoSession (gobject.GObject):
         self.got_usr1_signal = True
         os.write (self.usr1_pipe_w, "Y")
 
-    def __xnest_child_watch_handler (self, pid, status):
-        dprint ("Xnest died")
+    def __xephyr_child_watch_handler (self, pid, status):
+        dprint ("Xephyr died")
         
-        self.xnest_pid = 0
-        self.xnest_child_watch = 0
+        self.xephyr_pid = 0
+        self.xephyr_child_watch = 0
 
         self.emit ("finished");
         
@@ -268,7 +268,7 @@ class ProtoSession (gobject.GObject):
 
     # Write out a temporary Xauthority file which contains the same magic
     # cookie as the parent display so that we can pass that using -auth
-    # to Xnest.
+    # to Xephyr.
     #
     # Xauthority is a binary file format:
     #
@@ -350,21 +350,21 @@ class ProtoSession (gobject.GObject):
     # runing the mainloop we re-enter, then we'll install another
     # SIGUSR1 handler and everything will break
     #
-    def __start_xnest (self, parent_window):
-        dprint ("Starting Xnest %s" % self.display_name)
+    def __start_xephyr (self, parent_window):
+        dprint ("Starting Xephyr %s" % self.display_name)
 
-        self.xnest_xauth_file = self.__write_temp_xauth_file (True)
+        self.xephyr_xauth_file = self.__write_temp_xauth_file (True)
 
         (self.usr1_pipe_r, self.usr1_pipe_w) = os.pipe ()
         self.got_usr1_signal = False
         signal.signal (signal.SIGUSR1, self.__sigusr1_handler)
 
-        self.xnest_pid = os.fork ()
-        if self.xnest_pid == 0: # Child process
+        self.xephyr_pid = os.fork ()
+        if self.xephyr_pid == 0: # Child process
             signal.signal (signal.SIGUSR1, signal.SIG_IGN)
 
-            argv = XNEST_ARGV + \
-                   [ "-auth", self.xnest_xauth_file ] + \
+            argv = XEPHYR_ARGV + \
+                   [ "-auth", self.xephyr_xauth_file ] + \
                    [ "-name", "sabayon" ]
             if parent_window:
                 argv += [ "-parent", parent_window ]
@@ -375,20 +375,20 @@ class ProtoSession (gobject.GObject):
             os.execv (argv[0], argv)
 
             # Shouldn't ever reach here
-            sys.stderr.write ("Failed to launch Xnest")
+            sys.stderr.write ("Failed to launch Xephyr")
             os._exit (1)
 
         self.main_loop = gobject.MainLoop ()
 
-        self.xnest_child_watch = gobject.child_watch_add (self.xnest_pid,
-                                                          self.__xnest_child_watch_handler)
+        self.xephyr_child_watch = gobject.child_watch_add (self.xephyr_pid,
+                                                           self.__xephyr_child_watch_handler)
         io_watch = gobject.io_add_watch (self.usr1_pipe_r,
                                          gobject.IO_IN | gobject.IO_PRI,
                                          self.__usr1_pipe_watch_handler)
-        timeout = gobject.timeout_add (XNEST_USR1_TIMEOUT * 1000,
+        timeout = gobject.timeout_add (XEPHYR_USR1_TIMEOUT * 1000,
                                        self.__usr1_timeout_handler)
 
-        dprint ("Waiting on child process (%d)" % self.xnest_pid)
+        dprint ("Waiting on child process (%d)" % self.xephyr_pid)
 
         self.main_loop.run ()
         self.main_loop = None
@@ -404,16 +404,16 @@ class ProtoSession (gobject.GObject):
         self.usr1_pipe_w = 0
 
         if not self.got_usr1_signal:
-            if self.xnest_child_watch:
-                gobject.source_remove (self.xnest_child_watch)
-                self.xnest_child_watch = 0
+            if self.xephyr_child_watch:
+                gobject.source_remove (self.xephyr_child_watch)
+                self.xephyr_child_watch = 0
             
-            if self.xnest_pid:
-                safe_kill (self.xnest_pid, signal.SIGTERM)
-                self.xnest_pid = 0
-                raise SessionStartError, _("Failed to start Xnest: timed out waiting for USR1 signal")
+            if self.xephyr_pid:
+                safe_kill (self.xephyr_pid, signal.SIGTERM)
+                self.xephyr_pid = 0
+                raise SessionStartError, _("Failed to start Xephyr: timed out waiting for USR1 signal")
             else:
-                raise SessionStartError, _("Failed to start Xnest: died during startup")
+                raise SessionStartError, _("Failed to start Xephyr: died during startup")
 
     def __session_child_watch_handler (self, pid, status):
         dprint ("Session died")
@@ -512,13 +512,13 @@ class ProtoSession (gobject.GObject):
 
     def start (self, parent_window):
         # Get an X server going
-        self.__start_xnest (parent_window)
+        self.__start_xephyr (parent_window)
 
         # Start the session
         self.__start_session ()
         
     def force_quit (self):
         self.__kill_session ()
-        self.__kill_xnest ()
+        self.__kill_xephyr ()
 
 gobject.type_register (ProtoSession)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]