OBS User unknown 2008-05-16 12:21:16 +00:00 committed by Git OBS Bridge
parent ab4c4a8b64
commit f4b281f3aa
3 changed files with 67 additions and 4 deletions

View File

@ -0,0 +1,45 @@
Index: gnome-session/splash-widget.c
===================================================================
--- gnome-session/splash-widget.c (révision 4682)
+++ gnome-session/splash-widget.c (copie de travail)
@@ -437,7 +437,7 @@ get_splash_icon (SplashWidget *sw, const
pb = gtk_icon_theme_load_icon (icon_theme,
icon_no_extension,
- 48, /* icon size */
+ 22, /* icon size */
0, NULL);
g_free (icon_no_extension);
@@ -474,7 +474,7 @@ layout_icon (SplashWidget *sw, SplashIco
if (!si->scaled) {
if (gdk_pixbuf_get_width (si->unscaled) == sw->icon_size &&
gdk_pixbuf_get_height (si->unscaled) == sw->icon_size)
- si->scaled = g_object_ref (si->unscaled);
+ si->scaled = gdk_pixbuf_copy (si->unscaled);
else
si->scaled = gdk_pixbuf_scale_simple (
si->unscaled, sw->icon_size,
Index: gnome-session/splash-widget.h
===================================================================
--- gnome-session/splash-widget.h (révision 4682)
+++ gnome-session/splash-widget.h (copie de travail)
@@ -66,14 +66,14 @@ void splash_widget_add_icon (SplashWidg
#define SPLASH_BASE_HEIGHT 220
/* offset from bottom of label & font */
-#define SPLASH_LABEL_V_OFFSET 3
+#define SPLASH_LABEL_V_OFFSET 8
#define SPLASH_LABEL_FONT_SIZE 8
/* icon border, spacing, offset from bottom and initial size */
-#define SPLASH_ICON_BORDER 8
+#define SPLASH_ICON_BORDER 10
#define SPLASH_ICON_SPACING 4
-#define SPLASH_ICON_V_OFFSET 14
-#define SPLASH_BASE_ICON_SIZE 36
+#define SPLASH_ICON_V_OFFSET 20
+#define SPLASH_BASE_ICON_SIZE 22
#define SPLASH_BASE_ICON_ROWS 1
/* The global API */

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu May 15 16:35:22 CEST 2008 - olh@suse.de
- remove unneeded Recommends: -64bit on ppc (bnc#390761)
-------------------------------------------------------------------
Thu May 15 10:21:38 CEST 2008 - vuntz@suse.de
- Add gnome-session-bnc389137-splash-layout.patch to fix
bnc#389137: the layout of text & icons is not optimal with our
splash screen.
-------------------------------------------------------------------
Tue May 13 14:51:06 CEST 2008 - vuntz@suse.de

View File

@ -16,7 +16,7 @@ BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gn
License: GPL v2 or later; LGPL v2.1 or later
Group: System/GUI/GNOME
Version: 2.22.1.1
Release: 28
Release: 31
Summary: Session Tools for the GNOME 2.x Desktop
Source: %{name}-%{version}.tar.bz2
Source1: gnome
@ -52,6 +52,8 @@ Patch19: gnome-session-include-unistd.patch
Patch20: gnome-session-bnc385150-performance-hostname.patch
# PATCH-FEATURE-OPENSUSE gnome-session-gnome-wm-compiz-manager.patch vuntz@novell.com -- Launch compiz-manager when configured
Patch21: gnome-session-gnome-wm-compiz-manager.patch
# PATCH-FIX-OPENSUSE gnome-session-bnc389137-splash-layout.patch bnc389137 vuntz@novell.com -- Improve layout with our splash screen.
Patch22: gnome-session-bnc389137-splash-layout.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: control-center2
Obsoletes: gnome-core
@ -63,9 +65,6 @@ Requires: bug-buddy
%ifarch x86_64 s390x
Recommends: bug-buddy-32bit
%endif
%ifarch ppc
Recommends: bug-buddy-64bit
%endif
%gconf_schemas_prereq
%description
@ -125,6 +124,7 @@ gnome-patch-translation-prepare
%patch19 -p0
%patch20 -p1
%patch21 -p1
%patch22
gnome-patch-translation-update
%build
@ -179,6 +179,12 @@ rm -rf $RPM_BUILD_ROOT
%files lang -f %{name}-2.0.lang
%changelog
* Thu May 15 2008 olh@suse.de
- remove unneeded Recommends: -64bit on ppc (bnc#390761)
* Thu May 15 2008 vuntz@suse.de
- Add gnome-session-bnc389137-splash-layout.patch to fix
bnc#389137: the layout of text & icons is not optimal with our
splash screen.
* Tue May 13 2008 vuntz@suse.de
- Rewrite the logic in gnome-session-wm-switch.patch so that it
correctly handles compiz (because of compiz-manager).