Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at Wed May 4 10:14:06 CEST 2011.
-------- --- GNOME/gnome-session/gnome-session.changes 2011-02-21 18:13:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-session/gnome-session.changes 2011-04-27 14:48:11.000000000 +0200 @@ -1,0 +2,119 @@ +Wed Apr 27 12:43:38 UTC 2011 - fcro...@novell.com + +- Update to version 3.0.1: + + Updated translations. + +------------------------------------------------------------------- +Tue Apr 5 15:56:28 UTC 2011 - fcro...@novell.com + +- Update to version 3.0.0: + + Session Manager: + - Change path of GSettings schema + + Updated translations. + +------------------------------------------------------------------- +Tue Mar 29 09:01:59 UTC 2011 - fcro...@novell.com + +- Update to version 2.91.94: + + Session Manager: Bump the phase timeout to 30 seconds + + Updated translations. +- Changes from version 2.91.93: + + Session Manager: + - Make work with latest version of the shell. +- Changes from version 2.91.92: + + Session Manager: + - Better fatal error handling in general, including specific + handling when required components fail. + - Improve wording of fallback dialog. + - Avoid double-checking between gdm and gnome-session in + gnome-session-check-accelerated-helper. + - Switch to using seconds for idle time. + - Honor disable-log-out and disable-user-switching lockdown + settings. + - Change format of .session files in a incompatible way; this + is now documented in the gnome-session man page. + - Update gnome-session-quit man page + - Enforce the use of required components in the session. + - Deal with conflicts between Provides in different + applications by only having one provider running; this was + only working well for Provides defined in the session + definition. + - Use app-id when saving session instead of startup-id for + .desktop. + - Explicitly require gnome-shell/gnome-panel in .session files, + instead of using providers. + - Clean up saved session on logout if session is not getting + saved. + - Use "computer-fail" icon from theme instead of our own + sad-computer. + - Fix some gnome-shell/gnome-session interaction issue on + logout, when a third application cancels logout. + - Code cleanups +- Changes from version 2.91.91.3: + + Session Manager: + - Better error message on not-found session. + - Rename gnome-session-save to gnome-session-quit. + - Fix cancel button in logout dialog. + - Increase is-accelerated runnable helper timeout. + - Fix crash when if-session autostart condition is used. + - Add gnome-session-check-accelerated to set a X property about + acceleration + - Rename gnome-session-is-accelerated to + gnome-session-check-accelerated-helper. +- Drop gnome-session-fix-autostart.patch: fixed upstream. +- Disable gnome-session-bgo507101-tile-ui.patch for now: it needs + to be rebased. + +------------------------------------------------------------------- +Tue Mar 1 08:18:52 UTC 2011 - fcro...@novell.com + +- Update to version 2.91.90.1: + + Session Manager: + - Fix a crash happening in gdm + + Updated translations. +- Changes from version 2.91.90: + + Session Manager: + - Update for GSettings schemas changes + - Read default session from GSettings + - Make the current session name available via dbus + - Support autostart conditions that depend on the current + session + - Make notification-daemon a required part of the fallback + session + - Show a dialog after login the first time we fall back to + gnome-fallback + - Various fixes to shell logout/shutdown dialog + - Code cleanups + + Misc: + - gsettings-desktop-schemas 0.1.7 is required + + Updated translations. +- Changes from version 2.91.6: + + Session Manager: + - Fix build with latest GTK+ 3 + - Migrate to GSettings + - Add support for shell logout/shutdown dialog + - Use fallback session if required components are missing + + Defined Sessions: + - Do not consider Gallium's softpipe and llvmpipe as + accelerated + - Do not run nautilus by default + + Capplet: + - Migrate to GSettings + + Misc: + - Change GETTEXT_PACKAGE to gnome-session-3.0 + - Drop gnome-wm script + - Add a runtime dependency on gsettings-desktop-schemas + + Updated sranslations. +- Add pkgconfig(librsvg-2.0) BuildRequires. +- Add notification-daemon Requires to main package as it's now + required by the fallback session. +- Add gnome-session-fix-autostart.patch: fix crash in autostart + code, taken from git. +- Add gsettings-desktop-schemas Requires to gnome-session-core. +- Remove --with-default-wm=gnome-wm and --enable-splash configure + options: they're now gone. +- Drop gnome-session-enable-disable-compiz.patch: this should now + be done another way, with fallback modes in gnome-session. See + bnc#676360. + +------------------------------------------------------------------- @@ -29,0 +149,46 @@ + +------------------------------------------------------------------- +Thu Dec 23 16:04:46 CET 2010 - vu...@opensuse.org + +- Update to version 2.91.4: + + Session Manager: + - Add autostart condition through GSettings + - Don't ever show inhibitor dialog if logout is forced + - Fix some issue tracking clients on logout + - Add an application restart limit + - Move the definition of a session from gconf to .desktop-like + files + - Change default session to use GNOME Shell, with a fallback to + classic GNOME + - Update for GTK+ 3 changes + - Code cleanups + + Capplet: + - Set NoDisplay=true + - Fix inline search + - Update for GTK+ 3 changes + + Updated translations. +- Add pkgconfig(xcomposite) and pkgconfig(gl) BuildRequires, for + the new gnome-session-is-accelerated helper. + +------------------------------------------------------------------- +Fri Dec 17 13:43:32 CET 2010 - vu...@opensuse.org + +- Update to version 2.91.0: + + Session Manager: + - Miscellaneous string fixes + - Fix for GTK+ 3 changes + + Misc: + - Update information in README and other files + - Update man pages + - Build against GTK+ 3 by default + - Rename --enable-deprecations configure flag to + --enable-deprecation-flags + + Updated translations. +- Move to pkgconfig()-style BuildRequires: + + Old ones: gconf2-devel, libupower-glib-devel. + + New ones: dbus-glib-1, gconf-2.0, glib-2.0, gtk+-3.0, ice, sm, + upower-glib, xau, xext, xrender, xtst. +- Remove gnome-settings-daemon-devel BuildRequires: it's not + needed. +- Improve summary and description. +- Rework gnome-session-bgo507101-tile-ui.patch to build with GTK+3. calling whatdependson for head-i586 Old: ---- gnome-session-2.32.1.tar.bz2 gnome-session-enable-disable-compiz.patch New: ---- gnome-session-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.DU9z80/_old 2011-05-04 10:08:22.000000000 +0200 +++ /var/tmp/diff_new_pack.DU9z80/_new 2011-05-04 10:08:22.000000000 +0200 @@ -18,8 +18,8 @@ Name: gnome-session -Version: 2.32.1 -Release: 7 +Version: 3.0.1 +Release: 1 License: GPLv2+ Summary: Session Tools for the GNOME Desktop Url: http://www.gnome.org @@ -35,22 +35,31 @@ Patch1: gnome-session-kdm-support.patch # PATCH-NEEDS-REBASE gnome-session-wm-switch.patch bnc180506 d...@novell.com -- Fixes legacy sessions to use gnome-wm instead of metacity/compiz. Legacy sessions are not really supported anymore -- do we need to handle a similar case for current saved sessions, though? (was PATCH-FIX-OPENSUSE) Patch2: gnome-session-wm-switch.patch -# PATCH-FIX-UPSTREAM gnome-session-bgo507101-tile-ui.patch bgo507101 vu...@novell.com -- Tile UI for logout dialog. +# PATCH-NEEDS-REBASE gnome-session-bgo507101-tile-ui.patch bgo507101 vu...@novell.com -- Tile UI for logout dialog. (Was: PATCH-FIX-UPSTREAM) Patch3: gnome-session-bgo507101-tile-ui.patch -# PATCH-FEATURE-OPENSUSE gnome-session-enable-disable-compiz.patch vu...@novell.com -- Integration with enable-compiz/disable-compiz files generated by ccsm -Patch4: gnome-session-enable-disable-compiz.patch BuildRequires: fdupes BuildRequires: gconf-sanity-check -BuildRequires: gconf2-devel BuildRequires: gnome-common BuildRequires: gnome-patch-translation -BuildRequires: gnome-settings-daemon-devel BuildRequires: hicolor-icon-theme BuildRequires: intltool -BuildRequires: libupower-glib-devel BuildRequires: tcpd-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(librsvg-2.0) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(upower-glib) +BuildRequires: pkgconfig(xau) +BuildRequires: pkgconfig(xcomposite) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xtst) Requires: %{name}-core = %{version} # Programs that are in the default session (we use Requires since Recommends # might make it possible for some people to get an empty gnome-session, and @@ -59,6 +68,7 @@ Requires: gnome-settings-daemon Requires: metacity Requires: nautilus +Requires: notification-daemon Recommends: %{name}-lang Obsoletes: gnome-core # There's no splash anymore, so no branding package. @@ -79,8 +89,9 @@ Requires: ConsoleKit Requires: dbus-1-x11 Requires: gconf-sanity-check +Requires: gsettings-desktop-schemas >= 0.1.7 Requires: hicolor-icon-theme -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description core This packages contain a minimal version of gnome-session, that can be used for @@ -91,21 +102,20 @@ %prep %setup -q translation-update-upstream -gnome-patch-translation-prepare +# disabled unless patches 2 or 3 are enabled +# gnome-patch-translation-prepare %patch0 -p1 %patch1 -p1 # needs-rebase #%patch2 -p1 -%patch3 -p0 -%patch4 -p1 -gnome-patch-translation-update +# needs-rebase +#%patch3 -p0 +# gnome-patch-translation-update %build NOCONFIGURE=1 gnome-autogen.sh -%configure \ - --with-default-wm=gnome-wm \ - --enable-splash -%__make %{?jobs:-j%jobs} +%configure +%__make %{?jobs:-j%jobs} V=1 %install %makeinstall @@ -122,11 +132,9 @@ install -d -m755 %{buildroot}%{_datadir}/xsessions install -m644 %SOURCE2 %{buildroot}%{_datadir}/xsessions/gnome.desktop install -m644 %{S:7} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ -%suse_update_desktop_file gnome-wm %suse_update_desktop_file session-properties X-SuSE-ControlCenter-Personal %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop -%find_lang %{name}-2.0 %{?no_lang_C} -%find_gconf_schemas +%find_lang %{name}-3.0 %{?no_lang_C} %fdupes %{buildroot} %clean @@ -140,22 +148,17 @@ %desktop_database_postun %icon_theme_cache_postun -%pre core -f %{name}.schemas_pre - %post core +%glib2_gsettings_schema_post %icon_theme_cache_post -%posttrans core -f %{name}.schemas_posttrans - -%preun core -f %{name}.schemas_preun - %postun core +%glib2_gsettings_schema_postun %icon_theme_cache_postun %files %defattr (-, root, root) %{_bindir}/gnome -%{_bindir}/gnome-wm %{_bindir}/gnome-session-properties %{_datadir}/applications/*.desktop %{_datadir}/xsessions/*.desktop @@ -163,19 +166,27 @@ %exclude %{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg %{_datadir}/gnome-session/session-properties.ui %doc %{_mandir}/man1/gnome-session-properties.1* -%doc %{_mandir}/man1/gnome-wm.1* +# Defined sessions (for GNOME only) +%{_datadir}/gnome-session/sessions/gnome-fallback.session +%{_datadir}/gnome-session/sessions/gnome.session +# Helper for the defined sessions +%{_libexecdir}/gnome-session-check-accelerated +%{_libexecdir}/gnome-session-check-accelerated-helper -%files core -f %{name}.schemas_list +%files core %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/gnome-session -%{_bindir}/gnome-session-save +%{_bindir}/gnome-session-quit +%{_datadir}/GConf/gsettings/gnome-session.convert +%{_datadir}/glib-2.0/schemas/org.gnome.SessionManager.gschema.xml %dir %{_datadir}/gnome-session +%dir %{_datadir}/gnome-session/sessions %{_datadir}/gnome-session/gsm-inhibit-dialog.ui %{_datadir}/icons/hicolor/scalable/apps/gnome-session-sleep.svg %doc %{_mandir}/man1/gnome-session.1* -%doc %{_mandir}/man1/gnome-session-save.1* +%doc %{_mandir}/man1/gnome-session-quit.1* -%files lang -f %{name}-2.0.lang +%files lang -f %{name}-3.0.lang %changelog ++++++ gnome-session-2.32.1.tar.bz2 -> gnome-session-3.0.1.tar.bz2 ++++++ ++++ 61459 lines of diff (skipped) ++++++ gnome-session-bgo507101-tile-ui.patch ++++++ --- /var/tmp/diff_new_pack.DU9z80/_old 2011-05-04 10:08:22.000000000 +0200 +++ /var/tmp/diff_new_pack.DU9z80/_new 2011-05-04 10:08:22.000000000 +0200 @@ -2,9 +2,9 @@ =================================================================== --- gnome-session/gsm-manager.c.orig +++ gnome-session/gsm-manager.c -@@ -2804,7 +2804,8 @@ logout_dialog_response (GsmLogoutDialog - { - g_debug ("GsmManager: Logout dialog response: %d", response_id); +@@ -2836,7 +2836,8 @@ logout_dialog_response (GsmLogoutDialog + + display = gtk_widget_get_display (GTK_WIDGET (logout_dialog)); - gtk_widget_destroy (GTK_WIDGET (logout_dialog)); + if (response_id != GTK_RESPONSE_HELP) @@ -12,7 +12,7 @@ /* 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 +@@ -2846,6 +2847,10 @@ logout_dialog_response (GsmLogoutDialog case GTK_RESPONSE_NONE: case GTK_RESPONSE_DELETE_EVENT: break; @@ -21,7 +21,7 @@ + "gosgetstarted-73"); + break; case GSM_LOGOUT_RESPONSE_SWITCH_USER: - request_switch_user (manager); + request_switch_user (display, manager); break; Index: gnome-session/gsm-util.c =================================================================== @@ -35,7 +35,7 @@ #include <sys/types.h> #include <unistd.h> #include <sys/time.h> -@@ -503,3 +504,75 @@ gsm_util_setenv (const char *variable, +@@ -503,3 +504,86 @@ gsm_util_setenv (const char *variable, g_error_free (bus_error); } } @@ -45,10 +45,8 @@ + const char *link_id) +{ + GError *error = NULL; -+ char *command; + const char *lang; + char *uri = NULL; -+ GdkScreen *gscreen; + gboolean found; + + int i; @@ -77,16 +75,30 @@ + } + + if (found) { ++ GAppInfo *app_info; ++ char *command; ++ + if (link_id) { + command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL); + } else { + command = g_strconcat ("gnome-open ghelp://", uri, NULL); + } + -+ gscreen = gdk_screen_get_default (); -+ gdk_spawn_command_line_on_screen (gscreen, command, &error); -+ } else -+ command = NULL; ++ app_info = g_app_info_create_from_commandline (command, "gnome-open",G_APP_INFO_CREATE_NONE, &error); ++ g_free (command); ++ ++ if (error == NULL && app_info != NULL) { ++ GdkScreen *screen; ++ GdkAppLaunchContext *context; ++ ++ screen = gtk_widget_get_screen (GTK_WIDGET (parent)); ++ context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen)); ++ g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (context), &error); ++ ++ g_object_unref (context); ++ g_object_unref (app_info); ++ } ++ } + + if (!found || error != NULL) { + GtkWidget *d; @@ -108,7 +120,6 @@ + G_CALLBACK (gtk_widget_destroy), NULL); + } + -+ g_free (command); + g_free (uri); +} Index: gnome-session/gsm-util.h @@ -123,7 +134,7 @@ G_BEGIN_DECLS -@@ -47,6 +48,9 @@ char * gsm_util_generate_startup_id +@@ -49,6 +50,9 @@ char * gsm_util_generate_startup_id void gsm_util_setenv (const char *variable, const char *value); @@ -137,7 +148,7 @@ =================================================================== --- gnome-session/Makefile.am.orig +++ gnome-session/Makefile.am -@@ -84,6 +84,10 @@ libgsmutil_la_SOURCES = \ +@@ -91,6 +91,10 @@ libgsmutil_la_SOURCES = \ gsm-util.c \ gsm-util.h @@ -259,7 +270,7 @@ g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate)); } -@@ -137,11 +99,23 @@ gsm_logout_dialog_init (GsmLogoutDialog +@@ -137,11 +99,22 @@ gsm_logout_dialog_init (GsmLogoutDialog logout_dialog->priv->timeout_id = 0; logout_dialog->priv->timeout = 0; logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL; @@ -267,12 +278,11 @@ - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE); + gtk_window_set_resizable (GTK_WINDOW (logout_dialog), FALSE); -+ gtk_dialog_set_has_separator (GTK_DIALOG (logout_dialog), FALSE); gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); gtk_window_stick (GTK_WINDOW (logout_dialog)); + /* use HIG spacings */ -+ gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (logout_dialog)->vbox), 12); ++ gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), 12); + gtk_container_set_border_width (GTK_CONTAINER (logout_dialog), 6); + + gtk_dialog_add_button (GTK_DIALOG (logout_dialog), GTK_STOCK_HELP, @@ -284,7 +294,7 @@ logout_dialog->priv->up_client = up_client_new (); logout_dialog->priv->consolekit = gsm_get_consolekit (); -@@ -229,40 +203,28 @@ gsm_logout_supports_shutdown (GsmLogoutD +@@ -229,40 +202,28 @@ gsm_logout_supports_shutdown (GsmLogoutD } static void @@ -342,7 +352,7 @@ 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 +@@ -270,7 +231,7 @@ gsm_logout_dialog_timeout (gpointer data seconds_to_show); break; @@ -351,7 +361,7 @@ 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 +@@ -278,6 +239,10 @@ gsm_logout_dialog_timeout (gpointer data seconds_to_show); break; @@ -362,7 +372,7 @@ default: g_assert_not_reached (); } -@@ -312,25 +278,50 @@ gsm_logout_dialog_timeout (gpointer data +@@ -312,25 +277,50 @@ gsm_logout_dialog_timeout (gpointer data secondary_text = g_strdup (seconds_warning); } @@ -386,12 +396,12 @@ + 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); -+ + +- g_free (secondary_text); + return FALSE; + } + @@ -424,7 +434,7 @@ 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 +@@ -342,14 +332,120 @@ gsm_logout_dialog_set_timeout (GsmLogout } static GtkWidget * @@ -474,8 +484,10 @@ + gchar *markup; + GdkColor *color; + GtkWidget *label; ++ GtkStyle *style; + -+ color = >K_WIDGET (button)->style->fg[GTK_STATE_INSENSITIVE]; ++ style = gtk_widget_get_style (GTK_WIDGET (button)); ++ color = &style->fg[GTK_STATE_INSENSITIVE]; + markup = g_markup_printf_escaped ("<span size=\"small\" foreground=\"#%.2x%.2x%.2x\">%s</span>", + color->red, + color->green, @@ -545,7 +557,7 @@ if (current_dialog != NULL) { gtk_widget_destroy (GTK_WIDGET (current_dialog)); -@@ -359,83 +454,119 @@ gsm_get_dialog (GsmDialogLogoutType type +@@ -359,83 +455,119 @@ gsm_get_dialog (GsmDialogLogoutType type current_dialog = logout_dialog; @@ -553,7 +565,7 @@ - - logout_dialog->priv->type = type; + vbox = gtk_vbox_new (FALSE, 12); -+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (logout_dialog)->vbox), vbox, ++ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), vbox, + FALSE, FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); + gtk_widget_show (vbox); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
