Updating link to change in openSUSE:Factory/gnome-session revision 87.0

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=23a63570602f54d8af398b89040df257
This commit is contained in:
OBS User buildservice-autocommit 2010-02-11 19:31:59 +00:00 committed by Git OBS Bridge
parent 6ddac8fbb0
commit 16aec9ab3c
6 changed files with 35 additions and 42 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83e89a04fb090f1a1f6b609bdc39f1e69390269b885b7da6b32e980f4e765c0c
size 822009

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:181b47360f2b2e16e233bcc250d079b845c4a2656298309fea284a05be6438f3
size 827510

View File

@ -542,7 +542,7 @@ Index: gnome-session/gsm-logout-dialog.c
if (current_dialog != NULL) {
gtk_widget_destroy (GTK_WIDGET (current_dialog));
@@ -367,84 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type
@@ -367,83 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type
current_dialog = logout_dialog;
@ -690,8 +690,7 @@ Index: gnome-session/gsm-logout-dialog.c
+
gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name);
- gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS);
- gtk_label_set_text (GTK_LABEL (GTK_MESSAGE_DIALOG (logout_dialog)->label),
- primary_text);
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text);
+ gtk_window_set_title (GTK_WINDOW (logout_dialog), title);
+ gtk_window_set_position (GTK_WINDOW (logout_dialog),
+ GTK_WIN_POS_CENTER_ALWAYS);

View File

@ -1,24 +0,0 @@
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,21 @@
-------------------------------------------------------------------
Wed Jan 27 17:16:25 CET 2010 - vuntz@opensuse.org
- Update to version 2.29.6:
+ Session Manager:
- Fix typo in error message
- Add diagnostic output for exit phase timeout
- GSeal: Use accessor functions instead of direct access
- Check that the XSMP connection exists when stopping a client
to fix potential crash on exit
+ Capplet:
- Destroy the main window on close to ensure changes are saved
+ Misc:
- Install the helpers in libexecdir, not libdir
- Rebase gnome-session-bgo507101-tile-ui.patch.
- Drop gnome-session-fix-capplet-saving.patch: fixed upstream.
- Remove en@shaw translation on openSUSE 11.2 and earlier.
-------------------------------------------------------------------
Fri Dec 4 22:39:33 CET 2009 - vuntz@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package gnome-session (Version 2.28.0)
# spec file for package gnome-session (Version 2.29.6)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,8 +18,8 @@
Name: gnome-session
Version: 2.28.0
Release: 3
Version: 2.29.6
Release: 1
License: GPLv2+
Summary: Session Tools for the GNOME 2.x Desktop
Url: http://www.gnome.org
@ -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: gconf-sanity-check
@ -106,7 +104,6 @@ gnome-patch-translation-prepare
#%patch2 -p1
%patch3 -p0
%patch4 -p1
%patch5 -p1
gnome-patch-translation-update
%build
@ -122,6 +119,9 @@ NOCONFIGURE=1 gnome-autogen.sh
%{__rm} %{buildroot}%{_datadir}/locale/ha/LC_MESSAGES/*
%{__rm} %{buildroot}%{_datadir}/locale/ig/LC_MESSAGES/*
%endif
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
# install startup script and xsession file
install -d -m755 %{buildroot}%{_bindir}
install -m755 %SOURCE1 %{buildroot}%{_bindir}/gnome
@ -150,25 +150,25 @@ rm -rf %{buildroot}
%defattr (-, root, root)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/*
%{_libdir}/gnome-session
%{_libexecdir}/gnome-session
%{_datadir}/gnome-session
%{_datadir}/applications/*.desktop
%{_datadir}/xsessions/*.desktop
%{_datadir}/icons/hicolor/*/*/*.*
%doc %{_mandir}/man?/*.*
# Exclude files shipped in other subpackages
%exclude %{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper
%exclude %{_libdir}/gnome-session/helpers/gnome-session-splash
%exclude %{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper
%exclude %{_libexecdir}/gnome-session/helpers/gnome-session-splash
%files gtk1-support
%defattr (-, root, root)
%{_sysconfdir}/xdg/autostart/gnome-settings-daemon-helper.desktop
%{_libdir}/gnome-session/helpers/gnome-settings-daemon-helper
%{_libexecdir}/gnome-session/helpers/gnome-settings-daemon-helper
%files splash
%defattr (-, root, root)
%{_sysconfdir}/xdg/autostart/gnome-session-splash.desktop
%{_libdir}/gnome-session/helpers/gnome-session-splash
%{_libexecdir}/gnome-session/helpers/gnome-session-splash
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash.png