rpm/xfce4-session
SHA256
1
0
Fork 0
forked from pool/xfce4-session
Code Pull Requests Activity

Accepting request 60007 from X11:xfce

Browse Source 
Accepted submit request 60007 from user gberh

OBS-URL: https://build.opensuse.org/request/show/60007
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfce4-session?expand=0&rev=31
This commit is contained in:
Marcus Rückert 2011-02-04 17:26:55 +00:00 committed by Git OBS Bridge
commit 400a8f6ec9
6 changed files with 186 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch Normal file
View File

@ -0,0 +1,60 @@
From fd459002e75fc86b4284b1bf806719c1eb290025 Mon Sep 17 00:00:00 2001
From: Lionel Le Folgoc <mrpouit@gmail.com>
Date: Mon, 31 Jan 2011 18:23:26 +0000
Subject: Don't fallback to "system" icon in the logout dialog (bug #7196).
GTK_ICON_LOOKUP_GENERIC_FALLBACK caused gtk+ to look for "system" if
"system-*" was not found and "system" exists in most icon themes so the
"xfsm-*" fallback icons were never used.
---
diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c
index 6a97ef5..19fdfde 100644
--- a/xfce4-session/shutdown.c
+++ b/xfce4-session/shutdown.c
@@ -405,7 +405,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
icon = gtk_icon_theme_load_icon (icon_theme,
"system-log-out",
32,
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ 0,
NULL);
if (!icon)
icon = gtk_icon_theme_load_icon (icon_theme,
@@ -439,7 +439,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
icon = gtk_icon_theme_load_icon (icon_theme,
"system-reboot",
32,
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ 0,
NULL);
if (!icon)
@@ -481,7 +481,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
icon = gtk_icon_theme_load_icon (icon_theme,
"system-shutdown",
32,
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ 0,
NULL);
if (!icon)
@@ -543,7 +543,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
icon = gtk_icon_theme_load_icon (icon_theme,
"system-suspend",
32,
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ 0,
NULL);
if (!icon)
@@ -581,7 +581,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
icon = gtk_icon_theme_load_icon (icon_theme,
"system-hibernate",
32,
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
+ 0,
NULL);
if (!icon)
--
cgit v0.8.3.4

21
xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch Normal file
View File

@ -0,0 +1,21 @@
From 09b7748d189468bebd5b48950b9d6ee4cac0f93d Mon Sep 17 00:00:00 2001
From: Lionel Le Folgoc <mrpouit@gmail.com>
Date: Wed, 02 Feb 2011 16:28:01 +0000
Subject: Fix error pop up when clicking session menu item (bug #7123).
---
diff --git a/panel-plugin/xfsm-logout-plugin.c b/panel-plugin/xfsm-logout-plugin.c
index fe01709..5259684 100644
--- a/panel-plugin/xfsm-logout-plugin.c
+++ b/panel-plugin/xfsm-logout-plugin.c
@@ -174,7 +174,7 @@ xfsm_logout_plugin_do_dbus_call(XfsmLogoutPlugin *logout_plugin,
ret = dbus_g_proxy_call(proxy, "Shutdown", error,
G_TYPE_UINT, type,
G_TYPE_BOOLEAN, logout_plugin->allow_save,
- G_TYPE_INVALID);
+ G_TYPE_INVALID, G_TYPE_INVALID);
g_object_unref(G_OBJECT(proxy));
return ret;
--
cgit v0.8.3.4

35
xfce4-session-4.8.0-fix-fast-cli-option.patch Normal file
View File

@ -0,0 +1,35 @@
From 72f2c158740201b51365bdbb1965e28446e8c4af Mon Sep 17 00:00:00 2001
From: Krzysiek <krzysiek.bmkx@gmail.com>
Date: Wed, 02 Feb 2011 16:33:21 +0000
Subject: Fix --fast CLI option when used with another option (bug #7197).
---
diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c
index d322995..2ea18f1 100644
--- a/xfce4-session-logout/main.c
+++ b/xfce4-session-logout/main.c
@@ -154,10 +154,6 @@ main (int argc, char **argv)
{
shutdown_type = XFSM_SHUTDOWN_HIBERNATE;
}
- else if (opt_fast)
- {
- allow_save = FALSE;
- }
else if (opt_version)
{
printf ("%s (Xfce %s)\n\n"
@@ -170,6 +166,11 @@ main (int argc, char **argv)
return EXIT_SUCCESS;
}
+ if (opt_fast)
+ {
+ allow_save = FALSE;
+ }
+
dbus_error_init (&derror);
dbus_conn = dbus_bus_get (DBUS_BUS_SESSION, &derror);
if (G_UNLIKELY (dbus_conn == NULL))
--
cgit v0.8.3.4

27
xfce4-session-simple-splash-remove-shadows.patch Normal file
View File

@ -0,0 +1,27 @@
diff -urNp xfce4-session-4.8.0.orig/engines/simple/simple.c xfce4-session-4.8.0/engines/simple/simple.c
--- xfce4-session-4.8.0.orig/engines/simple/simple.c 2011-01-16 17:38:20.000000000 +0100
+++ xfce4-session-4.8.0/engines/simple/simple.c 2011-02-02 18:44:31.000000000 +0100
@@ -213,7 +213,6 @@ static void
simple_next (XfsmSplashEngine *engine, const gchar *text)
{
Simple *simple = (Simple *) engine->user_data;
- GdkColor shcolor;
gint tw, th, tx, ty;
pango_layout_set_text (simple->layout, text, -1);
@@ -231,15 +230,6 @@ simple_next (XfsmSplashEngine *engine, c
gdk_gc_set_clip_rectangle (simple->gc, &simple->textbox);
- /* draw shadow */
- shcolor.red = (simple->fgcolor.red + simple->bgcolor.red) / 2;
- shcolor.green = (simple->fgcolor.green + simple->bgcolor.green) / 2;
- shcolor.blue = (simple->fgcolor.blue + simple->bgcolor.blue) / 2;
- shcolor.red = (shcolor.red + shcolor.green + shcolor.blue) / 3;
- shcolor.green = shcolor.red;
- shcolor.blue = shcolor.red;
-
- gdk_gc_set_rgb_fg_color (simple->gc, &shcolor);
gdk_draw_layout (simple->pixmap, simple->gc,
tx + 2, ty + 2, simple->layout);

20
xfce4-session.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Feb 3 19:00:53 UTC 2011 - gber@opensuse.org
- added xfce4-session-4.8.0-fix-fast-cli-option.patch which fixes
the use of the --fast cli option with other options
- added
xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch
which fixes the error popup when clicking a session menu item
- added xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch
in order to prevent visual inconsistencies in the logout dialog
-------------------------------------------------------------------
Wed Feb 2 17:45:56 UTC 2011 - gber@opensuse.org
- added xfce4-session-simple-splash-remove-shadows.patch which
improves readability of the simple splash engine text by removing
the text shadows
- enabled support for GNOME keyring and assistive technologies
- generate documentation
-------------------------------------------------------------------
Mon Jan 17 12:28:31 UTC 2011 - gber@opensuse.org

24
xfce4-session.spec
View File

@ -26,16 +26,31 @@ Url: http://www.xfce.org/projects/xfce4-session/
Group: System/GUI/XFCE
Source: %{name}-%{version}.tar.bz2
Patch0: xfce4-session-4.7.1-fix-missing-include.patch
# PATCH-FEATURE-OPENSUSE xfce4-session-simple-splash-remove-shadows.patch gber@opensuse.org -- Improves readability of the simple splash engine text by removing the text shadows
Patch1: xfce4-session-simple-splash-remove-shadows.patch
# PATCH-FIX-UPSTREAM xfce4-session-4.8.0-fix-fast-cli-option.patch gber@opensuse.org -- Fixes the use of the --fast cli option with other options (backported from upstream git)
Patch2: xfce4-session-4.8.0-fix-fast-cli-option.patch
# PATCH-FIX-UPSTREAM xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch gber@opensuse.org -- Fixes the error popup when clicking a session menu item (backported from upstream git)
Patch3: xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch
# PATCH-FIX-UPSTREAM xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch gber@opensuse.org -- Prevents the logout dialog from falling back to system-* rather than xfsm-* icons (backported from upstream git)
Patch4: xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch
BuildRequires: intltool
BuildRequires: perl-XML-Parser
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(libwnck-1.0)
BuildRequires: pkgconfig(libxfce4ui-1)
BuildRequires: pkgconfig(libxfce4util-1.0)
BuildRequires: pkgconfig(libxfce4panel-1.0)
BuildRequires: pkgconfig(libxfcegui4-1.0)
BuildRequires: pkgconfig(libxfconf-0)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: update-desktop-files
BuildRequires: xorg-x11
BuildRequires: libxslt
BuildRequires: xml2po
BuildRequires: docbook_4
BuildRequires: docbook-xsl-stylesheets
Requires: %{name}-branding >= %{version}
Requires: xfce-utils
Recommends: fortune
@ -79,12 +94,19 @@ This package provides the upstream look and feel for the Xfce Session Manager.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%configure \
--docdir=%{_defaultdocdir}/%{name} \
--disable-static \
--enable-session-screenshots
--enable-session-screenshots \
--enable-gnome \
--enable-libgnome-keyring \
--enable-gen-doc
make %{?_smp_mflags} V=1
%install