rpm/lxsession
SHA256
1
0
Fork 0
forked from pool/lxsession
Code Pull Requests Activity

Accepting request 34468 from X11:lxde

Browse Source 
Copy from X11:lxde/lxsession based on submit request 34468 from user anubisg1

OBS-URL: https://build.opensuse.org/request/show/34468
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxsession?expand=0&rev=2
This commit is contained in:
OBS User autobuild 2010-03-11 00:46:51 +00:00 committed by Git OBS Bridge
parent b477dc7778
commit fc0f42b9d9
6 changed files with 114 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lxsession-0.4.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81ce404e457ac43f82946a421963d5632716df2da1cd80e54a7eab36f3270815
size 202071

65
lxsession-0.4.2-fix-buttons-position.patch Normal file
View File

@ -0,0 +1,65 @@
diff -uNr old-lxsession-0.4.2//lxsession-logout/lxsession-logout.c lxsession-0.4.2/lxsession-logout/lxsession-logout.c
--- old-lxsession-0.4.2//lxsession-logout/lxsession-logout.c 2010-03-10 07:41:10.972412403 +0100
+++ lxsession-0.4.2/lxsession-logout/lxsession-logout.c 2010-03-10 07:45:45.528412788 +0100
@@ -405,6 +405,8 @@
GtkWidget * logout_button = gtk_button_new_with_mnemonic(_("_Logout"));
GtkWidget * image = gtk_image_new_from_icon_name("system-log-out", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(logout_button), image);
+ /* align it to left 0.0 as X and 0.0 as Y */
+ gtk_button_set_alignment(GTK_BUTTON(logout_button), 0.0 ,0.0);
g_signal_connect(G_OBJECT(logout_button), "clicked", G_CALLBACK(logout_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), logout_button, FALSE, FALSE, 4);
@@ -414,6 +416,8 @@
GtkWidget * shutdown_button = gtk_button_new_with_mnemonic(_("Sh_utdown"));
GtkWidget * image = gtk_image_new_from_icon_name("system-shutdown", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(shutdown_button), image);
+ /* align it to left 0.0 as X and 0.0 as Y */
+ gtk_button_set_alignment(GTK_BUTTON(shutdown_button), 0.0 ,0.0);
g_signal_connect(G_OBJECT(shutdown_button), "clicked", G_CALLBACK(shutdown_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), shutdown_button, FALSE, FALSE, 4);
}
@@ -424,6 +428,8 @@
GtkWidget * reboot_button = gtk_button_new_with_mnemonic(_("_Reboot"));
GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-reboot", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(reboot_button), image);
+ /* align it to left 0.0 as X and 0.0 as Y */
+ gtk_button_set_alignment(GTK_BUTTON(reboot_button), 0.0 ,0.0);
g_signal_connect(G_OBJECT(reboot_button), "clicked", G_CALLBACK(reboot_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), reboot_button, FALSE, FALSE, 4);
}
@@ -434,6 +440,8 @@
GtkWidget * suspend_button = gtk_button_new_with_mnemonic(_("_Suspend"));
GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-suspend", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(suspend_button), image);
+ /* align it to left 0.0 as X and 0.0 as Y */
+ gtk_button_set_alignment(GTK_BUTTON(suspend_button), 0.0 ,0.0);
g_signal_connect(G_OBJECT(suspend_button), "clicked", G_CALLBACK(suspend_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), suspend_button, FALSE, FALSE, 4);
}
@@ -444,6 +452,8 @@
GtkWidget * hibernate_button = gtk_button_new_with_mnemonic(_("_Hibernate"));
GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-hibernate", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(hibernate_button), image);
+ /* align it to left 0.0 as X and 0.0 as Y */
+ gtk_button_set_alignment(GTK_BUTTON(hibernate_button), 0.0 ,0.0);
g_signal_connect(G_OBJECT(hibernate_button), "clicked", G_CALLBACK(hibernate_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), hibernate_button, FALSE, FALSE, 4);
}
@@ -454,12 +464,16 @@
GtkWidget * switch_user_button = gtk_button_new_with_mnemonic(_("S_witch User"));
GtkWidget * image = gtk_image_new_from_icon_name("gnome-session-switch", GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(switch_user_button), image);
+ /* align it to left 0.0 as X and 0.0 as Y */
+ gtk_button_set_alignment(GTK_BUTTON(switch_user_button), 0.0 ,0.0);
g_signal_connect(G_OBJECT(switch_user_button), "clicked", G_CALLBACK(switch_user_clicked), &handler_context);
gtk_box_pack_start(GTK_BOX(controls), switch_user_button, FALSE, FALSE, 4);
}
/* Create the Cancel button. */
GtkWidget * cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+ /* align it to left 0.0 as X and 0.0 as Y */
+ gtk_button_set_alignment(GTK_BUTTON(cancel_button), 0.0 ,0.0);
g_signal_connect(G_OBJECT(cancel_button), "clicked", G_CALLBACK(cancel_clicked), NULL);
gtk_box_pack_start(GTK_BOX(controls), cancel_button, FALSE, FALSE, 4);

