From 52fe9d1d845ac984f26cfd3fa5abcca7e7a0a499ec19f9b54a21ec09cc7291a5 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 12 Oct 2009 16:05:49 +0000 Subject: [PATCH 1/3] Accepting request 22292 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-session via accept of submit request 22292 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/22292 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=72 --- gnome-session-fix-capplet-saving.patch | 24 ++++++++++++++++++++++++ gnome-session.changes | 7 +++++++ gnome-session.spec | 3 +++ 3 files changed, 34 insertions(+) create mode 100644 gnome-session-fix-capplet-saving.patch diff --git a/gnome-session-fix-capplet-saving.patch b/gnome-session-fix-capplet-saving.patch new file mode 100644 index 0000000..ae1bbff --- /dev/null +++ b/gnome-session-fix-capplet-saving.patch @@ -0,0 +1,24 @@ +commit dd9df169196441717498ac09ee8c437fb552116e +Author: Vincent Untz +Date: Sun Oct 11 16:32:53 2009 -0400 + + [capplet] Destroy the main window on close to ensure changes are saved + + For some reasons, sometimes it works, and sometimes it doesn't. By + destroying the window, we make sure all objects are disposed and the + changes are saved. + + https://bugzilla.gnome.org/show_bug.cgi?id=597623 + +diff --git a/capplet/main.c b/capplet/main.c +index c8829a0..861e36a 100644 +--- a/capplet/main.c ++++ b/capplet/main.c +@@ -70,6 +70,7 @@ dialog_response (GsmPropertiesDialog *dialog, + gtk_widget_destroy (d); + } + } else { ++ gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_main_quit (); + } + } diff --git a/gnome-session.changes b/gnome-session.changes index 6e9d3c2..abdd29f 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 12 11:56:35 EDT 2009 - vuntz@opensuse.org + +- Add gnome-session-fix-capplet-saving.patch taken from upstream, + to fix saving the autostart changes when quickly quitting the + capplet after doing a change. + ------------------------------------------------------------------- Fri Oct 2 12:13:42 CEST 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index 2e64851..66df5a3 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -39,6 +39,8 @@ Patch2: gnome-session-wm-switch.patch Patch3: gnome-session-bgo507101-tile-ui.patch # PATCH-FEATURE-OPENSUSE gnome-session-enable-disable-compiz.patch vuntz@novell.com -- Integration with enable-compiz/disable-compiz files generated by ccsm Patch4: gnome-session-enable-disable-compiz.patch +# PATCH-FIX-UPSTREAM gnome-session-fix-capplet-saving.patch vuntz@opensuse.org -- Fix from upstream +Patch5: gnome-session-fix-capplet-saving.patch BuildRequires: DeviceKit-power-devel BuildRequires: fdupes BuildRequires: gconf2-devel @@ -81,6 +83,7 @@ gnome-patch-translation-prepare #%patch2 -p1 %patch3 -p0 %patch4 -p1 +%patch5 -p1 gnome-patch-translation-update %build From 37198bd29e593454625f70c03845ee37665bf19a0c5a4ec925ab7f6c1e090c49 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 12 Oct 2009 18:53:50 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=73 --- gnome-session-fix-capplet-saving.patch | 24 ------------------------ gnome-session.changes | 7 ------- gnome-session.spec | 3 --- 3 files changed, 34 deletions(-) delete mode 100644 gnome-session-fix-capplet-saving.patch diff --git a/gnome-session-fix-capplet-saving.patch b/gnome-session-fix-capplet-saving.patch deleted file mode 100644 index ae1bbff..0000000 --- a/gnome-session-fix-capplet-saving.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit dd9df169196441717498ac09ee8c437fb552116e -Author: Vincent Untz -Date: Sun Oct 11 16:32:53 2009 -0400 - - [capplet] Destroy the main window on close to ensure changes are saved - - For some reasons, sometimes it works, and sometimes it doesn't. By - destroying the window, we make sure all objects are disposed and the - changes are saved. - - https://bugzilla.gnome.org/show_bug.cgi?id=597623 - -diff --git a/capplet/main.c b/capplet/main.c -index c8829a0..861e36a 100644 ---- a/capplet/main.c -+++ b/capplet/main.c -@@ -70,6 +70,7 @@ dialog_response (GsmPropertiesDialog *dialog, - gtk_widget_destroy (d); - } - } else { -+ gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_main_quit (); - } - } diff --git a/gnome-session.changes b/gnome-session.changes index abdd29f..6e9d3c2 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Mon Oct 12 11:56:35 EDT 2009 - vuntz@opensuse.org - -- Add gnome-session-fix-capplet-saving.patch taken from upstream, - to fix saving the autostart changes when quickly quitting the - capplet after doing a change. - ------------------------------------------------------------------- Fri Oct 2 12:13:42 CEST 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index 66df5a3..2e64851 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -39,8 +39,6 @@ Patch2: gnome-session-wm-switch.patch Patch3: gnome-session-bgo507101-tile-ui.patch # PATCH-FEATURE-OPENSUSE gnome-session-enable-disable-compiz.patch vuntz@novell.com -- Integration with enable-compiz/disable-compiz files generated by ccsm Patch4: gnome-session-enable-disable-compiz.patch -# PATCH-FIX-UPSTREAM gnome-session-fix-capplet-saving.patch vuntz@opensuse.org -- Fix from upstream -Patch5: gnome-session-fix-capplet-saving.patch BuildRequires: DeviceKit-power-devel BuildRequires: fdupes BuildRequires: gconf2-devel @@ -83,7 +81,6 @@ gnome-patch-translation-prepare #%patch2 -p1 %patch3 -p0 %patch4 -p1 -%patch5 -p1 gnome-patch-translation-update %build From dba050c2c7f374fa3a0c87921dc25ca2dd3bd2b88e68648f5da76c76102c2e0f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 12 Oct 2009 18:53:51 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/gnome-session revision 84.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=bbfbe884fc88ac6e0cead0338ee071c4 --- gnome-session-fix-capplet-saving.patch | 24 ++++++++++++++++++++++++ gnome-session.changes | 7 +++++++ gnome-session.spec | 5 ++++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 gnome-session-fix-capplet-saving.patch diff --git a/gnome-session-fix-capplet-saving.patch b/gnome-session-fix-capplet-saving.patch new file mode 100644 index 0000000..ae1bbff --- /dev/null +++ b/gnome-session-fix-capplet-saving.patch @@ -0,0 +1,24 @@ +commit dd9df169196441717498ac09ee8c437fb552116e +Author: Vincent Untz +Date: Sun Oct 11 16:32:53 2009 -0400 + + [capplet] Destroy the main window on close to ensure changes are saved + + For some reasons, sometimes it works, and sometimes it doesn't. By + destroying the window, we make sure all objects are disposed and the + changes are saved. + + https://bugzilla.gnome.org/show_bug.cgi?id=597623 + +diff --git a/capplet/main.c b/capplet/main.c +index c8829a0..861e36a 100644 +--- a/capplet/main.c ++++ b/capplet/main.c +@@ -70,6 +70,7 @@ dialog_response (GsmPropertiesDialog *dialog, + gtk_widget_destroy (d); + } + } else { ++ gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_main_quit (); + } + } diff --git a/gnome-session.changes b/gnome-session.changes index 6e9d3c2..abdd29f 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 12 11:56:35 EDT 2009 - vuntz@opensuse.org + +- Add gnome-session-fix-capplet-saving.patch taken from upstream, + to fix saving the autostart changes when quickly quitting the + capplet after doing a change. + ------------------------------------------------------------------- Fri Oct 2 12:13:42 CEST 2009 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index 2e64851..898425d 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -19,7 +19,7 @@ Name: gnome-session Version: 2.28.0 -Release: 1 +Release: 2 License: GPL v2 or later ; LGPL v2.1 or later Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org @@ -39,6 +39,8 @@ Patch2: gnome-session-wm-switch.patch Patch3: gnome-session-bgo507101-tile-ui.patch # PATCH-FEATURE-OPENSUSE gnome-session-enable-disable-compiz.patch vuntz@novell.com -- Integration with enable-compiz/disable-compiz files generated by ccsm Patch4: gnome-session-enable-disable-compiz.patch +# PATCH-FIX-UPSTREAM gnome-session-fix-capplet-saving.patch vuntz@opensuse.org -- Fix from upstream +Patch5: gnome-session-fix-capplet-saving.patch BuildRequires: DeviceKit-power-devel BuildRequires: fdupes BuildRequires: gconf2-devel @@ -81,6 +83,7 @@ gnome-patch-translation-prepare #%patch2 -p1 %patch3 -p0 %patch4 -p1 +%patch5 -p1 gnome-patch-translation-update %build