Accepting request 37037 from X11:lxde

checked in (request 37037)

OBS-URL: https://build.opensuse.org/request/show/37037
OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxsession?expand=0&rev=25
This commit is contained in:
OBS User autobuild 2010-04-06 21:04:15 +00:00 committed by Git OBS Bridge
parent e699a121d6
commit f2fab4090a
5 changed files with 78 additions and 16 deletions

View File

@ -0,0 +1,70 @@
diff -uNr old-lxsession-0.4.3/lxsession-logout/lxsession-logout.c lxsession-0.4.3//lxsession-logout/lxsession-logout.c
--- old-lxsession-0.4.3/lxsession-logout/lxsession-logout.c 2010-03-18 17:21:34.000000000 +0100
+++ lxsession-0.4.3//lxsession-logout/lxsession-logout.c 2010-03-18 22:41:18.875553519 +0100
@@ -395,6 +395,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);
}
@@ -404,8 +406,10 @@
{
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);
- g_signal_connect(G_OBJECT(reboot_button), "clicked", G_CALLBACK(reboot_clicked), &handler_context);
+ 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);
}
@@ -415,7 +419,9 @@
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);
- g_signal_connect(G_OBJECT(suspend_button), "clicked", G_CALLBACK(suspend_clicked), &handler_context);
+ /* 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);
}
@@ -425,6 +431,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);
}
@@ -435,6 +443,8 @@
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);
}
@@ -443,11 +453,15 @@
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);
/* 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);

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

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

View File

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

View File

@ -1,13 +1,3 @@
-------------------------------------------------------------------
Mon Apr 5 19:00:33 UTC 2010 - andrea@opensuse.org
- new upstream version 0.4.4
- bug fixes
- added LTSP (Linux Terminal Server Project) support
- removed un-used gdm source code
- removed lxsession-0.4.3-fix-buttons-position.patch
because has been merged upstream
-------------------------------------------------------------------
Thu Mar 18 21:42:38 UTC 2010 - andrea@opensuse.org

View File

@ -1,5 +1,5 @@
#
# spec file for package lxsession (Version 0.4.4)
# spec file for package lxsession (Version 0.4.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,13 +19,14 @@
Name: lxsession
Version: 0.4.4
Version: 0.4.3
Release: 1
Summary: LXDE Session Manager, required for running the desktop environment
Group: System/GUI/Other
License: GPL
Url: http://www.lxde.org/
Source0: %{name}-%{version}.tar.bz2
Patch0: %name-0.4.3-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 +43,7 @@ Authors:
%prep
%setup -q -n %name-%version
%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@ -51,7 +53,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
%install
%makeinstall
%__rm -rf %buildroot/%_datadir/locale/{frp,es_VE,ur_PK}
%__rm -rf %buildroot/%_datadir/locale/frp
%find_lang %{name}
%fdupes -s %buildroot