Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xfce4-session for openSUSE:Factory checked in at 2023-04-01 19:32:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-session (Old) and /work/SRC/openSUSE:Factory/.xfce4-session.new.9019 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-session" Sat Apr 1 19:32:27 2023 rev:88 rq:1076636 version:4.18.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-session/xfce4-session.changes 2023-02-12 19:14:22.625061194 +0100 +++ /work/SRC/openSUSE:Factory/.xfce4-session.new.9019/xfce4-session.changes 2023-04-01 19:32:41.341488242 +0200 @@ -1,0 +2,9 @@ +Tue Mar 28 18:10:04 UTC 2023 - Manfred Hollstein <manfre...@gmx.net> + +- Update to version 4.18.2 + * manager: Fix GQueue memory management + * Fix Xfconf memory management + * Update bug report address + * Fix suspend/hibernation bug on ConsoleKit2 (Fixes #164) + +------------------------------------------------------------------- Old: ---- xfce4-session-4.18.1.tar.bz2 New: ---- xfce4-session-4.18.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-session.spec ++++++ --- /var/tmp/diff_new_pack.zqP16N/_old 2023-04-01 19:32:41.977491581 +0200 +++ /var/tmp/diff_new_pack.zqP16N/_new 2023-04-01 19:32:41.981491602 +0200 @@ -18,7 +18,7 @@ %bcond_with git Name: xfce4-session -Version: 4.18.1 +Version: 4.18.2 Release: 0 Summary: Xfce Session Manager License: GPL-2.0-only ++++++ xfce4-session-4.18.1.tar.bz2 -> xfce4-session-4.18.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/ChangeLog new/xfce4-session-4.18.2/ChangeLog --- old/xfce4-session-4.18.1/ChangeLog 2023-02-10 11:03:33.000000000 +0100 +++ new/xfce4-session-4.18.2/ChangeLog 2023-03-28 18:59:54.000000000 +0200 @@ -1,3 +1,55 @@ +commit cff23d0fadd502f7db9230f9ebbc02c00853f825 +Author: Gaël Bonithon <g...@xfce.org> +Date: Wed Mar 15 11:16:17 2023 +0100 + + manager: Fix GQueue memory management + + Other iterations over the queue don't seem to be a problem: + g_queue_remove() is only called in xfsm_manager_close_connection(), + which only really causes problems in one place. + + Fixes: #166 + (cherry picked from commit 321ca64377eb8ddf5572f260e78f119c9e87dd8b) + +commit 911f5b8101dec6a6d28f7601768588a2f0fd4aaf +Author: Gaël Bonithon <g...@xfce.org> +Date: Tue Mar 14 13:56:19 2023 +0100 + + Fix Xfconf memory management + + * Each xfconf_init() should match an xfconf_shutdown() + * Xfconf already manages a singleton channel, no need to duplicate that + + (cherry picked from commit 87ec0e7e8a3f18e776da899098698f0acf0b1fd9) + +commit 31bb178eb7945fdbb80d9d0f857fd4803565a12a +Author: Gaël Bonithon <g...@xfce.org> +Date: Sat Feb 18 17:05:31 2023 +0100 + + Update bug report address + + (cherry picked from commit 6d68dc31a922ae8b45460547382300da15b2630e) + +commit 03b0c1501de7b21d63d5cb3ab135b5184112e815 +Author: picokan <todaysora...@protonmail.com> +Date: Fri Feb 10 20:54:37 2023 +0000 + + Fix suspend/hibernation bug on ConsoleKit2 (Fixes #164) + + (cherry picked from commit e6c12ef7c643aeb05d5a9251976df78a9b82063e) + +commit c7316cf22f6a08eabc90aa5b6f8b6e68147e6d41 +Author: Gaël Bonithon <g...@xfce.org> +Date: Fri Feb 10 11:11:16 2023 +0100 + + Back to development + +commit 258e5741ef365b5c5216b522b950966ad34cc2a7 +Author: Gaël Bonithon <g...@xfce.org> +Date: Fri Feb 10 11:10:14 2023 +0100 + + Updates for release + commit 75e18489f3efad4187dd99ff73d241c6f54a7191 Author: Gaël Bonithon <g...@xfce.org> Date: Thu Feb 9 13:11:57 2023 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/NEWS new/xfce4-session-4.18.2/NEWS --- old/xfce4-session-4.18.1/NEWS 2023-02-10 11:00:53.000000000 +0100 +++ new/xfce4-session-4.18.2/NEWS 2023-03-28 18:57:16.000000000 +0200 @@ -1,3 +1,10 @@ +4.18.2 (2023-03-28) +====== +- manager: Fix GQueue memory management +- Fix Xfconf memory management +- Update bug report address +- Fix suspend/hibernation bug on ConsoleKit2 (Fixes #164) + 4.18.1 (2023-02-10) ====== - Update copyright year diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/aclocal.m4 new/xfce4-session-4.18.2/aclocal.m4 --- old/xfce4-session-4.18.1/aclocal.m4 2023-02-10 11:02:20.000000000 +0100 +++ new/xfce4-session-4.18.2/aclocal.m4 2023-03-28 18:58:11.000000000 +0200 @@ -810,6 +810,165 @@ +dnl XDT_FEATURE_DEPENDENCY(varname, package, version) +dnl +dnl Used only as an argument to XDT_CHECK_OPTIONAL_FEATURE(), this macro +dnl declares a dependency required for the feature to be enabled. +dnl +dnl If the dependency is checked and found, variables and substitutions will be +dnl created and set as in XDT_CHECK_PACKAGE(), plus varname_FOUND will be set +dnl to "yes", and HAVE_varname will be set in config.h. +dnl +dnl Note that, unlike with XDT_CHECK_OPTIONAL_PACKAGE(), no automake +dnl conditional is set for this dependency. +dnl +dnl See XDT_CHECK_OPTIONAL_FEATURE() for more information. +dnl +AC_DEFUN([XDT_FEATURE_DEPENDENCY], +[ + AC_REQUIRE([XDT_PROG_PKG_CONFIG]) + + if test x"$xdt_feature_deps_check_only" = x"yes"; then + if ! $PKG_CONFIG --exists "$2 >= $3" >/dev/null 2>&1; then + if test x"$xdt_feature_deps_missing" = x""; then + xdt_feature_deps_missing="$2 >= $3" + else + xdt_feature_deps_missing="$xdt_feature_deps_missing, $2 >= $3" + fi + fi + else + XDT_CHECK_PACKAGE([$1], [$2], [$3], + [ + AC_DEFINE([HAVE_$1], [1], [Define if $2 >= $3 present]) + $1_FOUND="yes" + ]) + fi +]) + + + +dnl XDT_CHECK_OPTIONAL_FEATURE(varname, optionname, dependency-checks, [helpstring], [default]) +dnl +dnl Introduces an --enable-optionname/--disable-optionname flag pair for a +dnl named feature. If neither flag is provided, the feature will be enabled or +dnl disabled depending on whether or not dependency-checks succeed or fail. +dnl If --enable-optionname is provided, the configure script will error out if +dnl the dependencies are not met. If --disable-optionname is provided, the +dnl feature will be disabled, and dependencies will not be checked. +dnl +dnl The dependency-checks argument should be a series of +dnl XDT_FEATURE_DEPENDENCY() macro calls, passed as a single quoted argument to +dnl XDT_CHECK_OPTIONAL_FEATURE(). +dnl +dnl If helpstring is not provided, optionname is used instead. +dnl +dnl The default is "auto", and semantics are as described above. If default is +dnl set to "yes", then the feature will be required unless --disable-optionname +dnl is passed to configure. If default is set to "no", the feature will not be +dnl built unless --enable-optionname is passed. +dnl +dnl If the feature is enabled and dependencies are met, ENABLE_varname will be +dnl defined in config.h. Additionally, an automake conditional called +dnl ENABLE_varname will be created, and a shell variable called ENABLE_varname +dnl will set to "yes" or "no". +dnl +dnl Example usage: +dnl +dnl XDT_CHECK_OPTIONAL_FEATURE([WAYLAND], +dnl [wayland], +dnl [ +dnl XDT_FEATURE_DEPENDENCY([GDK_WAYLAND], [gdk-wayland-3.0], [3.24.0]) +dnl XDT_FEATURE_DEPENDENCY([GTK_LAYER_SHELL], [gtk-layer-shell-0], [0.7.0]) +dnl ], +dnl [the Wayland windowing system]) +dnl +dnl Note that there are no commas between the XDT_FEATURE_DEPENDENCY() +dnl invocations; they should all form a single "argument" to +dnl XDT_CHECK_OPTIONAL_FEATURE(). +dnl +dnl Also note that you must quote the dependency-checks argument with square +dnl brackets, or you will get syntax errors in the generated configure script. +dnl +AC_DEFUN([XDT_CHECK_OPTIONAL_FEATURE], +[ + AC_ARG_ENABLE([$2], +AS_HELP_STRING([--enable-$2], [Enable support for m4_default($4, $2) (default=m4_default([$5], [auto]))]) +AS_HELP_STRING([--disable-$2], [Disable support for m4_default($4, $2)]), + [xdt_cv_$1_enabled=$enableval], [xdt_cv_$1_enabled=m4_default([$5], [auto])]) + + if test x"$xdt_cv_$1_enabled" != x"no"; then + xdt_feature_deps_check_only=yes + xdt_feature_deps_missing= + $3 + if test x"$xdt_feature_deps_missing" = x""; then + xdt_feature_deps_check_only= + $3 + ENABLE_$1="yes" + AC_DEFINE([ENABLE_$1], [1], [Define if m4_default($4, $2) is enabled]) + AC_MSG_CHECKING([if m4_default($4, $2) is enabled]) + AC_MSG_RESULT([yes]) + else + AC_MSG_CHECKING([if m4_default($4, $2) is enabled]) + AC_MSG_RESULT([dependencies missing: $xdt_feature_deps_missing]) + if test x"$xdt_cv_$1_enabled" = x"yes"; then + AC_MSG_ERROR([support for m4_default($4, $2) was required, but dependencies were not met]) + else + ENABLE_$1="no" + fi + fi + xdt_feature_deps_check_only= + xdt_feature_deps_missing= + else + ENABLE_$1="no" + AC_MSG_CHECKING([if m4_default($4, $2) is enabled]) + AC_MSG_RESULT([disabled]) + fi + + AM_CONDITIONAL([ENABLE_$1], [test x"$ENABLE_$1" = x"yes"]) +]) + + + +dnl XDT_CHECK_PACKAGE_BINARY(varname, package, pkgvarname, [binname]) +dnl +dnl Finds a program by looking for a variable named pkgvarname in the +dnl pkg-config file for package. If found, varname (both a shell variable and +dnl automake substitution) is set to the name of the binary (and possibly full +dnl path, if that is how it is specified in the pkg-config file). If not found, +dnl or not present and executable, configure will exit with an error. +dnl +dnl Users can also override this detection by specfying a varname on the +dnl configure command line. In that case, the provided value is still checked +dnl to ensure it exists and is executable. +dnl +dnl If binname is not provided (for documentation purposes), pkgvarname will be +dnl used instead. +dnl +dnl Example usage: +dnl +dnl XDT_CHECK_PACKAGE_BINARY([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal], [glib-genmarshal]) +dnl +AC_DEFUN([XDT_CHECK_PACKAGE_BINARY], +[ + AC_REQUIRE([XDT_PROG_PKG_CONFIG]) + + AC_ARG_VAR([$1], [Location of program ]m4_default($4, $3)) + AC_MSG_CHECKING([for m4_default($4, $3)]) + + if test x"$$1" = x""; then + $1=`$PKG_CONFIG --variable=$3 $2` + fi + if test x"$$1" != x"" -a -x "$$1"; then + AC_MSG_RESULT([$$1]) + else + AC_MSG_ERROR([could not find m4_default($4, $3). You can run: +./configure $1=/path/to/m4_default($4, $3) +to provide a custom location for it.]) + fi +]) + + + dnl XDT_CHECK_LIBX11() dnl dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/configure new/xfce4-session-4.18.2/configure --- old/xfce4-session-4.18.1/configure 2023-02-10 11:02:24.000000000 +0100 +++ new/xfce4-session-4.18.2/configure 2023-03-28 18:58:15.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # From configure.ac Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for xfce4-session 4.18.1. +# Generated by GNU Autoconf 2.71 for xfce4-session 4.18.2. # -# Report bugs to <https://bugzilla.xfce.org/>. +# Report bugs to <https://gitlab.xfce.org/xfce/xfce4-session>. # # Copyright (c) 2003-2023 # The Xfce development team. All rights reserved. @@ -282,10 +282,10 @@ printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else printf "%s\n" "$0: Please tell bug-autoc...@gnu.org and -$0: https://bugzilla.xfce.org/ about your system, including -$0: any error possibly output before this message. Then -$0: install a modern shell, or manually run the script -$0: under such a shell if you do have one." +$0: https://gitlab.xfce.org/xfce/xfce4-session about your +$0: system, including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." fi exit 1 fi @@ -627,9 +627,9 @@ # Identity of this package. PACKAGE_NAME='xfce4-session' PACKAGE_TARNAME='xfce4-session' -PACKAGE_VERSION='4.18.1' -PACKAGE_STRING='xfce4-session 4.18.1' -PACKAGE_BUGREPORT='https://bugzilla.xfce.org/' +PACKAGE_VERSION='4.18.2' +PACKAGE_STRING='xfce4-session 4.18.2' +PACKAGE_BUGREPORT='https://gitlab.xfce.org/xfce/xfce4-session' PACKAGE_URL='' # Factoring default headers for most tests. @@ -1471,7 +1471,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xfce4-session 4.18.1 to adapt to many kinds of systems. +\`configure' configures xfce4-session 4.18.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1546,7 +1546,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfce4-session 4.18.1:";; + short | recursive ) echo "Configuration of xfce4-session 4.18.2:";; esac cat <<\_ACEOF @@ -1624,7 +1624,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <https://bugzilla.xfce.org/>. +Report bugs to <https://gitlab.xfce.org/xfce/xfce4-session>. _ACEOF ac_status=$? fi @@ -1688,7 +1688,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfce4-session configure 4.18.1 +xfce4-session configure 4.18.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2049,7 +2049,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfce4-session $as_me 4.18.1, which was +It was created by xfce4-session $as_me 4.18.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3323,7 +3323,7 @@ # Define the identity of the package. PACKAGE='xfce4-session' - VERSION='4.18.1' + VERSION='4.18.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -19043,7 +19043,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfce4-session $as_me 4.18.1, which was +This file was extended by xfce4-session $as_me 4.18.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19103,7 +19103,7 @@ Configuration commands: $config_commands -Report bugs to <https://bugzilla.xfce.org/>." +Report bugs to <https://gitlab.xfce.org/xfce/xfce4-session>." _ACEOF ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` @@ -19111,7 +19111,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -xfce4-session config.status 4.18.1 +xfce4-session config.status 4.18.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/configure.ac new/xfce4-session-4.18.2/configure.ac --- old/xfce4-session-4.18.1/configure.ac 2023-02-10 11:01:44.000000000 +0100 +++ new/xfce4-session-4.18.2/configure.ac 2023-03-28 18:57:37.000000000 +0200 @@ -13,9 +13,9 @@ dnl Version information m4_define([xfsm_version_major], [4]) m4_define([xfsm_version_minor], [18]) -m4_define([xfsm_version_micro], [1]) +m4_define([xfsm_version_micro], [2]) m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version -m4_define([xfsm_version_build], [75e18489]) +m4_define([xfsm_version_build], [cff23d0f]) m4_define([xfsm_version_tag], []) m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])]) @@ -27,7 +27,7 @@ The Xfce development team. All rights reserved. Written for Xfce by Benedikt Meurer <be...@xfce.org>.]) -AC_INIT([xfce4-session], [xfsm_version], [https://bugzilla.xfce.org/]) +AC_INIT([xfce4-session], [xfsm_version], [https://gitlab.xfce.org/xfce/xfce4-session]) AC_PREREQ([2.60]) AC_REVISION([$Id$]) AC_PROG_MAKE_SET() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/libxfsm/xfsm-util.c new/xfce4-session-4.18.2/libxfsm/xfsm-util.c --- old/xfce4-session-4.18.1/libxfsm/xfsm-util.c 2023-01-12 19:32:36.000000000 +0100 +++ new/xfce4-session-4.18.2/libxfsm/xfsm-util.c 2023-03-15 12:08:16.000000000 +0100 @@ -155,16 +155,6 @@ } -XfconfChannel* -xfsm_open_config (void) -{ - static XfconfChannel *channel = NULL; - - if (G_UNLIKELY (channel == NULL)) - channel = xfconf_channel_get ("xfce4-session"); - return channel; -} - gchar* xfsm_gdk_display_get_fullname (GdkDisplay *display) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/libxfsm/xfsm-util.h new/xfce4-session-4.18.2/libxfsm/xfsm-util.h --- old/xfce4-session-4.18.1/libxfsm/xfsm-util.h 2023-01-12 19:23:39.000000000 +0100 +++ new/xfce4-session-4.18.2/libxfsm/xfsm-util.h 2023-03-15 12:08:16.000000000 +0100 @@ -32,6 +32,7 @@ G_BEGIN_DECLS; #define DEFAULT_SESSION_NAME "Default" +#define SETTINGS_CHANNEL "xfce4-session" typedef struct _XfsmSessionInfo XfsmSessionInfo; @@ -68,8 +69,6 @@ gboolean xfsm_strv_equal (gchar **a, gchar **b); -XfconfChannel *xfsm_open_config (void); - gchar *xfsm_gdk_display_get_fullname (GdkDisplay *display); cairo_surface_t *xfsm_load_session_preview (const gchar *name, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/settings/main.c new/xfce4-session-4.18.2/settings/main.c --- old/xfce4-session-4.18.1/settings/main.c 2023-02-09 13:43:45.000000000 +0100 +++ new/xfce4-session-4.18.2/settings/main.c 2023-03-15 12:08:16.000000000 +0100 @@ -248,6 +248,7 @@ } g_object_unref(builder); + xfconf_shutdown (); return EXIT_SUCCESS; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/settings/xfce4-session-settings-common.h new/xfce4-session-4.18.2/settings/xfce4-session-settings-common.h --- old/xfce4-session-4.18.1/settings/xfce4-session-settings-common.h 2020-04-07 11:04:33.000000000 +0200 +++ new/xfce4-session-4.18.2/settings/xfce4-session-settings-common.h 2023-03-15 12:08:16.000000000 +0100 @@ -19,8 +19,6 @@ #ifndef __XFCE4_SESSION_SETTINGS_COMMON_H__ #define __XFCE4_SESSION_SETTINGS_COMMON_H__ -#define SETTINGS_CHANNEL "xfce4-session" - void session_editor_init(GtkBuilder *builder); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/xfce4-session/main.c new/xfce4-session-4.18.2/xfce4-session/main.c --- old/xfce4-session-4.18.1/xfce4-session/main.c 2023-02-09 13:43:45.000000000 +0100 +++ new/xfce4-session-4.18.2/xfce4-session/main.c 2023-03-15 12:08:16.000000000 +0100 @@ -171,7 +171,7 @@ setup_environment (); - channel = xfsm_open_config (); + channel = xfconf_channel_get (SETTINGS_CHANNEL); dpy = gdk_display_get_default (); init_display (*manager, dpy, opt_disable_tcp); @@ -244,12 +244,10 @@ g_object_unref (shutdown_helper); g_object_unref (*manager); - g_object_unref (channel); g_clear_error (&error); shutdown_helper = NULL; *manager = NULL; - channel = NULL; gtk_main_quit (); } @@ -353,6 +351,7 @@ { xfce_dialog_show_error (NULL, error, _("Unable to contact settings server")); g_error_free (error); + return EXIT_FAILURE; } /* Process all pending events prior to start DBUS */ @@ -369,6 +368,7 @@ gtk_main (); xfsm_startup_shutdown (); + xfconf_shutdown (); return EXIT_SUCCESS; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/xfce4-session/xfce4-session.1 new/xfce4-session-4.18.2/xfce4-session/xfce4-session.1 --- old/xfce4-session-4.18.1/xfce4-session/xfce4-session.1 2020-04-07 11:04:33.000000000 +0200 +++ new/xfce4-session-4.18.2/xfce4-session/xfce4-session.1 2023-02-18 17:17:24.000000000 +0100 @@ -78,7 +78,7 @@ and Benedikt Meurer <be...@xfce.org>. .SH "REPORTING BUGS" -Report bugs to http://bugzilla.xfce.org/. +Report bugs to https://gitlab.xfce.org/xfce/xfce4-session/. .SH COPYRIGHT Copyright \(co 2003-2014 Benedikt Meurer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/xfce4-session/xfsm-consolekit.c new/xfce4-session-4.18.2/xfce4-session/xfsm-consolekit.c --- old/xfce4-session-4.18.1/xfce4-session/xfsm-consolekit.c 2023-02-09 12:48:34.000000000 +0100 +++ new/xfce4-session-4.18.2/xfce4-session/xfsm-consolekit.c 2023-03-15 12:08:16.000000000 +0100 @@ -303,7 +303,7 @@ variant = g_dbus_proxy_call_sync (consolekit->proxy, method, - g_variant_new_boolean (TRUE), + g_variant_new ("(b)", TRUE), G_DBUS_CALL_FLAGS_NONE, -1, NULL, @@ -393,7 +393,7 @@ XfconfChannel *channel; gboolean ret = TRUE; - channel = xfsm_open_config (); + channel = xfconf_channel_get (SETTINGS_CHANNEL); if (xfconf_channel_get_bool (channel, "/shutdown/LockScreen", FALSE)) ret = xfce_screensaver_lock (consolekit->screensaver); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/xfce4-session/xfsm-logout-dialog.c new/xfce4-session-4.18.2/xfce4-session/xfsm-logout-dialog.c --- old/xfce4-session-4.18.1/xfce4-session/xfsm-logout-dialog.c 2023-02-07 18:01:05.000000000 +0100 +++ new/xfce4-session-4.18.2/xfce4-session/xfsm-logout-dialog.c 2023-03-15 12:08:16.000000000 +0100 @@ -174,7 +174,7 @@ g_object_unref (provider); /* load xfconf settings */ - channel = xfsm_open_config (); + channel = xfconf_channel_get (SETTINGS_CHANNEL); if (xfsm_shutdown_can_save_session (dialog->shutdown)) save_session = xfconf_channel_get_bool (channel, "/general/SaveOnExit", TRUE); @@ -750,7 +750,7 @@ GdkPixbuf *screenshot = NULL; XfsmFadeout *fadeout = NULL; XfsmLogoutDialog *xfsm_dialog; - XfconfChannel *channel = xfsm_open_config (); + XfconfChannel *channel = xfconf_channel_get (SETTINGS_CHANNEL); gboolean autosave; XfsmShutdown *shutdown; GdkDevice *device; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/xfce4-session/xfsm-manager.c new/xfce4-session-4.18.2/xfce4-session/xfsm-manager.c --- old/xfce4-session-4.18.1/xfce4-session/xfsm-manager.c 2023-01-12 19:23:40.000000000 +0100 +++ new/xfce4-session-4.18.2/xfce4-session/xfsm-manager.c 2023-03-16 10:28:46.000000000 +0100 @@ -1570,6 +1570,8 @@ if (sms != NULL && SmsGetIceConnection (sms) == ice_conn) { + /* maybe we remove client from the queue here but as we also get out + * of the loop no need for extra precaution */ xfsm_manager_close_connection (manager, client, FALSE); break; } @@ -2070,9 +2072,10 @@ remove_clients_for_connection (XfsmManager *manager, const gchar *service_name) { - GList *lp; + /* we might remove elements in queue below so a copy is needed */ + GList *list = g_list_copy (g_queue_peek_nth_link (manager->running_clients, 0)); - for (lp = g_queue_peek_nth_link (manager->running_clients, 0); + for (GList *lp = list; lp; lp = lp->next) { @@ -2082,6 +2085,8 @@ xfsm_manager_close_connection (manager, client, FALSE); } } + + g_list_free (list); } static void @@ -2710,6 +2715,8 @@ XfsmClient *client = XFSM_CLIENT (lp->data); if (g_strcmp0 (xfsm_client_get_object_path (client), arg_client_id) == 0) { + /* maybe we remove client from the queue here but as we also get out + * of the loop no need for extra precaution */ xfsm_manager_close_connection (manager, client, FALSE); xfsm_dbus_manager_complete_unregister_client (object, invocation); return TRUE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/xfce4-session/xfsm-shutdown-fallback.c new/xfce4-session-4.18.2/xfce4-session/xfsm-shutdown-fallback.c --- old/xfce4-session-4.18.1/xfce4-session/xfsm-shutdown-fallback.c 2023-02-09 12:48:34.000000000 +0100 +++ new/xfce4-session-4.18.2/xfce4-session/xfsm-shutdown-fallback.c 2023-03-15 12:08:16.000000000 +0100 @@ -336,7 +336,7 @@ XfceScreensaver *saver; gboolean ret = TRUE; - channel = xfsm_open_config (); + channel = xfconf_channel_get (SETTINGS_CHANNEL); saver = xfce_screensaver_new (); if (xfconf_channel_get_bool (channel, "/shutdown/LockScreen", FALSE)) ret = xfce_screensaver_lock (saver); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/xfce4-session/xfsm-systemd.c new/xfce4-session-4.18.2/xfce4-session/xfsm-systemd.c --- old/xfce4-session-4.18.1/xfce4-session/xfsm-systemd.c 2023-02-09 12:48:34.000000000 +0100 +++ new/xfce4-session-4.18.2/xfce4-session/xfsm-systemd.c 2023-03-15 12:08:16.000000000 +0100 @@ -116,7 +116,7 @@ XfconfChannel *channel; gboolean ret = TRUE; - channel = xfsm_open_config (); + channel = xfconf_channel_get (SETTINGS_CHANNEL); if (xfconf_channel_get_bool (channel, "/shutdown/LockScreen", FALSE)) ret = xfce_screensaver_lock (systemd->screensaver); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-session-4.18.1/xfce4-session-logout/xfce4-session-logout.1 new/xfce4-session-4.18.2/xfce4-session-logout/xfce4-session-logout.1 --- old/xfce4-session-4.18.1/xfce4-session-logout/xfce4-session-logout.1 2020-04-07 11:04:33.000000000 +0200 +++ new/xfce4-session-4.18.2/xfce4-session-logout/xfce4-session-logout.1 2023-02-18 17:17:24.000000000 +0100 @@ -54,7 +54,7 @@ Tarricone <kel...@xfce.org> and Benedikt Meurer <be...@xfce.org> as part of the Xfce project. .SH "REPORTING BUGS" -Report bugs to http://bugzilla.xfce.org/. +Report bugs to https://gitlab.xfce.org/xfce/xfce4-session/. .SH COPYRIGHT Copyright \(co 2004 Benedikt Meurer. .br
