From 5df11e1d80e416f2a16fe08c1c72549819bc4251404f48265bd9c317f94526db Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 15 Oct 2010 14:45:43 +0000 Subject: [PATCH] Accepting request 50709 from GNOME:Factory checked in (request 50709) OBS-URL: https://build.opensuse.org/request/show/50709 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=99 --- gnome-session-2.31.6.tar.bz2 | 3 ++ gnome-session-2.32.0.tar.bz2 | 3 -- gnome-session-bgo507101-tile-ui.patch | 48 +++++++++++++-------------- gnome-session.changes | 10 ------ gnome-session.spec | 6 ++-- 5 files changed, 29 insertions(+), 41 deletions(-) create mode 100644 gnome-session-2.31.6.tar.bz2 delete mode 100644 gnome-session-2.32.0.tar.bz2 diff --git a/gnome-session-2.31.6.tar.bz2 b/gnome-session-2.31.6.tar.bz2 new file mode 100644 index 0000000..ce8071d --- /dev/null +++ b/gnome-session-2.31.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bce2be044a78a88418b870dc0ca9f6921572ca532f3b446bd0126e62a71029a6 +size 776995 diff --git a/gnome-session-2.32.0.tar.bz2 b/gnome-session-2.32.0.tar.bz2 deleted file mode 100644 index 7959df7..0000000 --- a/gnome-session-2.32.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b757574303062cba560cffeca654eccd4ed0dd163efe793a4a3efb6822dea25 -size 773010 diff --git a/gnome-session-bgo507101-tile-ui.patch b/gnome-session-bgo507101-tile-ui.patch index 4f905e4..b60904a 100644 --- a/gnome-session-bgo507101-tile-ui.patch +++ b/gnome-session-bgo507101-tile-ui.patch @@ -2,7 +2,7 @@ Index: gnome-session/gsm-manager.c =================================================================== --- gnome-session/gsm-manager.c.orig +++ gnome-session/gsm-manager.c -@@ -2804,7 +2804,8 @@ logout_dialog_response (GsmLogoutDialog +@@ -2748,7 +2748,8 @@ logout_dialog_response (GsmLogoutDialog { 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 * suspend, we just perform the respective action and return, -@@ -2814,6 +2815,10 @@ logout_dialog_response (GsmLogoutDialog +@@ -2758,6 +2759,10 @@ logout_dialog_response (GsmLogoutDialog case GTK_RESPONSE_NONE: case GTK_RESPONSE_DELETE_EVENT: break; @@ -137,17 +137,14 @@ Index: gnome-session/Makefile.am =================================================================== --- gnome-session/Makefile.am.orig +++ gnome-session/Makefile.am -@@ -84,6 +84,10 @@ libgsmutil_la_SOURCES = \ - gsm-util.c \ - gsm-util.h - -+libgsmutil_la_CPPFLAGS = \ -+ $(AM_CPPFLAGS) \ -+ -DDATADIR=\""$(datadir)"\" -+ - libgsmutil_la_LIBADD = \ - $(GNOME_SESSION_LIBS) - +@@ -22,6 +22,7 @@ INCLUDES = \ + -DDATA_DIR=\""$(datadir)/gnome-session"\" \ + -DDBUS_LAUNCH=\"dbus-launch\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ ++ -DDATADIR=\""$(datadir)"\" \ + -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ + -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \ + -DGCONFTOOL_CMD=\"$(GCONFTOOL)\" \ Index: gnome-session/gsm-logout-dialog.c =================================================================== --- gnome-session/gsm-logout-dialog.c.orig @@ -284,7 +281,7 @@ Index: gnome-session/gsm-logout-dialog.c logout_dialog->priv->up_client = up_client_new (); logout_dialog->priv->consolekit = gsm_get_consolekit (); -@@ -229,40 +203,28 @@ gsm_logout_supports_shutdown (GsmLogoutD +@@ -237,40 +211,28 @@ gsm_logout_supports_shutdown (GsmLogoutD } static void @@ -342,7 +339,7 @@ Index: gnome-session/gsm-logout-dialog.c seconds_warning = ngettext ("You will be automatically logged " "out in %d second.", "You will be automatically logged " -@@ -270,7 +232,7 @@ gsm_logout_dialog_timeout (gpointer data +@@ -278,7 +240,7 @@ gsm_logout_dialog_timeout (gpointer data seconds_to_show); break; @@ -351,7 +348,7 @@ Index: gnome-session/gsm-logout-dialog.c seconds_warning = ngettext ("This system will be automatically " "shut down in %d second.", "This system will be automatically " -@@ -278,6 +240,10 @@ gsm_logout_dialog_timeout (gpointer data +@@ -286,6 +248,10 @@ gsm_logout_dialog_timeout (gpointer data seconds_to_show); break; @@ -362,7 +359,7 @@ Index: gnome-session/gsm-logout-dialog.c default: g_assert_not_reached (); } -@@ -312,25 +278,50 @@ gsm_logout_dialog_timeout (gpointer data +@@ -320,25 +286,50 @@ gsm_logout_dialog_timeout (gpointer data secondary_text = g_strdup (seconds_warning); } @@ -386,8 +383,7 @@ Index: gnome-session/gsm-logout-dialog.c + int seconds_to_show; + + logout_dialog = (GsmLogoutDialog *) data; - -- g_free (secondary_text); ++ + if (!logout_dialog->priv->timeout) { + gtk_dialog_response (GTK_DIALOG (logout_dialog), + logout_dialog->priv->default_response); @@ -405,7 +401,8 @@ Index: gnome-session/gsm-logout-dialog.c + } + + gsm_logout_set_info_text (logout_dialog, seconds_to_show); -+ + +- g_free (secondary_text); + logout_dialog->priv->timeout--; return TRUE; @@ -424,7 +421,7 @@ Index: gnome-session/gsm-logout-dialog.c if (logout_dialog->priv->timeout_id != 0) { g_source_remove (logout_dialog->priv->timeout_id); -@@ -342,14 +333,118 @@ gsm_logout_dialog_set_timeout (GsmLogout +@@ -350,14 +341,118 @@ gsm_logout_dialog_set_timeout (GsmLogout } static GtkWidget * @@ -545,7 +542,7 @@ Index: gnome-session/gsm-logout-dialog.c if (current_dialog != NULL) { gtk_widget_destroy (GTK_WIDGET (current_dialog)); -@@ -359,83 +454,119 @@ gsm_get_dialog (GsmDialogLogoutType type +@@ -367,83 +462,119 @@ gsm_get_dialog (GsmDialogLogoutType type current_dialog = logout_dialog; @@ -681,15 +678,16 @@ Index: gnome-session/gsm-logout-dialog.c } - 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 (""); + gtk_label_set_line_wrap (GTK_LABEL (logout_dialog->priv->info_label), + TRUE); + gtk_box_pack_start (GTK_BOX (vbox), logout_dialog->priv->info_label, + TRUE, TRUE, 0); + 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_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS); - gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text); diff --git a/gnome-session.changes b/gnome-session.changes index 4d34f58..093bf0c 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/gnome-session.spec b/gnome-session.spec index e53792c..f96e2aa 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-session (Version 2.32.0) +# spec file for package gnome-session (Version 2.31.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: gnome-session -Version: 2.32.0 -Release: 1 +Version: 2.31.6 +Release: 2 License: GPLv2+ Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org