gnome3-team team mailing list archive
-
gnome3-team team
-
Mailing list archive
-
Message #00242
[Merge] lp:~jbicha/gnome-session/gnome-session-3.0.1 into lp:~gnome3-team/gnome-session/ubuntu
Jeremy Bicha has proposed merging lp:~jbicha/gnome-session/gnome-session-3.0.1 into lp:~gnome3-team/gnome-session/ubuntu.
Requested reviews:
Rodrigo Moya (rodrigo-moya)
For more details, see:
https://code.launchpad.net/~jbicha/gnome-session/gnome-session-3.0.1/+merge/60086
--
https://code.launchpad.net/~jbicha/gnome-session/gnome-session-3.0.1/+merge/60086
Your team GNOME3 Team is subscribed to branch lp:~gnome3-team/gnome-session/ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog 2011-05-04 09:06:28 +0000
+++ debian/changelog 2011-05-05 15:54:40 +0000
@@ -1,3 +1,20 @@
+gnome-session (3.0.1-0ubuntu1~build1) natty; urgency=low
+
+ * New upstream release
+ * debian/gnome-session.install
+ - Actually install the Ubuntu session
+ * debian/patches/81_restart_string_on_inhibit.patch
+ * debian/patches/95_dbus_request_shutdown.patch
+ * debian/patches/96_no_catch_sigsegv.patch
+ * debian/patches/97_fix_query_end_session_crash.patch
+ - Refreshed
+ * debian/patches/90_no_debug_flood_by_default.patch
+ * debian/patches/98_git_session_dialog.patch
+ * debian/patches/100_fix_xsmp_stop_crash.patch
+ - Removed upstream patches
+
+ -- Jeremy Bicha <jeremy@xxxxxxxxx> Thu, 05 May 2011 09:00:39 -0400
+
gnome-session (3.0.0-2ubuntu1~build1) natty; urgency=low
* Merge from Debian experimental, Ubuntu changes:
=== modified file 'debian/gnome-session.install'
--- debian/gnome-session.install 2011-05-04 08:56:21 +0000
+++ debian/gnome-session.install 2011-05-05 15:54:40 +0000
@@ -1,3 +1,4 @@
debian/tmp/usr/share/doc
debian/tmp/usr/share/xsessions/gnome.desktop
debian/tmp/usr/share/gnome-session/sessions/gnome.session
+debian/tmp/usr/share/gnome-session/sessions/ubuntu.session
\ No newline at end of file
=== removed file 'debian/patches/100_fix_xsmp_stop_crash.patch'
--- debian/patches/100_fix_xsmp_stop_crash.patch 2010-11-17 15:27:45 +0000
+++ debian/patches/100_fix_xsmp_stop_crash.patch 1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-Description: Don't crash in xsmp_stop on clients which have an ICE connection but not registered yet
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=598211
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-session/+bug/437425
-Origin: https://bugzilla.gnome.org/attachment.cgi?id=145401
-
-Index: gnome-session-2.32.1/gnome-session/gsm-xsmp-client.c
-===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-xsmp-client.c 2010-11-17 16:23:52.179939995 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-xsmp-client.c 2010-11-17 16:23:52.851940001 +0100
-@@ -725,6 +725,14 @@
- return FALSE;
- }
-
-+ if (xsmp->priv->conn == NULL) {
-+ g_set_error (error,
-+ GSM_CLIENT_ERROR,
-+ GSM_CLIENT_ERROR_NOT_REGISTERED,
-+ "Client is not registered");
-+ return FALSE;
-+ }
-+
- SmsDie (xsmp->priv->conn);
-
- return TRUE;
=== removed file 'debian/patches/19_gnome-wm-tweaking.patch'
--- debian/patches/19_gnome-wm-tweaking.patch 2010-11-17 15:27:45 +0000
+++ debian/patches/19_gnome-wm-tweaking.patch 1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-Description: Some magic for determining which WM to use.
-Author: ?
-
-Index: gnome-session-2.32.1/data/gnome-wm
-===================================================================
---- gnome-session-2.32.1.orig/data/gnome-wm 2010-11-17 16:23:44.847939996 +0100
-+++ gnome-session-2.32.1/data/gnome-wm 2010-11-17 16:23:47.759939996 +0100
-@@ -1,7 +1,8 @@
- #!/bin/sh
-
- # The user can specify his prefered WM by setting the WINDOW_MANAGER
--# environment variable.
-+# environment variable or setting the
-+# /desktop/gnome/applications/window_manager/default gconf key.
- #
- # If this is not set, we search a list of known windowmanagers and use
- # the first one that is found in the users's PATH
-@@ -53,30 +54,71 @@
- fi
- fi
-
-+# Get previously set window manager in gconf
-+if [ ! "$DEFWM" ]; then
-+ DEFWM=`gconftool-2 -g /desktop/gnome/applications/window_manager/default 2>/dev/null`
-+fi
-+
-+# special case handling for dapper upgrades (this runs only once after the upgrade)
-+if [ -z "$DEFWM" ] && [ -f /var/lib/gnome-session/dapper-upgrade ]; then
-+ gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/metacity --type string
-+ DEFWM=/usr/bin/metacity
-+fi
-+
-+# If not exist, set to compiz (if available)
-+if [ ! -x "$DEFWM" ]; then
-+ if [ -x "/usr/bin/compiz" ]; then
-+ gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/compiz --type string
-+ DEFWM=/usr/bin/compiz
-+ elif [ -x "/usr/bin/metacity" ]; then
-+ gconftool-2 -s /desktop/gnome/applications/window_manager/default /usr/bin/metacity --type string
-+ DEFWM=/usr/bin/metacity
-+ else
-+ unset DEFWM
-+ fi
-+fi
-+
-+# WINDOW_MANAGER overrides all
-+if [ -z "$WINDOW_MANAGER" ] ; then
-+ WINDOW_MANAGER=`gconftool-2 --get /desktop/gnome/session/required_components/windowmanager 2> /dev/null`
-+fi
-+
- # Avoid looping if the session configuration tells us to use gnome-wm or if
- # the user forces gnome-wm via WINDOW_MANAGER
- if [ "x$WINDOW_MANAGER" = "xgnome-wm" ]; then
- WINDOW_MANAGER=""
- fi
-
--# If compiz-gtk is installed, we always use it; it will fall back to
--# metacity if it cannot find decent hardware.
--
--if [ -z "$WINDOW_MANAGER" ] && [ -x /usr/bin/gtk-window-decorator ] ; then
-- WINDOW_MANAGER=compiz
--fi
-+if [ -z "$WINDOW_MANAGER" ] ; then
-+ # Create a list of window manager we can handle, trying to only use the
-+ # compositing ones when it makes sense
-
--# If compiz is not installed (which is the default), use metacity instead.
-+ xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null
-+ IS_X_COMPOSITED=$?
-
--if [ -z "$WINDOW_MANAGER" ]; then
-- KNOWN_WM="metacity sawfish mutter"
-+ KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm"
-+ if [ $IS_X_COMPOSITED -eq 0 ] ; then
-+ KNOWN_WM="compiz beryl $KNOWN_WM"
-+ fi
-+ # metacity is still the default wm in GNOME
-+ KNOWN_WM="metacity $KNOWN_WM"
-
-- for wm in $KNOWN_WM; do
-- if [ -x /usr/bin/"$wm" ]; then
-- WINDOW_MANAGER=/usr/bin/"$wm"
-- break
-- fi
-- done
-+ OLDIFS=$IFS
-+ if [ -z "$DEFWM" -o "x$DEFWM" = "xgnome-wm" ]; then
-+ for wm in $KNOWN_WM ; do
-+ IFS=":"
-+ for dir in $PATH ; do
-+ if [ -x "$dir/$wm" ] ; then
-+ WINDOW_MANAGER="$dir/$wm"
-+ break 2
-+ fi
-+ done
-+ IFS=$OLDIFS
-+ done
-+ else
-+ WINDOW_MANAGER=$DEFWM
-+ fi
-+ IFS=$OLDIFS
- fi
-
- # Look for the default window manager on the system
-@@ -125,7 +167,7 @@
-
- case `basename $WINDOW_MANAGER` in
- compiz)
-- gtk-window-decorator &
-+ #gtk-window-decorator &
- #OPT3=glib
- #OPT4=gconf
- ;;
-@@ -134,6 +176,9 @@
- ;;
- esac
-
-+# Store the selected WM with gconf
-+gconftool-2 -t string -s /desktop/gnome/applications/window_manager/current "$WINDOW_MANAGER"
-+
- exec "$WINDOW_MANAGER" $OPT1 $OPT2 $OPT3 $OPT4
-
- echo "ERROR: No window manager could run!"
=== modified file 'debian/patches/20_hide_nodisplay.patch'
--- debian/patches/20_hide_nodisplay.patch 2010-11-17 15:27:45 +0000
+++ debian/patches/20_hide_nodisplay.patch 2011-05-05 15:54:40 +0000
@@ -3,11 +3,11 @@
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=556459
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-session/+bug/462768
-Index: gnome-session-2.32.1/capplet/gsm-properties-dialog.c
+Index: gnome-session-3.0.1/capplet/gsm-properties-dialog.c
===================================================================
---- gnome-session-2.32.1.orig/capplet/gsm-properties-dialog.c 2010-11-17 16:23:46.007939999 +0100
-+++ gnome-session-2.32.1/capplet/gsm-properties-dialog.c 2010-11-17 16:23:48.103939996 +0100
-@@ -126,11 +126,13 @@
+--- gnome-session-3.0.1.orig/capplet/gsm-properties-dialog.c 2011-05-05 11:08:46.372465478 -0400
++++ gnome-session-3.0.1/capplet/gsm-properties-dialog.c 2011-05-05 11:09:05.632957552 -0400
+@@ -113,12 +113,14 @@
GspApp *app)
{
gboolean hidden;
@@ -15,29 +15,21 @@
gboolean enabled;
GIcon *icon;
const char *description;
-
+ const char *app_name;
+
hidden = gsp_app_get_hidden (app);
+ display = gsp_app_get_display (app);
enabled = gsp_app_get_enabled (app);
icon = gsp_app_get_icon (app);
description = gsp_app_get_description (app);
-@@ -161,7 +163,7 @@
- }
-
- gtk_list_store_set (list_store, iter,
-- STORE_COL_VISIBLE, !hidden,
-+ STORE_COL_VISIBLE, (display && !hidden),
- STORE_COL_ENABLED, enabled,
- STORE_COL_GICON, icon,
- STORE_COL_DESCRIPTION, description,
-Index: gnome-session-2.32.1/capplet/gsp-app.c
+Index: gnome-session-3.0.1/capplet/gsp-app.c
===================================================================
---- gnome-session-2.32.1.orig/capplet/gsp-app.c 2010-07-02 11:58:13.000000000 +0200
-+++ gnome-session-2.32.1/capplet/gsp-app.c 2010-11-17 16:23:48.107939995 +0100
+--- gnome-session-3.0.1.orig/capplet/gsp-app.c 2010-07-02 05:58:13.000000000 -0400
++++ gnome-session-3.0.1/capplet/gsp-app.c 2011-05-05 11:08:33.432134992 -0400
@@ -37,18 +37,20 @@
-
+
#define GSP_APP_SAVE_DELAY 2
-
+
-#define GSP_ASP_SAVE_MASK_HIDDEN 0x0001
-#define GSP_ASP_SAVE_MASK_ENABLED 0x0002
-#define GSP_ASP_SAVE_MASK_NAME 0x0004
@@ -51,20 +43,20 @@
+#define GSP_ASP_SAVE_MASK_COMMENT 0x0010
+#define GSP_ASP_SAVE_MASK_NO_DISPLAY 0x0020
+#define GSP_ASP_SAVE_MASK_ALL 0xffff
-
+
struct _GspAppPrivate {
char *basename;
char *path;
-
+
gboolean hidden;
+ gboolean no_display;
gboolean enabled;
-
+
char *name;
@@ -334,6 +336,14 @@
return FALSE;
}
-
+
+ if (gsp_key_file_get_boolean (keyfile,
+ G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY,
+ FALSE) != app->priv->no_display) {
@@ -79,7 +71,7 @@
@@ -442,6 +452,12 @@
app->priv->hidden);
}
-
+
+ if (app->priv->save_mask & GSP_ASP_SAVE_MASK_NO_DISPLAY) {
+ gsp_key_file_set_boolean (keyfile,
+ G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY,
@@ -91,7 +83,7 @@
GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED,
@@ -541,6 +557,14 @@
}
-
+
gboolean
+gsp_app_get_display (GspApp *app)
+{
@@ -116,16 +108,16 @@
TRUE);
@@ -935,6 +962,7 @@
app->priv->basename, NULL);
-
+
app->priv->hidden = FALSE;
+ app->priv->no_display = FALSE;
app->priv->enabled = TRUE;
-
+
if (!gsm_util_text_is_blank (name)) {
@@ -1031,6 +1059,12 @@
app->priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN;
}
-
+
+ if (app->priv->no_display) {
+ changed = TRUE;
+ app->priv->no_display = FALSE;
@@ -135,15 +127,15 @@
if (!app->priv->enabled) {
changed = TRUE;
app->priv->enabled = TRUE;
-Index: gnome-session-2.32.1/capplet/gsp-app.h
+Index: gnome-session-3.0.1/capplet/gsp-app.h
===================================================================
---- gnome-session-2.32.1.orig/capplet/gsp-app.h 2010-07-02 11:58:13.000000000 +0200
-+++ gnome-session-2.32.1/capplet/gsp-app.h 2010-11-17 16:23:48.107939995 +0100
+--- gnome-session-3.0.1.orig/capplet/gsp-app.h 2010-07-02 05:58:13.000000000 -0400
++++ gnome-session-3.0.1/capplet/gsp-app.h 2011-05-05 11:08:33.432134992 -0400
@@ -74,6 +74,7 @@
const char *gsp_app_get_path (GspApp *app);
-
+
gboolean gsp_app_get_hidden (GspApp *app);
+gboolean gsp_app_get_display (GspApp *app);
-
+
gboolean gsp_app_get_enabled (GspApp *app);
void gsp_app_set_enabled (GspApp *app,
=== modified file 'debian/patches/21_up_start_on_demand.patch'
--- debian/patches/21_up_start_on_demand.patch 2010-11-17 15:27:45 +0000
+++ debian/patches/21_up_start_on_demand.patch 2011-05-05 15:54:40 +0000
@@ -1,11 +1,11 @@
Description: Don't call up_client_new() until actually needed. This blocks for some time whilst UPower is started, if it wasn't running already (which is the case during auto-login). This can delay the whole session from starting.
Author: Chris Coulson <chrisccoulson@xxxxxxxxxxxxxx>
-Index: gnome-session-2.32.1/gnome-session/gsm-manager.c
+Index: gnome-session-3.0.1/gnome-session/gsm-manager.c
===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-manager.c 2010-11-17 16:23:46.927940002 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-manager.c 2010-11-17 16:23:48.487939997 +0100
-@@ -982,12 +982,20 @@
+--- gnome-session-3.0.1.orig/gnome-session/gsm-manager.c 2011-05-05 11:10:11.164633398 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-manager.c 2011-05-05 11:10:14.334714533 -0400
+@@ -1094,12 +1094,20 @@
}
static void
@@ -26,7 +26,7 @@
can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
if (can_hibernate) {
-@@ -1011,6 +1019,7 @@
+@@ -1123,6 +1131,7 @@
GError *error;
gboolean ret;
@@ -34,16 +34,16 @@
can_suspend = up_client_get_can_suspend (manager->priv->up_client);
if (can_suspend) {
-@@ -2540,7 +2549,7 @@
- G_CALLBACK (on_presence_status_changed),
- manager);
+@@ -2728,7 +2737,7 @@
+ NULL,
+ NULL, NULL);
- manager->priv->up_client = up_client_new ();
+ manager->priv->up_client = NULL;
- /* GConf setup */
- gconf_client_add_dir (manager->priv->gconf_client,
-@@ -3099,6 +3108,7 @@
+ manager->priv->shell = gsm_get_shell ();
+ }
+@@ -3332,6 +3341,7 @@
gboolean can_suspend;
gboolean can_hibernate;
=== modified file 'debian/patches/22_support_autostart_delay.patch'
--- debian/patches/22_support_autostart_delay.patch 2010-11-17 15:27:45 +0000
+++ debian/patches/22_support_autostart_delay.patch 2011-05-05 15:54:40 +0000
@@ -5,10 +5,10 @@
Author: Chris Coulson <chrisccoulson@xxxxxxxxxx>
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=608402
-Index: gnome-session-2.32.1/egg/eggdesktopfile.c
+Index: gnome-session-3.0.1/egg/eggdesktopfile.c
===================================================================
---- gnome-session-2.32.1.orig/egg/eggdesktopfile.c 2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-2.32.1/egg/eggdesktopfile.c 2010-11-17 16:23:48.827939998 +0100
+--- gnome-session-3.0.1.orig/egg/eggdesktopfile.c 2010-02-09 08:22:01.000000000 -0500
++++ gnome-session-3.0.1/egg/eggdesktopfile.c 2011-05-05 11:10:26.965037815 -0400
@@ -431,6 +431,16 @@
error);
}
@@ -26,10 +26,10 @@
char **
egg_desktop_file_get_string_list (EggDesktopFile *desktop_file,
const char *key,
-Index: gnome-session-2.32.1/egg/eggdesktopfile.h
+Index: gnome-session-3.0.1/egg/eggdesktopfile.h
===================================================================
---- gnome-session-2.32.1.orig/egg/eggdesktopfile.h 2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-2.32.1/egg/eggdesktopfile.h 2010-11-17 16:23:48.827939998 +0100
+--- gnome-session-3.0.1.orig/egg/eggdesktopfile.h 2010-02-09 08:22:01.000000000 -0500
++++ gnome-session-3.0.1/egg/eggdesktopfile.h 2011-05-05 11:10:26.965037815 -0400
@@ -127,6 +127,9 @@
double egg_desktop_file_get_numeric (EggDesktopFile *desktop_file,
const char *key,
@@ -40,19 +40,19 @@
char **egg_desktop_file_get_string_list (EggDesktopFile *desktop_file,
const char *key,
gsize *length,
-Index: gnome-session-2.32.1/gnome-session/gsm-app.c
+Index: gnome-session-3.0.1/gnome-session/gsm-app.c
===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-app.c 2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-app.c 2010-11-17 16:23:48.831939995 +0100
-@@ -246,6 +246,7 @@
- klass->impl_get_autorestart = NULL;
+--- gnome-session-3.0.1.orig/gnome-session/gsm-app.c 2011-03-22 16:31:43.000000000 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-app.c 2011-05-05 11:10:26.965037815 -0400
+@@ -252,6 +252,7 @@
klass->impl_provides = NULL;
+ klass->impl_get_provides = NULL;
klass->impl_is_running = NULL;
+ klass->impl_peek_autostart_delay = NULL;
g_object_class_install_property (object_class,
PROP_PHASE,
-@@ -442,6 +443,18 @@
+@@ -470,6 +471,18 @@
g_signal_emit (app, signals[REGISTERED], 0);
}
@@ -71,10 +71,10 @@
void
gsm_app_exited (GsmApp *app)
{
-Index: gnome-session-2.32.1/gnome-session/gsm-app.h
+Index: gnome-session-3.0.1/gnome-session/gsm-app.h
===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-app.h 2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-app.h 2010-11-17 16:23:48.831939995 +0100
+--- gnome-session-3.0.1.orig/gnome-session/gsm-app.h 2011-03-22 16:31:43.000000000 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-app.h 2011-05-05 11:10:26.965037815 -0400
@@ -65,6 +65,7 @@
GError **error);
gboolean (*impl_stop) (GsmApp *app,
@@ -82,8 +82,8 @@
+ int (*impl_peek_autostart_delay) (GsmApp *app);
gboolean (*impl_provides) (GsmApp *app,
const char *service);
- gboolean (*impl_has_autostart_condition) (GsmApp *app,
-@@ -115,6 +116,7 @@
+ char ** (*impl_get_provides) (GsmApp *app);
+@@ -118,6 +119,7 @@
gboolean gsm_app_has_autostart_condition (GsmApp *app,
const char *condition);
void gsm_app_registered (GsmApp *app);
@@ -91,11 +91,11 @@
/* exported to bus */
gboolean gsm_app_get_app_id (GsmApp *app,
-Index: gnome-session-2.32.1/gnome-session/gsm-autostart-app.c
+Index: gnome-session-3.0.1/gnome-session/gsm-autostart-app.c
===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-autostart-app.c 2010-11-17 12:17:04.000000000 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-autostart-app.c 2010-11-17 16:23:48.835939994 +0100
-@@ -60,6 +60,7 @@
+--- gnome-session-3.0.1.orig/gnome-session/gsm-autostart-app.c 2011-03-22 16:31:43.000000000 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-autostart-app.c 2011-05-05 11:10:26.965037815 -0400
+@@ -65,6 +65,7 @@
char *condition_string;
gboolean condition;
gboolean autorestart;
@@ -103,7 +103,7 @@
GFileMonitor *condition_monitor;
guint condition_notify_id;
-@@ -96,6 +97,7 @@
+@@ -102,6 +103,7 @@
app->priv->pid = -1;
app->priv->condition_monitor = NULL;
app->priv->condition = FALSE;
@@ -111,7 +111,7 @@
}
static gboolean
-@@ -452,6 +454,18 @@
+@@ -651,6 +653,18 @@
NULL);
setup_condition_monitor (app);
@@ -130,7 +130,7 @@
g_object_set (app,
"phase", phase,
"startup-id", startup_id,
-@@ -1069,6 +1083,14 @@
+@@ -1364,6 +1378,14 @@
}
}
@@ -145,7 +145,7 @@
static GObject *
gsm_autostart_app_constructor (GType type,
guint n_construct_properties,
-@@ -1109,6 +1131,7 @@
+@@ -1405,6 +1427,7 @@
app_class->impl_has_autostart_condition = gsm_autostart_app_has_autostart_condition;
app_class->impl_get_app_id = gsm_autostart_app_get_app_id;
app_class->impl_get_autorestart = gsm_autostart_app_get_autorestart;
@@ -153,11 +153,23 @@
g_object_class_install_property (object_class,
PROP_DESKTOP_FILENAME,
-Index: gnome-session-2.32.1/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-manager.c 2010-11-17 16:23:48.487939997 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-manager.c 2010-11-17 16:23:48.843940002 +0100
-@@ -326,13 +326,16 @@
+Index: gnome-session-3.0.1/gnome-session/gsm-autostart-app.h
+===================================================================
+--- gnome-session-3.0.1.orig/gnome-session/gsm-autostart-app.h 2011-03-22 16:31:43.000000000 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-autostart-app.h 2011-05-05 11:10:26.975038073 -0400
+@@ -71,6 +71,7 @@
+ #define GSM_AUTOSTART_APP_DBUS_PATH_KEY "X-GNOME-DBus-Path"
+ #define GSM_AUTOSTART_APP_DBUS_ARGS_KEY "X-GNOME-DBus-Start-Arguments"
+ #define GSM_AUTOSTART_APP_DISCARD_KEY "X-GNOME-Autostart-discard-exec"
++#define GSM_AUTOSTART_APP_DELAY_KEY "X-GNOME-Autostart-Delay"
+
+ G_END_DECLS
+
+Index: gnome-session-3.0.1/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-3.0.1.orig/gnome-session/gsm-manager.c 2011-05-05 11:10:14.334714533 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-manager.c 2011-05-05 11:10:26.975038073 -0400
+@@ -386,13 +386,16 @@
} else {
g_debug ("GsmManager: stopping app %s", gsm_app_peek_id (app));
@@ -180,7 +192,7 @@
}
}
}
-@@ -564,12 +567,37 @@
+@@ -676,10 +679,35 @@
}
static gboolean
@@ -212,19 +224,17 @@
GsmApp *app,
GsmManager *manager)
{
++ int delay;
+ if (gsm_app_peek_phase (app) != manager->priv->phase) {
+ goto out;
+ }
+@@ -759,6 +787,15 @@
+ gboolean ret;
GError *error;
- gboolean res;
-+ int delay;
-
- if (gsm_app_peek_phase (app) != manager->priv->phase) {
- goto out;
-@@ -588,6 +616,15 @@
- goto out;
- }
+ delay = gsm_app_peek_autostart_delay (app);
+ if (delay > 0) {
-+ g_timeout_add_seconds (delay,
++ g_timeout_add_seconds (delay,
+ (GSourceFunc)_autostart_delay_timeout,
+ g_object_ref (app));
+ g_debug ("GsmManager: %s is scheduled to start in %d seconds", id, delay);
@@ -232,9 +242,9 @@
+ }
+
error = NULL;
- res = gsm_app_start (app, &error);
- if (!res) {
-@@ -1416,11 +1453,12 @@
+ ret = gsm_client_end_session (client, data->flags, &error);
+ if (! ret) {
+@@ -1599,11 +1636,12 @@
return FALSE;
}
@@ -249,15 +259,3 @@
return FALSE;
}
-Index: gnome-session-2.32.1/gnome-session/gsm-autostart-app.h
-===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-autostart-app.h 2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-autostart-app.h 2010-11-17 16:23:48.843940002 +0100
-@@ -68,6 +68,7 @@
- #define GSM_AUTOSTART_APP_DBUS_PATH_KEY "X-GNOME-DBus-Path"
- #define GSM_AUTOSTART_APP_DBUS_ARGS_KEY "X-GNOME-DBus-Start-Arguments"
- #define GSM_AUTOSTART_APP_DISCARD_KEY "X-GNOME-Autostart-discard-exec"
-+#define GSM_AUTOSTART_APP_DELAY_KEY "X-GNOME-Autostart-Delay"
-
- G_END_DECLS
-
=== modified file 'debian/patches/81_restart_string_on_inhibit.patch'
--- debian/patches/81_restart_string_on_inhibit.patch 2011-02-10 16:47:35 +0000
+++ debian/patches/81_restart_string_on_inhibit.patch 2011-05-05 15:54:40 +0000
@@ -8,11 +8,11 @@
gnome-session/gsm-inhibit-dialog.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/gnome-session/gsm-inhibit-dialog.c b/gnome-session/gsm-inhibit-dialog.c
-index 7621a5b..5a71e1b 100644
---- a/gnome-session/gsm-inhibit-dialog.c
-+++ b/gnome-session/gsm-inhibit-dialog.c
-@@ -891,7 +891,7 @@ setup_dialog (GsmInhibitDialog *dialog)
+Index: gnome-session-3.0.1/gnome-session/gsm-inhibit-dialog.c
+===================================================================
+--- gnome-session-3.0.1.orig/gnome-session/gsm-inhibit-dialog.c 2011-05-05 09:05:49.236406339 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-inhibit-dialog.c 2011-05-05 09:05:55.976585800 -0400
+@@ -890,7 +890,7 @@
button_text = _("Shut Down Anyway");
break;
case GSM_LOGOUT_ACTION_REBOOT:
@@ -21,6 +21,3 @@
break;
default:
g_assert_not_reached ();
---
-1.7.1
-
=== removed file 'debian/patches/90_no_debug_flood_by_default.patch'
--- debian/patches/90_no_debug_flood_by_default.patch 2009-05-08 19:05:26 +0000
+++ debian/patches/90_no_debug_flood_by_default.patch 1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-Index: gnome-session-2.25.92/gnome-session/main.c
-===================================================================
---- gnome-session-2.25.92.orig/gnome-session/main.c 2009-03-10 17:43:12.000000000 +0100
-+++ gnome-session-2.25.92/gnome-session/main.c 2009-03-10 17:43:15.000000000 +0100
-@@ -57,7 +57,7 @@
-
- static gboolean failsafe = FALSE;
- static gboolean show_version = FALSE;
--static gboolean debug = TRUE;
-+static gboolean debug = FALSE;
-
- static void
- on_bus_name_lost (DBusGProxy *bus_proxy,
=== modified file 'debian/patches/95_dbus_request_shutdown.patch'
--- debian/patches/95_dbus_request_shutdown.patch 2010-11-17 15:27:45 +0000
+++ debian/patches/95_dbus_request_shutdown.patch 2011-05-05 15:54:40 +0000
@@ -1,11 +1,11 @@
Description: Add "RequestShutdown" and "RequestReboot" DBus methods to allow other applications to shutdown or reboot the machine via the session manager
-Author: ?
+Author: Chris Coulson <chrisccoulson@xxxxxxxxxx>
-Index: gnome-session-2.32.1/gnome-session/gsm-manager.c
+Index: gnome-session-3.0.1/gnome-session/gsm-manager.c
===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-manager.c 2010-11-17 16:23:49.851939998 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-manager.c 2010-11-17 16:23:50.203940000 +0100
-@@ -3087,6 +3087,48 @@
+--- gnome-session-3.0.1.orig/gnome-session/gsm-manager.c 2011-05-05 10:40:30.198418619 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-manager.c 2011-05-05 10:40:34.118511329 -0400
+@@ -3325,6 +3325,48 @@
}
gboolean
@@ -54,11 +54,11 @@
gsm_manager_shutdown (GsmManager *manager,
GError **error)
{
-Index: gnome-session-2.32.1/gnome-session/gsm-manager.h
+Index: gnome-session-3.0.1/gnome-session/gsm-manager.h
===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-manager.h 2010-11-17 16:23:45.999939999 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-manager.h 2010-11-17 16:23:50.203940000 +0100
-@@ -148,7 +148,10 @@
+--- gnome-session-3.0.1.orig/gnome-session/gsm-manager.h 2011-03-22 16:31:43.000000000 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-manager.h 2011-05-05 10:40:34.128511559 -0400
+@@ -160,7 +160,10 @@
guint flags,
gboolean *is_inhibited,
GError *error);
@@ -66,15 +66,15 @@
+gboolean gsm_manager_request_shutdown (GsmManager *manager,
+ GError **error);
+gboolean gsm_manager_request_reboot (GsmManager *manager,
-+ GError **error);
++ GError **error);
gboolean gsm_manager_shutdown (GsmManager *manager,
GError **error);
-Index: gnome-session-2.32.1/gnome-session/org.gnome.SessionManager.xml
+Index: gnome-session-3.0.1/gnome-session/org.gnome.SessionManager.xml
===================================================================
---- gnome-session-2.32.1.orig/gnome-session/org.gnome.SessionManager.xml 2010-11-17 16:23:46.007939999 +0100
-+++ gnome-session-2.32.1/gnome-session/org.gnome.SessionManager.xml 2010-11-17 16:23:50.203940000 +0100
-@@ -309,6 +309,23 @@
+--- gnome-session-3.0.1.orig/gnome-session/org.gnome.SessionManager.xml 2010-02-09 08:22:01.000000000 -0500
++++ gnome-session-3.0.1/gnome-session/org.gnome.SessionManager.xml 2011-05-05 10:40:34.128511559 -0400
+@@ -301,6 +301,23 @@
</doc:doc>
</method>
@@ -93,7 +93,7 @@
+ </doc:description>
+ </doc:doc>
+ </method>
-+
++
+
<!-- Signals -->
=== modified file 'debian/patches/96_no_catch_sigsegv.patch'
--- debian/patches/96_no_catch_sigsegv.patch 2010-11-17 15:27:45 +0000
+++ debian/patches/96_no_catch_sigsegv.patch 2011-05-05 15:54:40 +0000
@@ -1,12 +1,12 @@
Description: Don't register a handler for SIGSEGV. We want Apport to catch these crashes so that users can submit useful crash reports.
-Author: ?
+Author: Chris Coulson <chrisccoulson@xxxxxxxxxx>
-Index: gnome-session-2.32.1/gnome-session/gdm-signal-handler.c
+Index: gnome-session-3.0.1/gnome-session/gdm-signal-handler.c
===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gdm-signal-handler.c 2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-2.32.1/gnome-session/gdm-signal-handler.c 2010-11-17 16:23:51.279940004 +0100
+--- gnome-session-3.0.1.orig/gnome-session/gdm-signal-handler.c 2011-05-05 09:05:44.866290152 -0400
++++ gnome-session-3.0.1/gnome-session/gdm-signal-handler.c 2011-05-05 09:06:23.447320208 -0400
@@ -348,7 +348,7 @@
-
+
gdm_signal_handler_add (handler, SIGILL, NULL, NULL);
gdm_signal_handler_add (handler, SIGBUS, NULL, NULL);
- gdm_signal_handler_add (handler, SIGSEGV, NULL, NULL);
=== modified file 'debian/patches/97_fix_query_end_session_crash.patch'
--- debian/patches/97_fix_query_end_session_crash.patch 2010-11-17 15:27:45 +0000
+++ debian/patches/97_fix_query_end_session_crash.patch 2011-05-05 15:54:40 +0000
@@ -1,19 +1,23 @@
-Index: gnome-session-2.32.1/gnome-session/gsm-xsmp-client.c
+Description: Fix crash when non-responsive XSMP results in time-out
+Author: Chris Coulson <chrisccoulson@xxxxxxxxxx>
+Bug: http://pad.lv/408481
+Bug-Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=590828
+Index: gnome-session-3.0.1/gnome-session/gsm-xsmp-client.c
===================================================================
---- gnome-session-2.32.1.orig/gnome-session/gsm-xsmp-client.c 2010-11-17 16:23:46.003940001 +0100
-+++ gnome-session-2.32.1/gnome-session/gsm-xsmp-client.c 2010-11-17 16:23:52.179939995 +0100
-@@ -803,10 +803,12 @@
+--- gnome-session-3.0.1.orig/gnome-session/gsm-xsmp-client.c 2011-03-22 16:31:43.000000000 -0400
++++ gnome-session-3.0.1/gnome-session/gsm-xsmp-client.c 2011-05-05 09:04:53.474934083 -0400
+@@ -772,10 +772,12 @@
xsmp_get_app_name (GsmClient *client)
{
SmProp *prop;
- char *name;
+ char *name = NULL;
-
+
prop = find_property (GSM_XSMP_CLIENT (client), SmProgram, NULL);
- name = prop_to_command (prop);
+ if (prop) {
+ name = prop_to_command (prop);
+ }
-
+
return name;
}
=== removed file 'debian/patches/98_git_session_dialog.patch'
--- debian/patches/98_git_session_dialog.patch 2011-03-18 16:45:21 +0000
+++ debian/patches/98_git_session_dialog.patch 1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Description: capplet: Give the dialog a reasonable default height
-# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=635891
-#
-diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
-index 4432b09..8b51169 100644
---- a/capplet/gsm-properties-dialog.c
-+++ b/capplet/gsm-properties-dialog.c
-@@ -784,6 +784,7 @@ gsm_properties_dialog_init (GsmPropertiesDialog *dialog)
- "main-notebook"));
- gtk_container_add (GTK_CONTAINER (content_area), widget);
-
-+ gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 450);
- gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
- gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
- gtk_box_set_spacing (GTK_BOX (content_area), 2);
=== modified file 'debian/patches/series'
--- debian/patches/series 2011-05-04 08:56:21 +0000
+++ debian/patches/series 2011-05-05 15:54:40 +0000
@@ -7,16 +7,13 @@
#11_add_failsafe_option.patch
12_no_gdm_fallback.patch
13_no_fallback_notification.patch
-#19_gnome-wm-tweaking.patch
-#20_hide_nodisplay.patch
-#21_up_start_on_demand.patch
-#22_support_autostart_delay.patch
+20_hide_nodisplay.patch
+21_up_start_on_demand.patch
+22_support_autostart_delay.patch
#80_new_upstream_session_dialog.patch
81_restart_string_on_inhibit.patch
95_dbus_request_shutdown.patch
96_no_catch_sigsegv.patch
97_fix_query_end_session_crash.patch
-#98_git_session_dialog.patch
-100_fix_xsmp_stop_crash.patch
#101_screen_lock_on_suspend.patch
#102_fix_negative_transition_in_idletime.patch
=== modified file 'debian/po-up/de.po'
--- debian/po-up/de.po 2011-03-30 10:27:45 +0000
+++ debian/po-up/de.po 2011-05-05 15:54:40 +0000
@@ -1,42 +0,0 @@
-# German translation file for gnome-session.
-# Copyright (C) 1998-2002, 2007 Free Software Foundation, Inc.
-# Carsten Schaar <nhadcasc@xxxxxxxxxxxxxxxxxxxxxxxx>, 1998.
-# Matthias Warkus <mawa@xxxxxxxxx>, 1999-2001.
-# Karl Eichwalder <ke@xxxxxxx>, 2000, 2001.
-# Christian Meyer <chrisime@xxxxxxxxx>, 2000, 2001.
-# Benedikt Roth <Benedikt.Roth@xxxxxxx>, 2000, 2001.
-# Jörgen Scheibengruber <mfcn@xxxxxx>, 2002.
-# Christian Neumair <chris@xxxxxxxxxxxx>, 2002, 2003, 2004.
-# Hendrik Richter <hendrikr@xxxxxxxxx>, 2005, 2006, 2007.
-# Jochen Skulj <jochen@xxxxxxxxxxxxxx>, 2006.
-# Andre Klapper <ak-47@xxxxxxx>
-# Christian Kirbach <Christian.Kirbach@xxxxxxxxxxxxxx>
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-session\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 11:04+0200\n"
-"PO-Revision-Date: 2008-06-25 22:04-0600\n"
-"Last-Translator: Christian Kirbach <Christian.Kirbach@xxxxxxxxxxxxxx>\n"
-"Language-Team: German <gnome-de@xxxxxxxxx>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../patches/10_session_save.patch:114
-msgid "Your session has been saved."
-msgstr "Ihre Sitzung wurde abgespeichert."
-
-#: ../patches/10_session_save.patch:116 ../patches/10_session_save.patch:140
-msgid "Failed to save session"
-msgstr ""
-
-#: ../patches/10_session_save.patch:128
-msgid "Could not connect to the session bus"
-msgstr ""
-
-#: ../patches/10_session_save.patch:134
-msgid "Could not connect to the session manager"
-msgstr "Sitzungsmanager konnte nicht kontaktiert werden"
-
Follow ups
