[gnome-settings-daemon] (87 commits) Non-fast-forward update to branch wip/wayland-display

[Giovanni Campagna <gcampagna src gnome org>]

The branch 'wip/wayland-display' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 http://live.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  8d0af5b... Adapt to GnomeRR DBus rewrite

Commits added to the branch:

  af4cea1... wacom: Make the highlight duration of buttons in the OSD lo (*)
  11a3dbd... wacom: Remove the auto_off property from the OSD's buttons (*)
  e263efd... Update .gitignore (*)
  baa022d... xrandr: Simplify layout of adjacent screens (*)
  ccfcd88... housekeeping: Simplify cleanup code (*)
  0f7cbfe... xrandr: don't ever show a dialog for xrandr failures (*)
  2f7fd9c... Updated German translation (*)
  1c203be... power: Simplify up_client_get_devices() handling (*)
  2024483... wacom: Make sure the touch property is set to a touch devic (*)
  855c01c... power: Remove mention to fixed bug (*)
  0a4d6cc... print-notifications: Translate printer warnings (*)
  ff4406c... wacom: Make the OSD Window be a popup one (*)
  3058457... cursor: Request the OSK when the cursor is disabled (*)
  e4df875... wacom: Use the OSD window to edit the tablets' buttons (*)
  b9744e3... wacom: Move the OSD related key release processing to the G (*)
  2dac931... main: Remove empty finalize function (*)
  f8bcc02... main: Use GCancellable (*)
  14c67b6... main: Remove _stop() function (*)
  eb58637... Updated POTFILES.in (*)
  c6654fa... Updated Czech translation (*)
  a75aaa3... Updated Czech translation (*)
  8abc8d3... Updated Spanish translation (*)
  487a936... media-keys: Fix launched apps not getting focused (*)
  7058386... color: Split out the color calibration functionality into a (*)
  32cdd48... color: Split out the color profile functionality into a new (*)
  09f2cf1... color: Split out the X11 functionality into a new file (*)
  7c8fae7... Updated POTFILES.in (*)
  1b9d99f... wacom: Add the gsd_wacom_osd_window_set_edition_mode method (*)
  8b2f27e... wacom: Add a DBus interface and method to show the OSD wind (*)
  28a23b8... smartcard: drop old implementation (*)
  5832062... smartcard: add back smartcard support (*)
  12b3784... Revert "build: Disable smartcard plugin for now" (*)
  3769377... build: Fix smartcard plugin with srcdir != builddir (*)
  6818518... Updated POTFILES.in (*)
  26db852... Updated Czech translation (*)
  eb6f970... smartcard: fix driver activation notification (*)
  caf7545... smartcard: add screensaver proxy (*)
  8d67329... smartcard: add session manager proxy (*)
  92460ad... smartcard: support old card removal actions (*)
  18a369a... Tajik translation added (*)
  5573b87... Dist fixes for color and smartcard (*)
  54d6309... 3.9.5 (*)
  3e33737... mouse: replace dialog by warning (*)
  83da7bf... Updated Hebrew translation. (*)
  af7fdef... print-notifications: Move translator comments to appropriat (*)
  fda5e90... print-notifications: Coding style fixes (*)
  fc28380... print-notifications: Use better debugging messages (*)
  d264695... print-notifications: Honor CUPS' default port number (*)
  727f599... print-notifications: Connect to message bus asynchronously (*)
  a59cda6... print-notifications: Cancel subscription to DBus signals wh (*)
  e673cb3... print-notifications: Stop renewing of CUPS subscriptions on (*)
  2c7af20... print-notifications: Don't use DBus recipient URI for remot (*)
  dbee939... print-notifications: Don't run connection test for local se (*)
  723238e... print-notifications: Use IPP method for getting IPP notific (*)
  4880601... print-notifications: Regularly check for notifications from (*)
  9dd8a7c... print-notifications: Show final job states for remote CUPS  (*)
  0df8545... media-keys: Add bus namespace watching (*)
  cae0fc0... media-keys: Use MPRIS when no apps use the media-keys API (*)
  5614e2c... power: Add Brightness property for keyboard backlights (*)
  f79014f... power: always use absolute values to set the keyboard brigh (*)
  42485c0... media-keys: update for new power plugin DBus API (*)
  f927057... Updated Galician translations (*)
  696e04d... xsettings: Disable middle-click paste by default (*)
  e1a103b... Updated Traditional Chinese translation(Hong Kong and Taiwa (*)
  f06310d... Fixed Russian translation (*)
  7ac2994... mouse: Enable edge scrolling if two-finger scroll is unavai (*)
  a63ad9d... Updated Brazilian Portuguese translation (*)
  e962474... Updated Hungarian translation (*)
  0c5fd82... power: Use logind to discover critical action availability (*)
  099b16d... tests: Add support for CanHibernate/CanSuspend (*)
  ef4ae20... power: Add test case for falling back on critical (*)
  e7b2835... power: Handle critical action for UPSes (*)
  541cf96... common: generate session manager proxy (*)
  bed7ce8... smartcard: use common session proxy (*)
  2cabb3a... common: rename gnome-settings-session to gnome-settings-bus (*)
  4a0fabd... common: move screensaver proxy fetching into common code (*)
  8aa16ea... build: Fix srcdir != builddir (*)
  0ba4547... build: Add one more srcdir != builddir fix (*)
  a9483f7... Updated Traditional Chinese translation(Hong Kong and Taiwa (*)
  0846def... color: Rename GsdColorX11 to GsdColorState as it's no longe (*)
  06f74d8... Updated Spanish translation (*)
  047f030... xsettings: Add support for window-scaling (*)
  caaac49... color: adapt to GnomeRR API changes
  76bb65b... power: adapt to GnomeRR API changes
  e98b4da... wacom: adapt to GnomeRR API changes
  b5f24c5... xrandr: remove ApplyConfiguration DBus method
  7ebb999... xrandr: adapt to the new model for display configuration

(*) This commit already existed in another branch; no separate mail sent