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
This commit is contained in:
Vincent Untz 2009-10-12 16:05:49 +00:00 committed by Git OBS Bridge
parent 066dda6f8e
commit 52fe9d1d84
3 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,24 @@
commit dd9df169196441717498ac09ee8c437fb552116e
Author: Vincent Untz <vuntz@gnome.org>
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 ();
}
}

View File

@ -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

View File

@ -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