Hello community, here is the log from the commit of package xfce4-panel for openSUSE:Factory checked in at 2015-01-07 09:38:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-panel (Old) and /work/SRC/openSUSE:Factory/.xfce4-panel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-panel/xfce4-panel.changes 2013-10-03 07:27:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-panel.new/xfce4-panel.changes 2015-01-07 09:38:53.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 5 10:34:33 UTC 2015 - [email protected] + +- add xfce4-panel-fix-action-button-saving-session.patch in order + to fix the action button logout session saving logic (bxo#7930, + backported from upstream git) + +------------------------------------------------------------------- New: ---- xfce4-panel-fix-action-button-saving-session.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel.spec ++++++ --- /var/tmp/diff_new_pack.CJEtMd/_old 2015-01-07 09:38:54.000000000 +0100 +++ /var/tmp/diff_new_pack.CJEtMd/_new 2015-01-07 09:38:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfce4-panel # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,6 +33,8 @@ Patch1: xfce4-panel-add-calendar-popup.patch # PATCH-FIX-UPSTREAM xfce4-panel-fix-actions-autohide.patch bnc#764310 bxo#8960 [email protected] -- Fix autohiding after using the actions plugin menu Patch2: xfce4-panel-fix-actions-autohide.patch +# PATCH-FIX-UPSTREAM xfce4-panel-fix-action-button-saving-session.patch bxo#7930 [email protected] -- Fix action button logout session saving logic (backported from upstream git) +Patch3: xfce4-panel-fix-action-button-saving-session.patch BuildRequires: ed BuildRequires: intltool BuildRequires: perl @@ -104,6 +106,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # fix up missing icon ed -s plugins/clock/clock.desktop.in 2>/dev/null <<'EOF' ,s/^Icon=office-calendar/Icon=application-x-executable/ ++++++ xfce4-panel-fix-action-button-saving-session.patch ++++++ >From 3848b0c0df4c2d744e4a9db2653c0507f78fbba3 Mon Sep 17 00:00:00 2001 From: Andrzej <[email protected]> Date: Wed, 19 Nov 2014 09:37:54 +0000 Subject: Panel action button Logout always save session (bug #7930) diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c index 4a5dde4..1c76c48 100644 --- a/plugins/actions/actions.c +++ b/plugins/actions/actions.c @@ -911,10 +911,12 @@ static void actions_plugin_action_activate (GtkWidget *widget, ActionsPlugin *plugin) { - ActionEntry *entry; - gboolean unattended = FALSE; - GError *error = NULL; - gboolean succeed = FALSE; + ActionEntry *entry; + gboolean unattended = FALSE; + GError *error = NULL; + gboolean succeed = FALSE; + XfconfChannel *channel; + gboolean allow_save; entry = g_object_get_qdata (G_OBJECT (widget), action_quark); panel_return_if_fail (entry != NULL); @@ -925,26 +927,29 @@ actions_plugin_action_activate (GtkWidget *widget, && !actions_plugin_action_confirmation (plugin, entry, &unattended)) return; + channel = xfconf_channel_get ("xfce4-session"); + allow_save = xfconf_channel_get_bool (channel, "/general/SaveOnExit", FALSE); + switch (entry->type) { case ACTION_TYPE_LOGOUT: succeed = actions_plugin_action_dbus_xfsm ("Logout", FALSE, - !unattended, &error); + allow_save, &error); break; case ACTION_TYPE_LOGOUT_DIALOG: succeed = actions_plugin_action_dbus_xfsm ("Logout", TRUE, - !unattended, &error); + allow_save, &error); break; case ACTION_TYPE_RESTART: succeed = actions_plugin_action_dbus_xfsm ("Restart", FALSE, - !unattended, &error); + allow_save, &error); break; case ACTION_TYPE_SHUTDOWN: succeed = actions_plugin_action_dbus_xfsm ("Shutdown", FALSE, - !unattended, &error); + allow_save, &error); break; case ACTION_TYPE_HIBERNATE: -- cgit v0.10.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
