commit 4b64b669ef48c96fc42c3cf1bf8145b6183d8c4e
Author: Thomas Wood <thomas.wood@intel.com>
Date: Mon Jun 7 18:04:02 2010 +0100
Release 2.31.3
NEWS | 35 +++++++++++++++++++++++++++++++++++
configure.ac | 2 +-
2 files changed, 36 insertions(+), 1 deletions(-)
commit 0bab4d746a71b7f300735df19f562f7b151c8d70
Author: Thomas Wood <thomas.wood@intel.com>
Date: Mon Jun 7 17:58:58 2010 +0100
examples: make sure the label is shown when the panel is created
examples/cc-example-panel.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 8836316161e4bbdc3b353183a439bda074aa8eeb
Author: Thomas Wood <thomas.wood@intel.com>
Date: Mon Jun 7 16:51:11 2010 +0100
display: convert display capplet to a settings panel
Add CcPanel and module implmenetation for the display settings.
capplets/Makefile.am | 5 +-
capplets/display/Makefile.am | 78 -
capplets/display/TODO | 837 -------
capplets/display/build.sh | 1 -
capplets/display/display-capplet.ui | 437 ----
capplets/display/display-properties.desktop.in.in | 14 -
capplets/display/foo-marshal.c | 279 ---
capplets/display/foo-marshal.h | 63 -
.../gnome-display-properties-install-systemwide.c | 272 ---
.../icons/16x16/preferences-desktop-display.png | Bin 613 -> 0 bytes
.../icons/22x22/preferences-desktop-display.png | Bin 866 -> 0 bytes
.../icons/24x24/preferences-desktop-display.png | Bin 909 -> 0 bytes
.../icons/32x32/preferences-desktop-display.png | Bin 1602 -> 0 bytes
.../icons/scalable/preferences-desktop-display.svg | 470 ----
capplets/display/org.gnome.randr.policy.in | 29 -
capplets/display/scrollarea.c | 1944 ---------------
capplets/display/scrollarea.h | 124 -
capplets/display/xrandr-capplet.c | 2552 --------------------
configure.ac | 4 +-
panels/Makefile.am | 8 +-
panels/display/Makefile.am | 81 +
panels/display/TODO | 837 +++++++
panels/display/cc-display-panel.c | 114 +
panels/display/cc-display-panel.h | 74 +
panels/display/display-capplet.ui | 397 +++
panels/display/display-module.c | 41 +
panels/display/foo-marshal.c | 279 +++
panels/display/foo-marshal.h | 63 +
panels/display/gnome-display-panel.desktop.in.in | 15 +
.../gnome-display-properties-install-systemwide.c | 272 +++
.../icons/16x16/preferences-desktop-display.png | Bin 0 -> 613 bytes
.../icons/22x22/preferences-desktop-display.png | Bin 0 -> 866 bytes
.../icons/24x24/preferences-desktop-display.png | Bin 0 -> 909 bytes
.../icons/32x32/preferences-desktop-display.png | Bin 0 -> 1602 bytes
.../icons/scalable/preferences-desktop-display.svg | 470 ++++
panels/display/org.gnome.randr.policy.in | 29 +
panels/display/scrollarea.c | 1944 +++++++++++++++
panels/display/scrollarea.h | 124 +
panels/display/xrandr-capplet.c | 2516 +++++++++++++++++++
panels/display/xrandr-capplet.h | 3 +
po/POTFILES.in | 10 +-
po/POTFILES.skip | 2 +-
42 files changed, 7276 insertions(+), 7112 deletions(-)
commit b3530ea2511603cbd8a1eddc0586cf188701e5e2
Author: Thomas Wood <thomas.wood@intel.com>
Date: Mon Jun 7 10:33:45 2010 +0100
mouse/keyboard: hide accessibility preferences now in universal-access
Temporarily hide the mouse and keyboard accessibility preferences that are
now implemented in the universal-access panel.
.../keyboard/gnome-keyboard-properties-dialog.ui | 2 --
panels/mouse/gnome-mouse-properties.ui | 1 -
2 files changed, 0 insertions(+), 3 deletions(-)
commit 86b80431934fb75ef85b2321a91215577ec3d149
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Sun Jun 6 17:55:27 2010 +0200
Updated Galician translations
po/gl.po | 522 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 424 insertions(+), 98 deletions(-)
commit 1e615fafda464d2a615c8d86d427bf25bd13a066
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat Jun 5 10:04:37 2010 +0300
Updated Hebrew translation.
po/he.po | 530 +++++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 420 insertions(+), 110 deletions(-)
commit b6e436acda24bc61196ccf291b8f76a0ba98f3b8
Author: Thomas Wood <thomas.wood@intel.com>
Date: Fri Jun 4 17:59:03 2010 +0100
Remove accessibility capplet from the build
The accessibility capplet is now superseded by the unviversal-access panel.
capplets/Makefile.am | 2 --
configure.ac | 3 ---
po/POTFILES.in | 3 ---
po/POTFILES.skip | 2 --
4 files changed, 0 insertions(+), 10 deletions(-)
commit 54127b805e48b46662907a86a06c8c3a52b19c37
Author: Thomas Wood <thomas.wood@intel.com>
Date: Fri Jun 4 17:45:54 2010 +0100
build: Make sure distcheck passes
Rename files in POTFILES to match new names. Rename the universal access
.desktop file to be consistent with the other desktop files.
configure.ac | 2 +-
panels/universal-access/Makefile.am | 4 ++--
.../gnome-universal-access-panel.desktop.in.in | 11 +++++++++++
.../gnome-universal-access.desktop.in.in | 11 -----------
po/POTFILES.in | 13 +++++++------
po/POTFILES.skip | 12 ++++++------
6 files changed, 27 insertions(+), 26 deletions(-)
commit 18443d9c647df3f788e1c2d44a225f7aa8e9c848
Author: Thomas Wood <thomas.wood@intel.com>
Date: Fri Jun 4 16:31:22 2010 +0100
universal-access: set unimplemented UI as insensitive, rather than hidden
panels/universal-access/uap.ui | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
commit c2721d23a67e6463db0c13631b1ce843a49086d5
Author: Thomas Wood <thomas.wood@intel.com>
Date: Fri Jun 4 15:54:03 2010 +0100
universal-access: hook toggle keys beep option into the correct setting
panels/universal-access/cc-ua-panel.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit 3b5d9f079105771dff337ced91c9c285d4c16ba1
Author: Thomas Wood <thomas.wood@intel.com>
Date: Fri Jun 4 15:27:21 2010 +0100
universal-access: add implementation of text size option
Implement scaling the text size by adjusting the DPI, as currently
implemented in gsd-a11y-preferences-dialog.c from gnome-settings-daemon.
panels/universal-access/cc-ua-panel.c | 200 +++++++++++++++++++++++++++++++-
1 files changed, 193 insertions(+), 7 deletions(-)
commit 56b90b9fd4d4255946fb8a58026861c0ac1b1f70
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 18:08:50 2010 +0100
universal-access: implement contrast option combo box
The "Contrast" combo box sets and reads the GTK+ theme and icon theme
values. The known contrast themes are stored in the combo box model; any
other values are treated as "Normal" contrast.
panels/universal-access/cc-ua-panel.c | 99 +++++++++++++++++++++++++++++++++
panels/universal-access/uap.ui | 6 ++
2 files changed, 105 insertions(+), 0 deletions(-)
commit 4f3104ff8a7a46c06b75e4a37b76e34f3b5915fa
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 15:05:40 2010 +0100
universal-access: set the default contrast selection to "Normal"
panels/universal-access/uap.ui | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit e21b42eaaef51a8b68e8796e528f3f4d392a8acd
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 15:05:15 2010 +0100
universal-access: hide unimplemented sections
These sections are not yet implemented, so hide them from the user.
panels/universal-access/uap.ui | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
commit 628448e6b41bbfc8f85b138b45f1c0fabc1789ee
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 15:04:28 2010 +0100
universal-access: connect mouse and keyboard preference buttons
The mouse preferences button and keyboard preferences button should open
the appropriate panel within the shell.
panels/universal-access/cc-ua-panel.c | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
commit 9832c976752eabdf5de7baf3124a7bbe10bf0b73
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 15:02:48 2010 +0100
universal-access: set pointer sections insensitive by default
The section is "off" by default, so the section widgets should be marked
insensitive.
panels/universal-access/uap.ui | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit e092e55306981da4935d19601d0e96fd785bcbf6
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 15:01:43 2010 +0100
universal-access: Add a utility function to set up on/off toggle switches
The universal-access settings panel contains several on/off radio button
pairs that require special setup to work correctly with
GConfPropertyEditor.
panels/universal-access/cc-ua-panel.c | 89 +++++++++++++++------------------
1 files changed, 40 insertions(+), 49 deletions(-)
commit 6609f63c97874d1fb0bcd555b6490ca4ed12d6c6
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 14:57:08 2010 +0100
universal-access: Add formatting modelines for emacs users
panels/universal-access/cc-ua-panel.c | 3 ++-
panels/universal-access/cc-ua-panel.h | 3 ++-
panels/universal-access/universal-access-module.c | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
commit 2ae31184993acb29a422f165aa899a3842f6c189
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 11:28:05 2010 +0100
universal-access: add panel ID to .desktop file and extension point name
Panels are now loaded using the identifier specified in the .desktop file
panels/universal-access/cc-ua-panel.c | 2 +-
.../gnome-universal-access.desktop.in.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
commit d8ae738efe63b733083ff40478333eab20105bfe
Author: Thomas Wood <thomas.wood@intel.com>
Date: Tue Jun 1 11:53:25 2010 +0100
universal-access: Add hearing section implementation
Connect the hearing section widgets to the corresponding gconf keys.
panels/universal-access/cc-ua-panel.c | 163 +++++++++++++++++++++++++++++----
panels/universal-access/uap.ui | 87 +++++++++---------
2 files changed, 189 insertions(+), 61 deletions(-)
commit 6b40d1f89fc2fda66fbbcbd0c3e3a8a9863435f7
Author: Thomas Wood <thomas.wood@intel.com>
Date: Wed May 26 13:39:43 2010 +0100
universal-access: implement main mouse settings
Connect the main mouse settings to the corresponding gconf keys.
panels/universal-access/cc-ua-panel.c | 122 ++++++++++++++++++++++-----------
panels/universal-access/uap.ui | 6 +-
2 files changed, 85 insertions(+), 43 deletions(-)
commit 0171c05880070eefc19cf2f660a0a3b08a25d008
Author: Thomas Wood <thomas.wood@intel.com>
Date: Wed May 26 12:42:15 2010 +0100
universal-access: implement main keyboard settings
Connect the main keyboard settings to the corresponding gconf keys.
panels/universal-access/cc-ua-panel.c | 160 ++++++++++++++++++++++++++++++++-
panels/universal-access/uap.ui | 21 +++--
2 files changed, 170 insertions(+), 11 deletions(-)
commit 98ffb24bf14a793be81495d79c0b2ed3a41c6cef
Author: Thomas Wood <thomas.wood@intel.com>
Date: Tue May 25 11:17:03 2010 +0100
Add initial universal-access module and UI
configure.ac | 2 +
panels/Makefile.am | 2 +-
panels/universal-access/Makefile.am | 31 +
panels/universal-access/cc-ua-panel.c | 142 +
panels/universal-access/cc-ua-panel.h | 74 +
.../gnome-universal-access.desktop.in.in | 11 +
panels/universal-access/uap.ui | 2813 ++++++++++++++++++++
panels/universal-access/universal-access-module.c | 41 +
8 files changed, 3115 insertions(+), 1 deletions(-)
commit 6f7d9d93640e52f622aa047c50c39b976a882fde
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 11:56:28 2010 +0100
shell: don't call gtk_widget_show_all on the new panel
Don't call gtk_widget_show_all when loading a panel as there may be widgets
that the panel does not want to be visible initially.
panels/network/gnome-network-properties.ui | 1 +
shell/gnome-control-center.c | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
commit b8d094cad7ace3b1750cd37c9332923896d36567
Author: Thomas Wood <thomas.wood@intel.com>
Date: Thu Jun 3 11:47:36 2010 +0100
shell: load the X-GNOME-Settings-Panel ID into the data model
Load the panel id from the .desktop file into the model so that it does not
need to be loaded again later.
shell/cc-shell-model.c | 23 +++++++++++++++++++++--
shell/gnome-control-center.c | 42 ++++++++----------------------------------
2 files changed, 29 insertions(+), 36 deletions(-)
commit 3f06cc6fbbad2aa2fc40681210788279e8126176
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Thu Jun 3 13:22:00 2010 +0300
Updated Hebrew translation.
po/he.po | 44 +++++++++++++++++++++++++-------------------
1 files changed, 25 insertions(+), 19 deletions(-)
commit eae240a3cf318c5506b3c1e96090591451a1e390
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Thu Jun 3 11:31:03 2010 +0200
Updated Spanish translation
po/es.po | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
commit 130843187f22611d471cdb0ddc2b82315e53cdc2
Author: Thomas Wood <thomas.wood@intel.com>
Date: Wed Jun 2 17:57:03 2010 +0100
panels: make sure the Exec line is valid
Allow the panel desktop files to launch the control center shell started
with the relevant panel.
.../gnome-default-applications-panel.desktop.in.in | 2 +-
.../gnome-keybindings-panel.desktop.in.in | 2 +-
panels/keyboard/gnome-keyboard-panel.desktop.in.in | 2 +-
panels/mouse/gnome-mouse-panel.desktop.in.in | 2 +-
panels/network/gnome-network-panel.desktop.in.in | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
commit d36df5e3e43f071c83f4c01b523e5407356c14fd
Author: Thomas Wood <thomas.wood@intel.com>
Date: Wed Jun 2 17:53:42 2010 +0100
shell: Use X-GNOME-Settings-Panel key value for the command line parameter
Read the X-GNOME-Settings-Panel key from the desktop file to start the
correct panel from the command line parameter.
shell/gnome-control-center.c | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
commit 847bbba2b88179f30416819b78941b34fb9cc749
Author: Thomas Wood <thomas.wood@intel.com>
Date: Wed Jun 2 16:54:26 2010 +0100
panels: make .desktop file naming more consistent
Give the .desktop files for settings panels a more consistent naming
scheme.
configure.ac | 10 +++++-----
panels/default-applications/Makefile.am | 2 +-
.../default-applications.desktop.in.in | 15 ---------------
.../gnome-default-applications-panel.desktop.in.in | 15 +++++++++++++++
panels/keybindings/Makefile.am | 2 +-
.../gnome-keybindings-panel.desktop.in.in | 15 +++++++++++++++
panels/keybindings/keybinding.desktop.in.in | 15 ---------------
panels/keyboard/Makefile.am | 2 +-
panels/keyboard/gnome-keyboard-panel.desktop.in.in | 15 +++++++++++++++
panels/keyboard/keyboard.desktop.in.in | 15 ---------------
panels/mouse/Makefile.am | 2 +-
panels/mouse/gnome-mouse-panel.desktop.in.in | 15 +++++++++++++++
panels/mouse/gnome-settings-mouse.desktop.in.in | 15 ---------------
panels/network/Makefile.am | 2 +-
panels/network/gnome-network-panel.desktop.in.in | 15 +++++++++++++++
.../network/gnome-network-properties.desktop.in.in | 15 ---------------
16 files changed, 85 insertions(+), 85 deletions(-)
commit d91e466f93456c056d6afff6619e39fa66cc8177
Author: Thomas Wood <thomas.wood@intel.com>
Date: Wed Jun 2 16:20:45 2010 +0100
shell: Use the X-GNOME-Settings-Panel value to identify panels
Use the custom .desktop file field to identify panels and make sure the
panel implementations use the name to identify themselves.
examples/cc-example-panel.c | 2 +-
.../cc-default-applications-panel.c | 2 +-
panels/keybindings/cc-keybindings-panel.c | 2 +-
panels/keyboard/cc-keyboard-panel.c | 2 +-
panels/mouse/cc-mouse-panel.c | 2 +-
panels/network/cc-network-panel.c | 2 +-
shell/gnome-control-center.c | 91 +++++++++++--------
7 files changed, 59 insertions(+), 44 deletions(-)
commit 8aa419dabc70f872bb8f856988d019865edd5c8f
Author: Thomas Wood <thomas.wood@intel.com>
Date: Wed Jun 2 16:18:27 2010 +0100
Add X-GNOME-Settings-Panel key to panel desktop files
Add a key to identify the name of the extension that implements the panel.
This can then be used in the shell to launch the appropriate panel.
examples/gnome-example-panel.desktop.in.in | 2 +-
.../default-applications.desktop.in.in | 1 +
panels/keybindings/keybinding.desktop.in.in | 1 +
panels/keyboard/keyboard.desktop.in.in | 1 +
panels/mouse/gnome-settings-mouse.desktop.in.in | 1 +
.../network/gnome-network-properties.desktop.in.in | 1 +
6 files changed, 6 insertions(+), 1 deletions(-)
commit e14803b391276260d25bf5cab506a898f9f3c4ff
Author: Matthias Clasen <mclasen@redhat.com>
Date: Tue Jun 1 08:38:34 2010 -0400
shell: Improve keyboard navigation
When using keynav in the category views, the fact that the categories are
separate icon views leads to confusion, because each category will end up
with its own selected icon, so that you can end up with multiple selected
items (and the difference between focused/non-focused is not visually
obvious here). Also, since the category views appear visually as a single
unit, it is irritating that arrow keynav stops at category borders.
This commit arranges things so that only one category will ever have a
selected item by unselecting on focus-out. Furthermore, it uses the
keynav-failed signal and some new GTK+ api to make arrow up/down work across
category borders, in the expected way.
configure.ac | 2 +-
shell/gnome-control-center.c | 168 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 169 insertions(+), 1 deletions(-)
commit b754e8f6573264abb405b4da11a33801bf541119
Author: Bin Li <libin.charles@gmail.com>
Date: Mon May 31 21:28:20 2010 +0200
Catch yet another new error message from passwd
Also deal with "it is too simplistic/systematic". Closes bug
capplets/about-me/gnome-about-me-password.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 0c30e688372a2d4245e9a069c7dcac5c423d95e2
Author: Bin Li <libin.charles@gmail.com>
Date: Mon May 31 21:25:56 2010 +0200
Catch "password too recent" error message
Closes bug #620135.
capplets/about-me/gnome-about-me-password.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit e37945e29854c9603b7712a5c613cb09b8c3c847
Author: Ivar Smolin <okul@linux.ee>
Date: Sun May 30 09:36:58 2010 +0300
Estonian translation updated
po/et.po | 454 ++++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 263 insertions(+), 191 deletions(-)
commit c4ac0fcb086caaf1ac01945dc322ec50fdfb7df7
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sat May 29 12:56:09 2010 +0300
Updated Hebrew translation.
po/he.po | 1472 +++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 795 insertions(+), 677 deletions(-)
commit 186a999d6e82eea5b908d3a040871e02ff470c36
Author: Andre Klapper <a9016009@gmx.de>
Date: Thu May 27 20:57:18 2010 +0200
Replace deprecated GTK+ symbols. See bug 572325.
capplets/common/theme-thumbnail.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
commit 46cd0b40f9350204b2907c773445f1f0f2c46ab4
Author: Sergey V. Udaltsov <svu@gnome.org>
Date: Wed May 26 01:04:46 2010 +0100
Changing Print layout to Show layout
Using new shared function from libgnomekbd
configure.ac | 2 +-
.../keyboard/gnome-keyboard-properties-dialog.ui | 6 ++--
panels/keyboard/gnome-keyboard-properties-xkblt.c | 28 +++++++------------
3 files changed, 14 insertions(+), 22 deletions(-)
commit 27bf283683914d63296f9e95776e52093511aead
Author: Thomas Wood <thomas.wood@intel.com>
Date: Tue May 25 14:38:36 2010 +0100
shell: set the window name and icon when opening an embedded settings panel
This involves storing the default window title and icon name and resetting
the title and icon name when an embedded settings panel is closed.
The icon name and title for each panel is retrieved from the desktop file
information and stored in the CcShellModel.
shell/cc-shell-model.c | 3 +-
shell/cc-shell-model.h | 1 +
shell/gnome-control-center.c | 43 +++++++++++++++++++++++++++++++++++++++--
3 files changed, 43 insertions(+), 4 deletions(-)
commit 4fcc633a36680573fb20f1a2db3bdb903e0c462d
Author: Thomas Wood <thomas.wood@intel.com>
Date: Tue May 25 14:22:25 2010 +0100
shell: remove unused title label and ensure padding around each panel
Make sure there is always 6 pixels padding around the embedded settings
panel.
Remove the unused title label and alignment.
shell/gnome-control-center.c | 23 ++++++++++-------------
shell/shell.ui | 25 ++-----------------------
2 files changed, 12 insertions(+), 36 deletions(-)
commit a2665e9f01a70326caac63052ad0d8e3ea5999f0
Author: Rodrigo Moya <rodrigo@gnome-db.org>
Date: Tue May 25 11:41:45 2010 +0200
Fixed little typo in NEWS
NEWS | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 6dfe986044dc403b4806c933e738ccf6fc6b8d66
Author: William Jon McCann <jmccann@redhat.com>
Date: Sat Jan 16 21:17:35 2010 -0500
shell: Don't include both Personal and Look & Feel
It isn't really clear what the distinction is.
shell/gnomecc.menu | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
commit 6fd962552f828c0c26339af26e6e5428790c87ba
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Tue May 25 09:36:56 2010 +0200
Updated Galician translations
po/gl.po | 390 ++++++++++++++++++++++++++++++--------------------------------
1 files changed, 188 insertions(+), 202 deletions(-)
commit 83bedf633ceb3d3fc937ac366277fda1c61229e2
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Tue May 25 08:48:13 2010 +0200
Updated Spanish translation
po/es.po | 1122 ++++++++++++++++++++++++++++++--------------------------------
1 files changed, 535 insertions(+), 587 deletions(-)