r15036 - in /desktop/experimental/gnome-settings-daemon: ./ debian/ debian/patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Wed Mar 12 14:17:54 UTC 2008
Author: slomo
Date: Wed Mar 12 14:17:54 2008
New Revision: 15036
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15036
Log:
* import gnome-settings-daemon packaging
Added:
desktop/experimental/gnome-settings-daemon/
desktop/experimental/gnome-settings-daemon/debian/
desktop/experimental/gnome-settings-daemon/debian/changelog
desktop/experimental/gnome-settings-daemon/debian/compat
desktop/experimental/gnome-settings-daemon/debian/control
desktop/experimental/gnome-settings-daemon/debian/control.in
desktop/experimental/gnome-settings-daemon/debian/copyright
desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon-dev.install
desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install
desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.links
desktop/experimental/gnome-settings-daemon/debian/patches/
desktop/experimental/gnome-settings-daemon/debian/patches/01_xrdb.patch
desktop/experimental/gnome-settings-daemon/debian/patches/08_extra_touchpad_options.patch
desktop/experimental/gnome-settings-daemon/debian/patches/09_locate_pointer.patch
desktop/experimental/gnome-settings-daemon/debian/patches/11_sleepkey.patch
desktop/experimental/gnome-settings-daemon/debian/patches/19_extra_keybindings.patch
desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch
desktop/experimental/gnome-settings-daemon/debian/patches/91_gsd-add-randr-12.patch
desktop/experimental/gnome-settings-daemon/debian/patches/92_gsd-xrandr-version-check.patch
desktop/experimental/gnome-settings-daemon/debian/rules (with props)
Added: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog (added)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog Wed Mar 12 14:17:54 2008
@@ -1,0 +1,187 @@
+gnome-settings-daemon (2.22.0-1) experimental; urgency=low
+
+ * New package, based on the Ubuntu packaging.
+
+ -- Sebastian Dröge <slomo at debian.org> Wed, 12 Mar 2008 15:17:19 +0100
+
+gnome-settings-daemon (2.22.0-0ubuntu1) hardy; urgency=low
+
+ * New upstream version:
+ - Actually link against libXi when building with XInput support
+ - Disable debug by default
+ - Don't pass GError's if we're not going to use them
+ - Remove obsolete settings for the removed default editor plugin
+ - Updated translations
+
+ -- Sebastien Bacher <seb128 at canonical.com> Mon, 10 Mar 2008 18:53:42 +0100
+
+gnome-settings-daemon (2.21.92-0ubuntu1) hardy; urgency=low
+
+ * New upstream version:
+ - Only print debug messages if --debug is used
+ - Only load plugins when requested not at every start
+ - Fixed #515340, Add a way to prioritise plugin load
+ - Fixed #515341, Signal when plugins finish loading
+ - Fixed #517259, Escape hostname for use in gconf key
+ - Fixed #517418, gnome-display-properties resolution change
+ will not be used after logout or reboot (lp: #191878)
+ - Fixed #518075, Sound plugin should start pulseaudio itself
+ * debian/patches/90_from_svn_pulseaudio_correct_use.patch:
+ - dropped, fixed in the new version
+ * debian/patches/92_gsd-xrandr-version-check.patch:
+ - fix type which was breaking the build
+
+ -- Sebastien Bacher <seb128 at canonical.com> Sat, 08 Mar 2008 14:13:51 +0100
+
+gnome-settings-daemon (2.21.91-0ubuntu6) hardy; urgency=low
+
+ * debian/patches/92_gsd-xrandr-version-check.patch:
+ - Adds checks that the xserver runs Xrandr 1.2 before starting up the
+ xrandr service.
+
+ -- Bryce Harrington <bryce at ubuntu.com> Mon, 03 Mar 2008 21:53:34 -0800
+
+gnome-settings-daemon (2.21.91-0ubuntu5) hardy; urgency=low
+
+ * debian/control.in:
+ - updated libgnomedesktop requirements
+
+ [ Bryce Harrington ]
+
+ * debian/patches/91_gsd-add-randr-12.patch:
+ - Incorporate patch from RedHat to hook into the new xrandr 1.2 code
+ added to gnome-desktop. This enables the daemon to accept xrandr 1.2
+ changes to monitor/screen configuration.
+
+ -- Sebastien Bacher <seb128 at canonical.com> Fri, 29 Feb 2008 18:39:47 +0100
+
+gnome-settings-daemon (2.21.91-0ubuntu4) hardy; urgency=low
+
+ * debian/patches/19_extra_keybindings.patch:
+ - "Add proper xrandr callback when XF86Display is pressed.",
+ thanks Mario Limonciello (lp: #179444)
+ * debian/patches/90_from_svn_pulseaudio_correct_use.patch:
+ - change from svn to make pulseaudio work correctly
+
+ -- Sebastien Bacher <seb128 at canonical.com> Thu, 28 Feb 2008 22:09:04 +0100
+
+gnome-settings-daemon (2.21.91-0ubuntu3) hardy; urgency=low
+
+ * debian/control.in:
+ - rebuild using the new libxklavier due to soname change
+
+ -- Sebastien Bacher <seb128 at canonical.com> Wed, 27 Feb 2008 15:28:24 +0100
+
+gnome-settings-daemon (2.21.91-0ubuntu2) hardy; urgency=low
+
+ * debian/patches/08_extra_touchpad_options.patch:
+ - Turn the touchpad on or off based on the touchpad_enabled gconf
+ setting.
+
+ -- Scott James Remnant <scott at ubuntu.com> Thu, 14 Feb 2008 08:16:25 +0000
+
+gnome-settings-daemon (2.21.91-0ubuntu1) hardy; urgency=low
+
+ * New upstream version:
+ - Use a flat directory instead of a hierarchy to install plugins into
+ - Don't scan the plugins directory recursively
+ - Install the settings plugin to a versioned directory to fix install
+ with libdir == libexecdir
+ - Review short and long descriptions for GConf keys
+ - Don't crash when running the screensaver fails (lp: #188572)
+ - Rename src folder to gnome-settings-daemon
+ - Add uninstalled.pc file for building against an uninstalled copy of g-s-d
+ - Add separate checks for libbackground and use external copy
+ - Use gnome_settings_daemon for the GConf path
+ - Release the Glade XML ASAP and keep track of the 2 widgets we need
+ - Make sure we return a GError if initialization fails
+ - Load the XKB settings initially
+ - Fix leaks
+ - Unref the GConfClient only after done with it
+ - Check for xinput
+ - Fix copy'n'paste error
+ - Declare variables at the beginning of a block
+ to make older compilers happy
+ - Add back support for defining plugin start order
+ - Assign return value from g_slist_sort to the plugins list variable
+ - Replace gnome_vfs usage with GIO
+ * debian/control.in:
+ - updated libglib requirement
+ * debian/gnome-settings-daemon.install:
+ - new version changes
+ * debian/patches/80_from_upstream_fix_xkb_loading.patch,
+ debian/patches/90_configure_xinput_change.patch:
+ - dropped, fixed in the new version
+
+ -- Sebastien Bacher <seb128 at canonical.com> Mon, 11 Feb 2008 17:54:34 +0100
+
+gnome-settings-daemon (2.21.90.2-0ubuntu2) hardy; urgency=low
+
+ * debian/patches/80_from_upstream_fix_xkb_loading.patch:
+ - change from upstream, fix xkb loading (lp: #188171)
+
+ -- Sebastien Bacher <seb128 at canonical.com> Fri, 08 Feb 2008 18:53:05 +0100
+
+gnome-settings-daemon (2.21.90.2-0ubuntu1) hardy; urgency=low
+
+ * New upstream version:
+ - Use correct binary path in DBus service file
+ - Updated translations
+ * debian/patches/90_configure_xinput_change.patch:
+ - new version update
+
+ -- Sebastien Bacher <seb128 at canonical.com> Wed, 06 Feb 2008 19:40:58 +0100
+
+gnome-settings-daemon (2.21.90.1-0ubuntu3) hardy; urgency=low
+
+ * debian/control.in:
+ - replaces on gnome-control-center (LP: #187401)
+
+ -- Sebastien Bacher <seb128 at canonical.com> Thu, 31 Jan 2008 09:06:13 +0100
+
+gnome-settings-daemon (2.21.90.1-0ubuntu2) hardy; urgency=low
+
+ * debian/patches/30_pkgconfig-path.patch,
+ debian/gnome-settings-daemon.links:
+ - updated gnome-control-center changes
+
+ -- Sebastien Bacher <seb128 at canonical.com> Tue, 29 Jan 2008 22:37:57 +0100
+
+gnome-settings-daemon (2.21.90.1-0ubuntu1) hardy; urgency=low
+
+ * New upstream version
+
+ -- Sebastien Bacher <seb128 at canonical.com> Tue, 29 Jan 2008 17:57:47 +0100
+
+gnome-settings-daemon (2.21.90-0ubuntu1) hardy; urgency=low
+
+ * New upstream version:
+ - Add a more appealing animation for locate pointer feature if composite
+ is available
+ - Quote function names in AC_DEFUN to fix autoconf warnings
+ - Fix build with builddir != srcdir
+ - Use g_ascii_dtostr instead of setlocale
+ - Read check for XFT2 that got loast in the g-s-d split
+ - Fix typo in typing break key
+ - Define GNOME_DESKTOP_USE_UNSTABLE_API before including gnome-bg.h
+ - No longer define DBUS_API_SUBJECT_TO_CHANGE
+ - Initialize GnomeProgram to avoid critical warnings from libgnome
+ - Hopefully allow $(libdir) to be the same directory as $(libexecdir) by
+ installing the gnome-settings-daemon binary into a
+ subdirectory of $(libexecdir)
+ - Don't use weird autofoo stuff to install gnome-settings-daemon
+ into another directory
+ - Suppress verbose GConf schema installation output
+ * debian/patches/90_configure_xinput_change.patch:
+ - new version update
+
+ -- Sebastien Bacher <seb128 at canonical.com> Tue, 29 Jan 2008 15:44:13 +0100
+
+gnome-settings-daemon (2.21.5.2-0ubuntu1) hardy; urgency=low
+
+ * Upload to ubuntu
+ * debian/patches/90_configure_xinput_change.patch:
+ - use xinput for the build
+
+ -- Sebastien Bacher <seb128 at canonical.com> Wed, 16 Jan 2008 11:12:19 +0100
+
Added: desktop/experimental/gnome-settings-daemon/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/compat?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/compat (added)
+++ desktop/experimental/gnome-settings-daemon/debian/compat Wed Mar 12 14:17:54 2008
@@ -1,0 +1,1 @@
+5
Added: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control (added)
+++ desktop/experimental/gnome-settings-daemon/debian/control Wed Mar 12 14:17:54 2008
@@ -1,0 +1,21 @@
+Source: gnome-settings-daemon
+Section: gnome
+Priority: extra
+Maintainer: Sebastien Bacher <seb128 at canonical.com>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Build-Depends: cdbs, debhelper (>= 5), dpkg-dev (>= 1.13.19), autotools-dev, libdbus-glib-1-dev (>= 0.74), libglib2.0-dev (>= 2.15.0), libgtk2.0-dev, libgconf2-dev, libgnomevfs2-dev, libgnome-desktop-dev (>= 1:2.21.92-0ubuntu2), libglade2-dev, libgnomekbd-dev (>= 2.21.4), libgstreamer-plugins-base0.10-dev, libxklavier12-dev, libx11-dev, libxml-parser-perl, gnome-pkg-tools
+Standards-Version: 3.7.3
+
+Package: gnome-settings-daemon
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgnome-desktop-2 (>= 1:2.21.92-0ubuntu2)
+Replaces: capplets-data (<< 1:2.21.5), gnome-control-center (<< 1:2.21.5)
+Description: GNOME settings daemon
+ The package contains the GNOME daemon which handles the session settings
+
+Package: gnome-settings-daemon-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libgnome-settings-daemon-dev
+Description: Utility library for accessing gnome-settings-daemon over DBUS
+ The package contains what is required to access gnome-settings-daemon over DBUS
Added: desktop/experimental/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control.in?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in (added)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in Wed Mar 12 14:17:54 2008
@@ -1,0 +1,21 @@
+Source: gnome-settings-daemon
+Section: gnome
+Priority: extra
+Maintainer: Sebastien Bacher <seb128 at canonical.com>
+Uploaders: @GNOME_TEAM@
+Build-Depends: cdbs, debhelper (>= 5), dpkg-dev (>= 1.13.19), autotools-dev, libdbus-glib-1-dev (>= 0.74), libglib2.0-dev (>= 2.15.0), libgtk2.0-dev, libgconf2-dev, libgnomevfs2-dev, libgnome-desktop-dev (>= 1:2.21.92-0ubuntu2), libglade2-dev, libgnomekbd-dev (>= 2.21.4), libgstreamer-plugins-base0.10-dev, libxklavier12-dev, libx11-dev, libxml-parser-perl, gnome-pkg-tools
+Standards-Version: 3.7.3
+
+Package: gnome-settings-daemon
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgnome-desktop-2 (>= 1:2.21.92-0ubuntu2)
+Replaces: capplets-data (<< 1:2.21.5), gnome-control-center (<< 1:2.21.5)
+Description: GNOME settings daemon
+ The package contains the GNOME daemon which handles the session settings
+
+Package: gnome-settings-daemon-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libgnome-settings-daemon-dev
+Description: Utility library for accessing gnome-settings-daemon over DBUS
+ The package contains what is required to access gnome-settings-daemon over DBUS
Added: desktop/experimental/gnome-settings-daemon/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/copyright?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/copyright (added)
+++ desktop/experimental/gnome-settings-daemon/debian/copyright Wed Mar 12 14:17:54 2008
@@ -1,0 +1,72 @@
+This package was debianized by Sebastien Bacher <seb128 at canonical.com> on
+Wed, 16 Jan 2008 11:12:19 +0100.
+
+It was downloaded from http://ftp.acc.umu.se/pub/GNOME/sources/gnome-settings-daemon
+
+Upstream Authors:
+
+ Jonathan Blandford <jrb at redhat.com>
+ William Jon McCann <mccann at jhu.edu>
+
+Copyright:
+
+ Copyright © 2001 Ximian, Inc.
+ Copyright (C) 2007 William Jon McCann <mccann at jhu.edu>
+ Copyright (C) 2000 Helix Code, Inc
+ Copyright © 2007 Matthias Clasen
+ Copyright (C) 2007 Rodrigo Moya
+ Copyright (C) 2007 Anders Carlsson
+ Copyright © 2004 Red Hat, Inc.
+ Copyright 2002 Sun Microsystems, Inc.
+ Copyright © 2005,2006 Novell, Inc.
+ Copyright © 2007 The GNOME Foundation
+ Copyright (C) 2002-2005 - Paolo Maggi
+ Copyright (C) 2002 Red Hat, Inc.
+ Copyright 1998, 2001 Tim Janik
+ Copyright � 2001 Udaltsoft
+ Copyright (C) 2001, 2002, 2003 Bastien Nocera
+ Copyright (C) 2003 Ross Burton <ross at burtonini.com>
+ Copyright © 2001 Jonathan Blandford <jrb at gnome.org>
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+eggaccelerators.h, eggaccelerators.c
+
+License:
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+The Debian packaging is (C) 2008, Sebastien Bacher <seb128 at canonical.com> and
+is licensed under the GPL, see above.
Added: desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon-dev.install?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon-dev.install (added)
+++ desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon-dev.install Wed Mar 12 14:17:54 2008
@@ -1,0 +1,2 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
Added: desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install (added)
+++ desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install Wed Mar 12 14:17:54 2008
@@ -1,0 +1,3 @@
+debian/tmp/etc/gconf/schemas
+debian/tmp/usr/lib/gnome-settings-daemon*
+debian/tmp/usr/share
Added: desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.links?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.links (added)
+++ desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.links Wed Mar 12 14:17:54 2008
@@ -1,0 +1,1 @@
+usr/lib/gnome-settings-daemon/gnome-settings-daemon usr/bin/gnome-settings-daemon
Added: desktop/experimental/gnome-settings-daemon/debian/patches/01_xrdb.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/01_xrdb.patch?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/01_xrdb.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/01_xrdb.patch Wed Mar 12 14:17:54 2008
@@ -1,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/xrdb/gsd-xrdb-manager.c gnome-settings-daemon-2.21.5.2.new/plugins/xrdb/gsd-xrdb-manager.c
+--- gnome-settings-daemon-2.21.5.2/plugins/xrdb/gsd-xrdb-manager.c 2007-12-24 12:18:48.000000000 +0100
++++ gnome-settings-daemon-2.21.5.2.new/plugins/xrdb/gsd-xrdb-manager.c 2008-01-16 15:20:14.000000000 +0100
+@@ -41,7 +41,7 @@
+
+ #define GSD_XRDB_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRDB_MANAGER, GsdXrdbManagerPrivate))
+
+-#define SYSTEM_AD_DIR DATADIR "/xrdb"
++#define SYSTEM_AD_DIR "/etc/gnome/config"
+ #define GENERAL_AD SYSTEM_AD_DIR "/General.ad"
+ #define USER_AD_DIR ".gnome2/xrdb"
+ #define USER_X_RESOURCES ".Xresources"
Added: desktop/experimental/gnome-settings-daemon/debian/patches/08_extra_touchpad_options.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/08_extra_touchpad_options.patch?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/08_extra_touchpad_options.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/08_extra_touchpad_options.patch Wed Mar 12 14:17:54 2008
@@ -1,0 +1,207 @@
+diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.91/plugins/mouse/gsd-mouse-manager.c gnome-settings-daemon-2.21.91.new/plugins/mouse/gsd-mouse-manager.c
+--- gnome-settings-daemon-2.21.91/plugins/mouse/gsd-mouse-manager.c 2008-01-14 17:49:29.000000000 +0000
++++ gnome-settings-daemon-2.21.91.new/plugins/mouse/gsd-mouse-manager.c 2008-02-14 08:16:12.000000000 +0000
+@@ -57,6 +57,10 @@
+ #define KEY_LOCATE_POINTER "/desktop/gnome/peripherals/mouse/locate_pointer"
+ #define KEY_DWELL_ENABLE "/desktop/gnome/accessibility/mouse/dwell_enable"
+ #define KEY_DELAY_ENABLE "/desktop/gnome/accessibility/mouse/delay_enable"
++#define KEY_TOUCHPAD_ENABLED "/desktop/gnome/peripherals/mouse/touchpad_enabled"
++#define KEY_TAP_TO_CLICK "/desktop/gnome/peripherals/mouse/tap_to_click"
++#define KEY_PAD_VERT_SCROLL "/desktop/gnome/peripherals/mouse/pad_vert_scroll"
++#define KEY_PAD_HORIZ_SCROLL "/desktop/gnome/peripherals/mouse/pad_horiz_scroll"
+
+ struct GsdMouseManagerPrivate
+ {
+@@ -395,6 +399,161 @@
+ 0, 0, motion_threshold);
+ }
+
++static int
++set_touchpad_enabled (gboolean state)
++{
++ int numdevices, i;
++ int values[2];
++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
++ XDeviceResolutionControl c;
++
++ values[0] = 0;
++ values[1] = state ? 0 : 1; /* setting is touchpad off */
++ c.control = DEVICE_RESOLUTION;
++ c.length = sizeof(XDeviceResolutionControl);
++ c.first_valuator = 0;
++ c.num_valuators = 2;
++ c.resolutions = values;
++
++ for (i = 0; i < numdevices; i++) {
++ if (strcmp (devicelist[i].name, "Synaptics Touchpad") == 0) {
++ XDevice * device ;
++ gdk_error_trap_push();
++ device = XOpenDevice(GDK_DISPLAY(),
++ devicelist[i].id);
++ if (gdk_error_trap_pop()) {
++ g_warning("Error: Touchpad configured as core pointer.");
++ continue;
++ }
++ gdk_error_trap_push();
++ XChangeDeviceControl (GDK_DISPLAY(), device,
++ DEVICE_RESOLUTION, &c);
++ if (gdk_error_trap_pop()) {
++ g_warning("Error in setting tap to click");
++ continue;
++ }
++ XCloseDevice (GDK_DISPLAY(), device);
++ }
++ }
++ return 0;
++}
++
++static int
++set_tap_to_click (gboolean state)
++{
++ int numdevices, i;
++ int values[2];
++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
++ XDeviceResolutionControl c;
++
++ values[0] = 1;
++ values[1] = state;
++ c.control = DEVICE_RESOLUTION;
++ c.length = sizeof(XDeviceResolutionControl);
++ c.first_valuator = 0;
++ c.num_valuators = 2;
++ c.resolutions = values;
++
++ for (i = 0; i < numdevices; i++) {
++ if (strcmp (devicelist[i].name, "Synaptics Touchpad") == 0) {
++ XDevice * device ;
++ gdk_error_trap_push();
++ device = XOpenDevice(GDK_DISPLAY(),
++ devicelist[i].id);
++ if (gdk_error_trap_pop()) {
++ g_warning("Error: Touchpad configured as core pointer.");
++ continue;
++ }
++ gdk_error_trap_push();
++ XChangeDeviceControl (GDK_DISPLAY(), device,
++ DEVICE_RESOLUTION, &c);
++ if (gdk_error_trap_pop()) {
++ g_warning("Error in setting tap to click");
++ continue;
++ }
++ XCloseDevice (GDK_DISPLAY(), device);
++ }
++ }
++ return 0;
++}
++
++static int
++set_vert_scroll (gboolean state)
++{
++ int numdevices, i;
++ int values[2];
++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
++ XDeviceResolutionControl c;
++
++ values[0] = 2;
++ values[1] = state;
++ c.control = DEVICE_RESOLUTION;
++ c.length = sizeof(XDeviceResolutionControl);
++ c.first_valuator = 0;
++ c.num_valuators = 2;
++ c.resolutions = values;
++
++ for (i = 0; i < numdevices; i++) {
++ if (strcmp (devicelist[i].name, "Synaptics Touchpad") == 0) {
++ XDevice * device ;
++ gdk_error_trap_push();
++ device = XOpenDevice(GDK_DISPLAY(),
++ devicelist[i].id);
++ if (gdk_error_trap_pop()) {
++ g_warning("Error: Touchpad configured as core pointer.");
++ continue;
++ }
++ gdk_error_trap_push();
++ XChangeDeviceControl (GDK_DISPLAY(), device,
++ DEVICE_RESOLUTION, &c);
++ if (gdk_error_trap_pop()) {
++ g_warning("Error in setting vertical scroll");
++ continue;
++ }
++ XCloseDevice (GDK_DISPLAY(), device);
++ }
++ }
++ return 0;
++}
++
++static int
++set_horiz_scroll (gboolean state)
++{
++ int numdevices, i;
++ int values[2];
++ XDeviceInfo *devicelist = XListInputDevices (GDK_DISPLAY(), &numdevices);
++ XDeviceResolutionControl c;
++
++ values[0] = 3;
++ values[1] = state;
++ c.control = DEVICE_RESOLUTION;
++ c.length = sizeof(XDeviceResolutionControl);
++ c.first_valuator = 0;
++ c.num_valuators = 2;
++ c.resolutions = values;
++
++ for (i = 0; i < numdevices; i++) {
++ if (strcmp (devicelist[i].name, "Synaptics Touchpad") == 0) {
++ XDevice * device ;
++ gdk_error_trap_push();
++ device = XOpenDevice(GDK_DISPLAY(),
++ devicelist[i].id);
++ if (gdk_error_trap_pop()) {
++ g_warning("Error: Touchpad configured as core pointer.");
++ continue;
++ }
++ gdk_error_trap_push();
++ XChangeDeviceControl (GDK_DISPLAY(), device,
++ DEVICE_RESOLUTION, &c);
++ if (gdk_error_trap_pop()) {
++ g_warning("Error in setting horizontal scroll");
++ continue;
++ }
++ XCloseDevice (GDK_DISPLAY(), device);
++ }
++ }
++ return 0;
++}
+
+ #define KEYBOARD_GROUP_SHIFT 13
+ #define KEYBOARD_GROUP_MASK ((1 << 13) | (1 << 14))
+@@ -597,6 +756,18 @@
+ if (entry->value->type == GCONF_VALUE_INT) {
+ set_motion_threshold (manager, gconf_value_get_int (entry->value));
+ }
++ } else if (! strcmp (entry->key, KEY_TOUCHPAD_ENABLED)) {
++ if (entry->value->type == GCONF_VALUE_BOOL)
++ set_touchpad_enabled (gconf_value_get_bool (entry->value));
++ } else if (! strcmp (entry->key, KEY_TAP_TO_CLICK)) {
++ if (entry->value->type == GCONF_VALUE_BOOL)
++ set_tap_to_click (gconf_value_get_bool (entry->value));
++ } else if (! strcmp (entry->key, KEY_PAD_VERT_SCROLL)) {
++ if (entry->value->type == GCONF_VALUE_BOOL)
++ set_vert_scroll (gconf_value_get_bool (entry->value));
++ } else if (! strcmp (entry->key, KEY_PAD_HORIZ_SCROLL)) {
++ if (entry->value->type == GCONF_VALUE_BOOL)
++ set_horiz_scroll (gconf_value_get_bool (entry->value));
+ } else if (! strcmp (entry->key, KEY_LOCATE_POINTER)) {
+ if (entry->value->type == GCONF_VALUE_BOOL) {
+ set_locate_pointer (manager, gconf_value_get_bool (entry->value));
+@@ -662,6 +833,11 @@
+ gconf_client_get_bool (client, KEY_DWELL_ENABLE, NULL),
+ gconf_client_get_bool (client, KEY_DELAY_ENABLE, NULL));
+
++ set_touchpad_enabled (gconf_client_get_bool (client, KEY_TOUCHPAD_ENABLED, NULL));
++ set_tap_to_click (gconf_client_get_bool (client, KEY_TAP_TO_CLICK, NULL));
++ set_vert_scroll (gconf_client_get_bool (client, KEY_PAD_VERT_SCROLL, NULL));
++ set_horiz_scroll (gconf_client_get_bool (client, KEY_PAD_HORIZ_SCROLL, NULL));
++
+ g_object_unref (client);
+
+ return TRUE;
Added: desktop/experimental/gnome-settings-daemon/debian/patches/09_locate_pointer.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/09_locate_pointer.patch?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/09_locate_pointer.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/09_locate_pointer.patch Wed Mar 12 14:17:54 2008
@@ -1,0 +1,18 @@
+diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/mouse/gsd-mouse-manager.c gnome-settings-daemon-2.21.5.2.new/plugins/mouse/gsd-mouse-manager.c
+--- gnome-settings-daemon-2.21.5.2/plugins/mouse/gsd-mouse-manager.c 2008-01-14 18:49:29.000000000 +0100
++++ gnome-settings-daemon-2.21.5.2.new/plugins/mouse/gsd-mouse-manager.c 2008-01-16 15:22:22.000000000 +0100
+@@ -436,11 +436,11 @@
+ XAllowEvents (gdk_x11_get_default_xdisplay (),
+ ReplayKeyboard,
+ xev->xkey.time);
+- XUngrabKeyboard (gdk_x11_get_default_xdisplay (),
+- xev->xkey.time);
++ /* XUngrabKeyboard (gdk_x11_get_default_xdisplay (),
++ xev->xkey.time); */
+ }
+
+- return GDK_FILTER_REMOVE;
++ /* return GDK_FILTER_REMOVE; */
+ }
+ return GDK_FILTER_CONTINUE;
+ }
Added: desktop/experimental/gnome-settings-daemon/debian/patches/11_sleepkey.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/11_sleepkey.patch?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/11_sleepkey.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/11_sleepkey.patch Wed Mar 12 14:17:54 2008
@@ -1,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.5.2/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-2.21.5.2.new/plugins/media-keys/gsd-media-keys-manager.c
+--- gnome-settings-daemon-2.21.5.2/plugins/media-keys/gsd-media-keys-manager.c 2008-01-14 16:12:58.000000000 +0100
++++ gnome-settings-daemon-2.21.5.2.new/plugins/media-keys/gsd-media-keys-manager.c 2008-01-16 15:23:45.000000000 +0100
+@@ -869,7 +869,7 @@
+ do_mail_action (manager);
+ break;
+ case SLEEP_KEY:
+- do_sleep_action ("apm", "xset dpms force off");
++ do_sleep_action ("gdm-signal -s", "xset dpms force off");
+ break;
+ case SCREENSAVER_KEY:
+ if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) {
Added: desktop/experimental/gnome-settings-daemon/debian/patches/19_extra_keybindings.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/19_extra_keybindings.patch?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/19_extra_keybindings.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/19_extra_keybindings.patch Wed Mar 12 14:17:54 2008
@@ -1,0 +1,52 @@
+diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.91/data/apps_gnome_settings_daemon_keybindings.schemas.in gnome-settings-daemon-2.21.91.new/data/apps_gnome_settings_daemon_keybindings.schemas.in
+--- gnome-settings-daemon-2.21.91/data/apps_gnome_settings_daemon_keybindings.schemas.in 2008-02-08 06:29:12.000000000 -0600
++++ gnome-settings-daemon-2.21.91.new/data/apps_gnome_settings_daemon_keybindings.schemas.in 2008-02-28 15:04:31.000000000 -0600
+@@ -132,6 +132,16 @@
+ </locale>
+ </schema>
+
++ <schema>
++ <key>/schemas/apps/gnome_settings_daemon/keybindings/xrandr</key>
++ <applyto>/apps/gnome_settings_daemon/keybindings/xrandr</applyto>
++ <type>string</type>
++ <default>0xd6</default>
++ <locale name="C">
++ <short>Activate connected display</short>
++ <long>Activate a connected display using xrandr</long>
++ </locale>
++ </schema>
+
+ <schema>
+ <key>/schemas/apps/gnome_settings_daemon/keybindings/help</key>
+diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.91/plugins/media-keys/actions/acme.h gnome-settings-daemon-2.21.91.new/plugins/media-keys/actions/acme.h
+--- gnome-settings-daemon-2.21.91/plugins/media-keys/actions/acme.h 2007-12-24 05:18:48.000000000 -0600
++++ gnome-settings-daemon-2.21.91.new/plugins/media-keys/actions/acme.h 2008-02-28 15:04:31.000000000 -0600
+@@ -33,6 +33,7 @@
+ HOME_KEY,
+ MEDIA_KEY,
+ CALCULATOR_KEY,
++ XRANDR_KEY,
+ SEARCH_KEY,
+ EMAIL_KEY,
+ SLEEP_KEY,
+@@ -66,6 +67,7 @@
+ { HOME_KEY, GCONF_BINDING_DIR "/home", NULL },
+ { MEDIA_KEY, GCONF_BINDING_DIR "/media", NULL },
+ { CALCULATOR_KEY, GCONF_BINDING_DIR "/calculator", NULL },
++ { XRANDR_KEY, GCONF_BINDING_DIR "/xrandr", NULL },
+ { SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
+ { EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL },
+ { SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL },
+diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.21.91/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-2.21.91.new/plugins/media-keys/gsd-media-keys-manager.c
+--- gnome-settings-daemon-2.21.91/plugins/media-keys/gsd-media-keys-manager.c 2008-02-28 15:04:30.000000000 -0600
++++ gnome-settings-daemon-2.21.91.new/plugins/media-keys/gsd-media-keys-manager.c 2008-02-28 15:05:14.000000000 -0600
+@@ -903,6 +903,9 @@
+ case NEXT_KEY:
+ return do_multimedia_player_action (manager, "Next");
+ break;
++ case XRANDR_KEY:
++ execute (manager, "xrandr --auto", FALSE, FALSE);
++ break;
+ default:
+ g_assert_not_reached ();
+ }
Added: desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/30_pkgconfig-path.patch Wed Mar 12 14:17:54 2008
@@ -1,0 +1,11 @@
+--- gnome-settings-daemon/data/gnome-settings-daemon.pc.in.orig 2007-11-03 02:19:59.340704956 +0100
++++ gnome-settings-daemon/data/gnome-settings-daemon.pc.in 2007-11-03 02:20:30.994508804 +0100
+@@ -2,6 +2,8 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++libexecdir=@libexecdir@
++binary=${libexecdir}/gnome-settings-daemon
+
+ Name: gnome-settings-daemon
+ Description: Utility library for accessing gnome-settings-daemon over DBUS
Added: desktop/experimental/gnome-settings-daemon/debian/patches/91_gsd-add-randr-12.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/91_gsd-add-randr-12.patch?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/91_gsd-add-randr-12.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/91_gsd-add-randr-12.patch Wed Mar 12 14:17:54 2008
@@ -1,0 +1,309 @@
+diff -Nurp gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c gnome-settings-daemon-2.21.91-modified/plugins/xrandr/gsd-xrandr-manager.c
+--- gnome-settings-daemon-2.21.91/plugins/xrandr/gsd-xrandr-manager.c 2007-12-24 03:18:48.000000000 -0800
++++ gnome-settings-daemon-2.21.91-modified/plugins/xrandr/gsd-xrandr-manager.c 2008-02-20 16:23:14.000000000 -0800
+@@ -36,6 +36,10 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+
++#define I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA
++#include <libgnomeui/monitor-db.h>
++#include <libgnomeui/randrwrap.h>
++
+ #ifdef HAVE_RANDR
+ #include <X11/extensions/Xrandr.h>
+ #endif
+@@ -61,258 +65,60 @@ G_DEFINE_TYPE (GsdXrandrManager, gsd_xra
+
+ static gpointer manager_object = NULL;
+
+-#ifdef HAVE_RANDR
+-static int
+-get_rotation (GConfClient *client,
+- char *display,
+- int screen)
+-{
+- char *key;
+- int val;
+- GError *error;
+-
+- key = g_strdup_printf ("%s/%d/rotation", display, screen);
+- error = NULL;
+- val = gconf_client_get_int (client, key, &error);
+- g_free (key);
+-
+- if (error == NULL) {
+- return val;
+- }
+-
+- g_error_free (error);
+-
+- return 0;
+-}
+-
+-static int
+-get_resolution (GConfClient *client,
+- int screen,
+- char *keys[],
+- int *width,
+- int *height)
+-{
+- int i;
+- char *key;
+- char *val;
+- int w;
+- int h;
+-
+- val = NULL;
+- for (i = 0; keys[i] != NULL; i++) {
+- key = g_strdup_printf ("%s/%d/resolution", keys[i], screen);
+- val = gconf_client_get_string (client, key, NULL);
+- g_free (key);
+-
+- if (val != NULL) {
+- break;
+- }
+- }
+-
+- if (val == NULL) {
+- return -1;
+- }
+-
+- if (sscanf (val, "%dx%d", &w, &h) != 2) {
+- g_free (val);
+- return -1;
+- }
+-
+- g_free (val);
+-
+- *width = w;
+- *height = h;
+-
+- return i;
++static GdkAtom
++gnome_randr_atom (void)
++{
++ return gdk_atom_intern ("_GNOME_RANDR_ATOM", FALSE);
+ }
+
+-static int
+-get_rate (GConfClient *client,
+- char *display,
+- int screen)
++static Atom
++gnome_randr_xatom (void)
+ {
+- char *key;
+- int val;
+- GError *error;
+-
+- key = g_strdup_printf ("%s/%d/rate", display, screen);
+- error = NULL;
+- val = gconf_client_get_int (client, key, &error);
+- g_free (key);
+-
+- if (error == NULL) {
+- return val;
+- }
+-
+- g_error_free (error);
+-
+- return 0;
++ return gdk_x11_atom_to_xatom (gnome_randr_atom());
+ }
+
+-static int
+-find_closest_size (XRRScreenSize *sizes,
+- int nsizes,
+- int width,
+- int height)
+-{
+- int closest;
+- int closest_width;
+- int closest_height;
+- int i;
+-
+- closest = 0;
+- closest_width = sizes[0].width;
+- closest_height = sizes[0].height;
+- for (i = 1; i < nsizes; i++) {
+- if (ABS (sizes[i].width - width) < ABS (closest_width - width) ||
+- (sizes[i].width == closest_width &&
+- ABS (sizes[i].height - height) < ABS (closest_height - height))) {
+- closest = i;
+- closest_width = sizes[i].width;
+- closest_height = sizes[i].height;
+- }
++static GdkFilterReturn
++on_client_message (GdkXEvent *xevent,
++ GdkEvent *event,
++ gpointer data)
++{
++ RWScreen *screen = data;
++ XEvent *ev = (XEvent *)xevent;
++
++ if (ev->type == ClientMessage &&
++ ev->xclient.message_type == gnome_randr_xatom()) {
++
++ configuration_apply_stored (screen);
++
++ return GDK_FILTER_REMOVE;
+ }
+-
+- return closest;
++
++ /* Pass the event on to GTK+ */
++ return GDK_FILTER_CONTINUE;
+ }
+-#endif /* HAVE_RANDR */
+
+ static void
+-apply_settings (GsdXrandrManager *manager)
++on_randr_event (RWScreen *screen, gpointer data)
+ {
+-#ifdef HAVE_RANDR
+- GdkDisplay *display;
+- Display *xdisplay;
+- int major;
+- int minor;
+- int event_base;
+- int error_base;
+- GConfClient *client;
+- int n_screens;
+- GdkScreen *screen;
+- GdkWindow *root_window;
+- int width;
+- int height;
+- int rate;
+- int rotation;
+-#ifdef HOST_NAME_MAX
+- char hostname[HOST_NAME_MAX + 1];
+-#else
+- char hostname[256];
+-#endif
+- char *specific_path;
+- char *keys[3];
+- int i;
+- int residx;
+-
+- display = gdk_display_get_default ();
+- xdisplay = gdk_x11_display_get_xdisplay (display);
+-
+- /* Check if XRandR is supported on the display */
+- if (!XRRQueryExtension (xdisplay, &event_base, &error_base)
+- || XRRQueryVersion (xdisplay, &major, &minor) == 0) {
+- return;
+- }
+-
+- if (major != 1 || minor < 1) {
+- g_message ("Display has unsupported version of XRandR (%d.%d), not setting resolution.", major, minor);
+- return;
+- }
+-
+- client = gconf_client_get_default ();
+-
+- i = 0;
+- specific_path = NULL;
+- if (gethostname (hostname, sizeof (hostname)) == 0) {
+- specific_path = g_strconcat ("/desktop/gnome/screen/", hostname, NULL);
+- keys[i++] = specific_path;
+- }
+- keys[i++] = "/desktop/gnome/screen/default";
+- keys[i++] = NULL;
+-
+- n_screens = gdk_display_get_n_screens (display);
+- for (i = 0; i < n_screens; i++) {
+- screen = gdk_display_get_screen (display, i);
+- root_window = gdk_screen_get_root_window (screen);
+- residx = get_resolution (client, i, keys, &width, &height);
+-
+- if (residx != -1) {
+- XRRScreenSize *sizes;
+- int nsizes;
+- int j;
+- int closest;
+- short *rates;
+- int nrates;
+- int status;
+- int current_size;
+- short current_rate;
+- XRRScreenConfiguration *config;
+- Rotation current_rotation;
+-
+- config = XRRGetScreenInfo (xdisplay, gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)));
+-
+- rate = get_rate (client, keys[residx], i);
+-
+- sizes = XRRConfigSizes (config, &nsizes);
+- closest = find_closest_size (sizes, nsizes, width, height);
+-
+- rates = XRRConfigRates (config, closest, &nrates);
+- for (j = 0; j < nrates; j++) {
+- if (rates[j] == rate)
+- break;
+- }
+-
+- /* Rate not supported, let X pick */
+- if (j == nrates)
+- rate = 0;
+-
+- rotation = get_rotation (client, keys[residx], i);
+- if (rotation == 0)
+- rotation = RR_Rotate_0;
+-
+- current_size = XRRConfigCurrentConfiguration (config, ¤t_rotation);
+- current_rate = XRRConfigCurrentRate (config);
+-
+- if (closest != current_size ||
+- rate != current_rate ||
+- rotation != current_rotation) {
+- status = XRRSetScreenConfigAndRate (xdisplay,
+- config,
+- gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
+- closest,
+- (Rotation) rotation,
+- rate,
+- GDK_CURRENT_TIME);
+- }
+-
+- XRRFreeScreenConfigInfo (config);
+- }
+- }
+-
+- g_free (specific_path);
+-
+- /* We need to make sure we process the screen resize event. */
+- gdk_display_sync (display);
+-
+- while (gtk_events_pending ()) {
+- gtk_main_iteration ();
+- }
+-
+- if (client != NULL) {
+- g_object_unref (client);
+- }
+-
+-#endif /* HAVE_RANDR */
++ /* FIXME: Set up any new screens here */
+ }
+
+ gboolean
+ gsd_xrandr_manager_start (GsdXrandrManager *manager,
+ GError **error)
+ {
++ RWScreen *rw_screen;
++
+ g_debug ("Starting xrandr manager");
++
++ rw_screen = rw_screen_new (gdk_screen_get_default(), on_randr_event, NULL);
+
+- apply_settings (manager);
+-
++ configuration_apply_stored (rw_screen);
++
++ gdk_add_client_message_filter (gnome_randr_atom(),
++ on_client_message,
++ rw_screen);
++
+ return TRUE;
+ }
+
Added: desktop/experimental/gnome-settings-daemon/debian/patches/92_gsd-xrandr-version-check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/92_gsd-xrandr-version-check.patch?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/92_gsd-xrandr-version-check.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/92_gsd-xrandr-version-check.patch Wed Mar 12 14:17:54 2008
@@ -1,0 +1,45 @@
+diff -Nurp gnome-settings-daemon-2.21.91-patched/plugins/xrandr/gsd-xrandr-manager.c gnome-settings-daemon-2.21.91-working/plugins/xrandr/gsd-xrandr-manager.c
+--- gnome-settings-daemon-2.21.91-patched/plugins/xrandr/gsd-xrandr-manager.c 2008-03-03 16:48:36.000000000 -0800
++++ gnome-settings-daemon-2.21.91-working/plugins/xrandr/gsd-xrandr-manager.c 2008-03-03 17:41:58.000000000 -0800
+@@ -107,10 +107,30 @@ gboolean
+ gsd_xrandr_manager_start (GsdXrandrManager *manager,
+ GError **error)
+ {
++#ifdef HAVE_RANDR
+ RWScreen *rw_screen;
+-
++ int major, minor;
++ int event_base, error_base;
++ GdkDisplay *display;
++ Display *xdisplay;
++
+ g_debug ("Starting xrandr manager");
+-
++
++ display = gdk_display_get_default ();
++ xdisplay = gdk_x11_display_get_xdisplay (display);
++
++ if (!XRRQueryExtension (xdisplay, &event_base, &error_base) ||
++ XRRQueryVersion (xdisplay, &major, &minor) == 0)
++ {
++ g_warning( _("The X Server does not support the XRandR extension. Runtime resolution changes to the display size are not available.") );
++ return TRUE; /* Or should this return FALSE? */
++ }
++ else if (major != 1 || minor < 2)
++ {
++ g_warning( _("The version of the XRandR extension is incompatible with this program. Runtime changes to the display size are not available."));
++ return TRUE; /* Or should this return FALSE? */
++ }
++
+ rw_screen = rw_screen_new (gdk_screen_get_default(), on_randr_event, NULL);
+
+ configuration_apply_stored (rw_screen);
+@@ -118,7 +138,7 @@ gsd_xrandr_manager_start (GsdXrandrManag
+ gdk_add_client_message_filter (gnome_randr_atom(),
+ on_client_message,
+ rw_screen);
+-
++#endif /* HAVE_RANDR */
+ return TRUE;
+ }
+
Added: desktop/experimental/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/rules?rev=15036&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/rules (added)
+++ desktop/experimental/gnome-settings-daemon/debian/rules Wed Mar 12 14:17:54 2008
@@ -1,0 +1,11 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+
+binary-install/gnome-settings-daemon::
+ find debian -name '*.a' -delete
+ find debian -name '*.la' -delete
Propchange: desktop/experimental/gnome-settings-daemon/debian/rules
------------------------------------------------------------------------------
svn:executable = *
More information about the pkg-gnome-commits
mailing list