22
lxsession-0.4.2-implicit-fortify-decl.patch Normal file
View File

@ -0,0 +1,22 @@
diff -uNr old-lxsession-0.4.2//lxsession-logout/dbus-interface.c lxsession-0.4.2/lxsession-logout/dbus-interface.c
--- old-lxsession-0.4.2//lxsession-logout/dbus-interface.c 2010-02-22 13:08:17.000000000 +0100
+++ lxsession-0.4.2/lxsession-logout/dbus-interface.c 2010-03-08 12:25:31.314311904 +0100
@@ -18,6 +18,7 @@
#include <config.h>
#include <glib.h>
+#include <string.h>
#ifdef HAVE_DBUS
#include <dbus/dbus.h>
#endif
diff -uNr old-lxsession-0.4.2//lxsession-logout/lxsession-logout.c lxsession-0.4.2/lxsession-logout/lxsession-logout.c
--- old-lxsession-0.4.2//lxsession-logout/lxsession-logout.c 2010-02-21 19:19:21.000000000 +0100
+++ lxsession-0.4.2/lxsession-logout/lxsession-logout.c 2010-03-08 12:28:24.899311986 +0100
@@ -17,6 +17,7 @@
*/
#include <config.h>
+#include <stdlib.h>
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <glib/gi18n.h>

3
lxsession-0.4.2.tar.bz2 Normal file
View File

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

16
lxsession.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Mon Mar 8 11:31:58 UTC 2010 - andrea@opensuse.org
- new upstream version 0.4.2
* Fix incorrect configure message for missing dbus
* Major rewrite of lxsession-logout
- Convert to using only one toplevel window to solve Compiz
drawing over the controls
- Add support for shutdown/reboot via ConsoleKit
- Query HAL for capabilities rather than assuming they are
present if HAL is
- Latent (untested) support for suspend/hibernate via
DeviceKit/Power
- Remove GDM communication mechanism that was discontinued
in GDM 2.22
-------------------------------------------------------------------
Fri Dec 11 00:43:02 UTC 2009 - andrea@opensuse.org

12
lxsession.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package lxsession (Version 0.4.1)
# spec file for package lxsession (Version 0.4.2)
#
# 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
@ -19,13 +19,15 @@
Name: lxsession
Version: 0.4.1
Version: 0.4.2
Release: 1
Summary: LXDE Session Manager, required for running the desktop environment
Group: System/GUI/Other
License: GPL
Url: http://www.lxde.org/
Source: %{name}-%{version}.tar.bz2
Source0: %{name}-%{version}.tar.bz2
Patch0: %name-0.4.2-implicit-fortify-decl.patch
Patch1: %name-0.4.2-fix-buttons-position.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-glib-devel fdupes gtk2-devel intltool pkg-config
BuildRequires: docbook-utils docbook-xsl-stylesheets hal-devel libxslt
@ -42,6 +44,7 @@ Authors:
%prep
%setup -q -n %name-%version
%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@ -51,6 +54,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
%install
%makeinstall
%__rm -rf %buildroot/%_datadir/locale/frp
%find_lang %{name}
%fdupes -s %buildroot