Home_greyBuild Service > Projects > home:jieyang:branches:MeeGo:1.2.0:oss:Update:Testing > uxlaunch > Package diff
Login

Changes of commit 8

    Index: debug.patch
===================================================================
--- debug.patch (revision 7)
+++ debug.patch (revision 8)
@@ -1,5 +1,48 @@
+--- uxlaunch-0.59.1/xserver.c	2011-04-29 04:04:24.000000000 +0800
++++ uxlaunch-0.59.1/xserver.c.new	2012-04-28 10:36:29.561000041 +0800
+@@ -261,6 +261,7 @@
+          * magic to make X send the parent the signal.
+ 	 */
+ 	signal(SIGUSR1, SIG_IGN);
++		lprintf("sent sig_ign");
+ 
+ 	if (!xserver) {
+ 		if (!access("/usr/bin/Xorg", X_OK))
+@@ -340,11 +341,14 @@
+ 	lprintf("Entering wait_for_X_signal");
+ 	clock_gettime(CLOCK_REALTIME, &tv);
+ 	tv.tv_sec += 10;
++	lprintf("Entering wait_for_X_signal, after clock_gettime, tv.tv_sec-10:%02llu.%06llu. will start waiting...", tv.tv_sec-10, tv.tv_nsec);
+ 
+ 	pthread_mutex_lock(&notify_mutex);
+ 	pthread_cond_timedwait(&notify_condition, &notify_mutex, &tv);
+ 	pthread_mutex_unlock(&notify_mutex);
+ 	lprintf("done");
++	clock_gettime(CLOCK_REALTIME, &tv);
++	lprintf("Entering wait_for_X_signal, after clock_gettime, tv.tv_sec:%02llu.%06llu. will start waiting...", tv.tv_sec, tv.tv_nsec);
+ 
+ }
+ 
 --- uxlaunch-0.59.1/uxlaunch.c	2011-04-29 04:04:24.000000000 +0800
-+++ uxlaunch-0.59.1/uxlaunch.c.new	2012-04-27 16:47:17.526000042 +0800
++++ uxlaunch-0.59.1/uxlaunch.c.new	2012-04-28 11:44:33.906000039 +0800
+@@ -46,8 +46,6 @@
+ 
+ 	maybe_start_screensaver();
+ 
+-	start_desktop_session();
+-
+ 	/* finally, set local username to be allowed at any time,
+ 	 * which is not depenedent on hostname changes */
+ 	snprintf(xhost_cmd, 80, "/usr/bin/xhost +SI:localuser:%s",
+@@ -57,6 +55,8 @@
+ 
+ 	autostart_desktop_files();
+ 	do_autostart();
++
++	start_desktop_session();
+ }
+ 
+ int main(int argc, char **argv)
 @@ -104,7 +104,9 @@
  
  	setup_pam_session();
@@ -35,28 +78,3 @@
  
  	/*
  	 * we do this now to make sure dbus etc are not spawning
---- uxlaunch-0.59.1/xserver.c	2011-04-29 04:04:24.000000000 +0800
-+++ uxlaunch-0.59.1/xserver.c.new	2012-04-28 10:36:29.561000041 +0800
-@@ -261,6 +261,7 @@
-          * magic to make X send the parent the signal.
- 	 */
- 	signal(SIGUSR1, SIG_IGN);
-+		lprintf("sent sig_ign");
- 
- 	if (!xserver) {
- 		if (!access("/usr/bin/Xorg", X_OK))
-@@ -340,11 +341,14 @@
- 	lprintf("Entering wait_for_X_signal");
- 	clock_gettime(CLOCK_REALTIME, &tv);
- 	tv.tv_sec += 10;
-+	lprintf("Entering wait_for_X_signal, after clock_gettime, tv.tv_sec-10:%02llu.%06llu. will start waiting...", tv.tv_sec-10, tv.tv_nsec);
- 
- 	pthread_mutex_lock(&notify_mutex);
- 	pthread_cond_timedwait(&notify_condition, &notify_mutex, &tv);
- 	pthread_mutex_unlock(&notify_mutex);
- 	lprintf("done");
-+	clock_gettime(CLOCK_REALTIME, &tv);
-+	lprintf("Entering wait_for_X_signal, after clock_gettime, tv.tv_sec:%02llu.%06llu. will start waiting...", tv.tv_sec, tv.tv_nsec);
- 
- }
-