r37503 - in /desktop/unstable/gnome-session/debian: changelog control patches/20_add_app_start_dir.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sun Apr 7 17:17:58 UTC 2013
Author: pochu
Date: Sun Apr 7 17:17:58 2013
New Revision: 37503
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37503
Log:
* debian/patches/20_add_app_start_dir.patch:
+ New patch. Add a new command line option, --start <dir>, to
specify a directory to load .desktop files from. This differs
from --autostart in that the latter overrides session loading
while the new option doesn't. This is necessary for gdm3 to be
able to start a11y tools.
Added:
desktop/unstable/gnome-session/debian/patches/20_add_app_start_dir.patch
Modified:
desktop/unstable/gnome-session/debian/changelog
desktop/unstable/gnome-session/debian/control
desktop/unstable/gnome-session/debian/patches/series
Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=37503&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Sun Apr 7 17:17:58 2013
@@ -1,3 +1,14 @@
+gnome-session (3.4.2.1-4) UNRELEASED; urgency=low
+
+ * debian/patches/20_add_app_start_dir.patch:
+ + New patch. Add a new command line option, --start <dir>, to
+ specify a directory to load .desktop files from. This differs
+ from --autostart in that the latter overrides session loading
+ while the new option doesn't. This is necessary for gdm3 to be
+ able to start a11y tools.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 07 Apr 2013 19:11:12 +0200
+
gnome-session (3.4.2.1-3) unstable; urgency=low
* defaults.list:
Modified: desktop/unstable/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/control?rev=37503&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/control [utf-8] Sun Apr 7 17:17:58 2013
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
Standards-Version: 3.9.3
Build-Depends: cdbs (>= 0.4.41),
dh-autoreconf,
Added: desktop/unstable/gnome-session/debian/patches/20_add_app_start_dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/20_add_app_start_dir.patch?rev=37503&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/20_add_app_start_dir.patch (added)
+++ desktop/unstable/gnome-session/debian/patches/20_add_app_start_dir.patch [utf-8] Sun Apr 7 17:17:58 2013
@@ -1,0 +1,54 @@
+--- a/gnome-session/gsm-session-fill.c
++++ b/gnome-session/gsm-session-fill.c
+@@ -462,6 +462,7 @@
+
+ gboolean
+ gsm_session_fill (GsmManager *manager,
++ char *autostart_dir,
+ char **override_autostart_dirs,
+ const char *session)
+ {
+@@ -469,6 +470,11 @@
+ gboolean is_fallback;
+ char *actual_session;
+
++ /* This doesn't override the loading of a .session file,
++ * so we don't return here. */
++ if (autostart_dir != NULL)
++ gsm_manager_add_autostart_apps_from_dir (manager, autostart_dir);
++
+ if (override_autostart_dirs != NULL) {
+ load_override_apps (manager, override_autostart_dirs);
+ return TRUE;
+--- a/gnome-session/gsm-session-fill.h
++++ b/gnome-session/gsm-session-fill.h
+@@ -27,6 +27,7 @@
+ G_BEGIN_DECLS
+
+ gboolean gsm_session_fill (GsmManager *manager,
++ char *autostart_dir,
+ char **override_autostart_dirs,
+ const char *session);
+
+--- a/gnome-session/main.c
++++ b/gnome-session/main.c
+@@ -272,9 +272,11 @@
+ GsmXsmpServer *xsmp_server;
+ GdmSignalHandler *signal_handler;
+ static char **override_autostart_dirs = NULL;
++ static char *autostart_dir = NULL;
+ static char *session_name = NULL;
+ static GOptionEntry entries[] = {
+ { "autostart", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &override_autostart_dirs, N_("Override standard autostart directories"), N_("AUTOSTART_DIR") },
++ { "start", 0, 0, G_OPTION_ARG_STRING, &autostart_dir, N_("Directory to load apps from in addition to the session"), NULL },
+ { "session", 0, 0, G_OPTION_ARG_STRING, &session_name, N_("Session to use"), N_("SESSION_NAME") },
+ { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
+ { "failsafe", 'f', 0, G_OPTION_ARG_NONE, &failsafe, N_("Do not load user-specified applications"), NULL },
+@@ -355,6 +357,7 @@
+ session_name = _gsm_manager_get_default_session (manager);
+
+ if (!gsm_session_fill (manager,
++ autostart_dir,
+ override_autostart_dirs,
+ session_name)) {
+ gsm_util_init_error (TRUE, "Failed to load session \"%s\"", session_name ? session_name : "(null)");
Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=37503&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/series [utf-8] Sun Apr 7 17:17:58 2013
@@ -6,3 +6,4 @@
12_no_gdm_fallback.patch
13_display_session_properties.patch
14_hide_session_properties_help.patch
+20_add_app_start_dir.patch
More information about the pkg-gnome-commits
mailing list