diff -Nru lxsession-0.4.4/debian/changelog lxsession-0.4.4/debian/changelog --- lxsession-0.4.4/debian/changelog 2010-11-03 23:09:03.000000000 +0000 +++ lxsession-0.4.4/debian/changelog 2010-11-03 23:46:42.000000000 +0000 @@ -1,4 +1,4 @@ -lxsession (0.4.4-3ubuntu1~ppa11) natty; urgency=low +lxsession (0.4.4-3ubuntu1~ppa12) natty; urgency=low * debian/rules: - Add CFLAGS for GTK3 migration. @@ -17,7 +17,7 @@ * debian/lxsession.install: - Add. - -- Julien Lavergne Thu, 04 Nov 2010 00:08:58 +0100 + -- Julien Lavergne Thu, 04 Nov 2010 00:46:33 +0100 lxsession (0.4.4-3) unstable; urgency=high diff -Nru lxsession-0.4.4/debian/patches/05_not_launching-autostart-programs.patch lxsession-0.4.4/debian/patches/05_not_launching-autostart-programs.patch --- lxsession-0.4.4/debian/patches/05_not_launching-autostart-programs.patch 2010-11-03 23:08:51.000000000 +0000 +++ lxsession-0.4.4/debian/patches/05_not_launching-autostart-programs.patch 2010-11-03 23:46:28.000000000 +0000 @@ -9,77 +9,55 @@ Index: lxsession-0.4.4/lxsession/lxsession.c =================================================================== ---- lxsession-0.4.4.orig/lxsession/lxsession.c 2010-11-03 22:51:12.000000000 +0100 -+++ lxsession-0.4.4/lxsession/lxsession.c 2010-11-04 00:08:43.000000000 +0100 -@@ -43,6 +43,8 @@ +--- lxsession-0.4.4.orig/lxsession/lxsession.c 2010-11-04 00:43:16.000000000 +0100 ++++ lxsession-0.4.4/lxsession/lxsession.c 2010-11-04 00:46:26.000000000 +0100 +@@ -43,6 +43,7 @@ static gboolean no_settings = FALSE; /* disable settings daemon */ static gboolean reload_settings = FALSE; /* reload settings daemon */ +static gboolean no_autostart = FALSE; /* no autostart */ -+const char *autostart = NULL; /* autostart only this application */ static GMainLoop* main_loop = NULL; static const char *display_name = NULL; -@@ -201,17 +203,33 @@ +@@ -198,6 +199,9 @@ + if( G_LIKELY( window_manager ) ) + run_app( window_manager, TRUE ); + ++ if( G_UNLIKELY( !no_autostart ) ) ++ ++ { /* load system-wide default apps */ for( dir = dirs; *dir; ++dir ) { -- filename = g_build_filename( *dir, prog_name, session_name, autostart_filename, NULL ); -+ if( G_UNLIKELY( !no_autostart ) ) -+ { -+ filename = g_build_filename( *dir, prog_name, session_name, autostart_filename, NULL ); -+ load_default_apps( filename ); -+ g_free( filename ); -+ } -+ } -+ /* load user-specific default apps */ -+ if( G_UNLIKELY( !no_autostart ) ) -+ { -+ filename = g_build_filename( g_get_user_config_dir(), prog_name, session_name, autostart_filename, NULL ); - load_default_apps( filename ); - g_free( filename ); - } -- /* load user-specific default apps */ -- filename = g_build_filename( g_get_user_config_dir(), prog_name, session_name, autostart_filename, NULL ); -- load_default_apps( filename ); -- g_free( filename ); +@@ -210,8 +214,10 @@ + load_default_apps( filename ); + g_free( filename ); - /* Support autostart spec of freedesktop.org */ -- xdg_autostart( session_name ); + /* Support autostart spec of freedesktop.org if not disable*/ -+ if( G_UNLIKELY( !no_autostart ) ) -+ { -+ xdg_autostart( session_name ); -+ } -+ else -+ { -+ if (G_LIKELY( autostart ) ) -+ { -+ g_spawn_command_line_async( autostart, NULL ); -+ } + xdg_autostart( session_name ); ++ + } } static void parse_options(int argc, char** argv) -@@ -242,6 +260,11 @@ +@@ -242,6 +248,9 @@ case 'r': reload_settings = TRUE; continue; -+ case 'a': /* autostart only 0 or 1 app */ ++ case 'a': /* autostart disable */ + no_autostart = TRUE; -+ if ( ++i >= argc ) goto usage; -+ if (argv[i]) autostart = argv[i]; + continue; default: goto usage; } -@@ -255,7 +278,8 @@ +@@ -255,7 +264,8 @@ "\t-s NAME\tspecify name of the desktop session profile\n" "\t-e NAME\tspecify name of DE, such as LXDE, GNOME, or XFCE.\n" "\t-r\t reload configurations (for Xsettings daemon)\n" - "\t-n\t disable Xsettings daemon support\n" ); + "\t-n\t disable Xsettings daemon support\n" -+ "\t-a\t Autostart only NAME program, or no if nothing is specify \n" ); ++ "\t-a\t autostart applications disable (window-manager mode only) \n" ); exit(1); }