pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 50709 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/gnome-session based on submit request 50709 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/50709
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=98
This commit is contained in:
OBS User autobuild 2010-10-15 14:45:44 +00:00 committed by Git OBS Bridge
commit 70db18fe5a
5 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-session-2.31.6.tar.bz2
View File

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

3
gnome-session-2.32.0.tar.bz2 Normal file
View File

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

48
gnome-session-bgo507101-tile-ui.patch
View File

@ -2,7 +2,7 @@ Index: gnome-session/gsm-manager.c
=================================================================== ===================================================================
--- gnome-session/gsm-manager.c.orig --- gnome-session/gsm-manager.c.orig
+++ gnome-session/gsm-manager.c +++ gnome-session/gsm-manager.c
@@ -2748,7 +2748,8 @@ logout_dialog_response (GsmLogoutDialog @@ -2804,7 +2804,8 @@ logout_dialog_response (GsmLogoutDialog
{ {
g_debug ("GsmManager: Logout dialog response: %d", response_id); g_debug ("GsmManager: Logout dialog response: %d", response_id);
@ -12,7 +12,7 @@ Index: gnome-session/gsm-manager.c
/* In case of dialog cancel, switch user, hibernate and /* In case of dialog cancel, switch user, hibernate and
* suspend, we just perform the respective action and return, * suspend, we just perform the respective action and return,
@@ -2758,6 +2759,10 @@ logout_dialog_response (GsmLogoutDialog @@ -2814,6 +2815,10 @@ logout_dialog_response (GsmLogoutDialog
case GTK_RESPONSE_NONE: case GTK_RESPONSE_NONE:
case GTK_RESPONSE_DELETE_EVENT: case GTK_RESPONSE_DELETE_EVENT:
break; break;
@ -137,14 +137,17 @@ Index: gnome-session/Makefile.am
=================================================================== ===================================================================
--- gnome-session/Makefile.am.orig --- gnome-session/Makefile.am.orig
+++ gnome-session/Makefile.am +++ gnome-session/Makefile.am
@@ -22,6 +22,7 @@ INCLUDES = \ @@ -84,6 +84,10 @@ libgsmutil_la_SOURCES = \
-DDATA_DIR=\""$(datadir)/gnome-session"\" \ gsm-util.c \
-DDBUS_LAUNCH=\"dbus-launch\" \ gsm-util.h
-DLIBEXECDIR=\"$(libexecdir)\" \
+ -DDATADIR=\""$(datadir)"\" \ +libgsmutil_la_CPPFLAGS = \
-DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ + $(AM_CPPFLAGS) \
-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ + -DDATADIR=\""$(datadir)"\"
-DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \ +
libgsmutil_la_LIBADD = \
$(GNOME_SESSION_LIBS)
Index: gnome-session/gsm-logout-dialog.c Index: gnome-session/gsm-logout-dialog.c
=================================================================== ===================================================================
--- gnome-session/gsm-logout-dialog.c.orig --- gnome-session/gsm-logout-dialog.c.orig
@ -281,7 +284,7 @@ Index: gnome-session/gsm-logout-dialog.c
logout_dialog->priv->up_client = up_client_new (); logout_dialog->priv->up_client = up_client_new ();
logout_dialog->priv->consolekit = gsm_get_consolekit (); logout_dialog->priv->consolekit = gsm_get_consolekit ();
@@ -237,40 +211,28 @@ gsm_logout_supports_shutdown (GsmLogoutD @@ -229,40 +203,28 @@ gsm_logout_supports_shutdown (GsmLogoutD
} }
static void static void
@ -339,7 +342,7 @@ Index: gnome-session/gsm-logout-dialog.c
seconds_warning = ngettext ("You will be automatically logged " seconds_warning = ngettext ("You will be automatically logged "
"out in %d second.", "out in %d second.",
"You will be automatically logged " "You will be automatically logged "
@@ -278,7 +240,7 @@ gsm_logout_dialog_timeout (gpointer data @@ -270,7 +232,7 @@ gsm_logout_dialog_timeout (gpointer data
seconds_to_show); seconds_to_show);
break; break;
@ -348,7 +351,7 @@ Index: gnome-session/gsm-logout-dialog.c
seconds_warning = ngettext ("This system will be automatically " seconds_warning = ngettext ("This system will be automatically "
"shut down in %d second.", "shut down in %d second.",
"This system will be automatically " "This system will be automatically "
@@ -286,6 +248,10 @@ gsm_logout_dialog_timeout (gpointer data @@ -278,6 +240,10 @@ gsm_logout_dialog_timeout (gpointer data
seconds_to_show); seconds_to_show);
break; break;
@ -359,7 +362,7 @@ Index: gnome-session/gsm-logout-dialog.c
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
@@ -320,25 +286,50 @@ gsm_logout_dialog_timeout (gpointer data @@ -312,25 +278,50 @@ gsm_logout_dialog_timeout (gpointer data
secondary_text = g_strdup (seconds_warning); secondary_text = g_strdup (seconds_warning);
} }
@ -383,7 +386,8 @@ Index: gnome-session/gsm-logout-dialog.c
+ int seconds_to_show; + int seconds_to_show;
+ +
+ logout_dialog = (GsmLogoutDialog *) data; + logout_dialog = (GsmLogoutDialog *) data;
+
- g_free (secondary_text);
+ if (!logout_dialog->priv->timeout) { + if (!logout_dialog->priv->timeout) {
+ gtk_dialog_response (GTK_DIALOG (logout_dialog), + gtk_dialog_response (GTK_DIALOG (logout_dialog),
+ logout_dialog->priv->default_response); + logout_dialog->priv->default_response);
@ -401,8 +405,7 @@ Index: gnome-session/gsm-logout-dialog.c
+ } + }
+ +
+ gsm_logout_set_info_text (logout_dialog, seconds_to_show); + gsm_logout_set_info_text (logout_dialog, seconds_to_show);
+
- g_free (secondary_text);
+ logout_dialog->priv->timeout--; + logout_dialog->priv->timeout--;
return TRUE; return TRUE;
@ -421,7 +424,7 @@ Index: gnome-session/gsm-logout-dialog.c
if (logout_dialog->priv->timeout_id != 0) { if (logout_dialog->priv->timeout_id != 0) {
g_source_remove (logout_dialog->priv->timeout_id); g_source_remove (logout_dialog->priv->timeout_id);
@@ -350,14 +341,118 @@ gsm_logout_dialog_set_timeout (GsmLogout @@ -342,14 +333,118 @@ gsm_logout_dialog_set_timeout (GsmLogout
} }
static GtkWidget * static GtkWidget *
@ -542,7 +545,7 @@ Index: gnome-session/gsm-logout-dialog.c
if (current_dialog != NULL) { if (current_dialog != NULL) {
gtk_widget_destroy (GTK_WIDGET (current_dialog)); gtk_widget_destroy (GTK_WIDGET (current_dialog));
@@ -367,83 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type @@ -359,83 +454,119 @@ gsm_get_dialog (GsmDialogLogoutType type
current_dialog = logout_dialog; current_dialog = logout_dialog;
@ -678,16 +681,15 @@ Index: gnome-session/gsm-logout-dialog.c
} }
- dialog_image = gtk_message_dialog_get_image (GTK_MESSAGE_DIALOG (logout_dialog)); - dialog_image = gtk_message_dialog_get_image (GTK_MESSAGE_DIALOG (logout_dialog));
-
- gtk_image_set_from_icon_name (GTK_IMAGE (dialog_image),
- icon_name, GTK_ICON_SIZE_DIALOG);
+ logout_dialog->priv->info_label = gtk_label_new (""); + logout_dialog->priv->info_label = gtk_label_new ("");
+ gtk_label_set_line_wrap (GTK_LABEL (logout_dialog->priv->info_label), + gtk_label_set_line_wrap (GTK_LABEL (logout_dialog->priv->info_label),
+ TRUE); + TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), logout_dialog->priv->info_label, + gtk_box_pack_start (GTK_BOX (vbox), logout_dialog->priv->info_label,
+ TRUE, TRUE, 0); + TRUE, TRUE, 0);
+ gtk_widget_show (logout_dialog->priv->info_label); + gtk_widget_show (logout_dialog->priv->info_label);
+
- gtk_image_set_from_icon_name (GTK_IMAGE (dialog_image),
- icon_name, GTK_ICON_SIZE_DIALOG);
gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name); 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_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS);
- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text); - gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text);

10
gnome-session.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Sep 27 14:43:01 CEST 2010 - vuntz@opensuse.org
- Update to version 2.32.0:
+ Miscellaneous string fixes
+ Update information in README and other files
+ Update man pages
+ Updated translations.
- Rebase gnome-session-bgo507101-tile-ui.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 6 14:34:28 CEST 2010 - vuntz@opensuse.org Mon Sep 6 14:34:28 CEST 2010 - vuntz@opensuse.org

6
gnome-session.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-session (Version 2.31.6) # spec file for package gnome-session (Version 2.32.0)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,8 +18,8 @@
Name: gnome-session Name: gnome-session
Version: 2.31.6 Version: 2.32.0
Release: 2 Release: 1
License: GPLv2+ License: GPLv2+
Summary: Session Tools for the GNOME 2.x Desktop Summary: Session Tools for the GNOME 2.x Desktop
Url: http://www.gnome.org Url: http://www.gnome.org