Hello community,

here is the log from the commit of package xfce4-settings for openSUSE:Factory 
checked in at 2012-04-19 10:42:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-settings (Old)
 and      /work/SRC/openSUSE:Factory/.xfce4-settings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xfce4-settings", Maintainer is "xfce-maintain...@suse.de"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-settings/xfce4-settings.changes    
2011-09-26 10:21:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xfce4-settings.new/xfce4-settings.changes       
2012-04-19 10:42:29.000000000 +0200
@@ -1,0 +2,10 @@
+Fri Mar 30 14:47:33 UTC 2012 - g...@opensuse.org
+
+- specfile cleanup
+- correct dependencies
+- added xfce4-settings-fix-keyboard-shortcut-settings.patch in
+  order to clear out all old entries in the list of shortcuts when
+  resetting the keyboard shortcuts in order to prevent duplicates
+  (bxo#8138)
+
+-------------------------------------------------------------------

New:
----
  xfce4-settings-fix-keyboard-shortcut-settings.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xfce4-settings.spec ++++++
--- /var/tmp/diff_new_pack.PviwsF/_old  2012-04-19 10:42:30.000000000 +0200
+++ /var/tmp/diff_new_pack.PviwsF/_new  2012-04-19 10:42:30.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package xfce4-settings
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -16,32 +16,36 @@
 #
 
 
-
 Name:           xfce4-settings
 Version:        4.8.3
-Release:        5
-License:        GPL-2.0 and GPL-2.0+
+Release:        0
 Summary:        Tools for Managing Xfce Settings
-Url:            http://www.xfce.org/projects/xfce4-settings
+License:        GPL-2.0 and GPL-2.0+
 Group:          System/GUI/XFCE
-Source:         %{name}-%{version}.tar.bz2
+Url:            http://docs.xfce.org/xfce/xfce4-settings/start
+Source:         
http://archive.xfce.org/src/xfce/xfce4-settings/4.8/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM xfce4-settings-fix-keyboard-shortcut-settings.patch 
g...@opensuse.org bxo#8138 -- When resetting the keyboard shortcuts clear out 
all old entries in the list of shortcuts in order to prevent duplicates 
(backported from upstream git)
+Patch0:         xfce4-settings-fix-keyboard-shortcut-settings.patch
 BuildRequires:  intltool
+BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(exo-1)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(inputproto)
+BuildRequires:  pkgconfig(libcanberra)
 BuildRequires:  pkgconfig(libnotify)
-BuildRequires:  pkgconfig(libwnck-1.0)
+BuildRequires:  pkgconfig(libxfce4kbd-private-2)
 BuildRequires:  pkgconfig(libxfce4ui-1)
 BuildRequires:  pkgconfig(libxfce4util-1.0)
 BuildRequires:  pkgconfig(libxfconf-0)
 BuildRequires:  pkgconfig(libxklavier)
-BuildRequires:  pkgconfig(libxfce4kbd-private-2)
-BuildRequires:  pkgconfig(libcanberra)
-BuildRequires:  xorg-x11-devel
-BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xcursor)
+BuildRequires:  pkgconfig(xi)
+BuildRequires:  pkgconfig(xrandr)
 Recommends:     %{name}-lang = %{version}
-Requires:       %{name}-branding >= %{version}
+Requires:       %{name}-branding = %{version}
 Provides:       xfce-mcs-manager = %{version}
 Obsoletes:      xfce-mcs-manager < %{version}
 Provides:       xfce-mcs-plugins = %{version}
@@ -58,8 +62,8 @@
 a daemon which exports XSettings to applications.
 
 %package branding-upstream
-License:        GPL-2.0 and GPL-2.0+
 Summary:        Upstream Branding of xfce4-settings
+Group:          System/GUI/XFCE
 Supplements:    packageand(%{name}:branding-upstream)
 Provides:       %{name}-branding = %{version}
 Conflicts:      otherproviders(%{name}-branding)
@@ -68,12 +72,13 @@
 BuildArch:      noarch
 
 %description branding-upstream
-This package provides the upstream look and feel for Xfce.
-
+This package provides the upstream look and feel for xfce4-settings.
 
 %lang_package
+
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -83,6 +88,7 @@
 
 %install
 %make_install
+
 %suse_update_desktop_file xfce-display-settings
 %suse_update_desktop_file xfce-keyboard-settings
 %suse_update_desktop_file xfce-mouse-settings
@@ -91,20 +97,19 @@
 %suse_update_desktop_file xfce-ui-settings
 %suse_update_desktop_file xfce-settings-manager
 %suse_update_desktop_file xfce4-settings-helper-autostart
+
 rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
-%find_lang %{name}
+
+%find_lang %{name} %{?no_lang_C}
 
 %clean
 rm -rf %{buildroot}
 
-%if 0%{?suse_version} >= 1140
-
 %post
 %desktop_database_post
 
 %postun
 %desktop_database_postun
-%endif
 
 %files
 %defattr(-,root,root)

++++++ xfce4-settings-fix-keyboard-shortcut-settings.patch ++++++
>From 6d5cf80f7b7826e791d503713c965e969549ea15 Mon Sep 17 00:00:00 2001
From: Eric Koegel <eric.koe...@gmail.com>
Date: Sun, 12 Feb 2012 11:41:41 +0000
Subject: Clear out all the old entries before resetting to defaults

When resetting the keyboard shortcuts to their default entries we
need to clear out all the old entires in the list to prevent
duplicates from appearing. (Bug 8138)
---
diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c 
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
index 8776a69..e8b6811 100644
--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c
+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
@@ -958,7 +958,9 @@ xfce_keyboard_settings_delete_button_clicked 
(XfceKeyboardSettings *settings)
 static void
 xfce_keyboard_settings_reset_button_clicked (XfceKeyboardSettings *settings)
 {
-  gint response;
+  gint          response;
+  GObject      *view;
+  GtkListStore *store;
 
   g_return_if_fail (XFCE_IS_KEYBOARD_SETTINGS (settings));
 
@@ -971,7 +973,15 @@ xfce_keyboard_settings_reset_button_clicked 
(XfceKeyboardSettings *settings)
                                   NULL);
 
   if (G_LIKELY (response == GTK_RESPONSE_YES))
-    xfce_shortcuts_provider_reset_to_defaults (settings->priv->provider);
+    {
+      view = gtk_builder_get_object (GTK_BUILDER (settings), 
"kbd_shortcuts_view");
+
+      /* Clear out all the previous entries */
+      store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view)));
+      gtk_list_store_clear (store);
+
+      xfce_shortcuts_provider_reset_to_defaults (settings->priv->provider);
+    }
 }
 
 
--
cgit v0.9.0.2
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to