Preparing for 1.4 release.mate-settings-daemon-1.4.0

2 files changed, 244 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index e7986d8..a103fc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,208 @@
+commit cd78e460a3f22eb9553f5c73b921e79c38278764
+Author: Stefano Karapetsas <[email protected]>
+Date:   Tue Jul 10 00:39:39 2012 +0200
+
+    sync translations with transifex
+
+ po/ar.po | 3443 ++++----------------------------------------------------------
+ po/et.po |  556 ++++++----
+ po/eu.po |  807 +++++++--------
+ po/tr.po |  850 +++++++++-------
+ 4 files changed, 1465 insertions(+), 4191 deletions(-)
+
+commit 96445bc6c0985320b486e4ec61155d0a5edc6a38
+Author: Stefano Karapetsas <[email protected]>
+Date:   Tue Jul 10 00:38:17 2012 +0200
+
+    add po gnome copyrights file
+
+ po/gnome-copyrights.txt | 1249 +++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 1249 insertions(+)
+
+commit d43c2a93701728947e0f4f96edda8631062282c0
+Author: Stefano Karapetsas <[email protected]>
+Date:   Fri Jun 22 18:06:39 2012 +0200
+
+    fix missing gsd=>msd rename due to pull request
+
+ plugins/media-keys/msd-media-keys-manager.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c70776f31ccd0551a7694ec4485ed26a0a53f9cd
+Author: Perberos <[email protected]>
+Date:   Tue Jun 5 13:05:34 2012 -0300
+
+    commenting "changed" callback, related with issue #16 on mate-desktop (https://github.com/mate-desktop/mate-desktop/issues/16)
+
+ plugins/background/msd-background-manager.c |   11 ++++++-----
+ plugins/background/test-background.c        |    2 +-
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+commit d22aab3682bdd800f6a6e7c2a0ef6b6cfd8ffe03
+Author: Perberos <[email protected]>
+Date:   Tue Jun 5 12:19:54 2012 -0300
+
+    changing code format (http://imageshack.us/photo/my-images/9/254223656580e542a60a.jpg/)
+
+ plugins/background/msd-background-manager.c | 1101 ++++++++++++++-------------
+ plugins/background/msd-background-manager.h |   59 +-
+ plugins/background/msd-background-plugin.c  |  117 +--
+ plugins/background/msd-background-plugin.h  |   51 +-
+ plugins/background/test-background.c        |   28 +-
+ 5 files changed, 711 insertions(+), 645 deletions(-)
+
+commit 47ab5efee5617d8110b3942512e9370c9367ec89
+Author: Perberos <[email protected]>
+Date:   Tue Jun 5 12:14:36 2012 -0300
+
+    removing autogenerated file
+
+ plugins/media-keys/libmedia-keys.la |   41 -----------------------------------
+ 1 file changed, 41 deletions(-)
+
+commit 43e7752536e4c78693a5520b6562e2081e9bbc52
+Merge: 2275e12 559fc8f
+Author: Stefano Karapetsas <[email protected]>
+Date:   Thu May 3 06:46:12 2012 -0700
+
+    Merge pull request #5 from stefanct/master
+    
+    media-keys: fix the "calculator key"
+
+commit 559fc8f95855dfe81dbafe9d3587b63cdec7b9dc
+Author: Stefan Tauner <[email protected]>
+Date:   Thu May 3 15:27:26 2012 +0200
+
+    media-keys: fix the "calculator key"
+    
+    try to find mate-calc, fall back to gcalctool if it is not found.
+    
+    Signed-off-by: Stefan Tauner <[email protected]>
+
+ plugins/media-keys/msd-media-keys-manager.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+commit 2275e121531db04c158811cc06b04a63b6d05979
+Author: Stefano Karapetsas <[email protected]>
+Date:   Fri Apr 6 11:53:20 2012 +0200
+
+    remove .gitignore
+
+ .gitignore |   49 -------------------------------------------------
+ 1 file changed, 49 deletions(-)
+
+commit f2acd50eb2525f6970dc1cf0e05060d3d3cc135d
+Merge: ab58977 c96bc4e
+Author: Stefano Karapetsas <[email protected]>
+Date:   Fri Apr 6 02:51:59 2012 -0700
+
+    Merge pull request #4 from benpicco/master
+    
+    sync with upstream
+
+commit c96bc4ead7779af1617f505e1590ab8652242ad0
+Author: Rodrigo Moya <[email protected]>
+Date:   Fri Nov 5 15:44:43 2010 +0100
+
+    housekeeping: Don't access free'd memory if a volume is unmounted whilst the dialog is displayed
+
+ plugins/housekeeping/msd-disk-space.c |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+commit 396265b9bf41b6331833a1938eb3e065e5928fe5
+Author: Rodrigo Moya <[email protected]>
+Date:   Tue Apr 19 15:59:35 2011 +0200
+
+    media-keys: React to stream-removed signal from GvcMixerControl
+
+ plugins/media-keys/msd-media-keys-manager.c |   17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+commit 3b1fa7dde9b8fc7fe0b22c9385703a2d150cd643
+Author: Bastien Nocera <[email protected]>
+Date:   Fri Nov 5 16:01:35 2010 +0000
+
+    xrandr: Use Xorg monitor settings by default
+    
+    So as not to break the default behaviour.
+
+ data/apps_mate_settings_daemon_xrandr.schemas.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a525db8f795d2101969a47f06c9fb6b60a497fb3
+Author: Martin Pitt <[email protected]>
+Date:   Tue Oct 5 11:30:46 2010 +0200
+
+    RANDR - Add mateconf key for disabling boot time configuration
+    
+    In a lot of situations it is undesirable to have g-s-d change the XRandR
+    settings, because it overrides X.org customizations, leads to unnecessary mode
+    switches, or increases boot time.
+    
+    Add a mateconf key "use_xorg_monitor_settings" to disable
+    apply_default_boot_configuration(), in which case the XRandR configuration will
+    not be touched unless there is a global or per-user configuration file.
+    
+    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=631388
+    Bug-Ubuntu: https://launchpad.net/bugs/640807
+
+ data/apps_mate_settings_daemon_xrandr.schemas.in |   19 +++++++++++++++++++
+ plugins/xrandr/msd-xrandr-manager.c              |    4 +++-
+ 2 files changed, 22 insertions(+), 1 deletion(-)
+
+commit 60b0ab065772c3f109d7471c0d6d814d477f9803
+Author: Gary Lin <[email protected]>
+Date:   Fri Oct 29 12:31:07 2010 -0500
+
+    (randr) bnc#647304 - If the stored configuration fails at startup, use the fallback configurations
+    
+    Previously, if a stored configuration existed but it could not be applied due
+    to nonmatching monitors, we would do nothing else - potentially leaving the user
+    in whatever startup state was used by the X server.  Now, in that condition
+    we simply fall back to trying the system-global configuration or the boot-time
+    configuration.
+    
+    Signed-off-by: Federico Mena Quintero <[email protected]>
+
+ plugins/xrandr/msd-xrandr-manager.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+commit 5da7f7c6ef1e59bba1f3aa7fa24fcaa44187704e
+Author: Vincent Untz <[email protected]>
+Date:   Tue Oct 12 15:53:30 2010 +0200
+
+    Revert "Fix launching the display configuration tool"
+    
+    In 2.32, we still want to use mate-display-properties.
+    
+    This reverts commit 03112091d18ad0f9cc66b5f8835aadb1c47bc9ee.
+
+ plugins/xrandr/msd-xrandr-manager.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 033a04ef9392b9d9bc5943ae592373c6dac96369
+Author: Benjamin Valentin <[email protected]>
+Date:   Fri Mar 16 09:18:47 2012 +0100
+
+    add .gitignore
+
+ .gitignore |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 49 insertions(+)
+
+commit ab589772234b8c89260bf10503df64bb2396070a
+Author: Stefano Karapetsas <[email protected]>
+Date:   Tue Feb 28 23:45:19 2012 +0100
+
+    update for 1.2 release
+
+ AUTHORS      |    7 +-
+ ChangeLog    | 1065 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ MAINTAINERS  |   20 --
+ README       |    3 +
+ autogen.sh   |    4 +-
+ configure.ac |    4 +-
+ 6 files changed, 1078 insertions(+), 25 deletions(-)
+
 commit 2466d4c04a33d8d81e92cea9bd8970f70401f126
 Author: Stefano Karapetsas <[email protected]>
 Date:   Tue Feb 28 23:43:06 2012 +0100
@@ -5,7 +210,7 @@ Date:   Tue Feb 28 23:43:06 2012 +0100
     updated nl translation
 
  po/nl.po |  845 +++++++++++++++++++++++++++++++-------------------------------
- 1 files changed, 423 insertions(+), 422 deletions(-)
+ 1 file changed, 423 insertions(+), 422 deletions(-)
 
 commit 53df40e0f61c25e078a76fc1a10e92597ce037cb
 Author: Stefano Karapetsas <[email protected]>
@@ -18,7 +223,7 @@ Date:   Tue Feb 28 23:39:15 2012 +0100
  distro/ubuntu/postrm   |    8 --------
  distro/ubuntu/preinst  |    7 -------
  distro/ubuntu/prerm    |   11 -----------
- 5 files changed, 0 insertions(+), 69 deletions(-)
+ 5 files changed, 69 deletions(-)
 
 commit 2dfe3164d9f195b50e066def8e2a4782b5910c10
 Merge: ecd8a15 e46b4ad
@@ -271,8 +476,8 @@ Date:   Tue Feb 21 20:13:04 2012 -0800
  plugins/common/Makefile.am                         |   10 +-
  plugins/common/gsd-keygrab.c                       |   24 +-
  plugins/common/gsd-keygrab.h                       |    6 +-
- plugins/common/gsd-osd-window.c                    |  128 ++++----
- plugins/common/gsd-osd-window.h                    |   50 ++--
+ plugins/common/gsd-osd-window.c                    |  128 +++----
+ plugins/common/gsd-osd-window.h                    |   50 +--
  plugins/datetime/Makefile.am                       |   26 +-
  plugins/datetime/gsd-datetime-mechanism-main.c     |    6 +-
  plugins/datetime/gsd-datetime-mechanism.c          |  148 ++++----
@@ -284,30 +489,30 @@ Date:   Tue Feb 21 20:13:04 2012 -0800
  plugins/dummy/gsd-dummy-plugin.c                   |   42 +-
  plugins/dummy/gsd-dummy-plugin.h                   |   28 +-
  plugins/font/Makefile.am                           |   12 +-
- plugins/font/gsd-font-manager.c                    |   52 ++--
+ plugins/font/gsd-font-manager.c                    |   52 +--
  plugins/font/gsd-font-manager.h                    |   34 +-
  plugins/font/gsd-font-plugin.c                     |   42 +-
  plugins/font/gsd-font-plugin.h                     |   28 +-
  plugins/housekeeping/Makefile.am                   |   24 +-
  plugins/housekeeping/gsd-disk-space.c              |   36 +-
  plugins/housekeeping/gsd-disk-space.h              |   10 +-
- plugins/housekeeping/gsd-housekeeping-manager.c    |   50 ++--
+ plugins/housekeeping/gsd-housekeeping-manager.c    |   50 +--
  plugins/housekeeping/gsd-housekeeping-manager.h    |   34 +-
  plugins/housekeeping/gsd-housekeeping-plugin.c     |   42 +-
  plugins/housekeeping/gsd-housekeeping-plugin.h     |   28 +-
- plugins/housekeeping/gsd-ldsm-dialog.c             |   90 +++---
- plugins/housekeeping/gsd-ldsm-dialog.h             |   44 ++--
+ plugins/housekeeping/gsd-ldsm-dialog.c             |   90 ++---
+ plugins/housekeeping/gsd-ldsm-dialog.h             |   44 +--
  plugins/housekeeping/gsd-ldsm-trash-empty.c        |   10 +-
  plugins/housekeeping/gsd-ldsm-trash-empty.h        |   14 +-
  plugins/keybindings/Makefile.am                    |   12 +-
- plugins/keybindings/gsd-keybindings-manager.c      |  102 +++---
+ plugins/keybindings/gsd-keybindings-manager.c      |  102 ++---
  plugins/keybindings/gsd-keybindings-manager.h      |   34 +-
  plugins/keybindings/gsd-keybindings-plugin.c       |   42 +-
  plugins/keybindings/gsd-keybindings-plugin.h       |   28 +-
  plugins/keyboard/Makefile.am                       |   20 +-
  plugins/keyboard/delayed-dialog.c                  |    4 +-
  plugins/keyboard/delayed-dialog.h                  |    2 +-
- plugins/keyboard/gsd-keyboard-manager.c            |  144 ++++----
+ plugins/keyboard/gsd-keyboard-manager.c            |  144 +++----
  plugins/keyboard/gsd-keyboard-manager.h            |   36 +-
  plugins/keyboard/gsd-keyboard-plugin.c             |   42 +-
  plugins/keyboard/gsd-keyboard-plugin.h             |   28 +-
@@ -315,19 +520,19 @@ Date:   Tue Feb 21 20:13:04 2012 -0800
  plugins/keyboard/gsd-keyboard-xkb.h                |   12 +-
  plugins/keyboard/gsd-xmodmap.c                     |    8 +-
  plugins/keyboard/gsd-xmodmap.h                     |    4 +-
- plugins/media-keys/Makefile.am                     |   52 ++--
+ plugins/media-keys/Makefile.am                     |   52 +--
  plugins/media-keys/acme.h                          |    2 +-
  plugins/media-keys/gsd-media-keys-manager.c        |  194 +++++-----
  plugins/media-keys/gsd-media-keys-manager.h        |   40 +-
  plugins/media-keys/gsd-media-keys-manager.xml      |    2 +-
  plugins/media-keys/gsd-media-keys-plugin.c         |   42 +-
  plugins/media-keys/gsd-media-keys-plugin.h         |   28 +-
- plugins/media-keys/gsd-media-keys-window.c         |  132 ++++----
- plugins/media-keys/gsd-media-keys-window.h         |   54 ++--
+ plugins/media-keys/gsd-media-keys-window.c         |  132 +++----
+ plugins/media-keys/gsd-media-keys-window.h         |   54 +--
  plugins/media-keys/test-media-keys.c               |    8 +-
  plugins/media-keys/test-media-window.c             |   42 +-
  plugins/mouse/Makefile.am                          |   28 +-
- plugins/mouse/gsd-locate-pointer.c                 |   56 ++--
+ plugins/mouse/gsd-locate-pointer.c                 |   56 +--
  plugins/mouse/gsd-locate-pointer.h                 |    2 +-
  plugins/mouse/gsd-mouse-manager.c                  |  116 +++---
  plugins/mouse/gsd-mouse-manager.h                  |   34 +-
@@ -338,7 +543,7 @@ Date:   Tue Feb 21 20:13:04 2012 -0800
  plugins/smartcard/Makefile.am                      |   18 +-
  plugins/smartcard/gsd-smartcard-manager.c          |  400 ++++++++++----------
  plugins/smartcard/gsd-smartcard-manager.h          |   76 ++--
- plugins/smartcard/gsd-smartcard-plugin.c           |  146 ++++----
+ plugins/smartcard/gsd-smartcard-plugin.c           |  146 +++----
  plugins/smartcard/gsd-smartcard-plugin.h           |   28 +-
  plugins/smartcard/gsd-smartcard.c                  |  192 +++++-----
  plugins/smartcard/gsd-smartcard.h                  |   82 ++--
@@ -348,18 +553,18 @@ Date:   Tue Feb 21 20:13:04 2012 -0800
  plugins/sound/gsd-sound-plugin.c                   |   42 +-
  plugins/sound/gsd-sound-plugin.h                   |   28 +-
  plugins/typing-break/Makefile.am                   |   12 +-
- plugins/typing-break/gsd-typing-break-manager.c    |   96 +++---
+ plugins/typing-break/gsd-typing-break-manager.c    |   96 ++---
  plugins/typing-break/gsd-typing-break-manager.h    |   34 +-
  plugins/typing-break/gsd-typing-break-plugin.c     |   42 +-
  plugins/typing-break/gsd-typing-break-plugin.h     |   28 +-
- plugins/xrandr/Makefile.am                         |   50 ++--
- plugins/xrandr/gsd-xrandr-manager.c                |  256 +++++++-------
+ plugins/xrandr/Makefile.am                         |   50 +--
+ plugins/xrandr/gsd-xrandr-manager.c                |  256 ++++++-------
  plugins/xrandr/gsd-xrandr-manager.h                |   34 +-
  plugins/xrandr/gsd-xrandr-manager.xml              |    4 +-
  plugins/xrandr/gsd-xrandr-plugin.c                 |   42 +-
  plugins/xrandr/gsd-xrandr-plugin.h                 |   28 +-
  plugins/xrdb/Makefile.am                           |   12 +-
- plugins/xrdb/gsd-xrdb-manager.c                    |   92 +++---
+ plugins/xrdb/gsd-xrdb-manager.c                    |   92 ++---
  plugins/xrdb/gsd-xrdb-manager.h                    |   34 +-
  plugins/xrdb/gsd-xrdb-plugin.c                     |   42 +-
  plugins/xrdb/gsd-xrdb-plugin.h                     |   28 +-
@@ -367,7 +572,7 @@ Date:   Tue Feb 21 20:13:04 2012 -0800
  plugins/xsettings/gsd-xsettings-manager.c          |   14 +-
  plugins/xsettings/gsd-xsettings-plugin.c           |    4 +-
  po/POTFILES.in                                     |   32 +-
- po/af.po                                           |  140 ++++----
+ po/af.po                                           |  140 +++----
  po/am.po                                           |   78 ++--
  po/ar.po                                           |  242 ++++++------
  po/as.po                                           |  192 +++++-----
@@ -402,7 +607,7 @@ Date:   Tue Feb 21 20:13:04 2012 -0800
  po/gu.po                                           |  192 +++++-----
  po/he.po                                           |  242 ++++++------
  po/hi.po                                           |  192 +++++-----
- po/hr.po                                           |  140 ++++----
+ po/hr.po                                           |  140 +++----
  po/hu.po                                           |  242 ++++++------
  po/id.po                                           |  242 ++++++------
  po/is.po                                           |   78 ++--
@@ -416,7 +621,7 @@ Date:   Tue Feb 21 20:13:04 2012 -0800
  po/lv.po                                           |  202 +++++-----
  po/mai.po                                          |  192 +++++-----
  po/mg.po                                           |   78 ++--
- po/mk.po                                           |  140 ++++----
+ po/mk.po                                           |  140 +++----
  po/ml.po                                           |  192 +++++-----
  po/mn.po                                           |   78 ++--
  po/mr.po                                           |  202 +++++-----
@@ -442,7 +647,7 @@ Date:   Tue Feb 21 20:13:04 2012 -0800
  po/sq.po                                           |   78 ++--
  po/sr.po                                           |  242 ++++++------
  po/[email protected]                                     |  242 ++++++------
- po/sv.po                                           |  254 +++++++-------
+ po/sv.po                                           |  254 ++++++-------
  po/ta.po                                           |  242 ++++++------
  po/te.po                                           |  202 +++++-----
  po/th.po                                           |  202 +++++-----
@@ -464,7 +669,7 @@ Date:   Mon Jan 30 12:44:31 2012 -0300
     g_get_user_config_dir() would be better (https://github.com/mate-desktop/mate-panel/issues/8)
 
  plugins/font/gsd-font-manager.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 commit eed429dc4b0c84be8c417f87bee1a25c14fdcb0f
 Author: Perberos <[email protected]>
@@ -473,7 +678,7 @@ Date:   Mon Jan 30 12:43:25 2012 -0300
     update version number on archlinux scripts
 
  distro/archlinux/PKGBUILD |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 2780dbb687aa51d8e882da0b6f6fc25fdc51a6a3
 Author: Perberos <[email protected]>
@@ -482,7 +687,7 @@ Date:   Mon Jan 30 12:41:58 2012 -0300
     set patch on archlinux script
 
  distro/archlinux/PKGBUILD |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
+ 1 file changed, 6 insertions(+), 6 deletions(-)
 
 commit 5ef77186f09411b243c59cd1288b15097f739ad1
 Author: Stefano Karapetsas <[email protected]>
@@ -502,7 +707,7 @@ Date:   Tue Jan 24 22:54:06 2012 +0100
     fix typo (Unkown => Unknown), thanks lintian!
 
  plugins/housekeeping/gsd-disk-space.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit abdc5ece08ead525084fb8ea4c220e75af0d0820
 Author: Stefano Karapetsas <[email protected]>
@@ -521,7 +726,7 @@ Date:   Mon Jan 23 10:55:24 2012 +0100
     fix media-keys/Makefile.am
 
  plugins/media-keys/Makefile.am |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 commit 8f91d9b2cefd226c60234a6122b624ba65e7b424
 Author: Stefano Karapetsas <[email protected]>
@@ -534,10 +739,10 @@ Date:   Sun Jan 22 22:59:41 2012 +0100
 
  configure.ac                                       |   44 +++
  plugins/media-keys/Makefile.am                     |    9 -
- plugins/media-keys/cut-n-paste/Makefile.am         |   34 ++-
+ plugins/media-keys/cut-n-paste/Makefile.am         |   34 +-
  .../cut-n-paste/gvc-gstreamer-acme-vol.c           |  402 ++++++++++++++++++++
  .../cut-n-paste/gvc-gstreamer-acme-vol.h           |   56 +++
- plugins/media-keys/gsd-media-keys-manager.c        |   75 ++++-
+ plugins/media-keys/gsd-media-keys-manager.c        |   75 +++-
  6 files changed, 601 insertions(+), 19 deletions(-)
 
 commit 5c00322b3ea38a54d06e6390711dd49c31b77040
@@ -557,7 +762,7 @@ Date:   Sat Dec 10 20:54:12 2011 +0100
     fixed libmatekbd version
 
  configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 commit 1dcec899caafbaeeaeedd9245da14dcba249808d
 Author: Stefano Karapetsas <[email protected]>
@@ -578,7 +783,7 @@ Date:   Thu Dec 8 14:13:06 2011 -0300
     fixing issue with <Control> key at keybinding
 
  plugins/common/eggaccelerators.c |   19 +++++++++++++++++++
- 1 files changed, 19 insertions(+), 0 deletions(-)
+ 1 file changed, 19 insertions(+)
 
 commit 80bf2f97b9d1c11592c29836b3f960d788464987
 Author: Perberos <[email protected]>
@@ -587,7 +792,7 @@ Date:   Thu Dec 8 14:12:24 2011 -0300
     using .config instead of .mate2
 
  plugins/font/gsd-font-manager.c |   39 ++++++++++++++++++++-------------------
- 1 files changed, 20 insertions(+), 19 deletions(-)
+ 1 file changed, 20 insertions(+), 19 deletions(-)
 
 commit 283de05cf3b8bed9dcde9e80875b860520de392a
 Author: Perberos <[email protected]>
@@ -597,11 +802,11 @@ Date:   Thu Dec 8 14:09:44 2011 -0300
 
  configure.ac                                      |   28 ++++---
  distro/archlinux/PKGBUILD                         |    2 +-
- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c |   20 ++--
+ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c |   20 ++---
  plugins/background/gsd-background-manager.c       |    8 +-
  plugins/common/gsd-keygrab.c                      |    4 +-
  plugins/keyboard/gsd-keyboard-manager.c           |   73 ++++++++--------
- plugins/keyboard/gsd-keyboard-xkb.c               |   46 +++++------
+ plugins/keyboard/gsd-keyboard-xkb.c               |   46 +++++-----
  plugins/keyboard/gsd-keyboard-xkb.h               |   10 +--
  plugins/media-keys/gsd-media-keys-manager.c       |   93 +++++++++++----------
  plugins/mouse/gsd-mouse-manager.c                 |   90 ++++++++++----------
@@ -615,7 +820,7 @@ Date:   Sat Dec 3 19:56:58 2011 -0300
     tabs vs spaces
 
  configure.ac |   52 ++++++++++++++++++++++++++--------------------------
- 1 files changed, 26 insertions(+), 26 deletions(-)
+ 1 file changed, 26 insertions(+), 26 deletions(-)
 
 commit 2b8ac94d2d4f1aa3090e186bb0ff9e5aed493e6c
 Author: Perberos <[email protected]>
@@ -659,7 +864,7 @@ Date:   Sat Dec 3 19:56:17 2011 -0300
  plugins/xrdb/data/Makefile.in              |  483 --
  plugins/xsettings/Makefile.in              |  718 --
  po/Makefile.in.in                          |  217 -
- 36 files changed, 0 insertions(+), 43092 deletions(-)
+ 36 files changed, 43092 deletions(-)
 
 commit 782f63710d79023c0762279fbb147a518abf8caf
 Author: Steve Zesch <[email protected]>
@@ -1063,4 +1268,4 @@ Date:   Thu Dec 1 23:53:21 2011 -0300
  po/zh_HK.po                                        | 1477 +++
  po/zh_TW.po                                        | 1513 +++
  po/zu.po                                           | 2975 ++++++
- 385 files changed, 265847 insertions(+), 0 deletions(-)
+ 385 files changed, 265847 insertions(+)
diff --git a/configure.ac b/configure.ac
index ced7fab..ecd1b1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.60])
 
 m4_define([msd_api_version_major],[1])
-m4_define([msd_api_version_minor],[2])
+m4_define([msd_api_version_minor],[4])
 m4_define([msd_api_version_micro],[0])
 m4_define([msd_api_version],
 	[msd_api_version_major.msd_api_version_minor.msd_api_version_micro])