commit 3393126f95baeed3bebb21560c7548484475e935
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Jun 8 13:20:36 2016 +0200

    release 1.15.0

 NEWS         | 13 +++++++++++++
 configure.ac |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

commit 83cb35d9f9f298565ba540bdf4c007de70bc25cb
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Jun 8 13:09:30 2016 +0200

    sync with Transiflex

 po/ar.po |    7 +-
 po/ca.po |    6 +-
 po/el.po |    7 +-
 po/hr.po |   12 +-
 po/it.po |    7 +-
 po/sc.po | 7499 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/uz.po |   30 +-
 7 files changed, 7535 insertions(+), 33 deletions(-)

commit b74c8cda3f4accc94f086f6fcd09d33f39a8d313
Author: monsta <monsta@inbox.ru>
Date:   Fri Jun 3 15:23:24 2016 +0300

    remove old gnome files

 MAINTAINERS    |  23 ---
 Makefile.am    |   2 -
 README.commits |  68 -------
 THANKS         | 621 ---------------------------------------------------------
 TODO           |  19 --
 5 files changed, 733 deletions(-)

commit 5a17525f875b012385004f9b164e59edc5962ee3
Author: raveit65 <chat-to-me@raveit.de>
Date:   Tue May 31 20:16:09 2016 +0200

    GTK+-3 fm-icon-view: fix a Wincompatible-pointer-types build warning

 src/file-manager/fm-icon-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 64cc5f2eaaaf1f27a41f900113edde77ceb1210d
Author: monsta <monsta@inbox.ru>
Date:   Tue May 31 18:08:45 2016 +0300

    GTK+2: fix build errors after last commits

 src/caja-information-panel.c | 4 ++++
 src/caja-pathbar.c           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

commit abec93de17fb483764ab27c5c781204cef561261
Author: raveit65 <chat-to-me@raveit.de>
Date:   Mon May 30 22:52:08 2016 +0200

    GTK+3 sidebars and caja-places: port style_set to style_updated

 src/caja-history-sidebar.c   | 11 +++++++----
 src/caja-information-panel.c |  7 +++----
 src/caja-pathbar.c           | 26 +++++++++++++++++---------
 src/caja-places-sidebar.c    | 13 ++++++++-----
 src/caja-sidebar-title.c     | 14 ++++++++++----
 5 files changed, 45 insertions(+), 26 deletions(-)

commit 469c6d88a8a37bf09b9b75d610f53cdf90629168
Author: lukefromdc <lukefromdc@hushmail.com>
Date:   Sat May 28 18:22:05 2016 -0400

    GTK3:caja-zoom-control.c GtkStyle>GtkStyleContext
    
    caja-zoom-control.c: label_style_set_callback to GtkStyleContext in GTK3 builds

 src/caja-zoom-control.c | 4 ++++
 1 file changed, 4 insertions(+)

commit a540850b3f69e384dd525d5f767541cf7d186454
Author: lukefromdc <lukefromdc@hushmail.com>
Date:   Sat May 28 18:19:27 2016 -0400

    GTK3: caja-places-sidebar.c use GtkStyleContext
    
    caja-places-sidebar.c: Port caja_places_sidebar_style_set to GtkStyleContext from GtkStyle in GTK3 builds

 src/caja-places-sidebar.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

commit 9e97cf839b297dedccb1955603a02295a6292d87
Author: lukefromdc <lukefromdc@hushmail.com>
Date:   Sat May 28 18:13:13 2016 -0400

    GTK3:caja-pathbar remove GtkStyle vars
    
    caja-pathbar.c: GtkStyleContext is already used to style the pathbar, so removed GtkStyle variables and unneeded caja_path_bar_style_set function

 src/caja-pathbar.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

commit 74a1a7a675fb265933a11b7cd01557caa72bf7a1
Author: lukefromdc <lukefromdc@hushmail.com>
Date:   Sat May 28 18:11:24 2016 -0400

    GTK3: caja-location-bar.c use GtkStyleContext
    
     Port one variable in style_set_handler to GtkStyleContext in GTK3 builds

 src/caja-location-bar.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 9f4ab08ded1b6a3ae4680c021fabd293fcf48cee
Author: lukefromdc <lukefromdc@hushmail.com>
Date:   Sat May 28 18:09:59 2016 -0400

    GTK3:caja-information-panel.c use GtkStyleContext
    
    caja-information-panel.c: Port caja_information_panel_style_set to GtkStyleContext in GTK3 builds

 src/caja-information-panel.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit aff48d2d6233db8c303a28f618b9f635a6a6b090
Author: lukefromdc <lukefromdc@hushmail.com>
Date:   Sat May 28 18:08:00 2016 -0400

    GTK3: port history sidebar to GtkStyleContext
    
    caja-history-sidebar.c: port caja_history_sidebar_style_set GtkStyleContext in GTK3 builds

 src/caja-history-sidebar.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit a6c32f442e7b86e97a741b3559d96e1f77bbe300
Author: lukefromdc <lukefromdc@hushmail.com>
Date:   Fri May 27 18:30:33 2016 -0400

    GTK3:  Fix two deprecations, stop 3.21 segfault
    
    In GTK 3.21, the use of GtkStyle in function style_set in caja-sidebar-title.c results in a segfault if the sidebar is showing, even though it is used only when the "information" sidebar is selected. GtkStyle also appears in update_title_font  in the same file.
    
    The second function resizes the bold headline label font in the information sidebar when either the length of the text or the width of the sidebar changes. Port it to GtkStyleContext and keep it.
    
    The first function (style_set) does two things: It invokes the second function when the style is set up, so port its second input variable (which seems to receive only NULL anyway) to GtkStyleContext. The rest of the function is supposed to set the font for the "more information" label, but mostly seems to block updating that font with the system font and cause the size of the font to be different between GTK 3.20 or earlier and GTK 3.21. Disable that portion entirely in GTK3 builds, as that way the font is consistant across GTK3 versions(an appropriate size in all cases tested), updates with changes in the system font, and cannot segfault in GTK 3.21. Porting it to GtkStyleContext has been tested and stops the segfaults but leaves the other two problems mentioned. Disable that portion of style_set in GTK3 and be done with it.

 src/caja-sidebar-title.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

commit 4d51ac3789ffcc78088efae1a1724c2e9e70eba6
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat May 21 10:55:47 2016 +0200

    add fogotten language file

 po/pms.po | 7499 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 7499 insertions(+)

commit 59b2084029a164bddaa7036de060ccc9e9148b99
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat May 21 10:45:22 2016 +0200

    update to 1.14.1 release

 NEWS         | 6 ++++++
 configure.ac | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

commit f21c0af0033c2d9b0f813ebb2aa9f42991470cae
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat May 21 10:01:21 2016 +0200

    sync with transiflex

 po/ar.po    |  15 ++++----
 po/ca.po    |  32 ++++++++--------
 po/de.po    |  20 +++++-----
 po/es.po    |   6 +--
 po/es_MX.po | 121 ++++++++++++++++++++++++++++++------------------------------
 po/frp.po   |  24 ++++++------
 po/ko.po    |   4 +-
 po/nb.po    |  28 +++++++-------
 po/ru.po    |   2 +-
 po/sq.po    |   8 ++--
 po/sv.po    |  12 +++---
 po/uz.po    | 112 +++++++++++++++++++++++++++----------------------------
 12 files changed, 193 insertions(+), 191 deletions(-)

commit 7a3cf0e3ec05acd1aa5599a690263c757c6c3616
Author: raveit65 <chat-to-me@raveit.de>
Date:   Tue May 3 17:17:52 2016 +0200

    GTK+3 css: improve border settings for desktop window

 data/caja.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit eebcc7053f03ddd0d69cd7f1a5d21c8132e01af7
Author: raveit65 <chat-to-me@raveit.de>
Date:   Thu Apr 28 00:24:11 2016 +0200

    css: don't allow borders on scrolledwindow

 data/caja.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 0b88f6fa5d043687c82a326dd5dcae4aed582644
Author: raveit65 <chat-to-me@raveit.de>
Date:   Fri Apr 22 10:51:46 2016 +0200

    GTK3 css: set a fg color for EelEditableLabel and allow box-shadow

 data/caja.css | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

commit 9a86c2cbc0b1e75f9073461ead8bc2d917694921
Author: monsta <monsta@inbox.ru>
Date:   Thu Apr 21 17:15:34 2016 +0300

    prefs dialog: don't crash on toggling "Show hidden and backup files"
    
    adapted from:
    https://git.gnome.org/browse/nautilus/commit/?id=7428762ea6601abba086fcc5e57f443b2e2b40b5
    
    fixes https://github.com/mate-desktop/caja/issues/326

 src/caja-window-menus.c   | 25 ++++++++++++++-----------
 src/caja-window-private.h |  2 +-
 src/caja-window.c         |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

commit 355a7dc4209ab6b0ddfdd5597c99d9a2ae63c406
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Apr 20 16:03:59 2016 +0200

    GTK+3: improve EelEditableLabel settings css file

 data/caja.css | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

commit e8be955849664584f1fb697fd904ae9f85945a5e
Author: raveit65 <chat-to-me@raveit.de>
Date:   Fri Apr 15 10:25:20 2016 +0200

    GTK+-3 theming: add a CSS file for caja, and initialize it at startup
    
    inspired by:
    https://git.gnome.org/browse/nautilus/commit/?id=dad5d12

 data/Makefile.am       |  2 ++
 data/caja.css          | 23 +++++++++++++++++++++++
 src/caja-application.c | 29 +++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)

commit e8ec81e2da654f5f07d94dc3f767d42f90fd12b4
Author: raveit65 <chat-to-me@raveit.de>
Date:   Tue Apr 19 15:48:27 2016 +0200

    GTK+3: add style class caja-desktop-window at top level
    
    The existing style class .caja-desktop does not match every widget
    which you see at the screen. Ie. the widget scrolledwindow,
    which is above the existing class in hierarchy.

 src/caja-desktop-window.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit bcd3aeb9f51d31911702992df087f0d1e6f5ef38
Author: monsta <monsta@inbox.ru>
Date:   Thu Apr 7 12:31:27 2016 +0300

    po: add missing languages to LINGUAS + fix sorting a bit

 po/LINGUAS | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 276a42f56a33001108f88ed843d8d364a66dee13
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Apr 6 17:39:01 2016 +0200

    release 1.14.0

 NEWS         | 1 +
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 615ff70572c027864f3766fe0acdadd9e3f00f9c
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Apr 6 17:21:22 2016 +0200

    Add Changelog generation

 Makefile.am | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

commit fae54eeb686160b85ad8ff3d0d1a859af709ee7a
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Apr 6 17:14:20 2016 +0200

    add new languages and sync with transiflex

 po/LINGUAS        |    2 +
 po/af.po          | 1539 +++++------
 po/am.po          | 1615 ++++++------
 po/ar.po          | 1539 +++++------
 po/as.po          | 1539 +++++------
 po/ast.po         | 1539 +++++------
 po/az.po          | 1539 +++++------
 po/be.po          |    6 +-
 po/bg.po          | 1604 ++++++------
 po/bn.po          | 1539 +++++------
 po/bn_IN.po       | 1539 +++++------
 po/br.po          |    2 +-
 po/bs.po          | 1539 +++++------
 po/ca.po          |    8 +-
 po/ca@valencia.po | 1539 +++++------
 po/cmn.po         | 1539 +++++------
 po/crh.po         | 1539 +++++------
 po/cs.po          |    2 +-
 po/da.po          |  163 +-
 po/de.po          |    2 +-
 po/dz.po          | 1539 +++++------
 po/el.po          |    2 +-
 po/en_AU.po       |    2 +-
 po/en_CA.po       | 1539 +++++------
 po/en_GB.po       |    2 +-
 po/eo.po          | 1568 +++++------
 po/es.po          |   11 +-
 po/es_AR.po       | 7500 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/es_CO.po       | 1563 +++++------
 po/es_MX.po       |   73 +-
 po/et.po          | 1546 +++++------
 po/eu.po          | 1539 +++++------
 po/fa.po          | 1547 +++++------
 po/fi.po          | 1539 +++++------
 po/fr.po          |    2 +-
 po/frp.po         | 7499 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fur.po         | 1537 +++++------
 po/fy.po          | 1537 +++++------
 po/ga.po          | 1539 +++++------
 po/gl.po          | 1539 +++++------
 po/gu.po          | 1539 +++++------
 po/ha.po          | 1539 +++++------
 po/hi.po          | 1539 +++++------
 po/hr.po          |    4 +-
 po/ia.po          | 1686 ++++++------
 po/id.po          | 1541 +++++------
 po/ig.po          | 1539 +++++------
 po/is.po          |    2 +-
 po/it.po          |    2 +-
 po/ja.po          | 1539 +++++------
 po/ka.po          | 1539 +++++------
 po/kk.po          | 1539 +++++------
 po/kn.po          | 1539 +++++------
 po/ko.po          | 1556 +++++------
 po/ku.po          | 1539 +++++------
 po/ky.po          | 1537 +++++------
 po/li.po          | 1539 +++++------
 po/lt.po          |   70 +-
 po/lv.po          | 1539 +++++------
 po/mai.po         | 1539 +++++------
 po/mg.po          | 1539 +++++------
 po/mi.po          | 1537 +++++------
 po/mk.po          | 1539 +++++------
 po/ml.po          | 1539 +++++------
 po/mn.po          | 1539 +++++------
 po/mr.po          | 1539 +++++------
 po/ms.po          |    2 +-
 po/nb.po          |  422 +--
 po/nds.po         | 1539 +++++------
 po/ne.po          |    2 +-
 po/nl.po          |    2 +-
 po/nn.po          | 1539 +++++------
 po/nso.po         | 1539 +++++------
 po/oc.po          | 1541 +++++------
 po/or.po          | 1539 +++++------
 po/pa.po          | 1539 +++++------
 po/pl.po          | 1541 +++++------
 po/ps.po          | 1539 +++++------
 po/pt.po          | 1539 +++++------
 po/pt_BR.po       |    4 +-
 po/ro.po          |   50 +-
 po/ru.po          |    4 +-
 po/rw.po          | 1537 +++++------
 po/si.po          | 1539 +++++------
 po/sk.po          |    2 +-
 po/sl.po          | 1541 +++++------
 po/sq.po          | 1539 +++++------
 po/sr.po          | 1539 +++++------
 po/sr@latin.po    | 1539 +++++------
 po/ta.po          | 1539 +++++------
 po/te.po          | 1539 +++++------
 po/th.po          |    6 +-
 po/tk.po          | 1539 +++++------
 po/tr.po          | 1557 +++++------
 po/ug.po          | 1539 +++++------
 po/uk.po          |  192 +-
 po/ur.po          | 1539 +++++------
 po/uz.po          | 1724 ++++++------
 po/vi.po          | 1539 +++++------
 po/wa.po          | 1539 +++++------
 po/xh.po          | 1539 +++++------
 po/yi.po          | 1537 +++++------
 po/yo.po          | 1539 +++++------
 po/zh_CN.po       |    6 +-
 po/zh_HK.po       | 1539 +++++------
 po/zh_TW.po       | 1539 +++++------
 po/zu.po          | 1539 +++++------
 107 files changed, 76414 insertions(+), 58707 deletions(-)

commit 02806483bb12c991695b677da1e5c3fd9741335f
Author: monsta <monsta@inbox.ru>
Date:   Wed Apr 6 15:29:55 2016 +0300

    NEWS: add 1.12.x entries, pack 1.13.x entries into single 1.14.0 one

 NEWS | 51 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 20 deletions(-)

commit c0bfecbb6f70bc732d35b477c57d538730c358bd
Author: Alexander van der Meij <alexandervdm@gliese.me>
Date:   Sun Mar 13 14:27:04 2016 +0100

    add default name/description for python extensions

 libcaja-private/caja-extensions.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

commit 2ca207ea1a91178d28583e2bdab5c3d6aac06d87
Author: Alexander van der Meij <alexandervdm@gliese.me>
Date:   Mon Mar 7 21:21:44 2016 +0100

    use exposed python filenames to list python extensions separately

 libcaja-extension/caja-extension-types.h |  1 +
 libcaja-private/caja-module.c            | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

commit ce7cc9580809d4017c74b0128f7e82f94eb173d9
Author: monsta <monsta@inbox.ru>
Date:   Wed Mar 16 18:13:51 2016 +0300

    icon container: don't set label colors right after widget realize
    
    the background might be not yet set at this point, and when it will
    be set, the label colors will be properly set on a signal anyway.
    so let's not do the same work twice.

 libcaja-private/caja-icon-container.c | 4 ----
 1 file changed, 4 deletions(-)

commit c74212b4630767b3b11b41cb26a8df20090096f4
Author: monsta <monsta@inbox.ru>
Date:   Wed Mar 16 18:04:22 2016 +0300

    eel: never try to block background change signal
    
    that's what was causing random font color changes. the code in
    eel-background.c is a complete asynchronous mess, with queued
    callbacks sometimes being called in such order that it caused
    blocking the background change signal in the situations where
    it should never be blocked.

 eel/eel-background.c | 8 --------
 1 file changed, 8 deletions(-)

commit 828aea9083e19cec1a712c349285553197bc1c6f
Author: monsta <monsta@inbox.ru>
Date:   Wed Mar 16 18:00:49 2016 +0300

    icon container: restore original font color select logic
    
    that is, before 057df2dc1d8ea67b477d696ac6feea8aaf392763
    
    the logic itself is valid, but it was somewhat broken later in a few
    attempts to fix the annoying font color bugs. so let's restore it.

 libcaja-private/caja-icon-container.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 92607629fc6b2503f28e79dcc73e3ac9ed72bffa
Author: lukefromdc <lukefromdc@hushmail.com>
Date:   Wed Mar 16 16:46:23 2016 -0400

    GTK 3.20-fix wrong desktop size right
    
    Reset default size of desktop window to -1 in GTK 3.19/20 only. The combination of a non-resizable
    window with a default size is what causes the desktop to open wrong size.
    
    based on https://github.com/GNOME/nautilus/commit/cf79068dc70c87e963e217e2e8ae149ee5ed1872
    
    "desktop-window: avoid wrong size"
    
    "gtk+ recently changed and unresizable windows now take into account
    the default size set. We set the default size for normal resizable
    windows in nautilus."
    
    "However the desktop window is a no resizable window. What happens now
    when setting a default size is that that size is used instead of the
    widget request size, since window sizing now takes precedence over
    widget sizing."
    
    "To fix it, set the default size to -1 to override what the nautilus
    window does by default, so we can avoid this misbehaviour."

 src/caja-desktop-window.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit c988bad5f4604b67e20c880ca6bef57aeed13304
Author: monsta <monsta@inbox.ru>
Date:   Tue Mar 1 13:55:42 2016 +0300

    remove ancient ChangeLog files from eel and po
    
    upstream did the same years ago:
    https://git.gnome.org/browse/nautilus/commit/?id=6cb7a112683a7dd1d22b471391619d901bfec039

 eel/ChangeLog |  9642 -------------------------------------
 po/ChangeLog  | 14540 --------------------------------------------------------
 2 files changed, 24182 deletions(-)

commit 250692c5164284759f2d5a027cea889f7acf5ff0
Author: monsta <monsta@inbox.ru>
Date:   Tue Mar 1 13:39:10 2016 +0300

    eel: drop unused eel-debug-drawing code

 eel/Makefile.am         |   2 -
 eel/eel-debug-drawing.c | 589 ------------------------------------------------
 eel/eel-debug-drawing.h |  75 ------
 eel/eel-image-table.c   |   1 -
 eel/eel-labeled-image.c |   1 -
 5 files changed, 668 deletions(-)

commit 8a826a675862d56b6d01c8467282bde9171f8cf8
Author: Alexander van der Meij <alexandervdm@gliese.me>
Date:   Mon Feb 29 15:16:21 2016 +0100

    fix loading multiple python extensions (regression since 1.9.3)

 libcaja-private/caja-module.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit bbdaab78b0f28b41543291557b5d3b545300b7d0
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sun Feb 21 14:14:56 2016 +0100

    release 1.13.1

 NEWS         | 14 ++++++++++++++
 configure.ac |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

commit faac58e63ce64603ac1ec0be66160511acfa2592
Author: Martin Wimpress <code@flexion.org>
Date:   Fri Feb 19 14:05:42 2016 +0000

    Sync with Transifex.

 po/be.po    |  1597 +++----
 po/br.po    |  1539 +++----
 po/ca.po    |  1991 ++++-----
 po/cs.po    |  1541 +++----
 po/cy.po    | 13127 ++++++++++++++++++++++++++--------------------------------
 po/da.po    |  1875 +++++----
 po/de.po    |  1541 +++----
 po/el.po    |  1551 +++----
 po/en_AU.po |  1539 +++----
 po/en_GB.po |  1539 +++----
 po/es.po    |  1539 +++----
 po/es_MX.po |  1920 ++++-----
 po/fr.po    |  1539 +++----
 po/he.po    |  1542 +++----
 po/hr.po    |  1542 +++----
 po/hu.po    |  1552 +++----
 po/hy.po    |  2413 +++++------
 po/is.po    |  1545 +++----
 po/it.po    |  1569 +++----
 po/lt.po    |  1579 +++----
 po/ms.po    |  1539 +++----
 po/nb.po    |  1539 +++----
 po/ne.po    |  1539 +++----
 po/nl.po    |  1539 +++----
 po/pt_BR.po |  1542 +++----
 po/ro.po    |  1551 +++----
 po/ru.po    |  1545 +++----
 po/sk.po    |  1582 +++----
 po/sv.po    |  1716 ++++----
 po/th.po    |  1541 +++----
 po/uk.po    |  1755 ++++----
 po/zh_CN.po |  1539 +++----
 32 files changed, 31645 insertions(+), 31862 deletions(-)

commit 5d809e05ae9777160be237dc7878712be9850cc7
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Feb 18 18:36:55 2016 +0100

    GTK+3: add style class caja-property-browser

 src/caja-property-browser.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 502d58395f8937a0e9db30d53da3e5d5c6123499
Author: monsta <monsta@inbox.ru>
Date:   Tue Feb 16 14:21:25 2016 +0300

    [GTK+3] handle smooth scroll events for zooming (with Ctrl held)
    
    fixes https://github.com/mate-desktop/caja/issues/516
    
    adapted from:
    https://git.gnome.org/browse/nautilus/commit/?id=1a76e044a2c9b834d00c4ea30f1e3af3321d8cdd
    https://git.gnome.org/browse/nautilus/commit/?id=878e2a4f7ada26bb7c106e5bbdbd8434acf86c77
    https://git.gnome.org/browse/nautilus/commit/?id=f7b54cdba55a0856b201e62818059ac5007fac35
    https://git.gnome.org/browse/nautilus/commit/?id=3d275a971132a41809a3b1e5b8ac683d264d6c35

 src/file-manager/fm-directory-view.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

commit e5c29655e5301b6d4ba19a3d4970745804039c0e
Author: lukefromdc <lukefromdc@hushmail.com>
Date:   Mon Feb 8 18:49:41 2016 -0500

     .view style class on icon view scrolled window
    
    GTK 3.19/3.20 builds only:
    
    Applying the .view class to the icon container no longer works in gtk3.19, so apply it to the scrolled window instead.  Apply it in both icon view and compact view, as both need it.  Doing it from this file prevents it from being applied to the scrolled window under a treeview, thus preventing the exposed corner above the scrollbar in a treeview from showing the view background color.
    
    Tested this build in gtk3.19.8 with good results. Tested in my own theme (UbuntuStudio_Legacy),Adwaita,  BlackMATE, Green-Submarine, and BlueMenta, all still work right. Adwaita now shows the proper white view color, and my own theme gives a white icon view without also showing
    white squares over the treeview scrollbars. That was an unwanted side effect of applying the view color in the gtk theme to all the scrolled windows containing list, icon, or compact views as there is no way to tell them apart from the theme only.  This approach keeps the scrolled window under the treeview transparent but themes them under icon or compact views.
    
    Using .view rather than a custom class enables themes not written for MATE to set the Caja background to match expected view colors, just as it did on the icon container in gtk3.18 and earlier. Leave it on the icon container too, as it may be needed in some themes to theme elements within the icon view.
    
    Also, I found no ill effects from the added style class on gtk3.18. In that case, the .view style class on the icon container should cover over anything in the scrolled window. Since the style class is not applied to the scrolled window used by a list view, no ill effect there in gtk 3.19 or gtk3.18.  Applying to gtk3.19 only builds for now just in case

 src/file-manager/fm-icon-view.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit f8d6a14a1f551b3e2e9d3b3d76dbc9eace9cdee9
Author: monsta <monsta@inbox.ru>
Date:   Mon Feb 8 11:11:57 2016 +0300

    window-slot: fix wrong reference handling on dispose
    
    adapted from:
    https://git.gnome.org/browse/nautilus/commit/?id=97a2553ada8c8015fe22e6ec87e48123b29fa4d4
    https://git.gnome.org/browse/nautilus/commit/?id=fd2685f838e613387179968d8e0b1326fe503a16

 src/caja-window-slot.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

commit 883201a49341d588f5a6ffe2b7fd54676eb71019
Author: monsta <monsta@inbox.ru>
Date:   Mon Feb 8 10:48:43 2016 +0300

    use g_hash_table_remove_all and get rid of some callbacks
    
    taken from
    https://git.gnome.org/browse/nautilus/commit/?id=564264cc6cc6fa44390791248019547a7133d70d
    and applied in some other places as well

 libcaja-private/caja-desktop-directory.c | 4 ++--
 libcaja-private/caja-directory-async.c   | 8 +-------
 src/file-manager/fm-directory-view.c     | 8 +-------
 3 files changed, 4 insertions(+), 16 deletions(-)

commit 35a84bbc4f81914136c894dd55630f21acbeb54a
Author: monsta <monsta@inbox.ru>
Date:   Mon Feb 8 10:34:53 2016 +0300

    eel: fix some forgotten memory leaks
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=8f15b28dd7afdd1a5c5b9c0d54c05d978a10461a
    https://git.gnome.org/browse/nautilus/commit/?id=60217c642cb4b12297b2d8ddd2a2eae45671a5a7
    https://git.gnome.org/browse/nautilus/commit/?id=5f5bea72af6e23986b7367a2a2157fb15481f367

 eel/eel-glib-extensions.c | 10 ++++++++++
 eel/eel-gtk-extensions.c  |  1 +
 eel/eel-mate-extensions.c |  1 +
 3 files changed, 12 insertions(+)

commit b2737bb68c81e4095aa14c94fc93eb2acdd00ce0
Author: monsta <monsta@inbox.ru>
Date:   Sun Feb 7 14:10:57 2016 +0300

    fix crash when restoring file with special characters from trash
    
    for example, a file named simply "%s"
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=d69885bd67edc1fae76c790f6162807817d63b2f

 libcaja-private/caja-file.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit af1603f8f8dd3c575fdd87284cfe711d1d7ef75f
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Feb 6 23:20:30 2016 +0100

    properties-window: use 'bold and right-aligned are always FALSE' for gtk2 too
    
    This is needed to fix gtk3 build failure for gtk+-3.14, causes by different
    GTK_CHECK versions for deprecated GtkLabel for 3.16.

 src/file-manager/fm-properties-window.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

commit 3d29330d2eaca9ac890bdbb10c42e8df73ba1b87
Author: monsta <monsta@inbox.ru>
Date:   Fri Feb 5 14:42:15 2016 +0300

    fix random crash on startup when python-caja extension is enabled
    
    I hate Schroedinger's bugs...

 libcaja-private/caja-module.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit b717d132ae9c16389f8dc81062e9fa08e6a94234
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Feb 2 04:01:11 2016 +0100

    GTK3: add 'caja-notebook' style class + fix deprecated theme warnings with gtk+-3.20

 src/caja-notebook.c | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

commit 32589e59a4456ac11ac63c9aff473ec99617684a
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Feb 2 01:53:31 2016 +0100

    GTK3 BlueMenta: add caja-pathbar style class
    
    Needed for gtk+-3.20

 src/caja-pathbar.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 6fd67036b7bb6bad36b9101b6e9b15e5d9852677
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Feb 2 00:42:11 2016 +0100

    GTK3: add caja-search-bar style class
    
    Needed fot gtk+-3.20

 src/caja-search-bar.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit 147d7c7707f9fa2a22e66695d0b12b361f575642
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Feb 2 00:40:41 2016 +0100

    GTK3: add caja-location-entry style class
    
    Neeed for gtk+-3.20

 src/caja-location-entry.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 6ea2659b4574f8598e4c364f56bb2194bafc35c2
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Feb 1 20:29:20 2016 +0100

    GTK3 sid-pane: add 'caja-side-pane' style class
    
    All widgets for the sidebar can be selected with this style class
    on top. Needed for gtk+-3.20.

 src/caja-side-pane.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 334e89244987fcfe89ca765f3986fa85254395eb
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Feb 1 20:24:39 2016 +0100

    Gtk3 navigation-window: add 'caja-navigation-window' style class at top level
    
    This style selector can be use by themes to select the caja navigation window.
    Needed for gtk+-3.20

 src/caja-navigation-window.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit 40d196aadb946363fddbf4dfe44477168f78e4a6
Author: monsta <monsta@inbox.ru>
Date:   Mon Feb 1 16:59:23 2016 +0300

    fix a build warning and a sudden build error that followed O_o

 src/file-manager/fm-tree-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 67c2e0ec70da71192964acdba4a828691aa5f5c7
Author: monsta <monsta@inbox.ru>
Date:   Mon Feb 1 16:59:02 2016 +0300

    fix several build warnings

 libcaja-private/caja-customization-data.c | 1 +
 libcaja-private/caja-extensions.c         | 2 +-
 libcaja-private/caja-extensions.h         | 2 +-
 libcaja-private/caja-module.c             | 1 +
 src/caja-application.c                    | 1 +
 src/caja-property-browser.c               | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

commit 5b56a80e6d57e2d4d1236dfcd7683f377d29bb5c
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sun Jan 31 03:25:28 2016 +0100

    GTK3 desktop: add a caja-desktop style class to the desktop canvas
    
    So that themes can tweak the color/background of desktop canvas items
    separately.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=8b676a6

 libcaja-private/caja-icon-container.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit a255e7eb1e1951e699ae833f9816892f6e09177f
Author: monsta <monsta@inbox.ru>
Date:   Tue Jan 26 14:18:44 2016 +0300

    oops... add some includes back (got implicit declaration warnings)

 src/caja-application.c | 2 ++
 1 file changed, 2 insertions(+)

commit 5a346bff46de02cd2e9641fc4c72ef5d6b067d66
Author: monsta <monsta@inbox.ru>
Date:   Tue Jan 26 13:15:11 2016 +0300

    remove some unused/unneeded stuff

 src/caja-application.c   | 6 ------
 src/caja-bookmark-list.c | 1 -
 src/caja-window-menus.c  | 1 -
 src/caja-window.c        | 6 ------
 4 files changed, 14 deletions(-)

commit 6b552f7968a844990a1b920da01d8dafc5cc0c33
Author: monsta <monsta@inbox.ru>
Date:   Tue Jan 26 13:14:43 2016 +0300

    fix a few build warnings

 libcaja-private/caja-bookmark.c       | 2 +-
 src/caja-file-management-properties.c | 8 ++++----
 src/caja-freedesktop-dbus.c           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

commit ebf820f112dd840b73183c693a832001f53b7bae
Author: monsta <monsta@inbox.ru>
Date:   Tue Jan 26 13:13:22 2016 +0300

    use g_strcmp0 instead of strcmp

 libcaja-private/caja-bookmark.c |  7 +++----
 src/caja-application.c          | 16 ++++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

commit 1129e653f6e33ea34efe64601643fbbe9a9d6f28
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 25 16:58:46 2016 +0100

    release 1.13.0

 NEWS | 5 +++++
 1 file changed, 5 insertions(+)

commit 1241ff234a8ec46542e97e48a6298b78c9a0d2b5
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 23 00:04:15 2016 +0100

    GTK3: fix deprecated GtkMisc

 eel/eel-gtk-extensions.c                        |  4 +-
 eel/eel-labeled-image.c                         | 22 ++++++---
 libcaja-private/caja-file-conflict-dialog.c     | 13 ++++--
 libcaja-private/caja-icon-container.c           |  7 +++
 libcaja-private/caja-mime-application-chooser.c |  4 +-
 libcaja-private/caja-open-with-dialog.c         |  8 ++--
 libcaja-private/caja-progress-info.c            |  8 ++--
 src/caja-autorun-software.c                     |  2 +-
 src/caja-connect-server-dialog.c                | 60 +++++++++++++++++--------
 src/caja-image-properties-page.c                |  6 +--
 src/caja-location-bar.c                         | 15 +++++--
 src/caja-notebook.c                             | 12 ++++-
 src/caja-x-content-bar.c                        |  4 +-
 src/file-manager/fm-directory-view.c            | 10 ++---
 src/file-manager/fm-ditem-page.c                |  4 +-
 src/file-manager/fm-list-view.c                 |  6 +--
 src/file-manager/fm-properties-window.c         |  4 +-
 17 files changed, 127 insertions(+), 62 deletions(-)

commit 130906c9182c71a6049eca472f8d3b91804124cf
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 21 20:07:43 2016 +0100

    GTK3 general: don't use deprecated gdk_app_launch_context_new()
    
    partially taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-2&id=bd151c8

 libcaja-private/caja-program-choosing.c | 30 ++++++++++++++++++++++++++++--
 src/caja-connect-server-dialog-main.c   |  4 ++++
 2 files changed, 32 insertions(+), 2 deletions(-)

commit b058255bef4dab6ce19c6b056af2b32cd2e386a0
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 23 17:59:42 2016 +0100

    GTK3 property-browser: expand the GtkScrolledWindow vertical

 src/caja-property-browser.c | 3 +++
 1 file changed, 3 insertions(+)

commit 709163687da777a4489b48d4a1f3da4637bab111
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 21 00:25:35 2016 +0100

    GTK3 property-browser: don't use GtkHBox for both toolkits +
    
    don't use deprecated gtk_hbox_new for gtk3

 src/caja-property-browser.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

commit 610b1913c3f4cfc082c52bada71731aaca8ffcd4
Author: monsta <monsta@inbox.ru>
Date:   Wed Jan 20 18:21:59 2016 +0300

    information-panel: use GtkWidget* instead of Gtk(V)Box
    
    and don't use deprecated function in GTK+3 build

 src/caja-information-panel.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 805c09d647f40ee44466be501ccc054688cd68ff
Author: monsta <monsta@inbox.ru>
Date:   Wed Jan 20 17:59:47 2016 +0300

    fm-properties-window: use more code in both GTK+ builds

 src/file-manager/fm-properties-window.c | 45 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

commit 129c6af2f177d9413bb1280f8dd5be2fbb82a150
Author: monsta <monsta@inbox.ru>
Date:   Wed Jan 20 17:32:38 2016 +0300

    information-panel: one more GtkWidget* usage
    
    also use GtkBox type in both GTK+ builds

 libcaja-private/caja-keep-last-vertical-box.c |  9 ++-------
 libcaja-private/caja-keep-last-vertical-box.h | 10 +---------
 src/caja-information-panel.c                  |  8 ++++----
 3 files changed, 7 insertions(+), 20 deletions(-)

commit 333dad8ccd723175c2949c7fa0ad34b554f6af3c
Author: monsta <monsta@inbox.ru>
Date:   Wed Jan 20 17:12:45 2016 +0300

    information-panel: use GtkWidget* instead of Gtk(H)Box
    
    and don't use deprecated function in GTK+3 build

 src/caja-information-panel.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

commit 421d3ed2cea75931b62a3a59efdcd16a4989f008
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 22 16:27:38 2016 +0100

    navigation-pane: replace deprecated gtk_image_new_from_stock GTK_STOCK_EDIT
    
    Note: this icon is shiped by gtk+ itself

 src/caja-navigation-window-pane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b14e1b5201694c68b51fd13545e303afa55b0328
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 22 04:26:55 2016 +0100

    GTK3: fix deprecated GtkStock in libcaja-private

 libcaja-private/caja-autorun.c              | 6 +++---
 libcaja-private/caja-bookmark.c             | 2 +-
 libcaja-private/caja-file-conflict-dialog.c | 2 +-
 libcaja-private/caja-progress-info.c        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

commit ff6a32e8002be01e253a61a4abb9b61961252ddd
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 22 01:59:31 2016 +0100

    Gtk3: fix all possible deprecated GtkStock in src

 src/caja-connect-server-dialog.c | 12 ++++++------
 src/caja-location-entry.c        |  8 ++++----
 src/caja-notebook.c              |  2 +-
 src/caja-query-editor.c          |  4 ++--
 src/caja-search-bar.c            |  4 ++--
 src/caja-side-pane.c             |  2 +-
 src/caja-zoom-control.c          |  4 ++--
 7 files changed, 18 insertions(+), 18 deletions(-)

commit d99b7141da19a746a9329daece4a83704f0101b5
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 22 01:55:20 2016 +0100

    GTK3 side-pane + spartial-window: don't use deprecated gtk_arrow_new ()

 src/caja-side-pane.c      | 4 ++++
 src/caja-spatial-window.c | 4 ++++
 2 files changed, 8 insertions(+)

commit cc6a1d11d8903c3051d0af400559679cc5b4aed6
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 21 20:35:13 2016 +0100

    GTK3 query-editor: fix deprecated GTK_TYPE_VBOX usage

 src/caja-query-editor.c | 10 ++++++++++
 src/caja-query-editor.h |  8 ++++++++
 2 files changed, 18 insertions(+)

commit cb297b4c850e5c3149fad22fabcd7b18d05bd884
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 21 05:28:30 2016 +0100

    GTK3 file-conflict-dialog: fix size of dialog window if replacing folders

 libcaja-private/caja-file-conflict-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit 52d5bb9f398df3c7760006083c6969f3194c3e84
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 21 04:15:57 2016 +0100

    editable-labels: don't use deprecated gdk_cursor_new ()

 eel/eel-editable-label.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit e810ad1a06fecc9188951b348b0ea736dbafaa4e
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 21 04:13:16 2016 +0100

    GTK3 editable-label: don't use deprecated gtk_draw_insertion_cursor()
    
    + reduce if define hell a bit
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=377349b

 eel/eel-editable-label.c | 127 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 81 insertions(+), 46 deletions(-)

commit aded26ee41b319149994e1ca9ca717e51b086f64
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 19 01:57:04 2016 +0100

    GTK3 mime-application-chooser: don't use deprecated gtk_hbutton_box_new

 libcaja-private/caja-mime-application-chooser.c | 4 ++++
 1 file changed, 4 insertions(+)

commit d6f6175563e204a6450ce60dadd90280dcb807f2
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 19 01:44:41 2016 +0100

    GTK3 fm-list-view: don't use deprecated gtk_tree_view_set_rules_hint

 src/file-manager/fm-list-view.c | 2 ++
 1 file changed, 2 insertions(+)

commit e2e45eb5558f3e43ca1fe901c8c94efdf2caef06
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 19 01:41:59 2016 +0100

    GTK3: don'use deprecated gtk_hseparator_new

 libcaja-private/caja-column-chooser.c   |  4 ++++
 src/file-manager/fm-properties-window.c | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

commit 0ca18e1d5110c571d53afd631f0bad4d0097641e
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 19 01:34:31 2016 +0100

    GTK3 eel-wrap-table: don't use deprecated gtk_viewport_get_{h/v}adjustment

 eel/eel-wrap-table.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 54820f4200c190318ed1213d12ce585b9b422619
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 19 01:29:48 2016 +0100

    GTK: some missing GTK_TYPE_{H/V}BOX adjustments
    
    this completes https://github.com/mate-desktop/caja/commit/cf39567

 libcaja-private/caja-keep-last-vertical-box.h | 10 +++++++++-
 src/caja-emblem-sidebar.h                     |  8 ++++++++
 src/caja-side-pane.c                          |  7 +++++++
 src/caja-side-pane.h                          |  8 ++++++++
 src/caja-sidebar-title.h                      |  8 ++++++++
 src/caja-trash-bar.h                          |  8 ++++++++
 src/caja-x-content-bar.h                      |  8 ++++++++
 src/caja-zoom-control.h                       |  8 ++++++++
 8 files changed, 64 insertions(+), 1 deletion(-)

commit 1ff346876afd37a957aa490be25bdd2fd90e4773
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 01:29:22 2016 +0100

    fix fg-color of dark themes
    
    fixes https://github.com/mate-desktop/caja/issues/81

 libcaja-private/caja-icon-container.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit cf39567d3b05b69383c252812c5adf26382c866a
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 18 15:41:50 2016 +0100

    GTK3: fix deprecated GTK_TYPE_{H/V}BOX usage

 libcaja-private/caja-keep-last-vertical-box.c   |  7 +++++++
 libcaja-private/caja-mime-application-chooser.c |  7 +++++++
 src/caja-emblem-sidebar.c                       |  8 +++++++-
 src/caja-sidebar-title.c                        |  8 ++++++++
 src/caja-trash-bar.c                            |  7 +++++++
 src/caja-x-content-bar.c                        |  7 ++++++-
 src/caja-zoom-control.c                         | 11 +++++++++++
 7 files changed, 53 insertions(+), 2 deletions(-)

commit 0edcf869c2f6b28a5bd0ee6e612229db8c9f2d67
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 18 15:37:52 2016 +0100

    GTK3 icon-info: don't use deprecated gtk_icon_info_free
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=67028ca

 libcaja-private/caja-icon-info.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

commit 28ad0e568b51653d20413d83d1a8b9236b26874f
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 18 15:32:45 2016 +0100

    GTK3 desktop-icon-view: don't use deprecated GDK grab API
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-2&id=70df8fa

 src/file-manager/fm-desktop-icon-view.c | 40 +++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

commit acadd35e4cab5beb155496558597ae5c755f1225
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 18 15:30:10 2016 +0100

    GTK3 canvas: don't use deprecated GDK grab API
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-2&id=2ff006d

 eel/eel-canvas.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 eel/eel-canvas.h |  7 +++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

commit 57c2e8090698e8d05beec0c53e3a116fd8b88862
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sun Jan 17 21:45:22 2016 +0100

    GTK3: more deprecated GtkVBox/GtkHBox fixes

 libcaja-private/caja-column-chooser.c           |  8 +++++++-
 libcaja-private/caja-column-chooser.h           |  8 ++++++++
 libcaja-private/caja-mime-application-chooser.h |  8 ++++++++
 src/caja-image-properties-page.c                |  8 +++++++-
 src/caja-image-properties-page.h                |  8 ++++++++
 src/caja-window-slot.c                          |  9 +++++++++
 src/file-manager/fm-properties-window.c         | 14 +++++++++++++-
 7 files changed, 60 insertions(+), 3 deletions(-)

commit 312f33c5b54c735d15e78c9b96672b8b555f4834
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sun Jan 17 17:15:24 2016 +0100

    GTK3 connect-to-server-dialog: reduce if define hell

 src/caja-connect-server-dialog.c | 54 ++++++++++++----------------------------
 1 file changed, 16 insertions(+), 38 deletions(-)

commit 3c796cdf6020ac59cbcaca103453501292423c71
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 23:26:05 2016 +0100

    GTK3 all: don't use deprecated GDK pointer methods
    
    Use the new GdkDevice methods instead.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-4&id=a816e00
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-4&id=cdf858f

 eel/eel-art-gtk-extensions.c               | 13 +++++++++++++
 eel/eel-editable-label.c                   |  6 ++++++
 libcaja-private/caja-dnd.c                 | 11 +++++++++++
 libcaja-private/caja-icon-container.c      |  8 ++++++++
 libcaja-private/caja-tree-view-drag-dest.c | 11 ++++++++++-
 src/caja-notebook.c                        | 11 +++++++++++
 6 files changed, 59 insertions(+), 1 deletion(-)

commit 50970d1bb15d1f9c682e92dda345e59cfcf5330f
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 20:42:24 2016 +0100

    don't use deprecated gdk_cursor_new for both toolkit versions
    
    gdk_cursor_new i deprecated with gtk+-3.16 and
    gdk_cursor_new_for_display is available since 2.2

 libcaja-private/caja-icon-container.c   | 10 ++++++----
 src/caja-window.c                       |  6 +++++-
 src/file-manager/fm-list-view.c         |  4 ++--
 src/file-manager/fm-properties-window.c |  4 +++-
 4 files changed, 16 insertions(+), 8 deletions(-)

commit ccfe6d5364ecfd8f3bafef853e6a9fc7457a0af4
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 17:29:33 2016 +0100

    GTK3 test-caja-wrap-table: don't use deprecated gtk_scrolled_window_add_with_viewport ()
    
    gtk_scrolled_window_add_with_viewport () --> gtk_container_add ()

 test/test-caja-wrap-table.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

commit 2de22faab6d8918f6d5001edeb3f794cac829710
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 16:09:47 2016 +0100

    GTK3 general: don't use gdk_cursor_unref()
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=74a8f78

 eel/eel-editable-label.c                | 6 ++++--
 libcaja-private/caja-icon-canvas-item.c | 4 ++++
 libcaja-private/caja-icon-container.c   | 4 ++++
 src/caja-window.c                       | 4 ++++
 src/file-manager/fm-list-view.c         | 4 ++++
 src/file-manager/fm-properties-window.c | 4 ++++
 6 files changed, 24 insertions(+), 2 deletions(-)

commit 76cad7a49fd7c5876e780bda4823d55a73ed2556
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 15:27:16 2016 +0100

    GTK3 icon-canvas-item: add a missing gtk_style_context_restore()
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=8296f8c

 libcaja-private/caja-icon-canvas-item.c | 2 ++
 1 file changed, 2 insertions(+)

commit f5825a429522af2c5e8390b2601c23da9dc8d880
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 15:19:54 2016 +0100

    GTK3 eel-editable-label: don't use deprecated gtk_widget_get_requisition ()
    
    gtk_widget_get_requisition () --> gtk_widget_get_preferred_size ()

 eel/eel-editable-label.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 782f9380134734731a1547970d4bc9ab7b57410e
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 13:36:52 2016 +0100

    GTK3: don't use deprecated gdk_threads_{enter/leave} ()
    
    Since we don't ever call gdk_threads_init()

 cut-n-paste-code/libegg/eggsmclient-xsmp.c | 13 ++++++++++---
 eel/eel-canvas.c                           |  4 ++++
 libcaja-private/caja-thumbnails.c          |  4 ++++
 src/caja-pathbar.c                         |  5 ++++-
 4 files changed, 22 insertions(+), 4 deletions(-)

commit 8187e18cc3044d8a9e9da1bb959b543a2afcb980
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 13:00:54 2016 +0100

    Revert "define max/min version of GLib"
    
    To avoid a glib redefine of a version defined by glib itself,
    which spams only the build log and nobody takes care of it.
    
    This reverts commit 3e9b28b2ebc9579bc868e2a8d1dc2d6f6b568c68.

 configure.ac                            | 6 ------
 libcaja-extension/caja-extension-i18n.h | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

commit 7b5604b7e1af03445e7209b8a067ef359c2b4846
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 15 12:24:20 2016 +0100

    GTK3: don't use deprecated gtk_widget_size_request
    
    gtk_widget_size_request --> gtk_widget_get_preferred_size

 eel/eel-art-gtk-extensions.c          |  6 +++++-
 eel/eel-editable-label.c              |  8 ++++----
 eel/eel-labeled-image.c               | 10 +++++++---
 eel/eel-wrap-table.c                  |  8 ++++++--
 libcaja-private/caja-icon-container.c |  8 ++++----
 5 files changed, 26 insertions(+), 14 deletions(-)

commit 4c7f59163c415140d76330a1b3c57b1efe35ca14
Author: bl0ckeduser <bl0ckedusersoft@gmail.com>
Date:   Tue Jan 12 14:01:05 2016 -0500

    Small additional for closing tabs with middle-click
    
    fixes https://github.com/mate-desktop/caja/issues/457

 src/caja-notebook.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 3b7b4cfa969402c5cc9e45369f552729f2b65308
Merge: 3c5a4ef 1befe8d
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Wed Jan 13 15:15:35 2016 +0100

    Merge pull request #498 from mate-desktop/dev-GtkStyleContext
    
    port to gtk_style_context and other fixes

commit 1befe8ddf08c12b5c926d269b31d270fb94b9c3e
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 12 01:21:41 2016 +0100

    GTK3 file-conflict-dialog: don't use override_font
    
    Set the PangoAttributeList on the GtkLabel instead.
    
    and 'don't force a size request on the labels'
    This is not required anymore in GTK+ 3
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=52b8185
    https://git.gnome.org/browse/nautilus/commit/?id=b8077a7
    https://git.gnome.org/browse/nautilus/commit/?id=1457f53

 libcaja-private/caja-file-conflict-dialog.c | 32 +++++++++++++----------------
 1 file changed, 14 insertions(+), 18 deletions(-)

commit 4b2d71fef886fbdffd8d1a03a337cf1e794d1252
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 11 22:25:23 2016 +0100

    GTK3 icon-container: invalidate the layout cache on style-updated
    
    This way label sizes will be recomputed if e.g. DPI settings change.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=578468
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=2f064e5

 libcaja-private/caja-icon-container.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2c8e8a06a050d43d730475bf05cbd07508f32160
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 11 20:38:24 2016 +0100

    GTK3 icon-container: don't chain up style-updated for the desktop container
    
    Chaining up resets the background to the default color, which is not
    what we want for the desktop container.
    Fixes https://github.com/mate-desktop/caja/issues/445
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=83a7d27

 libcaja-private/caja-icon-container.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

commit 43e928f798eec8035a00ab9f58a0bc43a31f8ab8
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 11 19:29:39 2016 +0100

    GTK3 icon-container: use the "rubberband" style class for the selection item
    
    Instead of using a custom style property.
    
    Autor: lukefromdc
    
    same as:
    https://git.gnome.org/browse/nautilus/commit/?id=ca7f81e2

 libcaja-private/caja-icon-container.c | 121 ++++++++++++++++++++++------------
 1 file changed, 78 insertions(+), 43 deletions(-)

commit 4974f96274a7cbc0056983dea03b2d42615714e4
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 11 18:36:08 2016 +0100

    GTK3 icon-canvas-item: don't override parent container style flags
    
    When drawing the canvas item elements, don't override the parent
    container style flags, so we don't lose e.g. backdrop information.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=31dad6f

 libcaja-private/caja-icon-canvas-item.c | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

commit 8e4612599a9a6cb1f380dd6cbef9ad3d885cf77f
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 11 17:56:38 2016 +0100

    GTK3 icon-canvas-item: don't draw pango layouts when renaming
    
    Fixes a regression introduced in commit
    3a858857fff5e1d7e0bffcec63fea6d2a933ce27 that causes unwanted text to be
    drawn while renaming a file in icon view.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=f07aa75

 libcaja-private/caja-icon-canvas-item.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit 412486b1f4c8a0a60d9aa07b39e38ed66852ae3d
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 11 17:48:12 2016 +0100

    GTK3 icon-canvas-item: render the additional text with gtk_render_layout()
    
    And add a style class for it.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=7732a6b
    https://git.gnome.org/browse/nautilus/commit/?id=2cb91c0

 libcaja-private/caja-icon-canvas-item.c | 35 +++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

commit 5ec02960d6f78dd23b02af27e6f3c595ab4e99bc
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 11 15:08:16 2016 +0100

    GTK3 icon-container: remove unused code caching canvas item colors
    
    Caching colors in CajaIconContainer to use them in the canvas item
    is not needed anymore, as gtk_render_* fetches the right values directly
    from the style context.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=77eecef

 libcaja-private/caja-icon-container.c | 133 ++++------------------------------
 libcaja-private/caja-icon-private.h   |  16 +---
 2 files changed, 18 insertions(+), 131 deletions(-)

commit e9ecff6c51b4e84fc350ccfe972439ed8dbe7215
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 11 15:04:04 2016 +0100

    GTK3 icon-canvas-item: use gtk_render_* methods instead of direct cairo
    
    Instead of hardcoding colors and using direct cairo calls to draw the
    canvas items frame/background/labels, use gtk_render_* methods directly.
    This has the advantage of making them more friendly with GTK+ themes
    (by adding a caja-canvas-item style class to the canvas context when drawing)
    and removes a ton of convolut
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=95910c9

 libcaja-private/caja-icon-canvas-item.c | 385 ++++++++++++++++++++------------
 1 file changed, 243 insertions(+), 142 deletions(-)

commit d430735d425443f9fbfd301b4ece46c1058281eb
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 20:43:28 2016 +0100

    GTK3 editable-Label: render background
    
    Without this the rename widget background is always transparent, which
    makes it very hard to read on e.g. the desktop with a background
    image.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=c3b2b0a

 eel/eel-editable-label.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

commit d1c10a0a832731f81db1c627c07fe5d750543294
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 20:40:21 2016 +0100

    GTK3 editable-label: fix selection color in backdrop state
    
    Don't set the ACTIVE flag if we don't have focus, it just doesn't make
    sense.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=845d3fc

 eel/eel-editable-label.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 7a2f6641563b525bf32c18a2e52ac290f06c9a53
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 20:37:32 2016 +0100

    GTK3 editable-label: use GTK_STYLE_CLASS_ENTRY
    
    Because that's what it is actually...
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=e54ace0

 eel/eel-editable-label.c | 4 ++++
 1 file changed, 4 insertions(+)

commit de1bef38ac1fb7e33bf3742200635870eb22ae2e
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 20:34:56 2016 +0100

    GTK3 editable-label: use gtk_render_frame() instead of hardcoding a stroke
    
    This allows the stroke to use rounded corners and border images, among
    other things.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=b143b95

 eel/eel-editable-label.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

commit 930436556075111dc13d4c8d8d270a3c89a9cd13
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 20:31:36 2016 +0100

    GTK3 editable-label: don't hardcode black for the insertion cursor
    
    Use the theme foreground/text color instead.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=f9383ac

 eel/eel-editable-label.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 59d1c9281e80922c2bda883c4635379022beb375
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 20:29:00 2016 +0100

    GTK3 editable-label: make sure to size_request the padding set on the label
    
    And not the alignment, which is an offset inside the allocated size.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=8b87a3e

 eel/eel-editable-label.c | 9 +++++++++
 1 file changed, 9 insertions(+)

commit 8b37981175499c9c876648165ddb7a5f94ae6849
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 18:12:16 2016 +0100

    GTK3 icon-canvas-item: make the icon frame transparent when not prelit
    
    This fixes icons on the desktop appearing weird
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=6a11ecd

 libcaja-private/caja-icon-canvas-item.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

commit 6698c8b370f2d9aa278b63090cbc9957d7ca0e36
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 18:05:52 2016 +0100

    GTK3 editable-label: chain up in style_updated()
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=fbabd8e

 eel/eel-editable-label.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 098a34323263e29a4c221fb49305dd666296aa74
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 16:20:18 2016 +0100

    GTK3 editable-label: fix some drawing regressions
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=6d079cc

 eel/eel-editable-label.c | 229 +++--------------------------------------------
 1 file changed, 10 insertions(+), 219 deletions(-)

commit b1350c6d63250d5ecfab95804c1bb7f5eeefe29f
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 16:12:35 2016 +0100

    GTK3 general: use eel_create_spotlight_pixbuf()
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=8b13a04

 src/caja-places-sidebar.c        | 9 +++++++++
 src/file-manager/fm-list-model.c | 8 ++++++++
 src/file-manager/fm-tree-model.c | 8 ++++++++
 3 files changed, 25 insertions(+)

commit 8d89b454e7eb52922b2ca3847c0ac909b352e67f
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 16:09:15 2016 +0100

    GTK3 icon-canvas-item: remove an useless snippet of drawing code
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=09f0b79

 libcaja-private/caja-icon-canvas-item.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

commit ef3587fbf0d3e83b082ac94054799ce98b2fe52d
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 02:49:09 2016 +0100

    GTK3 icon-container: remove unused style properties
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=e652eb0

 libcaja-private/caja-icon-container.c | 47 +++--------------------------------
 libcaja-private/caja-icon-private.h   |  2 --
 2 files changed, 3 insertions(+), 46 deletions(-)

commit e2942ccb6206376293044bf0f7c885505e6a1113
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 01:14:42 2016 +0100

    GTK3 icon-container: hook to style_updated instead of style_set
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=a083fa0

 libcaja-private/caja-icon-container.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

commit b03a4c4078440f3ec1baea7ea158606f3c68e277
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 01:11:39 2016 +0100

    GTK3 icon-canvas-item: use eel_create_spotlight_pixbuf()
    
    Instead of passing eel_pixbuf_render() always the same values
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=a1fa4ea

 libcaja-private/caja-icon-canvas-item.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 288ceb4c5d5af35676031754db51cc1c5c53105f
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 00:50:35 2016 +0100

    GTK3 icon-container: fix setting the selection when renaming
    
    Closes: bgo #642766
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=a8a5b8d

 libcaja-private/caja-icon-container.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit f700d63c933877362ed1cb92d8bddd2df1e29227
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 00:41:46 2016 +0100

    GTK3 icon-container: fix a couple of ACTIVE -> NORMAL typos
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=d0d9059

 libcaja-private/caja-icon-container.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit fa7dd4677f4196750d0c752c7b1823fdd7c54cbb
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 22:04:08 2016 +0100

    GTK3 icon-container: remove useless theming properties
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=e2ca42cac78cb0287a1bbb73030e7bba8b171970

 libcaja-private/caja-icon-canvas-item.c | 16 ++++++---
 libcaja-private/caja-icon-container.c   | 57 +++++++++++++++++----------------
 2 files changed, 41 insertions(+), 32 deletions(-)

commit 390400e11e888ee65d4620a03615c5aa23e4d089
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 00:39:38 2016 +0100

    GTK3 icon-container: plug a memory leak
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=f394ce8

 libcaja-private/caja-icon-container.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit e5708b8799ecd7b74b0c6d890677c0281b762cee
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 21:24:28 2016 +0100

    GTK3 icon-container: fix rendering of text on the desktop
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=2e5f7a2

 libcaja-private/caja-icon-container.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 6a19cea2b87a4977a70b1bd6e14edb09a5ebde62
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 00:34:11 2016 +0100

    GTK3 icon-container: don't malloc() GdkRGBA colors manually
    
    As GdkRGBA might or might not use internally a different allocator, like
    g_slice.
    This should fix some memory corruption issues, thanks to Alban Browaeys
    for tracking down the bug.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=4c026bf

 libcaja-private/caja-icon-container.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

commit c0e9c136368c537209932431774edef5bb6b8982
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 00:22:27 2016 +0100

    GTK3 icon-dnd: set the right style class, and use GdkRGBA
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=5d811bb

 libcaja-private/caja-icon-dnd.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

commit 85faafb667ca2ab548347814595ac9b305c024b8
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 00:11:42 2016 +0100

    Gtk3 tree-drag-dest: set the right style class
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=18e3369

 libcaja-private/caja-tree-view-drag-dest.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 01e61137a215658271f8b727ba56b8b2272fe1b2
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 23:53:55 2016 +0100

    GTK3 icon-canvas-item: set the right style class
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=0668960

 libcaja-private/caja-icon-canvas-item.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

commit c8c302522c9692e616611def4594c8f7364e79d2
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 23:49:26 2016 +0100

    GTK3 editable-label: use gtk_style_context_get() to query standard props
    
    Also, fix a leak.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=ef8544b

 eel/eel-editable-label.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit 34031cbce020b242d523258e06565c6a00c54e5d
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 23:42:36 2016 +0100

    GTK3 icon-info: plug a leak
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=705d814

 libcaja-private/caja-icon-info.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 7eea4d477154160e3dd52b76346218b0ca22f8ed
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 21:51:03 2016 +0100

    GTK3 editable-label: copy-paste code from GTK+ to sync drawing with GtkLabel
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=ca9f8d8
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=e3feaf8
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=caa55b7

 eel/eel-editable-label.c | 223 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 220 insertions(+), 3 deletions(-)

commit 95c80f76e565ed3943008593254b527550d2e1e0
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 23:32:07 2016 +0100

    GTK3 window: port to GtkStyleContext, plug a leak
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=465f576

 src/caja-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit d125a70db28b8f37543ef93469f4736859afb53b
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 21:07:15 2016 +0100

    Gtk3 eel-gtk-extensions: do not use gtk_widget_modify_font
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=b5302eb

 eel/eel-gtk-extensions.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit 1dffd0e4615ffe0ec3c2b86a61b02d735898ab90
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Dec 26 20:47:53 2015 +0100

    GTK3 eel-gdk-extensions: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=1d3dd96

 eel/eel-gdk-extensions.c | 49 +++++++++++++++++++++++++++++++++---------------
 eel/eel-gdk-extensions.h | 10 ++++++++--
 2 files changed, 42 insertions(+), 17 deletions(-)

commit da1e7f715a4eb882abe97837eef02c7d38bd5e54
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 05:03:27 2016 +0100

    GTK3 window: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=076886e

 src/caja-window.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit 20dd53f7822de644ca60cc200f5286a90d3b28b3
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 04:57:44 2016 +0100

    GTK3 spatial-window: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=507b56e3a527e28117b259dbf0dce48f1656dd7d

 src/caja-spatial-window.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 5a7203f46bcccc29271058d1f03ed149d6c2860b
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 04:55:59 2016 +0100

    GTK3 notebook: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=bc5d290

 src/caja-notebook.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

commit 39ce5849c81c688c53245316584489db5bc354ab
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 04:53:29 2016 +0100

    GTK3 location-bar: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=5fc40ad

 src/caja-location-bar.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

commit 2139cadd1b2143797287afd200dc4b6a6d687aee
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 04:49:57 2016 +0100

    GTK3 properties-window: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=8e5689

 src/file-manager/fm-properties-window.c | 84 +++++++++++++++++++++++++++++++--
 1 file changed, 80 insertions(+), 4 deletions(-)

commit 3758b1025d59bd534717bd78d0e87dba9d45e542
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jan 7 04:37:43 2016 +0100

    GTK3 list-view: port to GtkStyleContext

 src/file-manager/fm-list-view.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

commit d74c80ebae7d2acd4804ac1d20f6d77b1df53a2a
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Jan 4 22:11:54 2016 +0100

    Gtk3 tree-view-drag-dest: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=f8bdf9c

 libcaja-private/caja-tree-view-drag-dest.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit 569a001e73f2963f239da92c433e62de2a030509
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Wed Jan 6 21:49:08 2016 +0100

    Gtk3 caja-sidebartitle: partial-port-to-GtkStyleContext

 src/caja-sidebar-title.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 104 insertions(+), 1 deletion(-)

commit 5425761290d94b208efea117e3b6a865e9157b92
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Wed Jan 6 22:16:38 2016 +0100

    GTK3 icon-container: fix rendering of text on the desktop
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=2e5f7a23350016c67bb9e9cca86a9fb2360d79e2

 libcaja-private/caja-icon-canvas-item.c |  2 +-
 libcaja-private/caja-icon-container.c   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

commit 11fe5df21deec3181bbb72a577a26f7d2bb4d8b0
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 5 19:56:52 2016 +0100

    GTK3 icon-container: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=4f23a0a

 libcaja-private/caja-icon-container.c | 234 +++++++++++++++++++++++++++++++++-
 libcaja-private/caja-icon-dnd.c       |   4 +-
 libcaja-private/caja-icon-private.h   |  16 +++
 3 files changed, 247 insertions(+), 7 deletions(-)

commit dca1155b3473e91ef12b03dca1506b86ccbaba07
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sun Dec 27 01:46:55 2015 +0100

    GTK3 icon-canvas-item: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=fc74332

 libcaja-private/caja-icon-canvas-item.c | 90 +++++++++++++++++++++++++++------
 1 file changed, 74 insertions(+), 16 deletions(-)

commit 4df0d0df37e1a69a4c6bcd76580adc736d1f4e5f
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Dec 26 20:31:28 2015 +0100

    GTK3 file-conflict-dialog: port to GtkStyleContext
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=5da941e

 libcaja-private/caja-file-conflict-dialog.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

commit b1b2cb896d0cbe4a210af4bf3b867cb89580c4c3
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Dec 26 20:20:19 2015 +0100

    GTK3 eel-gdk-pixbuf: use GdkRGBA everywhere
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=020adaf

 eel/eel-gdk-pixbuf-extensions.c | 12 ++++++++++++
 eel/eel-gdk-pixbuf-extensions.h |  4 ++++
 eel/eel-graphic-effects.c       | 17 +++++++++++++++++
 eel/eel-graphic-effects.h       |  9 +++++++++
 4 files changed, 42 insertions(+)

commit a781d9bffc37f71f4eeb68641f34095d92820507
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Dec 26 20:10:35 2015 +0100

    GTK3 editable-label: port to GtkStyleContext
    
    There are still some rendering artifacts, but we will fix them later. (maybe)
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=d6e07c7

 eel/eel-editable-label.c | 176 ++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 152 insertions(+), 24 deletions(-)

commit 74bc6ba6820170591cde83ff54037f50b41b6a22
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Dec 26 19:59:44 2015 +0100

    Gtk3 eel-canvas: port to GtkStyleContext

 eel/eel-canvas.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit d99909f05e151ace2b6b3eb4f87700c417e513d5
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Dec 26 19:58:09 2015 +0100

    GTK3 eel-canvas-rect: use RGBA colors only
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=f0691e7

 eel/eel-canvas-rect-ellipse.c | 83 +++++++++++++++++++++++++++++++++++++++++++
 eel/eel-canvas-rect-ellipse.h |  5 +++
 2 files changed, 88 insertions(+)

commit a461e0a356a76f81076d78dd3b08a854884cdeeb
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Dec 26 19:55:08 2015 +0100

    GTK3 icon-dnd: fix DnD highlighting regression
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=7bd06fa

 libcaja-private/caja-icon-dnd.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

commit 2848d0359a8bc433ba9de56ccc93a04d2f6bbdf2
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Fri Jan 8 20:16:20 2016 +0100

    GTK3 eel-gdk-extensions: add eel_make_color_inactive() to public API
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=42e7268

 eel/eel-gdk-extensions.c | 32 ++++++++++++++++++++++++++++++++
 eel/eel-gdk-extensions.h |  3 +++
 2 files changed, 35 insertions(+)

commit 3c5a4ef68906a73850fa2ffe403cfcd37dc31ff9
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 01:05:50 2016 +0100

    GTK3 icon-container: remove spurious call to gtk_adjustment_changed()
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=42865d5

 libcaja-private/caja-icon-container.c | 2 --
 1 file changed, 2 deletions(-)

commit 65a3791db8209d7a001c1af6f944e8dd180859e1
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Jan 9 16:16:24 2016 +0100

    icon-info: use gdk_pixbuf_new_from_stream_at_scale()
    
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=83a83e3

 libcaja-private/caja-icon-info.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit f6f8c610ace0f0979237da8fba5b4afa6e137e67
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 12 01:27:46 2016 +0100

    conflict-dialog: make the rename entry expand the whole width
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=392359d

 libcaja-private/caja-file-conflict-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 5bdb265cec05efa811f5818bb92a97c4a211712d
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 12 01:25:24 2016 +0100

    file-conflict-dialog: Don't use italic fonts
    
    It adds nothing and makes the text harder to read.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=d064618

 libcaja-private/caja-file-conflict-dialog.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit ed977d25e487400f547997f95802d139e4fce26b
Author: bl0ckeduser <bl0ckedusersoft@gmail.com>
Date:   Fri Jan 8 10:04:18 2016 -0500

    Middle-click tab closing (#457)

 src/caja-navigation-window-pane.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

commit 61800829da41036da5719b0e39e6f015cbd75f9a
Author: bl0ckeduser <bl0ckedusersoft@gmail.com>
Date:   Tue Jan 5 20:57:49 2016 -0500

    Fix fontcolor in icon view with some light themes
    fixes #438

 libcaja-private/caja-icon-container.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 660f0f52647616d9e3a146e484afb8a31b74d03d
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Tue Jan 5 01:22:47 2016 +0100

    pre-bump version to 1.13.0

 NEWS         | 2 ++
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit aa1509ee3d9dddfb88351627c361c3bac453235a
Author: ericcurtin <ericcurtin17@gmail.com>
Date:   Mon Jan 4 19:49:32 2016 +0000

    Fix spelling-error-in-manpage usr/share/man/man1/caja-file-management-properties.1.gz
    
    excutable -> executable

 docs/caja-file-management-properties.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit fa33f9db4d261aed3287da361437296354dd2ccd
Author: Monsta <monsta@inbox.ru>
Date:   Sat Jan 2 21:41:13 2016 +0300

    drop MateConf migration script

 libcaja-private/Makefile.am  |  4 ---
 libcaja-private/caja.convert | 83 --------------------------------------------
 2 files changed, 87 deletions(-)

commit db7c8c10af2006f7f87b8e001262eb2ad513db49
Author: Monsta <monsta@inbox.ru>
Date:   Sat Jan 2 16:28:41 2016 +0300

    remove unused #defines

 src/caja-notebook.c | 4 ----
 1 file changed, 4 deletions(-)

commit 2e4ced0b5fbf3cd5b09ccc74023c946df64fcace
Author: monsta <monsta@inbox.ru>
Date:   Fri Dec 25 11:06:54 2015 +0300

    pathbar: remove unneeded asserts

 src/caja-pathbar.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

commit 5f53983105c83a649c47283577e4115f2d57d22d
Author: Monsta <monsta@inbox.ru>
Date:   Thu Dec 24 16:41:39 2015 +0300

    eel: remove unused function

 eel/eel-canvas.c | 36 ------------------------------------
 eel/eel-canvas.h |  7 -------
 2 files changed, 43 deletions(-)

commit 9f2270200e47229cb0b4316aaf708e28f94e4a9b
Author: monsta <monsta@inbox.ru>
Date:   Wed Dec 23 15:53:24 2015 +0300

    Release 1.12.2

 NEWS         | 7 +++++++
 configure.ac | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

commit f378fc76793ae0710e08bfb05b4b106a1f171a9c
Author: monsta <monsta@inbox.ru>
Date:   Tue Dec 22 17:06:09 2015 +0300

    set smclient mode to "no restart" when running as root or on other desktops

 src/caja-main.c | 3 +++
 1 file changed, 3 insertions(+)

commit 53f698436f2111bf8655ad9039c6a93948e10028
Author: monsta <monsta@inbox.ru>
Date:   Tue Dec 22 17:01:40 2015 +0300

    oops... fix build breakage introduced in last commit

 cut-n-paste-code/libegg/eggsmclient-private.h | 1 +
 1 file changed, 1 insertion(+)

commit a3a7cbd2e6d718e62904bcadd7ee01a6b283e1cf
Author: monsta <monsta@inbox.ru>
Date:   Tue Dec 22 16:40:07 2015 +0300

    smclient: drop win32/osx support, adjust indent

 cut-n-paste-code/libegg/eggsmclient-private.h |  32 ++---
 cut-n-paste-code/libegg/eggsmclient.c         |  12 +-
 cut-n-paste-code/libegg/eggsmclient.h         | 172 +++++++++++++-------------
 3 files changed, 96 insertions(+), 120 deletions(-)

commit c32f2770d9dd37769efd404b0c547946800b5d00
Author: monsta <monsta@inbox.ru>
Date:   Tue Dec 22 15:34:40 2015 +0300

    drop source files that aren't used for years

 libcaja-private/Makefile.am               |   2 -
 libcaja-private/caja-file.c               |   1 -
 libcaja-private/caja-users-groups-cache.c | 295 ------------------------------
 libcaja-private/caja-users-groups-cache.h |  34 ----
 4 files changed, 332 deletions(-)

commit 2e026b344d9b9a81172b3633968914ab2511e730
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Mon Dec 21 13:51:35 2015 +0100

    Typo fix in code and g_param_spec: homogenous -> homogeneous.

 eel/eel-wrap-table.c | 6 +++---
 eel/eel-wrap-table.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 17260d6f9549e2a8e51a08b7a156bae77d5e8e75
Author: Monsta <monsta@inbox.ru>
Date:   Sat Dec 19 20:47:09 2015 +0300

    use g_strcmp0 instead of unsafe strcmp

 src/file-manager/fm-icon-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 706a0b60812c33d44210088706dbcf8d4324a9da
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sat Dec 5 04:43:01 2015 +0100

    GTK3 properties-window: bold and right-aligned are always FALSE
    
    So we can remove them
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=12bcaf9

 src/file-manager/fm-properties-window.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

commit acd9202389781d863abf05e8e8feb65c7b380300
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Sep 30 14:44:43 2015 +0200

    GTK3 properties-window: set max-width for value labels
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-16&id=ac83942

 src/file-manager/fm-properties-window.c | 1 +
 1 file changed, 1 insertion(+)

commit a0c71663bbcf89db74eeee61cdf6eaf815af2323
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Sep 30 14:37:10 2015 +0200

    GTK3: fm-properties-window, port GtkTable to GtkGrid
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-4&id=0026899
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-4&id=8b99f1f
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-4&id=b4877e5
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-16&id=0a5838

 src/file-manager/fm-properties-window.c | 919 ++++++++++++++++++++++++++++++--
 1 file changed, 880 insertions(+), 39 deletions(-)

commit f54aab0e53880c8e8c65d878ffe06e5e941e16e8
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Sep 30 12:49:16 2015 +0200

    GTK3: desktop-item-properties, port GtkTable to GtkGrid
    
    inspired from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-4&id=29dea2e

 src/file-manager/fm-ditem-page.c | 55 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

commit d96cb50cd99b8785482c610145035ca09322be47
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Sep 30 12:41:33 2015 +0200

    GTK3: fm-directory-view, port GtkTable to GtkGrid
    
    inspired from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-4&id=c6903f4

 src/file-manager/fm-directory-view.c | 69 ++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

commit 05d56843bec81e24ff072ed63937bb02b2a6bde5
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Sep 30 12:15:33 2015 +0200

    GTK3: connect-server-dialog, port GtkTable to GtkGrid
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-4&id=7f3e5ce

 src/caja-connect-server-dialog.c | 169 +++++++++++++++++++++++++++++++--------
 1 file changed, 136 insertions(+), 33 deletions(-)

commit 36513d53535e0b3bae58948a1dbcd29639204453
Author: monsta <monsta@inbox.ru>
Date:   Fri Dec 4 13:58:58 2015 +0300

    properties -> custom icon dialog: add /usr/share/icons to Places
    
    fixes https://github.com/mate-desktop/caja/issues/283

 src/file-manager/fm-properties-window.c | 1 +
 1 file changed, 1 insertion(+)

commit bd118906732c342ad98a7b2d836032301235625f
Author: Monsta <monsta@inbox.ru>
Date:   Sun Nov 29 20:53:22 2015 +0300

    Bump version to 1.12.1

 NEWS         | 4 ++++
 configure.ac | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

commit f7c7f3bc85e929de3519ca72ccd1f4d48180f8ef
Author: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date:   Fri Nov 20 15:16:31 2015 +0000

    Updated translations

 po/am.po    | 3032 ++++++++++++------------
 po/be.po    |   36 +-
 po/br.po    |  214 +-
 po/ca.po    |  341 +--
 po/cs.po    |    2 +-
 po/da.po    |    2 +-
 po/de.po    |    9 +-
 po/es_CO.po | 7464 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/es_MX.po | 7464 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fa.po    | 2840 +++++++++++------------
 po/fi.po    | 2756 +++++++++++-----------
 po/fr.po    |    2 +-
 po/hr.po    | 2758 +++++++++++-----------
 po/hy.po    |  104 +-
 po/ia.po    | 2756 +++++++++++-----------
 po/id.po    | 2766 +++++++++++-----------
 po/kk.po    |    2 +-
 po/mi.po    | 2756 +++++++++++-----------
 po/ms.po    | 2758 +++++++++++-----------
 po/oc.po    |    4 +-
 po/pt_BR.po |    2 +-
 po/ro.po    |   16 +-
 po/ru.po    | 2759 +++++++++++-----------
 po/rw.po    | 6305 ++++++++++++++++++++++++-------------------------
 po/sk.po    |    2 +-
 po/sq.po    | 2756 +++++++++++-----------
 po/sv.po    |    2 +-
 po/tr.po    |   14 +-
 po/uk.po    | 2761 +++++++++++-----------
 po/yi.po    | 6281 ++++++++++++++++++++++++-------------------------
 po/zh_CN.po |    8 +-
 31 files changed, 36821 insertions(+), 22151 deletions(-)

commit 0eaf1d0019b1cb4da4b87f6e2e034ec7e9979736
Author: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date:   Fri Nov 20 15:11:47 2015 +0000

    Fixed caja flooding .xsession-errors with "caja_menu_provider_get_background_items: assertion 'CAJA_IS_MENU_PROVIDER (provider)' failed"

 libcaja-extension/caja-menu-provider.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 88d2ff05f2a5f4c31a8012290ab3ef671d3b48a6
Author: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date:   Fri Nov 20 14:49:38 2015 +0000

    Don't translate default font value in gsettings schema

 libcaja-private/org.mate.caja.gschema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ca2012998d187defac1079e1a8976e46c8b0c69e
Author: Monsta <monsta@inbox.ru>
Date:   Sun Nov 15 14:45:43 2015 +0300

    fix g_object_unref call
    
    it wasn't properly unref'ed and caused a runtime warning

 src/caja-application.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit fc6abce360d8f03f5812b8ec94fe6a1d700cc2ab
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Mon Nov 2 01:57:39 2015 +0100

    release 1.12.0

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 77afce566361b203591dbf7724b8798f37c35e7a
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Sun Nov 1 18:26:03 2015 +0100

    Sync translations with transifex

 po/af.po          | 2756 ++++++++++++++++++++---------------------
 po/ar.po          | 2758 ++++++++++++++++++++---------------------
 po/as.po          | 2756 ++++++++++++++++++++---------------------
 po/ast.po         | 2756 ++++++++++++++++++++---------------------
 po/az.po          | 2756 ++++++++++++++++++++---------------------
 po/be.po          | 2756 ++++++++++++++++++++---------------------
 po/bg.po          | 2756 ++++++++++++++++++++---------------------
 po/bn.po          | 2756 ++++++++++++++++++++---------------------
 po/bn_IN.po       | 2756 ++++++++++++++++++++---------------------
 po/br.po          | 2827 +++++++++++++++++++++---------------------
 po/bs.po          | 2756 ++++++++++++++++++++---------------------
 po/ca.po          | 2758 ++++++++++++++++++++---------------------
 po/ca@valencia.po | 2756 ++++++++++++++++++++---------------------
 po/cmn.po         | 2758 ++++++++++++++++++++---------------------
 po/crh.po         | 2756 ++++++++++++++++++++---------------------
 po/cs.po          | 2757 ++++++++++++++++++++---------------------
 po/da.po          | 2758 ++++++++++++++++++++---------------------
 po/de.po          | 2828 +++++++++++++++++++++---------------------
 po/dz.po          | 2756 ++++++++++++++++++++---------------------
 po/el.po          | 2762 ++++++++++++++++++++---------------------
 po/en_AU.po       | 2760 ++++++++++++++++++++---------------------
 po/en_CA.po       | 2756 ++++++++++++++++++++---------------------
 po/en_GB.po       | 2758 ++++++++++++++++++++---------------------
 po/eo.po          | 2756 ++++++++++++++++++++---------------------
 po/es.po          | 2812 +++++++++++++++++++++---------------------
 po/et.po          | 2776 ++++++++++++++++++++---------------------
 po/eu.po          | 2758 ++++++++++++++++++++---------------------
 po/fr.po          | 2759 ++++++++++++++++++++---------------------
 po/fur.po         | 2756 ++++++++++++++++++++---------------------
 po/fy.po          | 2756 ++++++++++++++++++++---------------------
 po/ga.po          | 2756 ++++++++++++++++++++---------------------
 po/gl.po          | 2758 ++++++++++++++++++++---------------------
 po/gu.po          | 2756 ++++++++++++++++++++---------------------
 po/ha.po          | 2756 ++++++++++++++++++++---------------------
 po/he.po          | 2758 ++++++++++++++++++++---------------------
 po/hi.po          | 2756 ++++++++++++++++++++---------------------
 po/hu.po          | 2752 ++++++++++++++++++++---------------------
 po/hy.po          | 3539 +++++++++++++++++++++++++++--------------------------
 po/ig.po          | 2756 ++++++++++++++++++++---------------------
 po/is.po          | 2758 ++++++++++++++++++++---------------------
 po/it.po          | 2758 ++++++++++++++++++++---------------------
 po/ja.po          | 2763 ++++++++++++++++++++---------------------
 po/ka.po          | 2756 ++++++++++++++++++++---------------------
 po/kk.po          | 2758 ++++++++++++++++++++---------------------
 po/kn.po          | 2756 ++++++++++++++++++++---------------------
 po/ko.po          | 2758 ++++++++++++++++++++---------------------
 po/ku.po          | 2756 ++++++++++++++++++++---------------------
 po/ky.po          | 2756 ++++++++++++++++++++---------------------
 po/li.po          | 2756 ++++++++++++++++++++---------------------
 po/lt.po          | 2866 +++++++++++++++++++++----------------------
 po/lv.po          | 2758 ++++++++++++++++++++---------------------
 po/mai.po         | 2756 ++++++++++++++++++++---------------------
 po/mg.po          | 2756 ++++++++++++++++++++---------------------
 po/mk.po          | 2756 ++++++++++++++++++++---------------------
 po/ml.po          | 2756 ++++++++++++++++++++---------------------
 po/mn.po          | 2756 ++++++++++++++++++++---------------------
 po/mr.po          | 2758 ++++++++++++++++++++---------------------
 po/nb.po          | 2752 ++++++++++++++++++++---------------------
 po/nds.po         | 2756 ++++++++++++++++++++---------------------
 po/ne.po          | 2756 ++++++++++++++++++++---------------------
 po/nl.po          | 2762 ++++++++++++++++++++---------------------
 po/nn.po          | 2756 ++++++++++++++++++++---------------------
 po/nso.po         | 2758 ++++++++++++++++++++---------------------
 po/oc.po          | 2756 ++++++++++++++++++++---------------------
 po/or.po          | 2756 ++++++++++++++++++++---------------------
 po/pa.po          | 2756 ++++++++++++++++++++---------------------
 po/pl.po          | 2760 ++++++++++++++++++++---------------------
 po/ps.po          | 2756 ++++++++++++++++++++---------------------
 po/pt.po          | 2831 +++++++++++++++++++++---------------------
 po/pt_BR.po       | 2759 ++++++++++++++++++++---------------------
 po/ro.po          | 3388 +++++++++++++++++++++++++-------------------------
 po/si.po          | 2756 ++++++++++++++++++++---------------------
 po/sk.po          | 2759 ++++++++++++++++++++---------------------
 po/sl.po          | 2761 ++++++++++++++++++++---------------------
 po/sr.po          | 2756 ++++++++++++++++++++---------------------
 po/sr@latin.po    | 2756 ++++++++++++++++++++---------------------
 po/sv.po          | 2773 ++++++++++++++++++++---------------------
 po/ta.po          | 2756 ++++++++++++++++++++---------------------
 po/te.po          | 2756 ++++++++++++++++++++---------------------
 po/th.po          | 2756 ++++++++++++++++++++---------------------
 po/tk.po          | 2756 ++++++++++++++++++++---------------------
 po/tr.po          | 2763 ++++++++++++++++++++---------------------
 po/ug.po          | 2756 ++++++++++++++++++++---------------------
 po/ur.po          | 2758 ++++++++++++++++++++---------------------
 po/uz.po          | 2756 ++++++++++++++++++++---------------------
 po/vi.po          | 2756 ++++++++++++++++++++---------------------
 po/wa.po          | 2756 ++++++++++++++++++++---------------------
 po/xh.po          | 2756 ++++++++++++++++++++---------------------
 po/yo.po          | 2756 ++++++++++++++++++++---------------------
 po/zh_CN.po       | 2757 ++++++++++++++++++++---------------------
 po/zh_HK.po       | 2756 ++++++++++++++++++++---------------------
 po/zh_TW.po       | 2758 ++++++++++++++++++++---------------------
 po/zu.po          | 2756 ++++++++++++++++++++---------------------
 93 files changed, 129398 insertions(+), 128822 deletions(-)

commit fc51dd877d800b47dccb0e78bb6a3eaa584e6427
Author: monsta <monsta@inbox.ru>
Date:   Fri Oct 30 14:31:27 2015 +0300

    update NEWS for 1.12

 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 597e229c69cf05e734ce0a08cc8ad1af4b2ebae8
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat Sep 26 17:05:23 2015 +0200

    GTK3: do not use deprecated gtk_misc_set_alignment

 eel/eel-gtk-extensions.c                        |  4 +++
 eel/eel-labeled-image.c                         | 10 ++++++
 libcaja-private/caja-autorun.c                  | 13 ++++++++
 libcaja-private/caja-file-conflict-dialog.c     | 13 ++++++++
 libcaja-private/caja-mime-application-chooser.c |  4 +++
 libcaja-private/caja-open-with-dialog.c         |  8 +++++
 libcaja-private/caja-progress-info.c            |  8 +++++
 src/caja-autorun-software.c                     |  5 +++
 src/caja-connect-server-dialog.c                | 42 ++++++++++++++++++++++++-
 src/caja-image-properties-page.c                |  5 +++
 src/caja-location-bar.c                         |  5 +++
 src/caja-notebook.c                             |  4 +++
 src/caja-property-browser.c                     |  8 +++++
 src/caja-x-content-bar.c                        |  4 +++
 src/file-manager/fm-directory-view.c            | 12 +++++++
 src/file-manager/fm-ditem-page.c                |  4 +++
 src/file-manager/fm-list-view.c                 |  5 +++
 src/file-manager/fm-properties-window.c         |  4 +++
 test/test-eel-editable-label.c                  |  9 ++++++
 19 files changed, 166 insertions(+), 1 deletion(-)

commit 5609227c672d94e54edec26e2b4db5f9e1697e17
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sun Sep 27 17:07:04 2015 +0200

    GTK3: Replace gtk_{v,h}box new with gtk_box_new
    
    - gtk_{v,h}box usage is deprecated since gtk+-3.2.0

 eel/eel-debug-drawing.c                     |  4 ++++
 libcaja-private/caja-autorun.c              |  5 +++++
 libcaja-private/caja-column-chooser.c       |  4 ++++
 libcaja-private/caja-file-conflict-dialog.c |  5 +++++
 libcaja-private/caja-icon-container.c       |  4 ++++
 libcaja-private/caja-open-with-dialog.c     |  5 +++++
 libcaja-private/caja-progress-info.c        |  5 +++++
 src/caja-connect-server-dialog.c            |  5 +++++
 src/caja-emblem-sidebar.c                   |  4 ++++
 src/caja-image-properties-page.c            |  4 ++++
 src/caja-location-bar.c                     |  4 ++++
 src/caja-location-dialog.c                  |  4 ++++
 src/caja-navigation-window-pane.c           |  4 ++++
 src/caja-navigation-window.c                |  4 ++++
 src/caja-notebook.c                         |  4 ++++
 src/caja-pathbar.c                          |  4 ++++
 src/caja-property-browser.c                 | 16 ++++++++++++++++
 src/caja-query-editor.c                     |  5 +++++
 src/caja-search-bar.c                       |  4 ++++
 src/caja-side-pane.c                        |  4 ++++
 src/caja-sidebar-title.c                    |  4 ++++
 src/caja-spatial-window.c                   |  4 ++++
 src/caja-view-as-action.c                   |  4 ++++
 src/file-manager/fm-directory-view.c        |  4 ++++
 src/file-manager/fm-ditem-page.c            |  4 ++++
 src/file-manager/fm-list-view.c             |  4 ++++
 src/file-manager/fm-properties-window.c     |  5 +++++
 test/test-eel-editable-label.c              |  4 ++++
 test/test-eel-labeled-image.c               |  3 +++
 29 files changed, 134 insertions(+)

commit d14fef384a435471860130f7337d5dea5bb824a0
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Oct 14 16:05:27 2015 +0200

    Gtk3 places-sidebar: fixes accidental device eject

 src/caja-places-sidebar.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 85bc8e68e2abcebace4729468738271c1f44fe40
Author: monsta <monsta@inbox.ru>
Date:   Wed Oct 7 13:31:55 2015 +0300

    Add NEWS for 1.11.0 (and include 1.10.4 ones from 1.10 branch)

 NEWS | 8 ++++++++
 1 file changed, 8 insertions(+)

commit cfc0e59605709434a295813f253ac80f0a2f880e
Author: monsta <monsta@inbox.ru>
Date:   Wed Oct 7 13:25:17 2015 +0300

    fixed wrong link to gnome website in the comments

 libcaja-private/caja-file-utilities.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 50a1209e289a213c8c7ed500bc565582cf466ab6
Author: raveit65 <chat-to-me@raveit.de>
Date:   Tue Oct 6 18:06:27 2015 +0200

    pre-bump version to 1.11.0

 NEWS         | 2 ++
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

commit 3d3d4a2fd72d0403b097fb4d0a38edb68d0d6c83
Author: bl0ckeduser <bl0ckedusersoft@gmail.com>
Date:   Thu Aug 13 13:49:57 2015 -0400

    Fix for #383 - tree view open in new window

 src/file-manager/fm-tree-view.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

commit 8ba6cc318da153c98a60b0de7f2db14b08f52fcf
Merge: f8ed2af 860b583
Author: Martin Wimpress <code@flexion.org>
Date:   Sat Sep 26 11:12:30 2015 +0100

    Merge pull request #463 from raveit65/master
    
    GTK3: reduce size of autorun-dialog

commit 860b5838a2d54011cd5a4b3678db9ddad65f67fc
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat Sep 26 11:51:00 2015 +0200

    GTK3: reduce size of autorun-dialog

 libcaja-private/caja-autorun.c | 6 ++++++
 1 file changed, 6 insertions(+)

commit f8ed2af9510cb20f2ad8101aeaab5c6458ade0d7
Author: monsta <monsta@inbox.ru>
Date:   Thu Sep 17 11:36:03 2015 +0300

    undostack: don't try restoring files w/o "trash::orig-path" attribute
    
    fixes https://github.com/mate-desktop/caja/issues/361

 libcaja-private/caja-undostack-manager.c | 5 +++++
 1 file changed, 5 insertions(+)

commit b1e9a7fe429546105ffda8424cc5719a13e8a295
Author: monsta <monsta@inbox.ru>
Date:   Thu Sep 17 11:06:53 2015 +0300

    use standard defines for "trash::" attributes

 libcaja-private/caja-file.c              | 4 ++--
 libcaja-private/caja-undostack-manager.c | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

commit d2dd87abc30e850bc18cd15b854e0246a22db880
Author: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date:   Thu Sep 10 14:25:34 2015 +0100

    When opening the first window, don't restore the position of the last closed window. It's confusing to users (the last closed window is irrelevant within one session with multiple windows open) and it can lead to really bad issues which users consider bugs (why is my first window behaving differently than other windows? why is my first window appearing in the corner of my screen? why when I open caja for the first time my window doesn't appear on the monitor my mouse presently is? etc..)

 src/caja-application.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

commit cd39b1a25d204ed9fe7899a895bd75f71032ded5
Author: infirit <infirit@gmail.com>
Date:   Sun Sep 6 16:46:20 2015 +0200

    Rework gsettings schema building
    
     * Bump intltool required version for gsettings support
     * Extract strings with intltool directly

 configure.ac                                       |   2 +-
 libcaja-private/Makefile.am                        |  10 +-
 libcaja-private/org.mate.caja.gschema.xml          | 469 +++++++++++++++++++++
 libcaja-private/org.mate.caja.gschema.xml.in       | 469 ---------------------
 .../org.mate.media-handling.gschema.xml            |  34 ++
 .../org.mate.media-handling.gschema.xml.in         |  34 --
 po/POTFILES.in                                     |   4 +-
 7 files changed, 509 insertions(+), 513 deletions(-)

commit 3e9b28b2ebc9579bc868e2a8d1dc2d6f6b568c68
Author: infirit <infirit@gmail.com>
Date:   Sun Sep 6 16:42:08 2015 +0200

    define max/min version of GLib

 configure.ac                            | 6 ++++++
 libcaja-extension/caja-extension-i18n.h | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

commit fb2a59dcdc87be6abcd67acf4c4028c921b607ae
Author: Clement Lefebvre <clement.lefebvre@linuxmint.com>
Date:   Fri Sep 4 21:51:14 2015 +0100

    Switch to org.gnome.SessionManager

 libcaja-private/caja-file-utilities.c |  8 +++----
 src/caja-application.c                | 43 ++++++++++++++++-------------------
 src/file-manager/fm-icon-view.c       | 19 ----------------
 3 files changed, 23 insertions(+), 47 deletions(-)

commit 5ce3040c0312f0ec838d03f97511fe4dcda276b3
Author: infirit <infirit@gmail.com>
Date:   Sun Aug 9 20:09:42 2015 +0200

    connect-server: add support for connecting to AFP-servers/volumes
    
    Since now gvfs support it.
    
    Patch by: Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
    nautilus comnmit: 5f018ca8b978a9e488560aeeb8db5febb7259d13
    nautilus bug: https://bugzilla.gnome.org/show_bug.cgi?id=674497

 src/caja-connect-server-dialog.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

commit 3d4693311627ef58f70a85258d03b1637e65c207
Author: Monsta <monsta@inbox.ru>
Date:   Tue Aug 25 16:07:31 2015 +0300

    removed suspicious win32 reference

 configure.ac | 1 -
 1 file changed, 1 deletion(-)

commit a050471613f5b7092bce1c0ae87026e91c8e23b4
Author: Monsta <monsta@inbox.ru>
Date:   Mon Aug 24 15:19:37 2015 +0300

    list view: jump to parent with left key on collapsed rows
    
    fixes https://github.com/mate-desktop/caja/issues/452
    
    from https://github.com/GNOME/nautilus/commit/9eee9ff6ca3e93d5d363725282d8ba393a1e6d01

 src/file-manager/fm-list-view.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

commit 17d512792703739148a6ebe216790eaa73a76f9f
Author: monsta <monsta@inbox.ru>
Date:   Tue Jul 21 11:15:21 2015 +0300

    Bump version to 1.10.3

 NEWS         | 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

commit d38397d5948cede78ff7a99112c18dfe8a8cfabf
Author: Monsta <monsta@inbox.ru>
Date:   Mon Jul 20 15:43:07 2015 +0300

    file properties dialog: bring back two missing tabs
    
    Notes and Image Properties tabs went missing after https://github.com/mate-desktop/caja/commit/451eef9b275ce006b270a3569d96e531e24dd15a
    
    fixes https://github.com/mate-desktop/caja/issues/433

 src/file-manager/fm-properties-window.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

commit ef5065ad9422477f1c35703f34d9bef53279a7ba
Author: Monsta <monsta@inbox.ru>
Date:   Mon Jul 20 13:34:53 2015 +0300

    removed useless call to g_list_free
    
    - first, we must not free the list of extensions at this point
    - second, the call did nothing as the argument is NULL after
      exiting the for loop

 libcaja-private/caja-extensions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8214c04737f1f9d5a7234fda9664584df8939384
Author: Monsta <monsta@inbox.ru>
Date:   Mon Jul 20 13:34:21 2015 +0300

    small indent fixes

 libcaja-private/caja-extensions.h       | 4 +---
 src/file-manager/fm-properties-window.c | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

commit 421f39ef10b9293aec5bc69dbfdbcb423b850651
Author: monsta <monsta@inbox.ru>
Date:   Thu Jul 16 10:33:01 2015 +0300

    Bump version to 1.10.2

 NEWS         | 10 ++++++++++
 configure.ac |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

commit 4b0d231fdf8dfd6d299ec07cc933000a610f0a74
Author: Monsta <monsta@inbox.ru>
Date:   Mon Jul 13 11:31:48 2015 +0300

    don't manage desktop and exit with last window when either running
    as root or on other desktops
    
    thanks to @mtwebster (https://github.com/linuxmint/nemo/commit/acabbaf6ca8e5ffc29851d766339c602777c4427)
    and @tarakbumba (https://github.com/mate-desktop/caja/pull/409)

 src/caja-main.c | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

commit 88dc45f1bbe2ecf9d1d3fa6cedf09fa425a202ae
Author: infirit <infirit@gmail.com>
Date:   Thu Jul 9 16:10:09 2015 +0200

    Use accessor functions instead of direct access

 eel/eel-wrap-table.c            | 5 -----
 src/file-manager/fm-list-view.c | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

commit db6b62171abd6dbfcc0c8f9c928f29af445831cc
Merge: 374ca9e 0a42ba9
Author: monsta <monsta@inbox.ru>
Date:   Tue Jul 7 16:10:52 2015 +0300

    Merge pull request #431 from NiceandGently/master
    
    icon-container: reset the double click counter after a double click

commit 374ca9e7bde63733c828759fec20c129f27fe58e
Author: Monsta <monsta@inbox.ru>
Date:   Tue Jul 7 11:11:21 2015 +0300

    Revert "Help menu/F1 shortcut: show the right help page from m-u-g"
    
    This reverts commit d01fbc6c9921253bb023d3e40bd763f4a931e840.

 src/caja-window-menus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 236551366f45361cfa4bea60d1360b086ac36366
Author: Monsta <monsta@inbox.ru>
Date:   Tue Jul 7 11:09:42 2015 +0300

    Revert "show main caja help page from m-u-g in all dialogs"
    
    This reverts commit b4e25754bf17ef54569367718eda57ea759108c5.

 src/caja-bookmarks-window.c             | 3 +--
 src/caja-connect-server-dialog.c        | 3 +--
 src/caja-file-management-properties.c   | 5 +----
 src/caja-location-dialog.c              | 3 +--
 src/caja-property-browser.c             | 3 +--
 src/file-manager/fm-directory-view.c    | 3 +--
 src/file-manager/fm-properties-window.c | 3 +--
 7 files changed, 7 insertions(+), 16 deletions(-)

commit e704022661db84095633b71b4ccc712186e5999a
Merge: 2cdfa50 0ad3772
Author: Martin Wimpress <code@flexion.org>
Date:   Sat Jun 27 08:11:10 2015 +0100

    Merge pull request #436 from obache/neatsrc
    
    Use g_malloc instead of malloc to be safe

commit 0ad3772ad8850197a62d8a388857c6cd532edd77
Author: OBATA Akio <obache@users.noreply.github.com>
Date:   Sat Jun 27 14:11:39 2015 +0900

    Use g_malloc instead of malloc to be safe

 libcaja-private/caja-undostack-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 2cdfa50d1108f0e0300ecd73111bb9c04132cb53
Merge: 2726ada e76236f
Author: Martin Wimpress <code@flexion.org>
Date:   Thu Jun 25 02:31:29 2015 +0100

    Merge pull request #434 from mate-desktop/leave-my-scrollbar-alone
    
    compact view: don't auto-scroll to the right on long filenames

commit e76236f4739b9deee107c09b9b2f9a87c537c9a7
Author: Monsta <monsta@inbox.ru>
Date:   Wed Jun 24 16:54:28 2015 +0300

    compact view: don't auto-scroll to the right on long filenames
    
    however, now it will auto-scroll to the left if you manually
    scroll to the right and then click on any filename. I presume
    this behavior is more desired than the previous one. if it's
    not so, let me know (in the comments).
    
    adapted from
    https://github.com/linuxmint/nemo/commit/72c2214c82637ab622438d46c28e67289a49d472
    (thanks to @glebihan)
    
    fixes https://github.com/mate-desktop/caja/issues/406

 libcaja-private/caja-icon-container.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 2726adabc5efab673c1607de3780b3303e7f8b17
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Tue Jun 23 16:32:22 2015 +0200

    Sync translations with transifex

 po/fa.po | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

commit 9c78e27b3a78945b1ffd0b3f85437f67a0c35baf
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Fri Jun 12 09:36:49 2015 +0200

    Sync translations with transifex

 po/am.po |  38 +++---
 po/fi.po |  18 +--
 po/hr.po | 442 ++++++++++++++++++++++++++++++++-------------------------------
 po/id.po |  39 +++---
 po/ms.po |  22 ++--
 po/ru.po |  89 ++++++++++++-
 po/sq.po | 115 +++++++++--------
 po/uk.po | 382 +++++++++++++++++++++++++++---------------------------
 8 files changed, 616 insertions(+), 529 deletions(-)

commit 0a42ba9721b78bd1e85885e42e57ed5eb59bd0ce
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sun Jun 21 10:32:15 2015 +0200

    icon-container: reset the double click counter after a double click
    
    If we don't do this, we ignore any other double click event that happen
    during the next 'gtk-double-click-time' interval after the first double
    click.
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?id=a8539a6

 libcaja-private/caja-icon-container.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 4e88a3edcbba1c2c6775f4144fa426017f9bd73b
Merge: 77ebf88 c4c4fed
Author: Martin Wimpress <code@flexion.org>
Date:   Sat Jun 20 14:23:29 2015 +0100

    Merge pull request #430 from mate-desktop/eel-stuff
    
    [GTK+3] eel: fix bad positioning of rename window in certain cases

commit c4c4fed16fd80654d40b356700076a27e49fc227
Author: Monsta <monsta@inbox.ru>
Date:   Fri Jun 19 15:22:02 2015 +0300

    [GTK+3] eel: fix bad positioning of rename window in certain cases
    
    adapted from https://github.com/linuxmint/nemo/commit/d5377cfd53034b6ab5588376322126f48782ec59
    (thanks to @mtwebster and nautilus developer who did the original commit)
    
    fixes https://github.com/mate-desktop/caja/issues/376

 eel/eel-canvas.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

commit 77ebf88b678149862def827a7e5d134e9df13122
Merge: e3147a2 2365acd
Author: monsta <monsta@inbox.ru>
Date:   Fri Jun 19 10:45:43 2015 +0300

    Merge pull request #428 from NiceandGently/master
    
    GTK3: editable-label : only clear the selection if we change to insensitive

commit e3147a24808fdd0cedecfa6b6ca42f376128c76c
Merge: b4e2575 3fdb9a1
Author: Martin Wimpress <code@flexion.org>
Date:   Thu Jun 18 19:00:22 2015 +0100

    Merge pull request #429 from mate-desktop/sux-bugs-and-drag-n-drop
    
    places-sidebar: enable both creating bookmarks and dropping files

commit 3fdb9a14077b14263e8acfc93addc8fbcf568ca1
Author: Monsta <monsta@inbox.ru>
Date:   Thu Jun 18 17:03:47 2015 +0300

    places-sidebar: enable both creating bookmarks and dropping files
    
    - drag a folder to the top or bottom of the bookmark list to add
    a new bookmark. a horizontal line will be shown and the mouse
    pointer will have a '+' at its right side.
    - if there are no bookmarks (and that section isn't shown), drag
    a folder over the network section's heading. this will add a new
    bookmark and make the bookmarks list visible.
    - drag a file or a folder over some existing bookmark to move it
    into the bookmarked folder. the mouse pointer will have an arrow
    at its right side.
    - if you want to copy a file or a folder there instead, perform
    the same operation but hold ctrl during that. the mouse pointer
    will have a '+' at its right side. no horizontal line will be
    shown, so you will be able to distinguish this operation from
    adding a new bookmark. :)
    
    adapted from https://github.com/linuxmint/nemo/commit/f18c4dd842be0998cbe6a519d9904bfd9993ca3e
    (thanks to @mtwebster)
    
    fixes https://github.com/mate-desktop/caja/issues/345
    closes https://github.com/mate-desktop/caja/issues/423

 src/caja-places-sidebar.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

commit 5690a7f39eb644c4cd7c299fd092b0fd5a1a3cd9
Author: Monsta <monsta@inbox.ru>
Date:   Thu Jun 18 16:09:40 2015 +0300

    places sidebar: fix indentation a bit

 src/caja-places-sidebar.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

commit 2365acdcb607f7cbb3820900b2a979b1bf23778a
Author: raveit65 <chat-to-me@raveit.de>
Date:   Thu Jun 18 02:15:03 2015 +0200

    editable-label GTk3: only clear the selection if we change to insensitive
    
    this fixes non selected text if renaming a file
    
    taken from:
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=d2c3410

 eel/eel-editable-label.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit b4e25754bf17ef54569367718eda57ea759108c5
Author: Monsta <monsta@inbox.ru>
Date:   Wed Jun 17 16:20:11 2015 +0300

    show main caja help page from m-u-g in all dialogs
    
    this should be corrected when m-u-g will be complete
    (e.g. will contain help for all these dialogs)

 src/caja-bookmarks-window.c             | 3 ++-
 src/caja-connect-server-dialog.c        | 3 ++-
 src/caja-file-management-properties.c   | 5 ++++-
 src/caja-location-dialog.c              | 3 ++-
 src/caja-property-browser.c             | 3 ++-
 src/file-manager/fm-directory-view.c    | 3 ++-
 src/file-manager/fm-properties-window.c | 3 ++-
 7 files changed, 16 insertions(+), 7 deletions(-)

commit d01fbc6c9921253bb023d3e40bd763f4a931e840
Author: Monsta <monsta@inbox.ru>
Date:   Wed Jun 17 16:05:43 2015 +0300

    Help menu/F1 shortcut: show the right help page from m-u-g

 src/caja-window-menus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit aaf9b090839e846c8c548f3737f3bf0d5fc98ea3
Merge: 7fd8cee b0a9b60
Author: Martin Wimpress <code@flexion.org>
Date:   Thu Jun 11 22:40:28 2015 +0100

    Merge branch 'master' of github.com:mate-desktop/caja

commit 7fd8ceec5e220e2573d9c6ab19258cb2e0b5f301
Author: Martin Wimpress <code@flexion.org>
Date:   Thu Jun 11 22:39:59 2015 +0100

    Bump version to 1.10.1

 NEWS         | 6 ++++++
 configure.ac | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

commit b0a9b60e902fbdfcea77cb74c7ae1a6eae681d48
Merge: 1d0cd08 0414509
Author: Martin Wimpress <code@flexion.org>
Date:   Thu Jun 11 22:11:07 2015 +0100

    Merge pull request #424 from flexiondotorg/master
    
    Revert "places-sidebar: allow dropping of files to bookmarks"

commit 04145091c35efdf09f131a8e20511db204ff3f2d
Author: Martin Wimpress <code@flexion.org>
Date:   Thu Jun 11 13:40:54 2015 +0100

    Revert "places-sidebar: allow dropping of files to bookmarks"
    
    This reverts commit 910b9141ac634a86d8f53fda534e33787a160efb.

 src/caja-places-sidebar.c | 129 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 115 insertions(+), 14 deletions(-)

commit 1d0cd082130636df0ed1087464380d4d0ebdd57f
Merge: 9815888 b9f3254
Author: monsta <monsta@inbox.ru>
Date:   Mon Jun 8 12:01:37 2015 +0300

    Merge pull request #400 from tarakbumba/fix_automunt_on_locked_screen
    
    Fix automount on locked screen

commit 98158880047235a60bd928b44144ea9a3f97b23e
Merge: b507f88 60449bc
Author: monsta <monsta@inbox.ru>
Date:   Tue May 19 13:53:51 2015 +0300

    Merge pull request #419 from NiceandGently/master
    
    GTK3: set top and bottom margin of statusbar to zero

commit 60449bc32bb7671abc5a090287018e4b04bfe507
Author: raveit65 <chat-to-me@raveit.de>
Date:   Tue May 19 10:43:37 2015 +0200

    GTK3: set top and bottom margin of statusbar to zero
    
    This reduce the size of the statusbar that it looks like GTK2 version.
    The size can now controled with .frame.flat and/or .flat.button selector
    by the theme.

 src/caja-window.c | 7 +++++++
 1 file changed, 7 insertions(+)

commit b507f88175ddccd6c4dd17261e92426ac24d17a4
Merge: 304866d ae0e855
Author: Martin Wimpress <code@flexion.org>
Date:   Tue May 12 21:53:55 2015 +0100

    Merge pull request #401 from NiceandGently/master
    
    U fixes for file management preferences

commit ae0e8557f924b5940e1aaea18fd43cceb0ee7203
Author: raveit65 <chat-to-me@raveit.de>
Date:   Tue Apr 7 11:59:34 2015 +0200

    Ui: set a default window size for file management preferences
    
    This fixes wrong window size in GTK3 version.
    For GTK2 best size is 600x600, best size for GTK3 is 800x600.
    But the smallest size works perfect for both GTK+ versions.

 src/caja-file-management-properties.ui | 2 ++
 1 file changed, 2 insertions(+)

commit 7b2976250eb354b989348a9be2778992c2e63ad1
Author: raveit65 <chat-to-me@raveit.de>
Date:   Tue Apr 7 11:49:00 2015 +0200

    Ui: expand list columns in file management preferences
    
    no need to have a scrollbar for a few entries

 src/caja-file-management-properties.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit b9f3254b87c9a20dd75238694a8e93ba8020792a
Author: tarakbumba <tarakbumba@gmail.com>
Date:   Tue Apr 7 00:16:35 2015 +0300

    Fix g_bus_unwatch_name assertion
    
    Guard the g_bus_unwatch_name() call to only run when we
    actually have set a watcher to the screensaver.

 src/caja-application.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit adc45ec84298f6246d9ed219607bb5c169f50e08
Author: tarakbumba <tarakbumba@gmail.com>
Date:   Tue Apr 7 00:07:27 2015 +0300

    Fix for https://github.com/mate-desktop/caja/issues/398
    
    On the Shmoocon at 2011 there was a presentation by Jon Larimer demonstrating
    how to abuse vulnerabilities and bugs, or even just creating socially or
    security compromising thumbnails in mounting and thumbnailing, which happens
    on automounting USB drives. This is a particular issue when this happens on a
    locked box where the attacker doesn't otherwise have access to the user
    account:
    
    http://www.net-security.org/secworld.php?id=10544
    
    Disable automounting if the MATE screen saver is currently locked.
    
    See also https://bugzilla.gnome.org/show_bug.cgi?id=642020
    
    This commit is merely based on :
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=b7262fa945ef1ea936c15f0d248ad7a024d97dca

 src/caja-application.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++++-
 src/caja-application.h |   4 +
 2 files changed, 232 insertions(+), 4 deletions(-)

commit 304866dd42e3ec1d8f1694f42c69af247a772330
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Apr 6 18:26:41 2015 +0200

    Bump version to 1.10.0

 NEWS         | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit d1e4b3bedd398803d8c6ef586266337a8709b4d6
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Sat Apr 4 16:47:23 2015 +0200

    Sync translations with transifex

 po/LINGUAS |    1 +
 po/be.po   |  290 +--
 po/br.po   |  188 +-
 po/de.po   |   26 +-
 po/el.po   |   12 +-
 po/es.po   |   11 +-
 po/et.po   |    6 +-
 po/hu.po   |    4 +-
 po/ia.po   | 7458 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/kk.po   |   60 +-
 po/ko.po   |    6 +-
 po/ky.po   |    8 +-
 po/mi.po   | 2099 ++++++++---------
 po/pt.po   |  118 +-
 po/ro.po   |   50 +-
 po/sk.po   |   90 +-
 po/sl.po   |   33 +-
 po/tr.po   |    8 +-
 18 files changed, 8993 insertions(+), 1475 deletions(-)

commit c69374566247cea1a63bb4551e3a91dd0156b28f
Author: Monsta <monsta@inbox.ru>
Date:   Wed Mar 18 16:10:04 2015 +0300

    places-sidebar: fix crash
    
    taken from upstream commits:
    https://git.gnome.org/browse/nautilus/commit/?id=cda2c75df4b95a481e8b774081ec1240d47fa45f
    https://git.gnome.org/browse/nautilus/commit/?id=4764a856c7a6e5a84d4067e7b105c09a93ffdbe4
    
    Closes https://github.com/mate-desktop/caja/pull/395

 src/caja-places-sidebar.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

commit aeccda42c6da068ec646b9be32c1e9e96ac09353
Author: raveit65 <chat-to-me@raveit.de>
Date:   Wed Mar 4 22:35:23 2015 +0100

    GTK3: add missing style class view to FMIconContainer
    
    Closes https://github.com/mate-desktop/caja/pull/392
    Closes https://github.com/mate-desktop/caja/issues/382

 src/file-manager/fm-icon-container.c | 4 ++++
 1 file changed, 4 insertions(+)

commit f57f76f2a293b4ed22dba91bba23bcf227e873c7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Feb 24 20:28:18 2015 +0100

    Bump version to 1.9.90

 NEWS         | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6d3947218ce1cf61adf8fcfe5847e3b28df6e65a
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Tue Feb 24 20:27:50 2015 +0100

    Sync translations with transifex

 po/ar.po |  6 +++---
 po/de.po |  6 +++---
 po/el.po | 12 ++++++------
 po/hu.po |  8 ++++----
 po/ro.po | 24 ++++++++++++------------
 po/uk.po |  8 ++++----
 6 files changed, 32 insertions(+), 32 deletions(-)

commit 23b75dadd35f039a8cd93111528a8a66dde8888e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Jan 21 14:53:39 2015 +0100

    Disable desktop if we arent inside MATE

 src/caja-main.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 842da48a34f98463c5c7d536ee56f0f24e373606
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Tue Jan 20 18:55:03 2015 +0100

    Sync translations with transifex

 po/ar.po    |   31 +-
 po/cs.po    |   23 +-
 po/da.po    |   10 +-
 po/de.po    |   18 +-
 po/en_AU.po |   22 +-
 po/en_GB.po |   12 +-
 po/es.po    |  115 +--
 po/et.po    |   24 +-
 po/fi.po    |  109 +--
 po/hu.po    |    6 +-
 po/ko.po    |   10 +-
 po/lt.po    |   11 +-
 po/pt.po    |  100 +--
 po/pt_BR.po |   13 +-
 po/ro.po    |   41 +-
 po/sk.po    |   22 +-
 po/sq.po    |   14 +-
 po/sr.po    | 2287 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_CN.po |   11 +-
 19 files changed, 1444 insertions(+), 1435 deletions(-)

commit 663333cfad242f09c0e12153ce7175cf7dd7bda2
Author: Monsta <monsta@inbox.ru>
Date:   Mon Jan 12 16:41:30 2015 +0300

    drop support for GTK+ < 2.12

 cut-n-paste-code/libegg/eggdesktopfile.c | 8 --------
 1 file changed, 8 deletions(-)

commit 53ec021ce6e0ee923bd86e11b4f516b2a19bc2e8
Author: Monsta <monsta@inbox.ru>
Date:   Mon Jan 12 16:04:13 2015 +0300

    drop support for GLib < 2.36
    
    Closes https://github.com/mate-desktop/caja/pull/372

 configure.ac                                    |  2 +-
 eel/eel-glib-extensions.c                       |  2 -
 eel/eel-string.c                                |  4 --
 libcaja-private/caja-autorun.c                  |  2 -
 libcaja-private/caja-clipboard.c                |  2 -
 libcaja-private/caja-customization-data.c       |  4 +-
 libcaja-private/caja-debug-log.c                | 14 -----
 libcaja-private/caja-directory-async.c          |  2 -
 libcaja-private/caja-directory.c                |  2 -
 libcaja-private/caja-dnd.c                      |  2 -
 libcaja-private/caja-emblem-utils.c             |  2 -
 libcaja-private/caja-file-changes-queue.c       | 30 -----------
 libcaja-private/caja-file-dnd.c                 |  2 -
 libcaja-private/caja-file-operations.c          | 14 ++---
 libcaja-private/caja-file-utilities.c           |  2 -
 libcaja-private/caja-file.c                     | 60 ++++++++-------------
 libcaja-private/caja-icon-canvas-item.c         |  2 -
 libcaja-private/caja-icon-container.c           |  2 -
 libcaja-private/caja-merged-directory.c         |  2 -
 libcaja-private/caja-mime-actions.c             |  2 -
 libcaja-private/caja-mime-application-chooser.c |  2 -
 libcaja-private/caja-open-with-dialog.c         |  2 -
 libcaja-private/caja-program-choosing.c         |  2 -
 libcaja-private/caja-query.c                    |  2 -
 libcaja-private/caja-search-engine-beagle.c     |  2 -
 libcaja-private/caja-search-engine-simple.c     |  2 -
 libcaja-private/caja-search-engine-tracker.c    |  2 -
 libcaja-private/caja-undostack-manager.c        | 70 -------------------------
 src/Makefile.am                                 |  1 -
 src/caja-application.c                          |  2 -
 src/caja-bookmark-list.c                        |  2 -
 src/caja-convert-metadata.c                     |  4 --
 src/caja-emblem-sidebar.c                       |  2 -
 src/caja-history-sidebar.c                      |  2 -
 src/caja-information-panel.c                    |  2 -
 src/caja-main.c                                 |  4 --
 src/caja-navigation-window-slot.c               |  2 -
 src/caja-pathbar.c                              |  2 -
 src/caja-places-sidebar.c                       |  2 -
 src/caja-property-browser.c                     |  2 -
 src/caja-query-editor.c                         |  2 -
 src/caja-spatial-window.c                       |  2 -
 src/caja-trash-bar.c                            |  2 -
 src/caja-window-manage-views.c                  |  2 -
 src/caja-window-slot.c                          |  2 -
 src/caja-window.c                               |  2 -
 src/file-manager/fm-directory-view.c            | 14 ++---
 src/file-manager/fm-list-model.c                |  2 -
 src/file-manager/fm-list-view.c                 |  2 -
 src/file-manager/fm-properties-window.c         | 40 +++++---------
 src/file-manager/fm-tree-model.c                |  2 -
 src/file-manager/fm-tree-view.c                 |  2 -
 src/glibcompat.h                                | 59 ---------------------
 test/test-caja-search-engine.c                  |  4 --
 test/test-copy.c                                |  6 +--
 55 files changed, 46 insertions(+), 362 deletions(-)

commit d327a96cfb61acd0ce606c4bf80349454b66bd44
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Jan 13 08:27:27 2015 +0100

    Bump version to 1.9.4

 NEWS         | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6a039eff3f9a762fc0239b6ba58c18cb3d09b364
Author: Monsta <monsta@inbox.ru>
Date:   Sun Jan 11 21:08:57 2015 +0300

    show mate-user-guide help

 src/caja-window-menus.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

commit 5706c595970bc76e11feb56ed56c190452c076d6
Author: Monsta <monsta@inbox.ru>
Date:   Sat Jan 10 13:20:30 2015 +0300

    use mate_gdk_spawn_command_line_on_screen like other MATE apps do
    
    Closes https://github.com/mate-desktop/caja/pull/370

 eel/eel-mate-extensions.c            | 20 ++------------------
 src/caja-window-menus.c              | 34 ++++++++--------------------------
 src/file-manager/fm-directory-view.c | 22 +++++-----------------
 3 files changed, 15 insertions(+), 61 deletions(-)

commit 54404f04a0e85c08a11f1a7557d1e0bddb34e036
Author: Balló György <ballogyor@gmail.com>
Date:   Sat Jan 10 17:16:32 2015 +0100

    audio-preview: Add support for GStreamer 1.0

 src/file-manager/fm-icon-view.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 28ffdb0bdc33e1bc0ce20d4eef41907a03dc110c
Author: Monsta <monsta@inbox.ru>
Date:   Mon Jan 5 17:44:39 2015 +0300

    some optimizations in the access to lists

 libcaja-private/caja-icon-container.c | 39 +++++++++--------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

commit c863b05d1a9eb6b174603e84c4b3864b9048ca81
Author: Monsta <monsta@inbox.ru>
Date:   Mon Jan 5 17:44:21 2015 +0300

    some NULL pointer checks

 src/caja-bookmark-list.c | 4 ++++
 1 file changed, 4 insertions(+)

commit b474b31308b269d60721b650fd0e34a7fa2743da
Author: Monsta <monsta@inbox.ru>
Date:   Wed Jan 7 13:13:33 2015 +0300

    drop support for ancient versions of exempi and exif

 configure.ac                     | 18 ++++--------------
 src/caja-image-properties-page.c | 28 +++++++++-------------------
 2 files changed, 13 insertions(+), 33 deletions(-)

commit 5b4e98dbe0ce1cd9c108b1a69810aac61a5c96fc
Author: infirit <infirit@gmail.com>
Date:   Mon Dec 29 11:46:58 2014 +0100

    Revert "dbus-manager: add a skeleton of NautilusDBusManager"
    
    This reverts commit 08bc0644ebc869ff1db320cc2bdfc4a471a6f9ac.

 libcaja-private/Makefile.am         |   2 -
 libcaja-private/caja-dbus-manager.c | 171 ------------------------------------
 libcaja-private/caja-dbus-manager.h |  10 ---
 src/caja-application.c              |   5 --
 4 files changed, 188 deletions(-)

commit 1690e1b22e5617dc1ab4d00822547a5d798ad399
Author: infirit <infirit@gmail.com>
Date:   Mon Dec 29 11:46:50 2014 +0100

    Revert "dbus-manager: implement the CopyURIs method"
    
    This reverts commit be39d4a5f6b03a142e21d3d0448ef0e779e7e173.

 libcaja-private/caja-dbus-manager.c | 81 ++++++++-----------------------------
 libcaja-private/caja-dbus-manager.h | 22 ----------
 2 files changed, 17 insertions(+), 86 deletions(-)

commit 3f31cb74f7acac3ff5ea70be4b1e8319a8b47920
Author: infirit <infirit@gmail.com>
Date:   Mon Dec 29 11:46:42 2014 +0100

    Revert "dbus-manager: add an EmptyTrash operation"
    
    This reverts commit 8116b5a43e11493d6e81a0a1e1ba67fa0d6289a4.

 libcaja-private/caja-dbus-manager.c | 18 ------------------
 1 file changed, 18 deletions(-)

commit a823778ec6c091cada6f4473413f220d6732ed7a
Author: 高群凯 <lenky0401@gmail.com>
Date:   Mon Dec 29 17:29:07 2014 +0800

    fixed: Adjust Default _zoom level always get the last "old" value
    
    The callback function update_auto_enum should be connected before the default_zoom_level_changed, otherwise the new_level always get the last "old" value in default_zoom_level_changed and the desktop-view display strange.

 src/file-manager/fm-desktop-icon-view.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 8116b5a43e11493d6e81a0a1e1ba67fa0d6289a4
Author: infirit <infirit@gmail.com>
Date:   Tue Dec 16 14:21:43 2014 +0100

    dbus-manager: add an EmptyTrash operation

 libcaja-private/caja-dbus-manager.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

commit be39d4a5f6b03a142e21d3d0448ef0e779e7e173
Author: infirit <infirit@gmail.com>
Date:   Tue Dec 16 14:20:13 2014 +0100

    dbus-manager: implement the CopyURIs method

 libcaja-private/caja-dbus-manager.c | 81 +++++++++++++++++++++++++++++--------
 libcaja-private/caja-dbus-manager.h | 22 ++++++++++
 2 files changed, 86 insertions(+), 17 deletions(-)

commit 08bc0644ebc869ff1db320cc2bdfc4a471a6f9ac
Author: infirit <infirit@gmail.com>
Date:   Tue Dec 16 13:54:43 2014 +0100

    dbus-manager: add a skeleton of NautilusDBusManager

 libcaja-private/Makefile.am         |   2 +
 libcaja-private/caja-dbus-manager.c | 171 ++++++++++++++++++++++++++++++++++++
 libcaja-private/caja-dbus-manager.h |  10 +++
 src/caja-application.c              |   5 ++
 4 files changed, 188 insertions(+)

commit ff9b49f940395684689a38117082632c3fe5819c
Author: Monsta <monsta@inbox.ru>
Date:   Thu Dec 11 11:57:44 2014 +0300

    simplify configure.ac a bit due to libunique being mandatory now

 configure.ac | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

commit a9d81bd98e2b644f8c422a6a8adab6afc69fa7fd
Author: infirit <infirit@gmail.com>
Date:   Mon Dec 15 14:24:51 2014 +0100

    autoconf: cleanup X11 and pango checks

 configure.ac | 58 ++++++++--------------------------------------------------
 1 file changed, 8 insertions(+), 50 deletions(-)

commit 15771ce4ea5245d07c33b3812763684f03669e93
Author: monsta <monsta@inbox.ru>
Date:   Sat Nov 29 12:41:38 2014 +0300

    va_start should be paired with va_end

 cut-n-paste-code/libegg/eggsmclient-xsmp.c | 1 +
 1 file changed, 1 insertion(+)

commit 499fa21c3070a5230770dcab80ff617a94281f69
Author: Monsta <monsta@inbox.ru>
Date:   Tue Oct 28 18:09:39 2014 +0300

    zero-init all signals arrays

 cut-n-paste-code/libegg/eggsmclient.c      | 2 +-
 eel/eel-background.c                       | 2 +-
 eel/eel-canvas.c                           | 4 ++--
 libcaja-extension/caja-menu-item.c         | 2 +-
 libcaja-private/caja-bookmark.c            | 2 +-
 libcaja-private/caja-clipboard-monitor.c   | 2 +-
 libcaja-private/caja-column-chooser.c      | 2 +-
 libcaja-private/caja-directory.c           | 2 +-
 libcaja-private/caja-entry.c               | 2 +-
 libcaja-private/caja-file.c                | 2 +-
 libcaja-private/caja-icon-container.c      | 2 +-
 libcaja-private/caja-merged-directory.c    | 2 +-
 libcaja-private/caja-search-engine.c       | 2 +-
 libcaja-private/caja-signaller.c           | 2 +-
 libcaja-private/caja-trash-monitor.c       | 2 +-
 libcaja-private/caja-tree-view-drag-dest.c | 2 +-
 src/caja-bookmark-list.c                   | 2 +-
 src/caja-information-panel.c               | 2 +-
 src/caja-navigation-bar.c                  | 2 +-
 src/caja-notebook.c                        | 2 +-
 src/caja-query-editor.c                    | 2 +-
 src/caja-search-bar.c                      | 2 +-
 src/caja-side-pane.c                       | 2 +-
 src/caja-zoom-control.c                    | 2 +-
 src/file-manager/fm-directory-view.c       | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)

commit d615da81cf6a34dac7b4bbbcf8b01323b0e9d6c3
Author: monsta <monsta@inbox.ru>
Date:   Sat Nov 29 12:45:12 2014 +0300

    NULL-init a pointer for g_assert to work correctly

 eel/eel-wrap-table.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit adbd317d170aa6379b5672ee792a16728aeb7ef4
Author: monsta <monsta@inbox.ru>
Date:   Fri Nov 14 14:55:57 2014 +0300

    properly zero-init a variable

 src/caja-places-sidebar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b1b2da32f2166adfdf239f3662ee309827f71e53
Author: Monsta <monsta@inbox.ru>
Date:   Sat Nov 8 14:41:10 2014 +0300

    added checks for NULL pointer where it's needed

 libcaja-private/caja-file-operations.c | 2 +-
 libcaja-private/caja-file.c            | 2 +-
 src/caja-connect-server-dialog.c       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 7aec152ba9f1f6af1706a5c7608bec317b8fbe79
Author: monsta <monsta@inbox.ru>
Date:   Sat Nov 8 14:25:44 2014 +0300

    don't leak memory

 libcaja-private/caja-icon-container.c | 1 +
 libcaja-private/caja-query.c          | 1 +
 src/caja-location-bar.c               | 2 ++
 3 files changed, 4 insertions(+)

commit 523ca6754f1f1f5e86367c644bb721b20f5fbebd
Author: Monsta <monsta@inbox.ru>
Date:   Wed Dec 3 16:05:43 2014 +0300

    libcaja-private: don't leak memory

 libcaja-private/caja-emblem-utils.c         |  3 +-
 libcaja-private/caja-file-conflict-dialog.c |  5 ++-
 libcaja-private/caja-file-utilities.c       | 13 ++----
 libcaja-private/caja-link.c                 | 21 +++++-----
 libcaja-private/caja-undostack-manager.c    | 62 +++++++++++------------------
 5 files changed, 43 insertions(+), 61 deletions(-)

commit 78661bd703b26343621b209f4f13e5e9fcbad802
Author: Monsta <monsta@inbox.ru>
Date:   Tue Dec 2 14:44:39 2014 +0300

    connect-server-dialog: don't leak memory

 src/caja-connect-server-dialog.c | 2 ++
 1 file changed, 2 insertions(+)

commit ae2b0bcee1db078730bd7ea1578df3b33642214a
Author: Monsta <monsta@inbox.ru>
Date:   Tue Dec 2 14:22:35 2014 +0300

    file-manager: don't leak memory

 src/file-manager/fm-directory-view.c    | 3 ++-
 src/file-manager/fm-ditem-page.c        | 3 +--
 src/file-manager/fm-properties-window.c | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

commit e94434691e9f6831072a3353bde9804509e0b624
Author: Monsta <monsta@inbox.ru>
Date:   Sat Nov 29 12:52:08 2014 +0300

    eel: fix logic a bit

 eel/eel-background.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 4ef3498229bfccc76e9354bbd8755fe116063b44
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Sat Nov 22 11:48:29 2014 +0100

    Sync translations with transifex

 po/de.po | 12 ++++++------
 po/hr.po | 34 +++++++++++++++++-----------------
 po/nl.po | 28 ++++++++++++++--------------
 3 files changed, 37 insertions(+), 37 deletions(-)

commit 852c503c1b81add4d705001b1f2a83af95ba0d94
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Sun Nov 16 15:33:55 2014 +0100

    Sync translations with transifex

 po/af.po          |  30 ++-
 po/am.po          |  30 ++-
 po/ar.po          |  30 ++-
 po/as.po          |  30 ++-
 po/ast.po         |  30 ++-
 po/az.po          |  30 ++-
 po/be.po          |  30 ++-
 po/bg.po          |  30 ++-
 po/bn.po          |  30 ++-
 po/bn_IN.po       |  30 ++-
 po/br.po          |  30 ++-
 po/bs.po          |  30 ++-
 po/ca.po          |  30 ++-
 po/ca@valencia.po |  30 ++-
 po/cmn.po         |  30 ++-
 po/crh.po         |  30 ++-
 po/cs.po          |  30 ++-
 po/da.po          |  30 ++-
 po/de.po          |  42 ++--
 po/dz.po          |  30 ++-
 po/el.po          |  30 ++-
 po/en_AU.po       |  30 ++-
 po/en_CA.po       |  30 ++-
 po/en_GB.po       |  30 ++-
 po/en_US.po       |  30 ++-
 po/eo.po          |  30 ++-
 po/es.po          | 625 +++++++++++++++++++++++++++++-------------------------
 po/et.po          |  30 ++-
 po/eu.po          |  30 ++-
 po/fa.po          |  30 ++-
 po/fi.po          |  30 ++-
 po/fr.po          |  28 ++-
 po/fur.po         |  30 ++-
 po/fy.po          |  30 ++-
 po/ga.po          |  30 ++-
 po/gl.po          |  30 ++-
 po/gu.po          |  30 ++-
 po/ha.po          |  30 ++-
 po/he.po          |  30 ++-
 po/hi.po          |  30 ++-
 po/hr.po          |  30 ++-
 po/hu.po          |  30 ++-
 po/hy.po          |  30 ++-
 po/id.po          |  28 ++-
 po/ig.po          |  30 ++-
 po/is.po          |  30 ++-
 po/it.po          |  31 ++-
 po/ja.po          |  43 ++--
 po/ka.po          |  30 ++-
 po/kk.po          |  30 ++-
 po/kn.po          |  30 ++-
 po/ko.po          |  28 ++-
 po/ku.po          |  30 ++-
 po/ky.po          |  30 ++-
 po/li.po          |  30 ++-
 po/lt.po          |  30 ++-
 po/lv.po          |  30 ++-
 po/mai.po         |  30 ++-
 po/mg.po          |  30 ++-
 po/mk.po          |  30 ++-
 po/ml.po          |  30 ++-
 po/mn.po          |  30 ++-
 po/mr.po          |  30 ++-
 po/ms.po          |  30 ++-
 po/nb.po          |  30 ++-
 po/nds.po         |  30 ++-
 po/ne.po          |  30 ++-
 po/nl.po          |  30 ++-
 po/nn.po          |  30 ++-
 po/nso.po         |  30 ++-
 po/oc.po          |  30 ++-
 po/or.po          |  30 ++-
 po/pa.po          |  30 ++-
 po/pl.po          |  28 ++-
 po/ps.po          |  30 ++-
 po/pt.po          |  30 ++-
 po/pt_BR.po       |  30 ++-
 po/ro.po          |  30 ++-
 po/ru.po          |  28 ++-
 po/si.po          |  30 ++-
 po/sk.po          |  30 ++-
 po/sl.po          |  30 ++-
 po/sq.po          |  30 ++-
 po/sr.po          |  30 ++-
 po/sr@latin.po    |  30 ++-
 po/sv.po          |  30 ++-
 po/ta.po          |  30 ++-
 po/te.po          |  30 ++-
 po/th.po          |  30 ++-
 po/tk.po          |  30 ++-
 po/tr.po          |  28 ++-
 po/ug.po          |  30 ++-
 po/uk.po          |  28 ++-
 po/ur.po          |  30 ++-
 po/uz.po          |  30 ++-
 po/vi.po          |  30 ++-
 po/wa.po          |  30 ++-
 po/xh.po          |  30 ++-
 po/yo.po          |  30 ++-
 po/zh_CN.po       |  30 ++-
 po/zh_HK.po       |  30 ++-
 po/zh_TW.po       |  28 ++-
 po/zu.po          |  30 ++-
 103 files changed, 2786 insertions(+), 909 deletions(-)

commit c9afac886191ea81cb6297923f0f78b6fe204ce3
Author: infirit <infirit@gmail.com>
Date:   Mon Nov 10 13:19:19 2014 +0100

    appdata: Add necessary markers for translation

 data/caja.appdata.xml.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 7c5bf761f45b836d64dcde2c1a821c630c198aaa
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Nov 10 09:29:41 2014 +0100

    Bump version to 1.9.3

 NEWS         | 3 ++-
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

commit 7a84f1f4268ff3dc5089cfd5db43b4d477343ebe
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Mon Nov 10 09:10:07 2014 +0100

    Sync translations with transifex

 po/af.po          | 602 +++++++++++++++++----------------
 po/am.po          | 604 +++++++++++++++++----------------
 po/ar.po          | 604 +++++++++++++++++----------------
 po/as.po          | 602 +++++++++++++++++----------------
 po/ast.po         | 602 +++++++++++++++++----------------
 po/az.po          | 602 +++++++++++++++++----------------
 po/be.po          | 840 +++++++++++++++++++++++-----------------------
 po/bg.po          | 604 +++++++++++++++++----------------
 po/bn.po          | 602 +++++++++++++++++----------------
 po/bn_IN.po       | 602 +++++++++++++++++----------------
 po/br.po          | 602 +++++++++++++++++----------------
 po/bs.po          | 602 +++++++++++++++++----------------
 po/ca.po          | 604 +++++++++++++++++----------------
 po/ca@valencia.po | 602 +++++++++++++++++----------------
 po/cmn.po         | 604 +++++++++++++++++----------------
 po/crh.po         | 602 +++++++++++++++++----------------
 po/cs.po          | 606 ++++++++++++++++++----------------
 po/da.po          | 604 +++++++++++++++++----------------
 po/de.po          | 614 +++++++++++++++++-----------------
 po/dz.po          | 602 +++++++++++++++++----------------
 po/el.po          | 606 ++++++++++++++++++----------------
 po/en_AU.po       | 606 ++++++++++++++++++----------------
 po/en_CA.po       | 602 +++++++++++++++++----------------
 po/en_GB.po       | 616 +++++++++++++++++-----------------
 po/en_US.po       | 602 +++++++++++++++++----------------
 po/eo.po          | 602 +++++++++++++++++----------------
 po/et.po          | 973 ++++++++++++++++++++++++++++--------------------------
 po/eu.po          | 604 +++++++++++++++++----------------
 po/fa.po          | 602 +++++++++++++++++----------------
 po/fi.po          | 602 +++++++++++++++++----------------
 po/fr.po          | 604 +++++++++++++++++----------------
 po/fur.po         | 602 +++++++++++++++++----------------
 po/fy.po          | 602 +++++++++++++++++----------------
 po/ga.po          | 602 +++++++++++++++++----------------
 po/gl.po          | 604 +++++++++++++++++----------------
 po/gu.po          | 602 +++++++++++++++++----------------
 po/ha.po          | 602 +++++++++++++++++----------------
 po/he.po          | 604 +++++++++++++++++----------------
 po/hi.po          | 602 +++++++++++++++++----------------
 po/hr.po          | 604 +++++++++++++++++----------------
 po/hu.po          | 602 +++++++++++++++++----------------
 po/hy.po          | 602 +++++++++++++++++----------------
 po/id.po          | 606 ++++++++++++++++++----------------
 po/ig.po          | 602 +++++++++++++++++----------------
 po/is.po          | 604 +++++++++++++++++----------------
 po/it.po          | 607 ++++++++++++++++++----------------
 po/ja.po          | 841 +++++++++++++++++++++++-----------------------
 po/ka.po          | 602 +++++++++++++++++----------------
 po/kk.po          | 604 +++++++++++++++++----------------
 po/kn.po          | 602 +++++++++++++++++----------------
 po/ko.po          | 607 ++++++++++++++++++----------------
 po/ku.po          | 602 +++++++++++++++++----------------
 po/ky.po          | 604 +++++++++++++++++----------------
 po/li.po          | 602 +++++++++++++++++----------------
 po/lt.po          | 604 +++++++++++++++++----------------
 po/lv.po          | 604 +++++++++++++++++----------------
 po/mai.po         | 602 +++++++++++++++++----------------
 po/mg.po          | 602 +++++++++++++++++----------------
 po/mk.po          | 602 +++++++++++++++++----------------
 po/ml.po          | 602 +++++++++++++++++----------------
 po/mn.po          | 602 +++++++++++++++++----------------
 po/mr.po          | 604 +++++++++++++++++----------------
 po/ms.po          | 606 ++++++++++++++++++----------------
 po/nb.po          | 602 +++++++++++++++++----------------
 po/nds.po         | 602 +++++++++++++++++----------------
 po/ne.po          | 602 +++++++++++++++++----------------
 po/nl.po          | 604 +++++++++++++++++----------------
 po/nn.po          | 602 +++++++++++++++++----------------
 po/nso.po         | 602 +++++++++++++++++----------------
 po/oc.po          | 602 +++++++++++++++++----------------
 po/or.po          | 602 +++++++++++++++++----------------
 po/pa.po          | 602 +++++++++++++++++----------------
 po/pl.po          | 606 ++++++++++++++++++----------------
 po/ps.po          | 602 +++++++++++++++++----------------
 po/pt.po          | 604 +++++++++++++++++----------------
 po/pt_BR.po       | 604 +++++++++++++++++----------------
 po/ro.po          | 604 +++++++++++++++++----------------
 po/ru.po          | 604 +++++++++++++++++----------------
 po/si.po          | 602 +++++++++++++++++----------------
 po/sk.po          | 606 ++++++++++++++++++----------------
 po/sl.po          | 604 +++++++++++++++++----------------
 po/sq.po          | 602 +++++++++++++++++----------------
 po/sr.po          | 602 +++++++++++++++++----------------
 po/sr@latin.po    | 602 +++++++++++++++++----------------
 po/sv.po          | 604 +++++++++++++++++----------------
 po/ta.po          | 602 +++++++++++++++++----------------
 po/te.po          | 602 +++++++++++++++++----------------
 po/th.po          | 602 +++++++++++++++++----------------
 po/tk.po          | 602 +++++++++++++++++----------------
 po/tr.po          | 604 +++++++++++++++++----------------
 po/ug.po          | 602 +++++++++++++++++----------------
 po/uk.po          | 604 +++++++++++++++++----------------
 po/ur.po          | 604 +++++++++++++++++----------------
 po/uz.po          | 602 +++++++++++++++++----------------
 po/vi.po          | 602 +++++++++++++++++----------------
 po/wa.po          | 602 +++++++++++++++++----------------
 po/xh.po          | 602 +++++++++++++++++----------------
 po/yo.po          | 602 +++++++++++++++++----------------
 po/zh_CN.po       | 614 +++++++++++++++++-----------------
 po/zh_HK.po       | 602 +++++++++++++++++----------------
 po/zh_TW.po       | 604 +++++++++++++++++----------------
 po/zu.po          | 602 +++++++++++++++++----------------
 102 files changed, 32218 insertions(+), 30166 deletions(-)

commit 93ffa10e9626eef68132e593f6a78270fa601c37
Author: infirit <infirit@gmail.com>
Date:   Sun Nov 9 23:07:26 2014 +0100

    appdata: Add autotool bits for appdata

 data/Makefile.am         |  7 +++++++
 data/caja.appdata.xml    | 41 -----------------------------------------
 data/caja.appdata.xml.in | 41 +++++++++++++++++++++++++++++++++++++++++
 po/POTFILES.in           |  1 +
 4 files changed, 49 insertions(+), 41 deletions(-)

commit 6552ae30564e045c2cf30dc3f3f7700fe5498d2b
Author: alxpl <alxpl@users.noreply.github.com>
Date:   Sun Nov 9 14:26:22 2014 +0200

    Create caja.appdata.xml
    
    An appdata file for inclusion in the upcoming software centers as per the new freedesktop.org specs.
    
    It should be placed in /usr/share/appdata/ similar to the way .desktop files are placed in /usr/share/applications/, e.g. if you have a "$(datadir)/applications" definition in your makefiles, you need to add a "$(datadir)/appdata" as well.
    
    Please, skim through the file in case I made a mistake and please, include it in the 1.8 branch as well.
    
    Thanks!

 data/caja.appdata.xml | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

commit 38ac39670151f9d8d1c689d3f6d16570a18290e9
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Nov 6 08:48:15 2014 +0100

    Fix segmentation fault if extensions dont provide information file

 src/caja-file-management-properties.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit df913aef213e9314e8037944fdb9a44f6dc7f9cf
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Nov 3 15:04:19 2014 +0100

    Add about dialog for extensions

 libcaja-private/caja-extensions.c      | 10 +++++-
 libcaja-private/caja-extensions.h      |  4 +++
 src/caja-file-management-properties.c  | 62 +++++++++++++++++++++++++++++++---
 src/caja-file-management-properties.ui |  4 +--
 4 files changed, 73 insertions(+), 7 deletions(-)

commit 3600fc2b4208a17217750bbce3e1928e760307fd
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Sun Nov 2 17:54:47 2014 +0100

    Sync translations with transifex

 po/es.po | 13 +++++++------
 po/hu.po |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

commit f4c1ed23ddb3bf5d8ba6d1faf46c26b91346d926
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Oct 27 15:21:59 2014 +0100

    Allow extensions to define an ini file with name, icon and description

 libcaja-private/caja-extensions.c     | 32 ++++++++++++++++++---------
 libcaja-private/caja-extensions.h     |  3 +++
 src/caja-file-management-properties.c | 41 ++++++++++++++++++++++++++---------
 3 files changed, 56 insertions(+), 20 deletions(-)

commit 451eef9b275ce006b270a3569d96e531e24dd15a
Author: Alexander van der Meij <alexandervdm@gliese.me>
Date:   Fri Aug 29 20:52:13 2014 +0200

    implementation of extension interface and status management (gsoc2014)

 libcaja-private/Makefile.am                  |    2 +
 libcaja-private/caja-column-utilities.c      |    3 +-
 libcaja-private/caja-extensions.c            |  205 +++
 libcaja-private/caja-extensions.h            |   48 +
 libcaja-private/caja-file.c                  |    4 +-
 libcaja-private/caja-global-preferences.c    |    1 +
 libcaja-private/caja-global-preferences.h    |    5 +-
 libcaja-private/caja-module.c                |   11 +-
 libcaja-private/caja-module.h                |    2 +-
 libcaja-private/org.mate.caja.gschema.xml.in |    9 +
 src/caja-application.c                       |    4 +-
 src/caja-file-management-properties-main.c   |    2 +-
 src/caja-file-management-properties.c        |   93 ++
 src/caja-file-management-properties.ui       | 1783 +++++++++-----------------
 src/caja-window-manage-views.c               |    3 +-
 src/caja-window-menus.c                      |    3 +-
 src/caja-window-toolbars.c                   |    3 +-
 src/file-manager/fm-directory-view.c         |    3 +-
 src/file-manager/fm-properties-window.c      |    3 +-
 19 files changed, 1017 insertions(+), 1170 deletions(-)

commit 2ce11c50a5f7cca914af7646cae5fb6d5362b5cf
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Fri Oct 24 15:48:13 2014 +0200

    Sync translations with transifex

 po/af.po          | 385 ++++++++++++++++++-----------------
 po/am.po          | 389 +++++++++++++++++------------------
 po/ar.po          | 393 ++++++++++++++++++------------------
 po/as.po          | 385 ++++++++++++++++++-----------------
 po/ast.po         | 385 ++++++++++++++++++-----------------
 po/az.po          | 469 ++++++++++++++++++++++++------------------
 po/be.po          | 593 +++++++++++++++++++++++++++---------------------------
 po/bg.po          | 397 ++++++++++++++++++------------------
 po/bn.po          | 385 ++++++++++++++++++-----------------
 po/bn_IN.po       | 385 ++++++++++++++++++-----------------
 po/br.po          | 385 ++++++++++++++++++-----------------
 po/bs.po          | 385 ++++++++++++++++++-----------------
 po/ca.po          | 393 ++++++++++++++++++------------------
 po/ca@valencia.po | 385 ++++++++++++++++++-----------------
 po/cmn.po         | 389 +++++++++++++++++------------------
 po/crh.po         | 385 ++++++++++++++++++-----------------
 po/cs.po          | 397 ++++++++++++++++++------------------
 po/da.po          | 389 +++++++++++++++++------------------
 po/de.po          | 420 +++++++++++++++++++-------------------
 po/dz.po          | 385 ++++++++++++++++++-----------------
 po/el.po          | 402 ++++++++++++++++++------------------
 po/en_AU.po       | 389 +++++++++++++++++------------------
 po/en_CA.po       | 385 ++++++++++++++++++-----------------
 po/en_GB.po       | 393 ++++++++++++++++++------------------
 po/en_US.po       | 391 +++++++++++++++++------------------
 po/eo.po          | 385 ++++++++++++++++++-----------------
 po/es.po          | 391 +++++++++++++++++------------------
 po/eu.po          | 391 +++++++++++++++++------------------
 po/fa.po          | 389 +++++++++++++++++------------------
 po/fi.po          | 387 +++++++++++++++++------------------
 po/fr.po          | 393 ++++++++++++++++++------------------
 po/fur.po         | 385 ++++++++++++++++++-----------------
 po/fy.po          | 385 ++++++++++++++++++-----------------
 po/ga.po          | 385 ++++++++++++++++++-----------------
 po/gl.po          | 395 ++++++++++++++++++------------------
 po/gu.po          | 385 ++++++++++++++++++-----------------
 po/ha.po          | 385 ++++++++++++++++++-----------------
 po/he.po          | 389 +++++++++++++++++------------------
 po/hi.po          | 385 ++++++++++++++++++-----------------
 po/hr.po          | 403 +++++++++++++++++++------------------
 po/hu.po          | 393 ++++++++++++++++++------------------
 po/hy.po          | 385 ++++++++++++++++++-----------------
 po/id.po          | 392 ++++++++++++++++++------------------
 po/ig.po          | 385 ++++++++++++++++++-----------------
 po/is.po          | 387 +++++++++++++++++------------------
 po/it.po          | 389 +++++++++++++++++------------------
 po/ka.po          | 385 ++++++++++++++++++-----------------
 po/kk.po          | 387 +++++++++++++++++------------------
 po/kn.po          | 385 ++++++++++++++++++-----------------
 po/ko.po          | 398 ++++++++++++++++++------------------
 po/ku.po          | 385 ++++++++++++++++++-----------------
 po/ky.po          | 389 +++++++++++++++++------------------
 po/li.po          | 385 ++++++++++++++++++-----------------
 po/lt.po          | 391 +++++++++++++++++------------------
 po/lv.po          | 389 +++++++++++++++++------------------
 po/mai.po         | 385 ++++++++++++++++++-----------------
 po/mg.po          | 385 ++++++++++++++++++-----------------
 po/mk.po          | 385 ++++++++++++++++++-----------------
 po/ml.po          | 385 ++++++++++++++++++-----------------
 po/mn.po          | 385 ++++++++++++++++++-----------------
 po/mr.po          | 393 ++++++++++++++++++------------------
 po/ms.po          | 389 +++++++++++++++++------------------
 po/nb.po          | 387 +++++++++++++++++------------------
 po/nds.po         | 385 ++++++++++++++++++-----------------
 po/ne.po          | 385 ++++++++++++++++++-----------------
 po/nl.po          | 391 +++++++++++++++++------------------
 po/nn.po          | 385 ++++++++++++++++++-----------------
 po/nso.po         | 385 ++++++++++++++++++-----------------
 po/oc.po          | 385 ++++++++++++++++++-----------------
 po/or.po          | 385 ++++++++++++++++++-----------------
 po/pa.po          | 387 +++++++++++++++++------------------
 po/pl.po          | 394 ++++++++++++++++++------------------
 po/ps.po          | 385 ++++++++++++++++++-----------------
 po/pt.po          | 391 +++++++++++++++++------------------
 po/pt_BR.po       | 389 +++++++++++++++++------------------
 po/ro.po          | 391 +++++++++++++++++------------------
 po/ru.po          | 391 +++++++++++++++++------------------
 po/si.po          | 385 ++++++++++++++++++-----------------
 po/sk.po          | 389 +++++++++++++++++------------------
 po/sl.po          | 395 ++++++++++++++++++------------------
 po/sq.po          | 387 +++++++++++++++++------------------
 po/sr.po          | 387 +++++++++++++++++------------------
 po/sr@latin.po    | 387 +++++++++++++++++------------------
 po/sv.po          | 391 +++++++++++++++++------------------
 po/ta.po          | 387 +++++++++++++++++------------------
 po/te.po          | 385 ++++++++++++++++++-----------------
 po/th.po          | 389 +++++++++++++++++------------------
 po/tk.po          | 385 ++++++++++++++++++-----------------
 po/tr.po          | 392 ++++++++++++++++++------------------
 po/ug.po          | 385 ++++++++++++++++++-----------------
 po/uk.po          | 394 ++++++++++++++++++------------------
 po/ur.po          | 391 +++++++++++++++++------------------
 po/uz.po          | 385 ++++++++++++++++++-----------------
 po/vi.po          | 385 ++++++++++++++++++-----------------
 po/wa.po          | 385 ++++++++++++++++++-----------------
 po/xh.po          | 385 ++++++++++++++++++-----------------
 po/yo.po          | 385 ++++++++++++++++++-----------------
 po/zh_CN.po       | 391 +++++++++++++++++------------------
 po/zh_HK.po       | 387 +++++++++++++++++------------------
 po/zh_TW.po       | 396 ++++++++++++++++++------------------
 po/zu.po          | 385 ++++++++++++++++++-----------------
 101 files changed, 20064 insertions(+), 19469 deletions(-)

commit b7338cedacbb77f59dadf6ae92be67adf1d48415
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Oct 21 16:08:24 2014 +0200

    Check result of symlink function to avoid warnings
    
    Translate also Perberos spanish comments

 src/file-manager/fm-directory-view.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

commit e5f731375d73fe2106304310e84bd68dc8da12fa
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Oct 21 12:06:19 2014 +0200

    Fix g_desktop_app_info_set_desktop_env deprecation

 src/caja-main.c | 2 ++
 1 file changed, 2 insertions(+)

commit 0ecd4559229017cffa3f4986f5c33cb5ac49ed57
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Oct 2 21:34:56 2014 +0200

    Bump version to 1.9.2

 NEWS         | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 6fd04ac5f915e07ca8168fd8754c0cce27a283ec
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Thu Oct 2 21:34:29 2014 +0200

    Sync translations with transifex

 po/et.po | 68 ++++++++++++++++++++++++++++++++--------------------------------
 po/ja.po | 44 ++++++++++++++++++++---------------------
 2 files changed, 56 insertions(+), 56 deletions(-)

commit 29f52914fc496786db6bd1227232e861c8b2b1b0
Author: infirit <infirit@gmail.com>
Date:   Sun Oct 5 21:04:13 2014 +0200

    Use g_get_user_config_dir instead of harcoding to $HOME/.config

 libcaja-private/caja-file-utilities.c | 2 +-
 src/caja-application.c                | 2 +-
 src/caja-convert-metadata.c           | 2 +-
 src/file-manager/fm-directory-view.c  | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

commit b0207b8d83807564e35142c0f8ab04e5fdb9715d
Author: infirit <infirit@gmail.com>
Date:   Sun Oct 5 20:52:39 2014 +0200

    Move accel file to the proper place. Fixes #276

 libcaja-private/caja-file-utilities.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 69464ff40d770523036fabc56244763346f8df49
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Mon Jan 16 10:28:40 2012 -0500

    extension: add some more missing gir annotations

 libcaja-extension/caja-column-provider.c        |  6 ++++++
 libcaja-extension/caja-menu-provider.c          | 16 ++++++++++++++++
 libcaja-extension/caja-menu.c                   | 11 +++++++++++
 libcaja-extension/caja-property-page-provider.c |  4 ++--
 4 files changed, 35 insertions(+), 2 deletions(-)

commit a6ff3b7b6d7259403a2ab9b1d8a3b11b194b0bc6
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   Mon Jan 9 17:20:16 2012 -0500

    extension: add some annotations

 libcaja-extension/caja-file-info.c                | 64 +++++++++++++++++++++++
 libcaja-extension/caja-location-widget-provider.c |  8 +++
 2 files changed, 72 insertions(+)

commit a209601a8043bf395941a28f95153c7a14836af1
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Oct 3 13:54:09 2014 +0200

    file-conflict-dialog: Alt+S is already used in Skip button

 libcaja-private/caja-file-conflict-dialog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 96fb1c780e7cebaf9fe6c4f48c8ddc5127d297d4
Author: Boris Egorov <egorov@linux.com>
Date:   Wed Sep 24 13:05:49 2014 +0700

    libcaja-private: fix always-false expressions
    
    CppCheck detected a few 'always false' expressions in caja.
    
    First two definitely appeareed due to copy-paste (mime-types
    comparison). It would be nice to move x_content_type's and corresponding
    greetings to some table (array of structs), wouldn't it?
    
    The last one looks like copy-paste problem too. There were two identical
    blocks of code in move_file_prepare() checking conflict type. BTW, there
    is exactly the same code in the same file inside copy_move_file().
    According to DRY, it would be nice to move this code to its own
    function.

 libcaja-private/caja-autorun.c         | 4 ++--
 libcaja-private/caja-file-operations.c | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

commit 95eb87d34c69dc7d2596e2a4344898630e63c5bb
Author: Phillip Susi <psusi@ubuntu.com>
Date:   Thu Sep 25 11:50:03 2014 +0200

    limit deep scount (folder contents and size) to one filesystem
    
    Closes https://github.com/mate-desktop/caja/issues/194
    Thanks to monsta <monsta@inbox.ru> to have suggested this solution
    
    Original GNOME commit:
    https://git.gnome.org/browse/nautilus/commit/?id=a645da5f1043c59203fd194fe85b6976d75d2ece
    
    When getting the size of the root directory, nautilus was descending
    into other filesystems including /proc, causing it to report nonsensical
    sizes.
    Store the fsid of the starting directory, and do not recurse into
    other mount points.
    https://bugzilla.gnome.org/show_bug.cgi?id=629394
    https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/585472

 libcaja-private/caja-directory-async.c | 43 ++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

commit 97b50471090b4fcca8c42f1da2cfafa1ec05ada0
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Sun Sep 21 16:41:27 2014 +0200

    Sync translations with transifex

 po/am.po    |  18 +--
 po/de.po    |  25 +--
 po/en_AU.po |   6 +-
 po/es.po    |  74 ++++-----
 po/et.po    | 505 ++++++++++++++++++++++++++++++------------------------------
 po/hr.po    |  19 +--
 po/ja.po    | 157 ++++++++++---------
 po/lt.po    | 309 +++++++++++++++++++------------------
 po/pt_BR.po |  33 ++--
 po/sv.po    |  11 +-
 po/tr.po    |   6 +-
 po/uk.po    | 120 +++++++--------
 12 files changed, 646 insertions(+), 637 deletions(-)

commit 05ca17c6975f2210885927e273280016fe1f9e20
Author: infirit <infirit@gmail.com>
Date:   Tue Jul 22 13:23:44 2014 +0200

    libunique is no optional
    
    This is most likely the beginning of a GtkApplication port that did not happen.

 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 7601bf40073cd13576c6ebf394af1070ef0b1408
Author: infirit <infirit@gmail.com>
Date:   Tue Jul 22 13:21:13 2014 +0200

    Move LIBUNIQUE_VERSION to the other gtk api depenant variables

 configure.ac | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

commit 571aeaa8218bc34ab69e56c12a9fe8e49edf2ac8
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Fri Jul 11 22:31:47 2014 +0200

    Sync translations with transifex

 po/am.po |  10 +-
 po/de.po |  24 ++---
 po/eu.po |  14 +--
 po/id.po |  13 +--
 po/lt.po |  24 ++---
 po/pt.po |  60 +++++------
 po/ro.po |  31 +++---
 po/ru.po |   9 +-
 po/sk.po |  80 +++++++--------
 po/tr.po | 339 ++++++++++++++++++++++++++++++++-------------------------------
 10 files changed, 305 insertions(+), 299 deletions(-)

commit 5c00ec63c8e6c73706e67876cb4b88837112f5d9
Merge: 055af12 e2c56fc
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Jul 8 11:36:24 2014 +0200

    Merge pull request #298 from bl0ckeduser/master
    
    Handle metadata key deletions (fixes #296)

commit e2c56fc2f8182c361684b9ae29beb998749912dc
Author: bl0ckeduser <bl0ckedusersoft@gmail.com>
Date:   Sat Jul 5 13:06:33 2014 -0400

    Handle metadata key deletions (fixes #296)

 libcaja-private/caja-desktop-metadata.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

commit 055af122062667206828a6e971d7c8cc8b29d519
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Jul 1 18:47:00 2014 +0200

    Bump version to 1.9.1

 NEWS         | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 7814fa4c9f24c220cc55ae728d717107f754cb72
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Jun 27 13:08:53 2014 +0200

    Add option in the UI to set IEC units usage
    
    Closes https://github.com/mate-desktop/caja/issues/293

 src/caja-file-management-properties.c  |  5 +++
 src/caja-file-management-properties.ui | 67 ++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

commit 6bd93009eeb559c71d87dfce84a636941ad2152b
Author: alexandervdm <alexandervdm@gliese.me>
Date:   Fri May 16 18:12:49 2014 +0200

    propagate button-release event when ejecting, fixes #169
    
    See also gnome bug https://bugzilla.gnome.org/show_bug.cgi?id=646302

 src/caja-places-sidebar.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit 4796e9bf097fd481798d58092fe95951e99e79dd
Merge: 30f8358 a2ab27a
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat May 10 15:03:06 2014 +0200

    Merge pull request #275 from NiceandGently/master
    
    fix some compile warnings

commit 30f835823d9f92d214f81225196fa7b0ea9e93e0
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Fri May 9 20:47:03 2014 +0200

    Sync translations with transifex

 po/de.po | 42 +++++++++++++++++++++---------------------
 po/ja.po | 55 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 49 insertions(+), 48 deletions(-)

commit 057df2dc1d8ea67b477d696ac6feea8aaf392763
Merge: 10ea499 8dacfcc
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Apr 29 21:06:55 2014 +0200

    Merge pull request #285 from bl0ckeduser/master
    
    Quick fix for #105

commit 8dacfccb119ef2e295fc51d1bf509ba6d3ea533f
Author: bl0ckeduser <bl0ckedusersoft@gmail.com>
Date:   Mon Apr 28 12:48:04 2014 -0400

    Quick fix for #105

 libcaja-private/caja-icon-container.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 10ea49955ddc8fd9ceeb4e2674529821ecd368fd
Author: mate-i18n <mate-i18n@ml.mate-desktop.org>
Date:   Sat Apr 26 14:26:59 2014 +0200

    Sync translations with transifex

 po/LINGUAS  |    1 +
 po/be.po    |  128 +-
 po/de.po    |  264 +--
 po/en_US.po | 7416 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/es.po    |   63 +-
 po/hr.po    |   72 +-
 po/hu.po    |   77 +-
 po/id.po    |   21 +-
 po/lt.po    |   21 +-
 po/mr.po    |  417 ++--
 po/pt.po    |    2 +-
 po/ro.po    |   13 +-
 po/sv.po    |   35 +-
 13 files changed, 7977 insertions(+), 553 deletions(-)

commit fb383b1bd34586ecc3495c240bda5478bdf2811e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Apr 24 14:01:08 2014 +0200

    Use MateAboutDialog

 configure.ac            | 2 +-
 src/caja-window-menus.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

commit d9ec9f96af11944daf5a2de7f66d5910a00c137b
Merge: e5a75ee 56c3927
Author: Sander Sweers <infirit@gmail.com>
Date:   Fri Apr 18 21:21:32 2014 +0200

    Merge pull request #282 from alexandervdm/master
    
    replace g_free call on GFile objects, closes #196

commit e5a75eef1f31a22c56b1bf23203114982b8b7e0e
Author: infirit <infirit@gmail.com>
Date:   Fri Apr 18 21:18:43 2014 +0200

    Fix minor man page issues, closes #280
    
    Patch by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

 docs/caja-autorun-software.1 | 2 +-
 docs/caja.1                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 56c392718be0ba63c1493891900229d41bedbd74
Author: alexandervdm <alexandervdm@gliese.me>
Date:   Wed Apr 16 17:07:30 2014 +0200

    replace g_free call on GFile objects, fixes #196

 src/file-manager/fm-tree-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a2ab27abdf58a2910b1c24b2612cee0e1052418c
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat Mar 22 22:13:47 2014 +0100

    fix missing guchar argument in eel-gdk-pixbuf-extensions.c

 eel/eel-gdk-pixbuf-extensions.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c966485816928ad8aa4b135815fa918bcef46837
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat Mar 22 22:10:13 2014 +0100

    fix g_atomic_int_exchange_and_add deprecations

 eel/eel-string.c | 4 ++++
 1 file changed, 4 insertions(+)

commit a395859226fd2532b5a8a59757c460ccbd26ded0
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat Mar 22 19:13:58 2014 +0100

    fix some g_thread_init deprecations

 test/test-caja-search-engine.c | 4 +++-
 test/test-copy.c               | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

commit e0d7a6b033f7ae2bbd504af86aec009def16d6d5
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat Mar 22 19:11:48 2014 +0100

    fix a wrong guint argument

 eel/eel-editable-label.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4cbe991d80bda7d01894f905d3738ec827a25b6d
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sat Mar 22 16:25:15 2014 +0100

    fix some compile warnings

 src/file-manager/fm-directory-view.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 910b9141ac634a86d8f53fda534e33787a160efb
Author: raveit65 <chat-to-me@raveit.de>
Date:   Mon Oct 7 19:17:37 2013 +0200

    places-sidebar: allow dropping of files to bookmarks

 src/caja-places-sidebar.c | 129 +++++-----------------------------------------
 1 file changed, 14 insertions(+), 115 deletions(-)

commit 60d4f83b0fab7633e73e8f4689f4c6931927c2ba
Author: raveit65 <chat-to-me@raveit.de>
Date:   Sun Oct 6 00:41:25 2013 +0200

    sidebar: rearranged of caja sidebar to 1.4 style

 src/caja-places-sidebar.c | 310 +++++++++++++++++++++++-----------------------
 1 file changed, 156 insertions(+), 154 deletions(-)

commit 7b3d67d7572509d0edb2259e99aef77cbdfc7bd6
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Mar 21 15:06:57 2014 +0100

    Show trash in tree panel
    
    Closes https://github.com/mate-desktop/caja/issues/233
    
    Also unused commented code in fm-tree-view.c

 src/file-manager/fm-tree-view.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

commit 06264fc91212150d3b741a723422955e7e97614c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Mar 19 17:30:03 2014 +0100

    Remove ConsoleKit usage
    
    Closes https://github.com/mate-desktop/caja/issues/125
    Closes https://github.com/mate-desktop/caja/issues/226

 src/caja-application.c | 159 -------------------------------------------------
 src/caja-application.h |   2 -
 2 files changed, 161 deletions(-)

commit 4f1e756e08e61840eb9a52de4debee30006ea31e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Mar 18 18:16:45 2014 +0100

    Possible solution for x-caja-desktop issue

 src/caja-application.c         | 14 +++++++++++---
 src/caja-window-manage-views.c | 18 +++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

commit 02a296bf051897dd2d30bea2ae61aee23ea635bf
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Mar 17 19:02:38 2014 +0100

    Bump version to 1.9.0

 NEWS         | 3 +++
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

commit 58741d7c41f8600b3aca19c004d94bf5d9a85bfa
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 9 23:46:32 2014 +0100

    icon-canvas-item: attempt to fix up a11y for CajaIconCanvasItem
    
    https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=184096f912b119edde1f538e8cdd5ea593d753ca

 libcaja-private/caja-icon-canvas-item.c | 606 ++++++++++++++------------------
 libcaja-private/caja-icon-container.c   |   2 +-
 2 files changed, 274 insertions(+), 334 deletions(-)

commit 8c55f91d32f7fba10f1192f7869a6577f9a9108a
Merge: aaddef1 47bc0f3
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 9 13:25:24 2014 +0100

    Merge pull request #263 from tarakbumba/caja_double_fork_fixed
    
    Fix double forking issue with pkexec

commit aaddef120d570c862e82665d3053a6face6f8748
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Mar 4 23:46:21 2014 +0100

    Sync translations with transifex

 po/be.po |   7 +-
 po/pt.po | 304 +++++++++++++++++++++++++++++++--------------------------------
 2 files changed, 156 insertions(+), 155 deletions(-)

commit 8bdaa9030073d401ebd728bc0ac6d3a21e22be68
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Mar 1 11:00:19 2014 +0100

    Bump version to 1.8.0

 NEWS         | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 86f90309199d507c9d6b1a3adbaadee98fa87e64
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Mar 1 10:59:52 2014 +0100

    Sync translations with transifex

 po/be.po    |  64 +++++------
 po/ko.po    | 350 ++++++++++++++++++++++++++++++------------------------------
 po/zh_CN.po |  14 +--
 3 files changed, 215 insertions(+), 213 deletions(-)

commit 47bc0f35c4548c1c1867a28df22cd7d37a6746bc
Author: tarakbumba <tarakbumba@gmail.com>
Date:   Wed Feb 26 19:53:45 2014 +0200

    Fix double forking issue with pkexec

 libcaja-private/caja-program-choosing.c | 142 +++++++++++++++++++++++---------
 1 file changed, 102 insertions(+), 40 deletions(-)

commit ee0a62c8759040d84055425954de1f860bac8652
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 23 18:18:03 2014 +0100

    Sync translations with transifex

 po/bg.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 1a65e051fa801a9c3f28d473bae64b92de19a3a1
Merge: ddfece7 0807ec2
Author: Sander Sweers <infirit@gmail.com>
Date:   Thu Feb 20 20:20:14 2014 +0100

    Merge pull request #260 from Zaffy/master
    
    Fixed crash in caja-pathbar.c (issue #209)

commit ddfece703bd71c548f8ec2e22d775b021af9c186
Merge: 777305f ea2afe4
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Feb 20 19:24:28 2014 +0100

    Merge branch 'master' of github.com:mate-desktop/mate-file-manager

commit ea2afe440a203f640fccee5f032436bee3a535f2
Author: infirit <infirit@gmail.com>
Date:   Thu Feb 20 14:02:16 2014 +0100

    Add Main category to desktop files (close #252)
    
    Also add NoDisplay=true to make sure they do not show up in the menu.

 data/caja-computer.desktop.in.in   | 3 ++-
 data/caja-home.desktop.in.in       | 3 ++-
 src/mate-network-scheme.desktop.in | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

commit 0807ec279c82e42cb455365736a2516d6d7b663e
Author: Zaffy <zaffy@lunar.sk>
Date:   Thu Feb 20 00:39:59 2014 +0100

    Fixed crash in caja-pathbar.c (issue #209)

 src/caja-pathbar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 777305f396a3458e6143b28b1064ebb16f0fd8b3
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Feb 19 22:55:41 2014 +0100

    Sync translations with transifex

 po/el.po | 22 +++++++++----------
 po/hr.po | 10 ++++-----
 po/ru.po | 18 +++++++--------
 po/sk.po | 76 ++++++++++++++++++++++++++++++++--------------------------------
 4 files changed, 63 insertions(+), 63 deletions(-)

commit b9ad3e29728b506f881b130dcaba82cdefb6f64e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Feb 18 18:32:28 2014 +0100

    Sync translations with transifex

 po/de.po | 16 ++++++++--------
 po/el.po | 24 ++++++++++++++----------
 po/hr.po | 22 +++++++++++-----------
 po/lv.po |  2 +-
 po/pt.po |  8 ++++----
 po/th.po | 33 +++++++++++++++++----------------
 6 files changed, 55 insertions(+), 50 deletions(-)

commit 97f77ef23898ef7249bbdef6ef39382e078bef3d
Author: infirit <infirit@gmail.com>
Date:   Mon Feb 17 17:04:04 2014 +0100

    Revert "Fix introspection dirs"
    
    This reverts commit 9d02675f9be7a16f89f49928ebadd6ab2c627f77.

 libcaja-extension/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit e88ba92c0b97a974dacf62056f72d70f4802512c
Merge: b2de190 e008630
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Feb 17 10:53:43 2014 +0100

    Merge pull request #257 from hekel/master
    
    Update Manual

commit b2de1900bd5a9631841b47d25dd63e47739db0b7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 16 23:07:30 2014 +0100

    Sync translations with transifex

 po/el.po | 2 +-
 po/lv.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 62d9ba93f261df33a3d358fdae0777494eb42594
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 16 23:07:18 2014 +0100

    Update Makefile for COPYING-DOCS removal

 Makefile.am | 1 -
 1 file changed, 1 deletion(-)

commit 9ce27fe5895f52e8da491a7fdc05b50c3f667380
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 16 21:55:13 2014 +0100

    Bump version to 1.7.90

 NEWS         | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 695ab010781d7b04624ed72c9681a03ab8f3100f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 16 21:54:49 2014 +0100

    Update NEWS

 NEWS | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

commit 7fd8e5160371a30e3c6dbb353625047091153ba5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 16 21:49:35 2014 +0100

    Sync translations with transifex

 po/fr.po    | 8 ++++----
 po/ru.po    | 4 ++--
 po/sk.po    | 8 ++++----
 po/zh_TW.po | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

commit 59b0dd9aa76b609b427168f8430438f76841b4f3
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 16 21:49:14 2014 +0100

    configure: Add check-news

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4006450b593fd9e2792909a51223b9c9dc39e8f1
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Feb 15 15:06:13 2014 +0100

    Sync translations with transifex

 po/af.po          |  68 ++++++-----
 po/am.po          |  70 ++++++-----
 po/ar.po          |  84 ++++++++------
 po/as.po          |  68 ++++++-----
 po/ast.po         |  68 ++++++-----
 po/az.po          |  68 ++++++-----
 po/be.po          |  68 ++++++-----
 po/bg.po          |  79 +++++++------
 po/bn.po          |  68 ++++++-----
 po/bn_IN.po       |  68 ++++++-----
 po/br.po          |  68 ++++++-----
 po/bs.po          |  68 ++++++-----
 po/ca.po          |  68 ++++++-----
 po/ca@valencia.po |  68 ++++++-----
 po/cmn.po         |  68 ++++++-----
 po/crh.po         |  68 ++++++-----
 po/cs.po          |  72 ++++++------
 po/da.po          |  68 ++++++-----
 po/de.po          |  70 ++++++-----
 po/dz.po          |  68 ++++++-----
 po/el.po          |  70 ++++++-----
 po/en_AU.po       |  68 ++++++-----
 po/en_CA.po       |  68 ++++++-----
 po/en_GB.po       | 339 ++++++++++++++++++++++++++++--------------------------
 po/eo.po          |  68 ++++++-----
 po/es.po          |  84 ++++++++------
 po/et.po          |  68 ++++++-----
 po/eu.po          |  68 ++++++-----
 po/fa.po          |  79 +++++++------
 po/fi.po          |  68 ++++++-----
 po/fr.po          |  68 ++++++-----
 po/fur.po         |  68 ++++++-----
 po/fy.po          |  68 ++++++-----
 po/ga.po          |  68 ++++++-----
 po/gl.po          |  70 ++++++-----
 po/gu.po          |  68 ++++++-----
 po/ha.po          |  68 ++++++-----
 po/he.po          |  68 ++++++-----
 po/hi.po          |  68 ++++++-----
 po/hr.po          | 110 ++++++++++--------
 po/hu.po          |  70 ++++++-----
 po/hy.po          |  68 ++++++-----
 po/id.po          |  68 ++++++-----
 po/ig.po          |  68 ++++++-----
 po/is.po          |  68 ++++++-----
 po/it.po          |  68 ++++++-----
 po/ja.po          |  79 +++++++------
 po/ka.po          |  68 ++++++-----
 po/kk.po          |  68 ++++++-----
 po/kn.po          |  68 ++++++-----
 po/ko.po          |  80 +++++++------
 po/ku.po          |  68 ++++++-----
 po/ky.po          |  68 ++++++-----
 po/li.po          |  68 ++++++-----
 po/lt.po          |  68 ++++++-----
 po/lv.po          |  70 ++++++-----
 po/mai.po         |  68 ++++++-----
 po/mg.po          |  68 ++++++-----
 po/mk.po          |  68 ++++++-----
 po/ml.po          |  68 ++++++-----
 po/mn.po          |  68 ++++++-----
 po/mr.po          |  68 ++++++-----
 po/ms.po          |  68 ++++++-----
 po/nb.po          |  68 ++++++-----
 po/nds.po         |  68 ++++++-----
 po/ne.po          |  68 ++++++-----
 po/nl.po          |  71 +++++++-----
 po/nn.po          |  68 ++++++-----
 po/nso.po         |  68 ++++++-----
 po/oc.po          |  68 ++++++-----
 po/or.po          |  68 ++++++-----
 po/pa.po          |  68 ++++++-----
 po/pl.po          |  70 ++++++-----
 po/ps.po          |  68 ++++++-----
 po/pt.po          |  70 ++++++-----
 po/pt_BR.po       |  79 +++++++------
 po/ro.po          |  68 ++++++-----
 po/ru.po          |  83 +++++++------
 po/si.po          |  68 ++++++-----
 po/sk.po          | 210 +++++++++++++++++----------------
 po/sl.po          |  68 ++++++-----
 po/sq.po          |  68 ++++++-----
 po/sr.po          |  68 ++++++-----
 po/sr@latin.po    |  68 ++++++-----
 po/sv.po          | 159 +++++++++++++------------
 po/ta.po          |  68 ++++++-----
 po/te.po          |  68 ++++++-----
 po/th.po          |  68 ++++++-----
 po/tk.po          |  68 ++++++-----
 po/tr.po          |  68 ++++++-----
 po/ug.po          |  68 ++++++-----
 po/uk.po          |  70 ++++++-----
 po/ur.po          |  68 ++++++-----
 po/uz.po          |  68 ++++++-----
 po/vi.po          |  68 ++++++-----
 po/wa.po          |  68 ++++++-----
 po/xh.po          |  68 ++++++-----
 po/yo.po          |  68 ++++++-----
 po/zh_CN.po       |  70 ++++++-----
 po/zh_HK.po       |  68 ++++++-----
 po/zh_TW.po       |  85 ++++++++------
 po/zu.po          |  68 ++++++-----
 102 files changed, 4227 insertions(+), 3402 deletions(-)

commit e008630594606d294be28952267087f4d51ba5e1
Author: hekel <hekel@archlinux.info>
Date:   Fri Feb 14 03:14:27 2014 -0500

    Update caja.1

 docs/caja.1 | 121 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 61 insertions(+), 60 deletions(-)

commit 03b16fc86adc67ce0b8caa79f7796b7dd0991394
Author: hekel <hekel@archlinux.info>
Date:   Fri Feb 14 03:13:52 2014 -0500

    Update caja-file-management-properties.1

 docs/caja-file-management-properties.1 | 69 ++++++++++++----------------------
 1 file changed, 24 insertions(+), 45 deletions(-)

commit 02974fdc82bb13f951fee34091b493b15aed728f
Author: hekel <hekel@archlinux.info>
Date:   Fri Feb 14 03:12:24 2014 -0500

    Update caja-connect-server.1

 docs/caja-connect-server.1 | 76 ++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 43 deletions(-)

commit 4d1642a2067265af357f65f0b4291f2c4d6727a5
Author: hekel <hekel@archlinux.info>
Date:   Fri Feb 14 03:11:55 2014 -0500

    Update caja-autorun-software.1

 docs/caja-autorun-software.1 | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

commit 7c0823aa8fe35f422840d3bac1dc67898792c91a
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Feb 12 17:22:35 2014 +0100

    Re add bookmark section in connect server dialog

 src/caja-connect-server-dialog.c | 50 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

commit a84932d55d293b3a7802d14363a58962e69f2a8b
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Feb 11 10:10:51 2014 +0100

    Include autogen.sh in tarball
    
    Closes https://github.com/mate-desktop/caja/issues/253

 Makefile.am | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit b70fa0754a4364fba767331d4d143623b1cf92f8
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Feb 11 10:08:55 2014 +0100

    Add description to caja-autorun-software manpage
    
    Patch by Mike Gabriel
    Closes https://github.com/mate-desktop/caja/issues/254

 docs/caja-autorun-software.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 764ae67a0b5dd61f04f3f5cd9bad58533ec4bce4
Author: infirit <infirit@gmail.com>
Date:   Mon Feb 10 21:35:25 2014 +0100

    Add Keyword to desktop files, patch by Mike Gabriel (sunweaver)

 data/caja-browser.desktop.in.in                    | 1 +
 data/caja-computer.desktop.in.in                   | 1 +
 data/caja-file-management-properties.desktop.in.in | 1 +
 data/caja-home.desktop.in.in                       | 1 +
 src/mate-network-scheme.desktop.in                 | 1 +
 5 files changed, 5 insertions(+)

commit abc66abadf4523d8a2da39a63e69547a53dffe04
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Feb 10 19:29:34 2014 +0100

    Sync translations with transifex

 po/da.po | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 06182d739bf1f82e093738fc50b114796d047e16
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Feb 10 15:00:32 2014 +0100

    Remove old unused COPYING-DOCS file
    
    See:
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738537#10
    https://git.gnome.org/browse/nautilus/commit/?id=f933accf04863e3e0f5828e9ba7655861057c2bc
    
    Closes #251
    https://github.com/mate-desktop/caja/issues/251

 COPYING-DOCS | 355 -----------------------------------------------------------
 1 file changed, 355 deletions(-)

commit 016f47cf659dd76b6b0cb78dfe5d1bc1c37e4c4b
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 9 20:22:16 2014 +0100

    Bump version to 1.7.2

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 18efb3cb1461a09f9928f0df64ac95878dd0b9b2
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 9 20:21:52 2014 +0100

    Sync translations with transifex

 po/it.po | 6 +++---
 po/sl.po | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

commit f2ac0a8e7a91fdddf116723123e8eab5a10f6b2f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Feb 8 15:29:01 2014 +0100

    Fix typo in po/lv.po

 po/lv.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 753d8ec521ce67931192d96a40f9798f6d9e2696
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Feb 8 13:53:31 2014 +0100

    Fix typo in po/el.po

 po/el.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b49675c60afce0c9407f393612fff0018e7c0e05
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Feb 8 13:27:31 2014 +0100

    Sync translations with transifex

 po/zh_CN.po | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit 39c83e324a86dad573b1ac51cf9ee065239e061f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Feb 3 18:20:39 2014 +0100

    Sync translations with transifex

 po/gl.po |   18 +-
 po/ms.po |   18 +-
 po/nl.po |   18 +-
 po/pt.po |   17 +-
 po/sk.po | 2122 +++++++++++++++++++++++++++++++-------------------------------
 po/uk.po |   18 +-
 6 files changed, 1108 insertions(+), 1103 deletions(-)

commit 1f5197aa4f2507cd8e754687e63824b17a4834c2
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Jan 29 22:16:27 2014 +0100

    Sync translations with transifex

 po/LINGUAS        |    1 +
 po/af.po          | 1632 ++++++------
 po/am.po          | 1636 ++++++------
 po/ar.po          | 1634 ++++++------
 po/as.po          | 1634 ++++++------
 po/ast.po         | 1632 ++++++------
 po/az.po          | 1634 ++++++------
 po/be.po          | 2816 ++++++++++----------
 po/bg.po          | 1637 ++++++------
 po/bn.po          | 1634 ++++++------
 po/bn_IN.po       | 1632 ++++++------
 po/br.po          | 1634 ++++++------
 po/bs.po          | 1634 ++++++------
 po/ca.po          | 1644 ++++++------
 po/ca@valencia.po | 1634 ++++++------
 po/cmn.po         | 7324 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/crh.po         | 1634 ++++++------
 po/cs.po          | 1647 ++++++------
 po/da.po          | 1638 ++++++------
 po/de.po          | 1670 ++++++------
 po/dz.po          | 1634 ++++++------
 po/el.po          | 1643 ++++++------
 po/en_AU.po       | 1634 ++++++------
 po/en_CA.po       | 1634 ++++++------
 po/en_GB.po       | 1634 ++++++------
 po/eo.po          | 1632 ++++++------
 po/es.po          | 1719 ++++++-------
 po/et.po          | 1634 ++++++------
 po/eu.po          | 1660 ++++++------
 po/fa.po          | 1632 ++++++------
 po/fi.po          | 1634 ++++++------
 po/fr.po          | 1639 ++++++------
 po/fur.po         | 1634 ++++++------
 po/fy.po          | 1634 ++++++------
 po/ga.po          | 1634 ++++++------
 po/gl.po          | 1634 ++++++------
 po/gu.po          | 1634 ++++++------
 po/ha.po          | 1634 ++++++------
 po/he.po          | 1638 ++++++------
 po/hi.po          | 1632 ++++++------
 po/hr.po          | 2414 +++++++++---------
 po/hu.po          | 1694 +++++++------
 po/hy.po          | 1634 ++++++------
 po/id.po          | 1787 ++++++-------
 po/ig.po          | 1634 ++++++------
 po/is.po          | 1636 ++++++------
 po/it.po          | 1634 ++++++------
 po/ja.po          | 1634 ++++++------
 po/ka.po          | 1634 ++++++------
 po/kk.po          | 1714 ++++++-------
 po/kn.po          | 1632 ++++++------
 po/ko.po          | 1651 ++++++------
 po/ku.po          | 1632 ++++++------
 po/ky.po          | 1634 ++++++------
 po/li.po          | 1634 ++++++------
 po/lt.po          | 1632 ++++++------
 po/lv.po          | 1636 ++++++------
 po/mai.po         | 1634 ++++++------
 po/mg.po          | 1634 ++++++------
 po/mk.po          | 1634 ++++++------
 po/ml.po          | 1632 ++++++------
 po/mn.po          | 1634 ++++++------
 po/mr.po          | 1634 ++++++------
 po/ms.po          | 1634 ++++++------
 po/nb.po          | 1632 ++++++------
 po/nds.po         | 1634 ++++++------
 po/ne.po          | 1634 ++++++------
 po/nl.po          | 1636 ++++++------
 po/nn.po          | 1634 ++++++------
 po/nso.po         | 1634 ++++++------
 po/oc.po          | 1634 ++++++------
 po/or.po          | 1634 ++++++------
 po/pa.po          | 1634 ++++++------
 po/pl.po          | 1816 ++++++-------
 po/ps.po          | 1634 ++++++------
 po/pt.po          | 1640 ++++++------
 po/pt_BR.po       | 1635 ++++++------
 po/ro.po          | 1634 ++++++------
 po/ru.po          | 1638 ++++++------
 po/si.po          | 1634 ++++++------
 po/sk.po          | 2032 +++++++--------
 po/sl.po          | 1949 +++++++-------
 po/sq.po          | 1701 ++++++-------
 po/sr.po          | 1634 ++++++------
 po/sr@latin.po    | 1634 ++++++------
 po/sv.po          | 1632 ++++++------
 po/ta.po          | 1634 ++++++------
 po/te.po          | 1634 ++++++------
 po/th.po          | 1632 ++++++------
 po/tk.po          | 1634 ++++++------
 po/tr.po          | 1636 ++++++------
 po/ug.po          | 1634 ++++++------
 po/uk.po          | 1634 ++++++------
 po/ur.po          | 1637 ++++++------
 po/uz.po          | 1634 ++++++------
 po/vi.po          | 1634 ++++++------
 po/wa.po          | 1634 ++++++------
 po/xh.po          | 1634 ++++++------
 po/yo.po          | 1634 ++++++------
 po/zh_CN.po       | 1855 +++++++-------
 po/zh_HK.po       | 1632 ++++++------
 po/zh_TW.po       | 1634 ++++++------
 po/zu.po          | 1634 ++++++------
 103 files changed, 91978 insertions(+), 84027 deletions(-)

commit 7fbadf79122f06e80dd52937bfec8dea36cc2581
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Jan 27 16:23:13 2014 +0100

    Add option to show file sizes with IEC units instead of SI units
    
    Contains also a typo fix for the previous commit
    
    Closes #203
    https://github.com/mate-desktop/caja/issues/203

 libcaja-private/caja-file-operations.c       |  5 ++++-
 libcaja-private/caja-file.c                  | 20 ++++++++++++++++----
 libcaja-private/caja-global-preferences.h    |  1 +
 libcaja-private/org.mate.caja.gschema.xml.in |  5 +++++
 src/file-manager/fm-directory-view.c         |  7 +++++--
 src/file-manager/fm-properties-window.c      | 18 ++++++++++++++----
 6 files changed, 45 insertions(+), 11 deletions(-)

commit d21e8d13f08a3c6cc89bec5e49ee4f76749ac89a
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Jan 27 15:25:38 2014 +0100

    Add "Open parent location" in menu if we are in search view
    
    It is shown if only one file is selected, and if it isn't a directory

 src/file-manager/fm-directory-view.c | 94 ++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

commit 0d898d91fbfe21cdbd2bb89cf224f07d514850cd
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Jan 14 16:19:40 2014 +0100

    configure: Avoid to create gz tarball

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 040109573bda3ae83b98c81e7afce18fa092f3a5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Jan 14 16:05:16 2014 +0100

    Bump version to 1.7.1

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 546ab8c2d6fdb11555d45497441812bf884b3f0e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Jan 14 16:03:36 2014 +0100

    Use memmove with latest glib (>= 2.39)
    
    g_memmove is removed in https://git.gnome.org/browse/glib/commit/?id=6e4a7fca431f53fdfd89afbe956212229cf52200

 eel/eel-editable-label.c | 5 +++++
 1 file changed, 5 insertions(+)

commit 8c93c83c6b063adb5d88b7bb1ad31d46a9f8e1e0
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Jan 13 12:23:21 2014 +0100

    Remove unused folder and file

 libnautilus-extension/README | 1 -
 1 file changed, 1 deletion(-)

commit 3499d2978abfc9a6def47db59ca826fd5c44ee8e
Merge: 334f232 75dbce2
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Jan 6 02:47:15 2014 -0800

    Merge pull request #230 from infirit/master
    
    Add  to ACLOCAL_AMFLAGS for user added flags

commit 75dbce2fafe5b45aecc8a9a944a92ae826986450
Author: infirit <infirit@gmail.com>
Date:   Sun Jan 5 14:11:59 2014 +0100

    Add  to ACLOCAL_AMFLAGS for user added flags

 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 334f232ef405664f390e926671fbbe74d1b322c0
Merge: f7595b2 551a745
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Dec 29 13:21:32 2013 -0800

    Merge pull request #214 from infirit/master
    
    Revert "Fix for x-caja-desktop windows at login"

commit f7595b249d052591cab05f5c0bd889f9e000a4aa
Merge: 0ef48fa 9286386
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Dec 22 14:59:33 2013 -0800

    Merge pull request #217 from infirit/yelp
    
    Update help uri to the correct location

commit 92863863832c79ffefbeb1a2c9d78a442fd197b0
Author: infirit <infirit@gmail.com>
Date:   Sun Dec 22 14:18:44 2013 +0100

    Update help uri to the correct location

 src/caja-bookmarks-window.c             | 2 +-
 src/caja-connect-server-dialog.c        | 2 +-
 src/caja-file-management-properties.c   | 4 ++--
 src/caja-location-dialog.c              | 2 +-
 src/caja-property-browser.c             | 2 +-
 src/caja-window-menus.c                 | 2 +-
 src/file-manager/fm-directory-view.c    | 2 +-
 src/file-manager/fm-properties-window.c | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

commit 551a745d6b83581b8a437695faf5a852d1c6ad29
Author: infirit <infirit@gmail.com>
Date:   Tue Dec 17 20:09:15 2013 +0100

    Revert "Fix for x-caja-desktop windows at login"
    
    This reverts commit d116bf8ba8be698869fef81b30d576bcacf3234c.
    
    Revert because it does not solve the problem and it causes problems
    for users with other docks like plank. See issue #211.

 data/caja.desktop.in.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0ef48fabc8235bbc1d37c588d235df3bad3f4d39
Merge: f17baf5 abc518d
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Dec 1 02:45:32 2013 -0800

    Merge pull request #202 from City-busz/fix-max-child-size
    
    Fix assertion failture on max_child_size

commit abc518d3298d6e1f73b0163dc09ce60ff60c248d
Author: Balló György <ballogyor@gmail.com>
Date:   Sat Nov 30 13:51:33 2013 +0100

    Fix assertion failture on max_child_size
    
    This fixes the crasher when opening properties.

 eel/eel-wrap-table.c | 3 +++
 1 file changed, 3 insertions(+)

commit f17baf5908a1d27c7a68392944fce430e0bfd43e
Merge: bf43c05 e6c9117
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Nov 29 05:55:37 2013 -0800

    Merge pull request #198 from eyelash/icon-size
    
    fix a GTK3 bug and simplify things

commit bf43c05a1c0a89f36f14192d3f5c504df01ae822
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Nov 13 16:40:45 2013 +0100

    Fix g_thread_init deprecation

 src/caja-main.c | 2 ++
 1 file changed, 2 insertions(+)

commit 8bf723259140dc1f0740f312b1b6f57de2329b7c
Merge: bf7b28d 6292ace
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Nov 8 05:48:41 2013 -0800

    Merge pull request #197 from eyelash/toolbar-height
    
    toolbar improvements

commit 6292aceba15b9e5806602f35b08ae2e0e357c1f7
Author: Elias Aebi <user142@hotmail.com>
Date:   Thu Nov 7 19:03:40 2013 +0100

    remove the border of the zoom control

 src/caja-zoom-action.c | 1 -
 1 file changed, 1 deletion(-)

commit 37316d8567823eba233e347a42e2886a9475715f
Author: Elias Aebi <user142@hotmail.com>
Date:   Thu Nov 7 18:53:02 2013 +0100

    remove the border of the view as combo box

 src/caja-view-as-action.c | 1 -
 1 file changed, 1 deletion(-)

commit e6c9117493378ea67def5b57b8c97c433a096229
Author: Elias Aebi <user142@hotmail.com>
Date:   Wed Nov 6 17:45:41 2013 +0100

    put the containers instead of the contents into the size group and remove the now unnecessary frame container

 src/caja-navigation-window-pane.c |  6 ++----
 src/caja-side-pane.c              | 14 ++------------
 2 files changed, 4 insertions(+), 16 deletions(-)

commit bf7b28d0d00722bc58a8e7ac1890d77e68b0708c
Merge: 26e32cc 10d8824
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Nov 5 10:48:14 2013 -0800

    Merge pull request #195 from eyelash/primary-toolbar
    
    add the primary-toolbar style class to the primary toolbar

commit dcb2d1918aa26db64727d14414983b6270b34cab
Author: Elias Aebi <user142@hotmail.com>
Date:   Sun Nov 3 21:24:31 2013 +0100

    remove a custom size allocation that broke stuff on GTK3

 src/caja-side-pane.c | 28 ----------------------------
 1 file changed, 28 deletions(-)

commit 293be904e1852d0da0372c5fa71d7eaf491d5356
Author: Elias Aebi <user142@hotmail.com>
Date:   Sun Nov 3 20:07:05 2013 +0100

    use the same icon size for the location button (the button that lets you toggle between button and text-based location bar) as for the close side pane button and the pathbar icons

 src/caja-navigation-window-pane.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 10d8824bc690ebb65d85569680b7e3e083066d11
Author: Elias Aebi <user142@hotmail.com>
Date:   Sun Nov 3 14:41:48 2013 +0100

    add the primary-toolbar style class to the primary toolbar (only for the GTK3 version)

 src/caja-navigation-window.c | 3 +++
 1 file changed, 3 insertions(+)

commit 26e32ccc5efa5885227fa9e5e9b7bfb22e32b62d
Merge: 70a2cb2 72418e6
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Oct 31 04:36:49 2013 -0700

    Merge pull request #193 from infirit/master
    
    Fix pkgconfig files and small cleanup of configure.ac

commit 72418e6eea09fbab0f5749c6e730b0fc755d78cb
Author: infirit <infirit@gmail.com>
Date:   Thu Oct 31 12:19:58 2013 +0100

    Remove forgotten GTK_API_VERSION and GTK_REQUIRED (now in case)

 configure.ac | 3 ---
 1 file changed, 3 deletions(-)

commit 85b62da5c5a371f76b8be57fe795936487b5c106
Author: infirit <infirit@gmail.com>
Date:   Thu Oct 31 12:19:02 2013 +0100

    Use GTK_API_VERSION in pkgconfig files

 libcaja-extension/libcaja-extension-uninstalled.pc.in | 2 +-
 libcaja-extension/libcaja-extension.pc.in             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 70a2cb2aed093e76142c10fff8bf7ccafbded7ce
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Oct 26 12:19:35 2013 +0200

    Bump version to 1.7.0

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c599b4c3473128745049a7b0b3a421e587995617
Merge: e6c97f8 a1c0ddc
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Oct 21 02:26:50 2013 -0700

    Merge pull request #188 from infirit/master
    
    Add disable-icon-update for distcheck / various cleanups

commit a1c0ddc581c0359e6e543cec5ac6502127a9d2a7
Author: infirit <infirit@gmail.com>
Date:   Sun Oct 20 22:33:43 2013 +0200

    Add update-icon-cache config option for makedistcheck
    
    Otherwise the cache file is left behind and make distcheck fails.

 Makefile.am            | 2 +-
 configure.ac           | 7 +++++++
 data/icons/Makefile.am | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

commit 430d4f7216169ea06fa22f7fc26d270c9238ddc6
Author: infirit <infirit@gmail.com>
Date:   Sun Oct 20 22:10:36 2013 +0200

    Remove ltmain.sh, autofoo will bring it in

 ltmain.sh | 9655 -------------------------------------------------------------
 1 file changed, 9655 deletions(-)

commit 24f34b574b610aa9f368ad9f4a319e01fc73d364
Author: infirit <infirit@gmail.com>
Date:   Sun Oct 20 21:41:23 2013 +0200

    Remove m4 and rely on autofoo to pull them in

 m4/gtk-doc.m4     |   67 -
 m4/intltool.m4    |  216 --
 m4/libtool.m4     | 7982 -----------------------------------------------------
 m4/ltoptions.m4   |  384 ---
 m4/ltsugar.m4     |  123 -
 m4/ltversion.m4   |   23 -
 m4/lt~obsolete.m4 |   98 -
 7 files changed, 8893 deletions(-)

commit ba4359d43bb0454e7f8028aac5e875b2ea64bbdf
Author: infirit <infirit@gmail.com>
Date:   Sun Oct 20 21:54:46 2013 +0200

    Remove pregenerated doc files, will be generated on every build

 docs/reference/libcaja-extension/html/ch01.html    |  63 --
 docs/reference/libcaja-extension/html/home.png     | Bin 654 -> 0 bytes
 docs/reference/libcaja-extension/html/index.html   |  66 ---
 docs/reference/libcaja-extension/html/index.sgml   | 170 ------
 docs/reference/libcaja-extension/html/ix01.html    | 224 -------
 docs/reference/libcaja-extension/html/left.png     | Bin 459 -> 0 bytes
 .../libcaja-extension-caja-column-provider.html    | 117 ----
 .../html/libcaja-extension-caja-column.html        | 182 ------
 .../libcaja-extension-caja-extension-types.html    | 158 -----
 .../html/libcaja-extension-caja-file-info.html     | 643 ---------------------
 .../html/libcaja-extension-caja-info-provider.html | 252 --------
 ...ja-extension-caja-location-widget-provider.html | 133 -----
 .../html/libcaja-extension-caja-menu-provider.html | 267 ---------
 .../html/libcaja-extension-caja-menu.html          | 473 ---------------
 ...caja-extension-caja-property-page-provider.html | 131 -----
 .../html/libcaja-extension-caja-property-page.html | 148 -----
 .../html/libcaja-extension.devhelp                 | 118 ----
 .../html/libcaja-extension.devhelp2                | 118 ----
 docs/reference/libcaja-extension/html/pt01.html    |  68 ---
 docs/reference/libcaja-extension/html/right.png    | Bin 472 -> 0 bytes
 docs/reference/libcaja-extension/html/style.css    | 265 ---------
 docs/reference/libcaja-extension/html/up.png       | Bin 406 -> 0 bytes
 .../tmpl/caja-column-provider.sgml                 |  45 --
 .../libcaja-extension/tmpl/caja-column.sgml        |  76 ---
 .../tmpl/caja-extension-types.sgml                 |  78 ---
 .../libcaja-extension/tmpl/caja-file-info.sgml     | 257 --------
 .../libcaja-extension/tmpl/caja-info-provider.sgml |  80 ---
 .../tmpl/caja-location-widget-provider.sgml        |  47 --
 .../libcaja-extension/tmpl/caja-menu-item.sgml     |  22 -
 .../libcaja-extension/tmpl/caja-menu-provider.sgml |  86 ---
 .../libcaja-extension/tmpl/caja-menu.sgml          | 208 -------
 .../tmpl/caja-property-page-provider.sgml          |  46 --
 .../libcaja-extension/tmpl/caja-property-page.sgml |  60 --
 .../tmpl/libcaja-extension-unused.sgml             |   0
 34 files changed, 4601 deletions(-)

commit e6c97f86dbe8e5abdddb68480dea473c46d34d3f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Oct 19 16:35:09 2013 +0200

    Rename INCLUDES to AM_CPPFLAGS in Makefile

 src/file-manager/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 65b4e4dbb0c7699e7277c38a024aa0e4897df218
Merge: 991136d 97956ce
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Oct 19 05:43:40 2013 -0700

    Merge pull request #182 from infirit/master
    
    Use GTK_API_VERSION for GIR and correct typo

commit 97956ce4fae0bc30bc49458c47860c30993d09e9
Author: infirit <infirit@gmail.com>
Date:   Fri Oct 18 18:48:33 2013 +0200

    Correct typo as pointed out by raveit65 on irc

 po/lv.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit cf90a0ce4af5e104fa5dd7f28128221a43422759
Author: infirit <infirit@gmail.com>
Date:   Fri Oct 18 18:47:00 2013 +0200

    Use GTK_API_VERSION for GIR

 configure.ac                  | 1 +
 libcaja-extension/Makefile.am | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit 3324b0975011ebd2338c69fc0f81e9f8dcae06ab
Author: infirit <infirit@gmail.com>
Date:   Fri Oct 18 18:36:21 2013 +0200

    Remove obsolete distro folder

 distro/archlinux/PKGBUILD                  | 41 ------------------------------
 distro/archlinux/mate-file-manager.install | 28 --------------------
 2 files changed, 69 deletions(-)

commit 75f0b9a877f98779969504edeefdfbcf3cf1262d
Author: infirit <infirit@gmail.com>
Date:   Fri Oct 18 18:36:02 2013 +0200

    Complete mate-file-manager -> caja rename

 HACKING    | 2 +-
 README     | 2 +-
 autogen.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 991136d9468b78f139a0ae4d9dbea9a864eed330
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Oct 17 15:51:44 2013 +0200

    Package name is caja

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b627dfe98d2f8bcb3e94e8a73e274b1cd96b2c3f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Oct 11 17:21:37 2013 +0200

    Sync translations with transifex

 po/ar.po    |  591 +++---
 po/be.po    | 1244 ++++++------
 po/bg.po    |  193 +-
 po/ca.po    |    9 +-
 po/cs.po    |   21 +-
 po/en_GB.po |   25 +-
 po/es.po    |   15 +-
 po/hr.po    |  386 ++--
 po/kk.po    |  964 +++++-----
 po/ko.po    |   72 +-
 po/mi.po    | 6196 ++++++++++++++++++++++++++++-------------------------------
 po/ms.po    | 2231 ++++++++++-----------
 po/pl.po    |   91 +-
 13 files changed, 5912 insertions(+), 6126 deletions(-)

commit 3512eb9905039f0dad597d7591a45b7fa763d2d7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Oct 6 18:12:22 2013 +0200

    Properly free GHashTable in properties window
    
    Closes #178
    https://github.com/mate-desktop/mate-file-manager/issues/178
    
    I had to recover two functions previously removed in eel-glib-extensions.

 eel/eel-glib-extensions.c               | 28 ++++++++++++++++++++++++++++
 eel/eel-glib-extensions.h               |  6 ++++++
 src/file-manager/fm-properties-window.c |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)

commit 70559a30ba34d71d0d9567457c3ec20de7d25fb7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Sep 26 11:34:43 2013 +0200

    Add manpage for caja-autorun-software
    
    Closes #114
    https://github.com/mate-desktop/mate-file-manager/issues/114

 docs/Makefile.am             |  1 +
 docs/caja-autorun-software.1 | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

commit ddd554133d6362a692f1d2281053c06b94651039
Merge: c79f320 77bd50e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Sep 22 15:02:58 2013 +0200

    Merge branch 'master' of github.com:mate-desktop/mate-file-manager

commit c79f320aba836847f35e5e465754b1ddd62806b4
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Sep 22 15:01:18 2013 +0200

    Add check if mimetype is null before apply thumbnail frame
    
    To avoid segfaults on file deletions

 libcaja-private/caja-file.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

commit 77bd50e13ed0e111a2e1f0c4313caf798d66e8d9
Merge: acccd87 6daecea
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Sep 20 13:50:34 2013 -0700

    Merge pull request #112 from aubade/browserfix
    
    Make browser windows always open new folders in the same window, even when Spatial enabled

commit acccd87b60837f610e1c4fd4d57937b9cb8e7bc4
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Sep 19 16:40:14 2013 +0200

    Possible fix for crash during file rename in external devices
    
    Bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1005660
    Solution from: https://git.gnome.org/browse/nautilus/commit/src/nautilus-icon-view.c?h=gnome-3-2&id=a67212a

 src/file-manager/fm-icon-view.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 47ac58d285ef6cd6076a54a3d2f12cb3208f8c36
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 18 17:02:01 2013 +0200

    Possible fix for crash during audio preview
    
    See https://bugzilla.redhat.com/show_bug.cgi?id=959444

 src/file-manager/fm-icon-view.c | 2 ++
 1 file changed, 2 insertions(+)

commit f66654cf3fc9c5a94003a2823fc64c18a7b987a4
Merge: 8537b86 7498673
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Sep 17 12:48:20 2013 -0700

    Merge pull request #154 from romovs/master
    
    fixed thumbnail frame not being displayed for some files

commit 74986734b3b188b702513028b53e54cafbb8c85b
Author: romovs <romovs@gmail.com>
Date:   Sun Aug 25 01:40:02 2013 +0300

    fixed thumbnail frame not being displayed for some files. also fixes #135.

 libcaja-private/caja-file.c         | 13 +++++++++++--
 libcaja-private/caja-ui-utilities.c |  9 ---------
 2 files changed, 11 insertions(+), 11 deletions(-)

commit 8537b86bf3a08581e2886ea1ec052ce23cea9bb1
Merge: 6ae1325 d24c568
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Sep 3 02:00:00 2013 -0700

    Merge pull request #162 from infirit/master
    
    Fix spatial mode crash and shift+double click

commit d24c5688eb09f6e806f0ad293eafe2a58644c37d
Author: infirit <infirit@gmail.com>
Date:   Sun Sep 1 17:14:01 2013 +0200

    Fix spatial mode crash and shift+double click
    
    Fixes issues:
    https://github.com/mate-desktop/mate-file-manager/issues/120
    https://github.com/mate-desktop/mate-file-manager/issues/161

 src/file-manager/fm-icon-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6ae13257e6b06b9ebf977f33d164a5786b9d2442
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Aug 6 08:34:02 2013 +0200

    Sync translations with transifex

 po/LINGUAS  |    1 +
 po/am.po    | 1459 ++++++------
 po/ca.po    |   72 +-
 po/cs.po    |  369 +--
 po/de.po    |   36 +-
 po/en_AU.po |   10 +-
 po/gl.po    |  714 +++---
 po/hr.po    | 1336 +++++------
 po/hu.po    |  150 +-
 po/ky.po    |  668 +++---
 po/lv.po    |  445 ++--
 po/pt_BR.po |   89 +-
 po/sk.po    |  202 +-
 po/tr.po    |  101 +-
 po/uk.po    | 1037 ++++-----
 po/ur.po    | 7400 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/zh_CN.po |    7 +-
 po/zh_TW.po |   70 +-
 18 files changed, 10834 insertions(+), 3332 deletions(-)

commit 3017ed6c4baae9968562ec046cbdf8661fcbe316
Merge: 9d02675 e85845f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Aug 1 16:26:04 2013 -0700

    Merge pull request #146 from infirit/master
    
    Replace ghelp: with help: for user-guide

commit e85845f9024e6cc3272d4cd92f011f886143d818
Author: infirit <infirit@gmail.com>
Date:   Thu Aug 1 12:29:26 2013 +0200

    Replace ghelp: with help: for user-guide

 src/caja-bookmarks-window.c             | 2 +-
 src/caja-connect-server-dialog.c        | 2 +-
 src/caja-file-management-properties.c   | 2 +-
 src/caja-location-dialog.c              | 2 +-
 src/caja-property-browser.c             | 2 +-
 src/caja-window-menus.c                 | 2 +-
 src/file-manager/fm-directory-view.c    | 2 +-
 src/file-manager/fm-properties-window.c | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

commit 9d02675f9be7a16f89f49928ebadd6ab2c627f77
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Jul 26 00:01:45 2013 +0200

    Fix introspection dirs

 libcaja-extension/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit aeb7bad55d7539d472ca2c8610c9a9c126d1037c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 25 15:48:53 2013 +0200

    configure: Translate spanish comments

 configure.ac | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

commit a823c728f14e2600fbbcd6ad14e6305331e80bf2
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 25 15:13:25 2013 +0200

    src: Add GTK3/GDK3 support

 src/caja-window-menus.c              | 26 +++++++++++++++++++++-----
 src/caja-window.c                    |  6 +++---
 src/file-manager/fm-directory-view.c | 16 ++++++++++++++++
 3 files changed, 40 insertions(+), 8 deletions(-)

commit a4f91079a8a8dda83614148ac50e7ef7e162c9b1
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 25 15:12:51 2013 +0200

    libcaja-private: Add GDK3 support

 libcaja-private/caja-icon-container.c   |  4 ++++
 libcaja-private/caja-program-choosing.c | 34 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

commit b965494b9c67f1e407c9c26bcc580e15838a64d3
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 25 15:12:17 2013 +0200

    eel: Add GDK3 support

 eel/eel-mate-extensions.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

commit a706a5994f0b704a3016416983dccce536ebe5f5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 25 15:11:46 2013 +0200

    cut-n-paste-code: Add GTK3 support

 cut-n-paste-code/libegg/eggsmclient-xsmp.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit a59fad1c5f8e2d5660b481d3e7849f6b3c5a8226
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 25 15:11:16 2013 +0200

    configure: Use appropriate gail version

 configure.ac | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 9414c75602ba6f099d39275b9c09db656f27a59e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 25 12:50:07 2013 +0200

    Fixes for GTK3 support

 libcaja-private/caja-tree-view-drag-dest.c | 4 ++++
 src/caja-desktop-window.c                  | 4 ++++
 src/caja-pathbar.c                         | 4 ++--
 src/file-manager/fm-list-view.c            | 7 +++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

commit 73325c232756ace088ae3f8d64455af2c35a5381
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 25 10:27:27 2013 +0200

    Fix a nautilus => caja rename

 libcaja-private/caja-cell-renderer-text-ellipsized.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 78e25fe0e165f05a3dfe61805626b36ea3e07d93
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 25 10:27:17 2013 +0200

    Include only gtk.h

 libcaja-private/caja-undostack-manager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d89968247ad185d4c9e37ab9930cb64dcda058dd
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Jul 24 18:07:09 2013 +0200

    eel: Add GTK3 support

 eel/eel-debug-drawing.c         | 46 ++++++++++++++++++++++++++++++
 eel/eel-gdk-extensions.c        |  2 +-
 eel/eel-gdk-pixbuf-extensions.c | 16 +++++++++--
 eel/eel-gdk-pixbuf-extensions.h |  5 ++++
 eel/eel-gtk-container.c         |  8 ++++++
 eel/eel-gtk-container.h         |  4 +++
 eel/eel-labeled-image.c         | 63 +++++++++++++++++++++++++++++++++++++++--
 eel/eel-wrap-table.c            | 48 ++++++++++++++++++++++++++++++-
 8 files changed, 185 insertions(+), 7 deletions(-)

commit 3d3cfc6566a29aea5da9f3223f3d4a0e28e3fa60
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Jul 24 15:49:14 2013 +0200

    eel: Disable unused function in GTK3

 eel/eel-debug-drawing.c | 2 ++
 eel/eel-debug-drawing.h | 3 +++
 2 files changed, 5 insertions(+)

commit aa136a012583317cd6b1fa246f1bf16194faf159
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Jul 24 15:19:42 2013 +0200

    Update for mate-desktop changes

 configure.ac                                | 2 +-
 eel/eel-background.c                        | 2 +-
 eel/eel-background.h                        | 2 +-
 eel/eel-mate-extensions.c                   | 2 +-
 libcaja-private/caja-directory-background.c | 2 +-
 libcaja-private/caja-thumbnails.c           | 2 +-
 src/caja-application.c                      | 2 +-
 src/file-manager/fm-properties-window.c     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

commit 308e85f6466b282752b6821d6fa785fc48d5e811
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Jul 23 17:35:24 2013 +0200

    eel: depth argument is removed from gdk_window_get_geometry in GTK3

 eel/eel-canvas.c | 4 ++++
 1 file changed, 4 insertions(+)

commit b9090995e0fb25f1d227efa2bd5aa00190938472
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Jul 23 17:02:36 2013 +0200

    Fix typo

 eel/eel-background.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c599a345825236d8e0c89c6c43a66d778422153d
Merge: 93a2ed0 5c97d98
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 18 15:05:15 2013 -0700

    Merge pull request #141 from NiceandGently/master
    
    fix privat icons dir and make files for automake-1.13

commit 93a2ed0d29cd905560eb0a285d18c8096d79e931
Merge: 39195bc 875a88f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 18 15:04:53 2013 -0700

    Merge pull request #140 from Semmu/dev-gtk3
    
    First gtk3 support commit.

commit 5c97d988bca602cb73efc7f3ae62a7fb51baff05
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jul 18 23:04:29 2013 +0200

    INCLUDES to AM_CPPFLAGS

 test/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 95f8fe17b9141f79e4beb39569d7f83b070f371b
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jul 18 23:03:11 2013 +0200

    INCLUDES to AM_CPPFLAGS

 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 186a1e3abe265d01be102767c4ce113ed5dcb7be
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jul 18 23:02:09 2013 +0200

    INCLUDES to AM_CPPFLAGS

 libcaja-private/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 91d11404e9136d9c75cccd7473c8f408fdd8595b
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jul 18 23:00:23 2013 +0200

    INCLUDES to AM_CPPFLAGS

 libcaja-extension/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d8a207223d7f69385898b5c78d0618ab2acd6e2a
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jul 18 22:58:50 2013 +0200

    INCLUDES to AM_CPPFLAGS

 eel/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 51c6314e25851a6a5e852e00de8272d6984f687d
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jul 18 22:57:38 2013 +0200

    INCLUDES to AM_CPPFLAGS

 cut-n-paste-code/libegg/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 43fce304a673d15ae8c9ca89474e37e3685765dd
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Thu Jul 18 22:55:03 2013 +0200

    fix_privat-icons-dir
    
    to avoid this direction.
    %{_datadir}/mate-file-manager/icons/hicolor/*/emblems/emblem-note.png

 data/icons/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit 39195bc02c24724e9a44af37fbbb463261e2f190
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jul 18 16:10:08 2013 +0200

    Bump version to 1.6.2

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 875a88f1d74e2a6888ab1ee02f1b728a1fafc327
Author: Laszlo Boros <iamsemmu@gmail.com>
Date:   Wed Jul 17 17:09:03 2013 +0200

    First gtk3 support commit.

 cut-n-paste-code/libegg/eggsmclient-private.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

commit 3cc3939ad8950a3b7c33a3e15281d370b1731459
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Jun 29 16:12:17 2013 +0200

    Fixes for make dist

 configure.ac                                 | 4 ++--
 data/Makefile.am                             | 2 ++
 docs/reference/libcaja-extension/Makefile.am | 5 +----
 eel/Makefile.am                              | 1 +
 libcaja-private/Makefile.am                  | 2 +-
 po/POTFILES.in                               | 1 +
 6 files changed, 8 insertions(+), 7 deletions(-)

commit 7fb7ef06b5f538eb7fbe5eb5a3d5e4dcb8e7fba7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Jun 29 16:11:52 2013 +0200

    Fix g_type_init deprecation

 src/caja-convert-metadata.c | 2 ++
 1 file changed, 2 insertions(+)

commit d433b647391a28226bfd6fa5e5474c5bbc548c81
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Jun 24 16:02:15 2013 +0200

    Fix URI management
    
    Closes #134 (https://github.com/mate-desktop/mate-file-manager/issues/134)

 src/caja-main.c | 51 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

commit d92c2754681b24ed5afcbb0d9458297e6101254e
Author: Scott Balneaves <sbalneav@mate-desktop.org>
Date:   Tue May 7 20:24:00 2013 -0500

    Fix for #111

 libcaja-private/caja-file.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

commit d116bf8ba8be698869fef81b30d576bcacf3234c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Apr 29 12:41:32 2013 +0200

    Fix for x-caja-desktop windows at login
    Use --no-default-window in Exec field

 data/caja.desktop.in.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2ba883533e92099322f595085d7ce4941226913f
Author: Scott Balneaves <sbalneav@mate-desktop.org>
Date:   Wed Apr 17 09:54:23 2013 -0500

    Possible fix for Issue #111

 libcaja-private/caja-file.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 6daeceae71a22d14893404a2e95bc89112674c69
Author: E.S. Quinn <onetruequinn@hotmail.com>
Date:   Mon Apr 15 17:19:06 2013 -0700

    Made File Browser windows always open folders in the same window,
    even when spatial mode is enabled.

 src/caja-window-manage-views.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit fb44f5ae12331d8ebfd0d6af6c091bced2fa3464
Merge: 4dc7209 2bc333f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Apr 14 13:39:05 2013 -0700

    Merge pull request #108 from dbravender/issue-94-spatial-mode-multiple-windows
    
    Fixes #94 - default for target_navigation needs to be FALSE for spatial mode to work

commit 2bc333f790580a6279b1817270d1fc634da7decf
Author: Dan Bravender <dan.bravender@gmail.com>
Date:   Mon Apr 15 01:37:11 2013 +0900

    Fixes #94 - default for target_navigation needs to be FALSE for spatial mode to work

 src/caja-window-manage-views.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4dc7209110b89326be44b8399ddbb5b4131d12a5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Apr 12 23:14:14 2013 +0200

    Fix default sort order in preferences window
    Closes #106 (https://github.com/mate-desktop/mate-file-manager/issues/106)

 src/caja-file-management-properties.c | 1 -
 1 file changed, 1 deletion(-)

commit 0491e02f9023ec71a12c3b873b7f60e40b01c8fc
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Apr 12 17:30:09 2013 +0200

    Fix radio buttons and GSettings in preferences window
    
    Closes: https://github.com/mate-desktop/mate-file-manager/issues/104
    Patch from: https://git.gnome.org/browse/nautilus/commit/?id=f200bfb

 src/caja-file-management-properties.c | 80 ++++++++++++-----------------------
 1 file changed, 28 insertions(+), 52 deletions(-)

commit aa058adbb8181a301882d82cd215da9752c77c49
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Apr 11 14:31:03 2013 +0200

    Bump version to 1.6.1

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a106e6d11f100f29191f9642f0b142a1b14f3801
Author: Scott Balneaves <sbalneav@mate-desktop.org>
Date:   Wed Apr 10 13:26:43 2013 -0500

    Typo on deprecations webpage.

 libcaja-private/caja-file-changes-queue.c | 14 +++++++-------
 libcaja-private/caja-undostack-manager.c  | 32 +++++++++++++++----------------
 2 files changed, 23 insertions(+), 23 deletions(-)

commit b7a3827fe65212bf9a924101aba93e0d18a4265d
Author: Scott Balneaves <sbalneav@mate-desktop.org>
Date:   Wed Apr 10 13:17:56 2013 -0500

    Update for #93

 libcaja-private/caja-file-changes-queue.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 801f2e3855eb627666dda712802e93d77aafdb89
Author: Scott Balneaves <sbalneav@mate-desktop.org>
Date:   Wed Apr 10 13:12:43 2013 -0500

    Fix for issue #93

 libcaja-private/caja-file-changes-queue.c | 30 +++++++++++++-
 libcaja-private/caja-undostack-manager.c  | 69 ++++++++++++++++++++++++++++++-
 2 files changed, 97 insertions(+), 2 deletions(-)

commit bbc91f27ad719774e51c54c8aba2015e67c63115
Merge: 9722fcc 34eabb5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Apr 10 02:14:46 2013 -0700

    Merge pull request #103 from bhull2010/master
    
    Fix drag rectangle going off the screen (Issue #90)

commit 34eabb5c19d44a838a6fb245267725fb41b70942
Author: Brent Hull <bhull2010@live.com>
Date:   Wed Apr 10 00:03:04 2013 -0400

    Fix drag selection going out of bounds (partial revert of 99f8b5f25192b8593ae337efe7f49c59ff13a3f4)

 libcaja-private/caja-icon-container.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

commit 9722fcc204aee6a7205f9b5b095d1e07e3f48558
Merge: 69fcf78 e4b7236
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Apr 5 02:22:50 2013 -0700

    Merge pull request #95 from cygwinports/master
    
    Build fixes

commit e4b72366305696faf7c378be034e7c4ce3284cfe
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date:   Fri Apr 5 01:37:35 2013 -0500

    Fix vpath build

 eel/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

commit 4761cb125522cab3614d63ac4596a0bcd860d142
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date:   Fri Apr 5 01:29:01 2013 -0500

    Fix gtk-doc build
    
    caja-extension-i18n.h is in IGNORE_HFILES, so it is not scanned and
    no documentation is generated for it.

 docs/reference/libcaja-extension/libcaja-extension-docs.xml | 1 -
 1 file changed, 1 deletion(-)

commit 69fcf78967d1a11388300219da3f44333fee5316
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 31 16:47:12 2013 +0200

    Bump version to 1.6.0

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dc5429773f1e4d3fef6f9159360c715479c03ea7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 31 16:46:32 2013 +0200

    Sync translations with transifex

 po/LINGUAS |    1 +
 po/ky.po   | 7319 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 7320 insertions(+)

commit 55a0d9a066b3cb6729c4832f40bdee4b0467c8c5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 31 16:44:51 2013 +0200

    Use 'Caja' as name in caja-folder-handler.desktop

 data/caja-folder-handler.desktop.in.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 9f4fe9c3666dc703bf668d4e7a5d85fedc82d86b
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 31 16:41:49 2013 +0200

    Add empty ChangeLog to allow build from git

 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

commit 33585f2f358d28f0e8ce176ce15c20c737fc0c51
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Sun Mar 24 16:33:13 2013 -0400

    "Removed ChangeLog"

 ChangeLog | 4842 -------------------------------------------------------------
 1 file changed, 4842 deletions(-)

commit 20b3b2801e693271af36c5e443b83c63741e135d
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sun Mar 17 12:09:30 2013 +0100

    add GenericName to caja desktop file

 data/caja.desktop.in.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit b3dc9bfd30782f38e932e23f5b1a61bc3a6807c5
Author: Wolfgang Ulbrich <chat-to-me@raveit.de>
Date:   Sun Mar 17 11:50:45 2013 +0100

    add GenericName to caja-browser desktop file

 data/caja-browser.desktop.in.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6d9fdfac5e6a4329815c1fbb48edbad36118a7d8
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 10 18:56:33 2013 +0100

    Bump version to 1.5.5

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f20552ecc50f122448c380d028b1d06d2c82240f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 3 18:15:36 2013 +0100

    Sync translations with transifex

 po/af.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/am.po          | 1249 ++++++++++++++++++++++++++--------------------------
 po/ar.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/as.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ast.po         | 1247 +++++++++++++++++++++++++--------------------------
 po/az.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/be.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/bg.po          | 1251 ++++++++++++++++++++++++++--------------------------
 po/bn.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/bn_IN.po       | 1247 +++++++++++++++++++++++++--------------------------
 po/br.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/bs.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ca.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ca@valencia.po | 1247 +++++++++++++++++++++++++--------------------------
 po/crh.po         | 1247 +++++++++++++++++++++++++--------------------------
 po/cs.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/da.po          | 1251 ++++++++++++++++++++++++++--------------------------
 po/de.po          | 1251 ++++++++++++++++++++++++++--------------------------
 po/dz.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/el.po          | 1251 ++++++++++++++++++++++++++--------------------------
 po/en_AU.po       | 1251 ++++++++++++++++++++++++++--------------------------
 po/en_CA.po       | 1247 +++++++++++++++++++++++++--------------------------
 po/en_GB.po       | 1247 +++++++++++++++++++++++++--------------------------
 po/eo.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/es.po          | 1251 ++++++++++++++++++++++++++--------------------------
 po/et.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/eu.po          | 1249 ++++++++++++++++++++++++++--------------------------
 po/fa.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/fi.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/fr.po          | 1250 ++++++++++++++++++++++++++--------------------------
 po/fur.po         | 1247 +++++++++++++++++++++++++--------------------------
 po/fy.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ga.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/gl.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/gu.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ha.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/he.po          | 1251 ++++++++++++++++++++++++++--------------------------
 po/hi.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/hr.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/hu.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/hy.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/id.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ig.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/is.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/it.po          | 1273 +++++++++++++++++++++++++++--------------------------
 po/ja.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ka.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/kk.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/kn.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ko.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ku.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/li.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/lt.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/lv.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/mai.po         | 1247 +++++++++++++++++++++++++--------------------------
 po/mg.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/mk.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ml.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/mn.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/mr.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ms.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/nb.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/nds.po         | 1247 +++++++++++++++++++++++++--------------------------
 po/ne.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/nl.po          | 1253 ++++++++++++++++++++++++++--------------------------
 po/nn.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/nso.po         | 1247 +++++++++++++++++++++++++--------------------------
 po/oc.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/or.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/pa.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/pl.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ps.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/pt.po          | 1250 ++++++++++++++++++++++++++--------------------------
 po/pt_BR.po       | 1247 +++++++++++++++++++++++++--------------------------
 po/ro.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ru.po          | 1251 ++++++++++++++++++++++++++--------------------------
 po/si.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/sk.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/sl.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/sq.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/sr.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/sr@latin.po    | 1247 +++++++++++++++++++++++++--------------------------
 po/sv.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/ta.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/te.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/th.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/tk.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/tr.po          | 1251 ++++++++++++++++++++++++++--------------------------
 po/ug.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/uk.po          | 1249 ++++++++++++++++++++++++++--------------------------
 po/uz.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/vi.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/wa.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/xh.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/yo.po          | 1247 +++++++++++++++++++++++++--------------------------
 po/zh_CN.po       | 1247 +++++++++++++++++++++++++--------------------------
 po/zh_HK.po       | 1247 +++++++++++++++++++++++++--------------------------
 po/zh_TW.po       | 1249 ++++++++++++++++++++++++++--------------------------
 po/zu.po          | 1247 +++++++++++++++++++++++++--------------------------
 99 files changed, 62017 insertions(+), 61518 deletions(-)

commit c1d965ceb53bc91e47b4b944a0c7864ef7cded21
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 3 13:51:41 2013 +0100

    Replace undocumented deprecated g_thread_gettime
    Bump minimum glib version accordingly

 configure.ac                           | 2 +-
 libcaja-private/caja-file-operations.c | 4 ++--
 libcaja-private/caja-icon-info.c       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

commit 25a08e37283fc4c0b4689a3da791a7ad5e23a690
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Feb 27 01:41:00 2013 +0100

    Fix internationalization of desktop icons

 libcaja-private/caja-desktop-link.c          | 54 +++++++++++++++++++++-------
 libcaja-private/org.mate.caja.gschema.xml.in |  6 ++--
 2 files changed, 45 insertions(+), 15 deletions(-)

commit ccb2ddc8fe129cc24759dc673d566583cb3837d5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 24 14:02:04 2013 +0100

    Add transifex configuration file

 .tx/config | 7 +++++++
 1 file changed, 7 insertions(+)

commit 4d06093faeb850af04cf12ddd9c122907b06556c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 24 13:57:40 2013 +0100

    Always select the folder you "came from" when navigating upwards
    Based on nautilus patch by Alexander Larsson
    http://git.gnome.org/browse/nautilus/commit/src/nautilus-window-manage-views.c?h=gnome-3-0&id=2b006f84a06633778e11755e579fafcecbb1b36b
    
    Closes https://github.com/mate-desktop/mate-file-manager/issues/19

 src/caja-window-manage-views.c | 50 +++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 10 deletions(-)

commit 4267c0ed145a1a3dd71a961ff0c6cac9aa50e416
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 24 13:21:26 2013 +0100

    Dont corrupt the default background color

 eel/eel-background.c | 61 ++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 30 deletions(-)

commit d9bca53b7ee374d61f72d4362ce491cc2f7566c5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 24 13:21:00 2013 +0100

    Fix issues with XDG dirs in places sidebar

 src/caja-places-sidebar.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

commit dc1b5569e4e7a3c36ee3440b6c264cf60810afe1
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 24 00:31:33 2013 +0100

    More indentation fixes

 src/caja-places-sidebar.c | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

commit b8114ef456b288f93dc870be5b89cc8e84f40460
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 24 00:22:36 2013 +0100

    Indentation fixes

 src/caja-places-sidebar.c | 847 +++++++++++++++++++++++-----------------------
 1 file changed, 424 insertions(+), 423 deletions(-)

commit c9dd4ede0f4b81b73f71d16acdffe3ac77211654
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Feb 23 22:32:33 2013 +0100

    Update copyright

 src/caja-window-menus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 66c7b2280e965b83c121f45db4b111e2fcba8802
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Feb 23 22:12:57 2013 +0100

    Updated NEWS

 NEWS | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 4a6aa5259aa9d5f49fb0c2a995baafdd0c3d2916
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Feb 23 22:10:25 2013 +0100

    Bump version to 1.5.4

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d1715e4fdef385cea4eda116090311dcff9fcd18
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Feb 23 22:02:09 2013 +0100

    Add support for freedesktop.org File Manager DBus Interface
    http://www.freedesktop.org/wiki/Specifications/file-manager-interface
    Most of code is adapted from Nautilus:
    http://git.gnome.org/browse/nautilus/tree/src/nautilus-freedesktop-dbus.c
    
    Closes https://github.com/mate-desktop/mate-file-manager/issues/3

 data/Makefile.am                                  |   9 +
 data/freedesktop-dbus-interfaces.xml              |  36 ++++
 data/org.mate.freedesktop.FileManager1.service.in |   3 +
 src/Makefile.am                                   |  16 ++
 src/caja-application.c                            |  36 ++++
 src/caja-application.h                            |   5 +-
 src/caja-freedesktop-dbus.c                       | 245 ++++++++++++++++++++++
 src/caja-freedesktop-dbus.h                       |  42 ++++
 8 files changed, 391 insertions(+), 1 deletion(-)

commit e99cd96502845cce688ee4f545eb4a4f2edfb23a
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 17 11:15:22 2013 +0100

    Updated POTFILES.in

 po/POTFILES.in | 1 -
 1 file changed, 1 deletion(-)

commit cffbe9073f80f68c0d3defe72a23861ab639eba0
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 17 11:04:45 2013 +0100

    Check if caja is mistakenly set as default application for a content type, to avoid infinite loops

 src/caja-main.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

commit f4efba80eeca027d782aa408e8ee96c44d5af76c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Feb 15 00:40:27 2013 +0100

    Allow to open files with Caja using g_app_info_launch_default_for_uri
    If there are only files to open, close Caja instead of open a default folder window
    Closes https://github.com/mate-desktop/mate-file-manager/issues/37

 src/caja-main.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

commit 90c877576f3e8d9ba17327e667aadb60bf53012e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Feb 11 11:45:48 2013 +0100

    Fix deprecated GStaticMutex

 libcaja-private/caja-debug-log.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 75a2eaf3719c68f9c0ee9227e5d3117f252fa4d4
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Feb 10 12:00:22 2013 +0100

    Sync translations with transifex

 po/LINGUAS        |    1 +
 po/af.po          | 6857 +++++++++++++++++++++++-------------------------
 po/am.po          | 6299 +++++++++++++++++++++-----------------------
 po/ar.po          | 7585 ++++++++++++++++++++++++++---------------------------
 po/as.po          | 6417 ++++++++++++++++++++++----------------------
 po/ast.po         | 7123 ++++++++++++++++++++++++-------------------------
 po/az.po          | 6117 +++++++++++++++++++++---------------------
 po/be.po          | 7133 ++++++++++++++++++++++++-------------------------
 po/bg.po          | 7114 ++++++++++++++++++++++++-------------------------
 po/bn.po          | 7099 ++++++++++++++++++++++++-------------------------
 po/bn_IN.po       | 7101 ++++++++++++++++++++++++-------------------------
 po/br.po          | 7107 ++++++++++++++++++++++++-------------------------
 po/bs.po          | 6781 +++++++++++++++++++++++------------------------
 po/ca.po          | 6425 ++++++++++++++++++++++-----------------------
 po/ca@valencia.po | 6415 ++++++++++++++++++++++----------------------
 po/crh.po         | 7009 ++++++++++++++++++++++++-------------------------
 po/cs.po          | 6917 +++++++++++++++++++++++-------------------------
 po/da.po          | 6814 +++++++++++++++++++++++------------------------
 po/de.po          | 6464 ++++++++++++++++++++++-----------------------
 po/dz.po          | 6653 +++++++++++++++++++++++-----------------------
 po/el.po          | 6449 ++++++++++++++++++++++-----------------------
 po/en_AU.po       | 7396 +++++++++++++++++++++++++++++++++++++++++++++++++++
 po/en_CA.po       | 6825 +++++++++++++++++++++++------------------------
 po/en_GB.po       | 6417 ++++++++++++++++++++++----------------------
 po/eo.po          | 7003 ++++++++++++++++++++++++-------------------------
 po/es.po          | 6473 ++++++++++++++++++++++-----------------------
 po/et.po          | 6421 ++++++++++++++++++++++-----------------------
 po/eu.po          | 6449 ++++++++++++++++++++++-----------------------
 po/fa.po          | 5675 +++++++++++++++++++--------------------
 po/fi.po          | 6413 ++++++++++++++++++++++----------------------
 po/fr.po          | 6471 ++++++++++++++++++++++-----------------------
 po/fur.po         | 6741 +++++++++++++++++++++++------------------------
 po/fy.po          | 6453 ++++++++++++++++++++++-----------------------
 po/ga.po          | 6909 +++++++++++++++++++++++-------------------------
 po/gl.po          | 6419 ++++++++++++++++++++++-----------------------
 po/gu.po          | 7107 ++++++++++++++++++++++++-------------------------
 po/ha.po          | 6727 +++++++++++++++++++++++------------------------
 po/he.po          | 6469 ++++++++++++++++++++++-----------------------
 po/hi.po          | 7123 ++++++++++++++++++++++++-------------------------
 po/hr.po          | 6835 +++++++++++++++++++++++------------------------
 po/hu.po          | 6417 ++++++++++++++++++++++----------------------
 po/hy.po          | 6731 +++++++++++++++++++++++------------------------
 po/id.po          | 6212 +++++++++++++++++++++----------------------
 po/ig.po          | 6727 +++++++++++++++++++++++------------------------
 po/is.po          | 7113 ++++++++++++++++++++++++-------------------------
 po/it.po          | 7161 ++++++++++++++++++++++++--------------------------
 po/ja.po          | 7045 ++++++++++++++++++++++++-------------------------
 po/ka.po          | 6915 +++++++++++++++++++++++-------------------------
 po/kk.po          | 6293 +++++++++++++++++++++-----------------------
 po/kn.po          | 7019 ++++++++++++++++++++++++-------------------------
 po/ko.po          | 7019 ++++++++++++++++++++++++-------------------------
 po/ku.po          | 6725 +++++++++++++++++++++++------------------------
 po/li.po          | 6539 ++++++++++++++++++++++-----------------------
 po/lt.po          | 6877 +++++++++++++++++++++++-------------------------
 po/lv.po          | 6879 +++++++++++++++++++++++-------------------------
 po/mai.po         | 6785 +++++++++++++++++++++++------------------------
 po/mg.po          | 6753 +++++++++++++++++++++++------------------------
 po/mk.po          | 7075 ++++++++++++++++++++++++-------------------------
 po/ml.po          | 6417 ++++++++++++++++++++++----------------------
 po/mn.po          | 6705 +++++++++++++++++++++++-----------------------
 po/mr.po          | 7099 ++++++++++++++++++++++++-------------------------
 po/ms.po          | 6765 +++++++++++++++++++++++------------------------
 po/nb.po          | 6413 ++++++++++++++++++++++----------------------
 po/nds.po         | 6747 +++++++++++++++++++++++------------------------
 po/ne.po          | 6807 +++++++++++++++++++++++------------------------
 po/nl.po          | 6453 ++++++++++++++++++++++-----------------------
 po/nn.po          | 7099 ++++++++++++++++++++++++-------------------------
 po/nso.po         | 6725 +++++++++++++++++++++++------------------------
 po/oc.po          | 6415 ++++++++++++++++++++++----------------------
 po/or.po          | 7107 ++++++++++++++++++++++++-------------------------
 po/pa.po          | 6417 ++++++++++++++++++++++----------------------
 po/pl.po          | 6879 +++++++++++++++++++++++-------------------------
 po/ps.po          | 6425 ++++++++++++++++++++++-----------------------
 po/pt.po          | 6505 ++++++++++++++++++++++-----------------------
 po/pt_BR.po       | 6421 ++++++++++++++++++++++-----------------------
 po/ro.po          | 6877 +++++++++++++++++++++++-------------------------
 po/ru.po          | 6487 ++++++++++++++++++++++-----------------------
 po/si.po          | 6573 ++++++++++++++++++++++------------------------
 po/sk.po          | 7055 ++++++++++++++++++++++++-------------------------
 po/sl.po          | 7367 +++++++++++++++++++++++++--------------------------
 po/sq.po          | 7067 ++++++++++++++++++++++++-------------------------
 po/sr.po          | 7171 ++++++++++++++++++++++++--------------------------
 po/sr@latin.po    | 7171 ++++++++++++++++++++++++--------------------------
 po/sv.po          | 6419 ++++++++++++++++++++++-----------------------
 po/ta.po          | 7053 ++++++++++++++++++++++++-------------------------
 po/te.po          | 7103 ++++++++++++++++++++++++-------------------------
 po/th.po          | 7017 ++++++++++++++++++++++++-------------------------
 po/tk.po          | 6363 ++++++++++++++++++++++----------------------
 po/tr.po          | 6757 +++++++++++++++++++++++------------------------
 po/ug.po          | 7009 ++++++++++++++++++++++++-------------------------
 po/uk.po          | 7184 ++++++++++++++++++++++++--------------------------
 po/uz.po          | 6823 +++++++++++++++++++++++------------------------
 po/vi.po          | 7019 ++++++++++++++++++++++++-------------------------
 po/wa.po          | 6487 ++++++++++++++++++++++-----------------------
 po/xh.po          | 6723 +++++++++++++++++++++++------------------------
 po/yo.po          | 6727 +++++++++++++++++++++++------------------------
 po/zh_CN.po       | 7019 ++++++++++++++++++++++++-------------------------
 po/zh_HK.po       | 7039 ++++++++++++++++++++++++-------------------------
 po/zh_TW.po       | 6408 ++++++++++++++++++++++----------------------
 po/zu.po          | 6723 +++++++++++++++++++++++------------------------
 100 files changed, 327054 insertions(+), 342477 deletions(-)

commit e21717c7ebc599c196d69d1790c5e36ed0ea140b
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Feb 7 23:38:10 2013 +0100

    Bump version to 1.5.3

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 76d4685df3d256f88f5caf97e3c6d8a75d3f0cb6
Merge: 27bc14a 22dcafe
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Jan 28 01:12:24 2013 -0800

    Merge pull request #77 from bhull2010/master
    
    Fix gsettings schema paths

commit 22dcafe6e4511b8a10f11e410a7bc3ddc833d40a
Author: Brent Hull <bhull2010@live.com>
Date:   Sun Jan 27 15:51:30 2013 -0500

    Fix schema path deprecations

 libcaja-private/org.mate.caja.gschema.xml.in           | 18 +++++++++---------
 libcaja-private/org.mate.media-handling.gschema.xml.in |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

commit 27bc14a1bc78f8cf3d6e4c28a85e810524ed8115
Author: Elan Ruusamäe <glen@delfi.ee>
Date:   Tue Jan 15 18:44:08 2013 +0200

    rename configure.in to configure.ac to be liked by autoconf 1.12
    
    aclocal-1.12: warning: autoconf input should be named 'configure.ac', not 'configure.in'

 autogen.sh   |   2 +-
 configure.ac | 489 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in | 489 -----------------------------------------------------------
 3 files changed, 490 insertions(+), 490 deletions(-)

commit 80e03df2333c8f16f2b73d4c458b42c8c30f05f7
Merge: 3ec2cb1 daefa06
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Jan 5 10:19:04 2013 -0800

    Merge pull request #67 from cygwinports/master
    
    Add mateconf-gsettings-data-convert file

commit daefa06e8b5042c2a745b7762181328a84f37570
Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date:   Tue Dec 25 18:27:19 2012 -0600

    Add mateconf-gsettings-data-convert file

 libcaja-private/Makefile.am  |  4 +++
 libcaja-private/caja.convert | 83 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

commit 3ec2cb1ade8ed91ed472091adcc592485dc49f4d
Merge: 8379b1d c598aa7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Dec 23 11:14:36 2012 -0800

    Merge pull request #65 from jasmineaura/develop
    
    Most of remaining deprecations, some cleanups, and a leak fix

commit c598aa7e65d9e370c63f883acbbb6504044c2531
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Dec 22 06:22:40 2012 +0200

    [configure] Fix minimum GIO really required to 2.26
    
    For g_settings_bind(), though it should've been required before for the
    (now replaced) g_settings_bind_with_mapping() func.

 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7b384b35d0226eed7711f2d1fa0ca04381380d23
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Dec 22 05:37:47 2012 +0200

    [general] Don't use deprecated gdk_drawable_get_size at all
    
    Since we now require GTK 2.24, we can directly use
    gdk_window_get_width(), gdk_window_get_height()

 eel/eel-art-gtk-extensions.c               | 13 -------------
 libcaja-private/caja-tree-view-drag-dest.c |  4 ----
 2 files changed, 17 deletions(-)

commit 558280660418ef9e27e36ddd0619225c691e44b7
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 25 18:34:52 2012 +0200

    [all] silence warnings from GCC 4.6
    
    GCC 4.6 introduced a new warning about variables declared and initialized,
    but not really used in the function body. Remove all of these occurrences
    to build cleanly.
    http://git.gnome.org/browse/nautilus/commit/?id=d4230de8667764e02dbb966b5d806ff78ced2fd5

 eel/eel-canvas-rect-ellipse.c                | 20 -------------------
 eel/eel-canvas.c                             |  5 -----
 libcaja-private/caja-clipboard.c             |  3 ---
 libcaja-private/caja-desktop-icon-file.c     |  6 ------
 libcaja-private/caja-directory-async.c       |  3 ---
 libcaja-private/caja-directory.c             |  2 --
 libcaja-private/caja-entry.c                 |  5 -----
 libcaja-private/caja-file-conflict-dialog.c  |  5 +----
 libcaja-private/caja-file-operations.c       |  9 +--------
 libcaja-private/caja-icon-canvas-item.c      | 15 +-------------
 libcaja-private/caja-icon-container.c        | 29 +++++-----------------------
 libcaja-private/caja-icon-dnd.c              | 11 +++++------
 libcaja-private/caja-saved-search-file.c     |  3 ---
 libcaja-private/caja-search-directory-file.c |  8 --------
 libcaja-private/caja-vfs-directory.c         |  5 -----
 libcaja-private/caja-vfs-file.c              |  4 ----
 src/caja-application.c                       |  5 -----
 src/caja-navigation-window-slot.c            |  4 ----
 src/caja-navigation-window.c                 | 14 --------------
 src/caja-pathbar.c                           | 12 ------------
 src/caja-query-editor.c                      |  3 ---
 src/caja-window-manage-views.c               | 22 ++-------------------
 src/caja-window.c                            |  3 ---
 src/file-manager/fm-directory-view.c         | 14 ++++----------
 src/file-manager/fm-icon-view.c              |  2 --
 src/file-manager/fm-list-view.c              |  8 +-------
 src/file-manager/fm-properties-window.c      |  4 +---
 src/file-manager/fm-tree-model.c             |  9 ---------
 src/file-manager/fm-tree-view.c              |  4 ----
 29 files changed, 21 insertions(+), 216 deletions(-)

commit ab206cf53ff4380c63f031101c36b6bc0c7a8489
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Oct 29 04:21:19 2012 +0200

    [places-sidebar] plug leak in _dispose, add g_clear_object in glibcomat.h
    
    to cleanup code a bit.
    
    http://git.gnome.org/browse/nautilus/commit/?id=c6fa6b2062a1adf3e4945824048b3771edb35ebe
    
    for g_clear_object compatibility:
    https://gitorious.org/vaapi/gstreamer-vaapi/commit/ab2ec5e2541834c2490a78ec839850df2b075cf5?format=diff

 src/caja-places-sidebar.c | 20 +++++---------------
 src/glibcompat.h          | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 15 deletions(-)

commit f5f249b7e2bb2206222ce5d0ae4ed95d8e99b8c2
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sun Oct 28 12:08:55 2012 +0200

    [fm-properties] Use G_SETTINGS_BIND_INVERT_BOOLEAN where appropriate
    
    http://git.gnome.org/browse/nautilus/commit/?id=df382f58d0ec2a1b779cf80048ad70944c8859df

 src/caja-file-management-properties.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

commit cbd664b1fb9409b6500fb36f3d051ab100ffc828
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Oct 29 17:44:02 2012 +0200

    [eel] Use future-safe GDK_WINDOW_XDISPLAY macro to query X display
    
    http://git.gnome.org/browse/nautilus/commit/?id=8cb07ccf2ddcf0cb8557c763f8905558d67736de

 eel/eel-canvas-rect-ellipse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ea7fa744d4c0d698c99c37372c98c52643381cce
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Oct 29 17:39:30 2012 +0200

    [lc-p] remove unnecessary GDK_DRAWABLE cast
    
    http://git.gnome.org/browse/nautilus/commit/?id=c2c4076ceb2216ff5e696b4e78aeb63e0f86c437

 libcaja-private/caja-icon-dnd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 46af99b44e1d2f4fc3315753bcc46f78476de823
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sun Oct 28 12:02:37 2012 +0200

    [general] Use GSourceFunc instead of GtkFunction
    
    http://git.gnome.org/browse/nautilus/commit/?id=a5caa0e98c844a23656cafaa9b6f985dada7bc51

 libcaja-private/caja-dnd.c            | 2 +-
 libcaja-private/caja-dnd.h            | 2 +-
 libcaja-private/caja-icon-container.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 02affdac18a1e985b1d4cee084b3e713904ce307
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sun Oct 28 11:27:40 2012 +0200

    [desktop-icon-view] don't use eel helper to set adjustment values
    
    http://git.gnome.org/browse/nautilus/commit/?id=8b4271f5ad62d00b76d7e34a594c9b1819eb495e

 src/file-manager/fm-desktop-icon-view.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 99f8b5f25192b8593ae337efe7f49c59ff13a3f4
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sun Oct 28 11:26:18 2012 +0200

    [icon-container] don't use eel helper to set adjustment values
    
    http://git.gnome.org/browse/nautilus/commit/?id=3a9c6cd783507cc2fbd0a838cd6710f74e7f17dd

 libcaja-private/caja-icon-container.c | 100 +++++++++++-----------------------
 1 file changed, 33 insertions(+), 67 deletions(-)

commit d127246c379859fbb890c382dc75e521848cbda7
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sun Oct 28 11:16:08 2012 +0200

    [eel] remove commented out canvas code

 eel/eel-canvas.c | 5 -----
 1 file changed, 5 deletions(-)

commit 32a2dfb6b461b29edbba044fcf93362547f3e331
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Dec 22 04:25:23 2012 +0200

    [property-browser] remove deprecated gtk_dialog_set_has_separator

 src/caja-property-browser.c | 1 -
 1 file changed, 1 deletion(-)

commit 8379b1dc107c9e0daf31ef1b654c9ab44d9bac23
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Dec 12 23:45:27 2012 +0100

    update README.commits

 README.commits | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit c4ccba6237c05be2335ee3b35f3328858208ccc7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Dec 3 23:30:01 2012 +0100

    bump version to 1.5.2

 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 6b7becac1a91cccf4ce93f68a006f8c3696f6622
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Dec 3 23:29:17 2012 +0100

    add Jasmine Hassan in authors

 AUTHORS                 | 3 ++-
 src/caja-window-menus.c | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

commit a7aa069036f960a37cc6149ecdceab917dffa7a0
Merge: 12908bc 2665b68
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Dec 3 14:20:22 2012 -0800

    Merge pull request #63 from jasmineaura/develop
    
    Bring Caja up to speed, stage2

commit 2665b684fda835cfa6a485b6e2c8c0a98190facb
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Dec 3 21:59:35 2012 +0200

    [eel-background] remove debug messages prev added to screen_size_changed
    
    The issue that was being debugged (crashes on VM window resize) is now fixed.

 eel/eel-background.c | 17 -----------------
 1 file changed, 17 deletions(-)

commit df3d039e68b2d2bc5a3a8ec6cb1c97483096bc6b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 27 16:17:45 2012 +0200

    [eel-background] Make the desktop background fading effect optional
    
    By checking new mate-bg (global) "background-fade" setting key before
    initiating a fade.
    
    This is hopefully useful for those running on older hardware, as the fading
    effect could delay login/startup a bit.
    
    For reference, see:
    https://bugzilla.gnome.org/show_bug.cgi?id=623174

 eel/eel-background.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 01c34579453893b76849400c9375dcc67c44622f
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 29 19:39:28 2012 +0200

    [global-prefs|application] use MATE global 'show-desktop-icons' setting
    
    instead of a local-to-caja setting 'show-desktop'
    
    This key would indicate that file managers (by default Caja, but applies to
    others like Thunar or ROX) should handle desktop, i.e. draw a background and
    place icons there. Otherwise (when false), mate-settings-daemon will take
    over drawing desktop background.
    
    This is different from 'draw-background', which is a separate option used
    only for drawing background without icons (by mate-settings-daemon).
    To Caja, 'show-desktop-icons' implies 'draw-background', and so if set to
    false, Caja won't (needlessly) draw the desktop.
    However, if the user uses the "Background & Emblems dialog" to drop an
    image-pattern/color/reset on the desktop, Caja will again draw the desktop.
    
    For reference:
    https://bugzilla.gnome.org/show_bug.cgi?id=632225

 libcaja-private/caja-global-preferences.h    | 106 +++++++++++++--------------
 libcaja-private/org.mate.caja.gschema.xml.in |   5 --
 src/caja-application.c                       |   9 ++-
 3 files changed, 58 insertions(+), 62 deletions(-)

commit 532fbb1ce6bf446c8c5e40f8a49abc3e450a65d0
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 28 01:33:08 2012 +0200

    [directory-bg] rewrite/refactor, untangle directory & desktop bg-setting code
    
    - Fixes crashes when resizing a VM window in VirtualBox.
    - Adds a method to allow handling desktop reset.

 libcaja-private/caja-directory-background.c | 741 +++++++++-------------------
 libcaja-private/caja-directory-background.h |  15 +-
 src/file-manager/fm-icon-view.c             |   7 +-
 3 files changed, 250 insertions(+), 513 deletions(-)

commit 4ca41b3e2371f706dd129bd8938a55cf2e421ad8
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 26 19:16:22 2012 +0200

    [eel-background] refactor to untangle directory & desktop bg-setting code

 eel/eel-background-box.c        |    2 +-
 eel/eel-background.c            | 1422 ++++++++++++++++++---------------------
 eel/eel-background.h            |  102 +--
 libcaja-private/caja-icon-dnd.c |   22 +-
 src/caja-information-panel.c    |   30 +-
 5 files changed, 742 insertions(+), 836 deletions(-)

commit 83a8343b64850c98e5e650ee464e12d71fb595b8
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sun Nov 25 07:52:05 2012 +0200

    [eel-background] make sure screen size actually changed before emmitting signal
    
    that is, APPEARANCE_CHANGED signal.
    
    Also, add a verbose message to know when the signal is about to be emitted,
    hopefully to aid id debugging a 'BadPixmap (invalid Pixmap parameter)'
    error & crash when resizing VM window in VirtualBox (4.2.4-81684 as of date).

 eel/eel-background.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

commit 12908bcb598233adabd7492d92efdda3d2cbc47c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Dec 1 00:46:40 2012 +0100

    fix caja/nautilus rename
    
    close https://github.com/mate-desktop/mate-file-manager/issues/58

 libcaja-private/org.mate.caja.gschema.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit ce8b3b314a0167bfbb347b2365c8e0eafa825fef
Author: Nelson Marques <nmo.marques@gmail.com>
Date:   Sun Nov 25 01:29:34 2012 +0000

    fix previous commit

 src/caja-window.c | 1 -
 1 file changed, 1 deletion(-)

commit b09188cc05463cdc54f4fbcf8d478ae471092179
Author: Nelson Marques <nmo.marques@gmail.com>
Date:   Sun Nov 25 00:52:02 2012 +0000

    fix no-return-in-nonvoid-function caja-window.c

 src/caja-window.c | 2 ++
 1 file changed, 2 insertions(+)

commit f6f5c1bb6d060aff5fb334017c640733675c2ae2
Merge: cbfe84e ae06676
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Nov 23 03:09:17 2012 -0800

    Merge pull request #56 from jasmineaura/develop
    
    [all] add and use glibcompat.h for glib-2.27.2 forward-compat

commit ae06676815e24a27549e0c79a74bc81c77822554
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Nov 23 11:58:30 2012 +0200

    [src] fix some incompatible pointer type warnings
    
    including a silly mistake in caja-window where destroy function's return type
    was accidently ommitted during the addition of gtk version checks.

 src/caja-application.c                  |  6 +++++-
 src/caja-window.c                       | 12 +++++++-----
 src/file-manager/fm-list-view.c         |  2 +-
 src/file-manager/fm-properties-window.c |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

commit b00cccb74307a49df74deb785936e3cd9cf3a5ad
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Nov 23 11:18:34 2012 +0200

    [all] include src/glibcompat.h & use g_list_free_full() where needed
    
    Also fixes a double-free regression in lc-p/caja-query from 7a42b9b0

 eel/eel-glib-extensions.c                       | 17 +++++-----
 libcaja-private/caja-autorun.c                  |  5 +--
 libcaja-private/caja-clipboard.c                |  5 +--
 libcaja-private/caja-customization-data.c       |  8 ++---
 libcaja-private/caja-debug-log.c                |  5 +--
 libcaja-private/caja-directory-async.c          | 23 ++++++--------
 libcaja-private/caja-directory.c                | 23 ++++++--------
 libcaja-private/caja-dnd.c                      |  9 +++---
 libcaja-private/caja-emblem-utils.c             |  5 +--
 libcaja-private/caja-file-changes-queue.c       | 17 +++++-----
 libcaja-private/caja-file-dnd.c                 |  5 +--
 libcaja-private/caja-file-operations.c          | 26 ++++++----------
 libcaja-private/caja-file-utilities.c           |  5 +--
 libcaja-private/caja-file.c                     | 29 +++++++----------
 libcaja-private/caja-icon-canvas-item.c         |  8 ++---
 libcaja-private/caja-icon-container.c           |  5 +--
 libcaja-private/caja-merged-directory.c         |  5 +--
 libcaja-private/caja-mime-actions.c             | 11 +++----
 libcaja-private/caja-mime-application-chooser.c |  5 +--
 libcaja-private/caja-open-with-dialog.c         |  5 +--
 libcaja-private/caja-program-choosing.c         | 14 ++++-----
 libcaja-private/caja-query.c                    |  7 ++---
 libcaja-private/caja-search-engine-beagle.c     |  5 +--
 libcaja-private/caja-search-engine-simple.c     | 11 +++----
 libcaja-private/caja-search-engine-tracker.c    |  7 ++---
 libcaja-private/caja-undostack-manager.c        | 32 ++++++++-----------
 src/caja-application.c                          | 12 +++-----
 src/caja-bookmark-list.c                        |  5 +--
 src/caja-emblem-sidebar.c                       |  5 +--
 src/caja-history-sidebar.c                      |  5 +--
 src/caja-information-panel.c                    |  5 +--
 src/caja-navigation-window-slot.c               |  8 ++---
 src/caja-pathbar.c                              |  5 +--
 src/caja-places-sidebar.c                       |  5 +--
 src/caja-property-browser.c                     | 11 +++----
 src/caja-query-editor.c                         |  5 +--
 src/caja-spatial-window.c                       |  5 +--
 src/caja-trash-bar.c                            |  5 +--
 src/caja-window-manage-views.c                  | 20 +++++-------
 src/caja-window-slot.c                          |  5 +--
 src/caja-window.c                               | 14 ++++-----
 src/file-manager/fm-directory-view.c            | 41 +++++++++----------------
 src/file-manager/fm-list-model.c                | 10 +++---
 src/file-manager/fm-list-view.c                 | 11 +++----
 src/file-manager/fm-properties-window.c         | 32 ++++++++-----------
 src/file-manager/fm-tree-model.c                |  5 +--
 src/file-manager/fm-tree-view.c                 | 11 +++----
 47 files changed, 234 insertions(+), 288 deletions(-)

commit b12a7f6ea3309ecddfc7e3ae839a7b558c862533
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Nov 23 11:16:18 2012 +0200

    [src] add glibcompat.h for glib-2.27.2 forward-compatability
    
    to use g_list_free_full() directly

 src/Makefile.am  |  1 +
 src/glibcompat.h | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

commit cbfe84ee50d01e523472a8e086add01245fad6bb
Merge: c5d3931 c7862d8
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Thu Nov 22 19:35:40 2012 -0800

    Merge pull request #55 from jasmineaura/develop
    
    [directory-view] fix double-free regression from 7a42b9b0

commit c7862d8bc2f25b627aab3d51577feaabb023a70e
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Nov 23 05:04:19 2012 +0200

    [directory-view] fix double-free regression from 7a42b9b0

 src/file-manager/fm-directory-view.c | 2 --
 1 file changed, 2 deletions(-)

commit c5d3931543c2314a7c156045fd21805cc1ab8ddf
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Thu Nov 22 21:35:08 2012 -0500

    Preparing for 1.5.1 release.

 ChangeLog    | 3430 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |    2 +-
 2 files changed, 3431 insertions(+), 1 deletion(-)

commit 3440a78e6e368a954412ad07d61dcf4e1f467da3
Merge: 7abcfff b731a83
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Wed Nov 21 16:22:04 2012 -0800

    Merge pull request #52 from jasmineaura/develop
    
    [eel-background] missed g_strdup in previous commit 3ba2c5e4

commit b731a8377c5d09ae4b81e43ec5ee605dcbcfa84f
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 22 02:15:01 2012 +0200

    [eel-background] missed g_strdup in previous commit 3ba2c5e4

 eel/eel-background.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7abcfff070982c49c554749d28706f58c7fde948
Merge: 4f762cd 3ba2c5e
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Wed Nov 21 06:49:13 2012 -0800

    Merge pull request #51 from jasmineaura/develop
    
    [eel-background] fix gradient support of color-drops (#49)

commit 3ba2c5e4fada787852a0b7db4722b578fa297aa8
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 21 12:55:15 2012 +0200

    [eel-background] use GtkStyle's bg color when no custom one is set
    
    this fixes #49 "Gradients-support of color-drops broken since 1.2"

 eel/eel-background.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

commit 4f762cdecf92c6391b27930456e40a703ea880f8
Merge: 49c5ca8 55f7b8c
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Tue Nov 20 19:23:06 2012 -0800

    Merge pull request #50 from jasmineaura/develop
    
    eel-bg and lc-p rendering-cleanup followups, eel-bg-box rendering-cleanup

commit 55f7b8caf97f3eb0da4dcc1a36e4c0ba0ed200d2
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 21 01:14:18 2012 +0200

    [background-box] use expose-event for GTK2, draw for GTK3

 eel/eel-background-box.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

commit c4e2b5d53b82c9f82099d8e6c89a82f88458f223
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 19 14:59:33 2012 +0200

    [lc-p] revise rendering-cleanup commit 2a4433a562
    
    mainly, in icon-dnd, in drag_begin_callback, CajaIconContainer was only declared
    for GTK2. Also, replace some deprecated gdk_drawable_get(size|screen) calls, and
    remove some unnecessary GDK_DRAWABLE casts.
    Also, in icon-canvas-item, in draw_label_text, missed ommitting a NULL parameter
    to gtk_paint_focus, for GTK3.

 libcaja-private/caja-icon-canvas-item.c | 16 +++++++++-------
 libcaja-private/caja-icon-container.c   |  4 +---
 libcaja-private/caja-icon-dnd.c         | 27 +++++++--------------------
 3 files changed, 17 insertions(+), 30 deletions(-)

commit d35f6594100ab023839c3c6ac9350adfd107f105
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 20 07:21:57 2012 +0200

    [sidebar-title] fix minor styling regression from 638df47e
    
    1. Actually return if the widget isn't realized, not the other way around.
    2. install the style properties (in class_init) before trying to use them
    in _select_text_color().
    
    This was basically adapted from code in lc-p/icon-container

 src/caja-sidebar-title.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

commit 71d1fdacecc445e7d8ca277422cf85ddd476bf7d
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 20 06:24:26 2012 +0200

    [eel-background] fix minor _expose regression from b5f9a6c8

 eel/eel-background.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 49c5ca823b2e18ac7524bb733f84c3549b8f359c
Merge: 4e9ac51 b5f9a6c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Nov 19 03:31:22 2012 -0800

    Merge pull request #45 from jasmineaura/develop
    
    [eel-background] drawable deprecations (GTK2), rendering-cleanup (GTK3)

commit b5f9a6c811da63f5c4aca18f05cb207783a7beea
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Nov 17 12:17:42 2012 +0200

    [eel-background] drawable deprecations (GTK2), rendering-cleanup (GTK3)
    
    1. Don't use gdk_drawable_get_display (deprecated in 2.24)
    
    2. Use GDK_PIXMAP_XDISPLAY(pixmap) directly instead of
    GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(GDK_DRAWABLE (pixmap)))
    
    3. Don't require GTK3 for stuff in GTK2.24, which we now require, and
    don't use gdk_drawable_get_size at all. So, use (i/o = instead of):
    gdk_window_get_width|height i/o gdk_drawable_get_size
    gdk_window_get_screen       i/o gdk_drawable_get_screen
    gdk_window_get_visual       i/o of gdk_drawable_get_visual
    
    4. add eel_background_draw for GTK3, eel_background_expose for GTK2
    This was removed in nautilus (after eel-background-box was removed):
    http://git.gnome.org/browse/nautilus/commit/?id=87eb53a0701252607b494f34c677b6506f82278c
    
    5. background: port to rendering-cleanup & cope with renamings of gnome-bg APIs
    http://git.gnome.org/browse/nautilus/commit/?id=0b664aae4090704fa2e44d42f213da2cea8bd828
    http://git.gnome.org/browse/nautilus/commit/?id=426079ef07d5f902911f30b0a9d7de95f3020374
    
    6. Fix remaining issue #41: crashes w/ gdk_x_error BadPixmap when changing screen resolution
    Remove eel_background_get_pixmap_and_color(), and use the pixmap/surface & color properties
    in background->details directly, when needed. i.e. No more g_object/surface referencing.
    And call eel_background_ensure_realized() and make_color_inactive() where appropriate.

 eel/eel-background.c | 289 ++++++++++++++++++++++-----------------------------
 eel/eel-background.h |  71 +++++++------
 2 files changed, 162 insertions(+), 198 deletions(-)

commit 4e9ac513b2deed3e884eb289809017e51831beed
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Sun Nov 18 17:05:11 2012 -0500

    fixed incorrect fsf addresses.

 libcaja-private/caja-desktop-metadata.c | 4 ++--
 libcaja-private/caja-desktop-metadata.h | 4 ++--
 src/caja-connect-server-operation.c     | 4 ++--
 src/caja-connect-server-operation.h     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

commit dc66bc40724191f0068869773576dc4edf042c6f
Merge: 935e1fe 1466df2
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Nov 16 05:08:48 2012 -0800

    Merge pull request #42 from jasmineaura/develop
    
    Bring Caja up to speed, stage1

commit 1466df20591105550738a1d0784a623af9909abf
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Nov 10 11:28:29 2012 +0200

    [navigation-window] Use gtk_paned_new for GTK3 instead of gtk_[h|v]paned_new
    
    http://git.gnome.org/browse/nautilus/commit/?id=0609431a5cb3803d0b98bd333f90e3c7796f86b7

 src/caja-navigation-window.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 48cc04df5933644ade234ce16ac8a6ee817bb867
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Nov 10 11:22:51 2012 +0200

    [eel] remove eel_gdk_pixbuf_list_ref()
    
    But unlike upstream commit below, not removing include eel-art-extensions.h
    from eel-gdk-pixbuf-extensions.h, as we still have functions in the latter
    using eel_irect_* (from eel-art-extensions), which are still used by the
    eel-debug-drawing we kept around.
    
    http://git.gnome.org/browse/nautilus/commit/?id=7dee3226ad6b3aa1c782cc3d2969e32c5eeae3f3

 eel/eel-gdk-pixbuf-extensions.c         | 12 ------------
 eel/eel-gdk-pixbuf-extensions.h         |  4 ----
 libcaja-private/caja-icon-canvas-item.c |  3 +--
 3 files changed, 1 insertion(+), 18 deletions(-)

commit 639c9137b77557f38946d6dc174772554343da47
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 11:29:02 2012 +0200

    [eel] remove unused eel_get_filename_charset()
    
    http://git.gnome.org/browse/nautilus/commit/?id=00c0b9daa2053a110e17c64fb79ce4884290dc76

 eel/eel-glib-extensions.c | 98 -----------------------------------------------
 eel/eel-glib-extensions.h |  3 --
 2 files changed, 101 deletions(-)

commit eb0fb3845bd7a6f3b566c454d16b6f7cd287ef9c
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 11:25:15 2012 +0200

    [eel] remove eel_gtk_widget_set_shown()
    
    http://git.gnome.org/browse/nautilus/commit/?id=31dfbdc19075ddf92b4f04a2f84e3111c3fb429b

 eel/eel-gtk-extensions.c | 22 ----------------------
 eel/eel-gtk-extensions.h |  3 ---
 2 files changed, 25 deletions(-)

commit f5b61ba409db5976bcc5be71accaac57ea88fcd0
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 11:21:40 2012 +0200

    [places-sidebar] use gtk_widget_set_visible() instead of the eel helper
    
    http://git.gnome.org/browse/nautilus/commit/?id=bb145a018a9d66b748971e40be4e09a7f843b2be

 src/caja-places-sidebar.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

commit 7a42b9b076d6b831c89bd0b9e996368c1c95aef3
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 10:30:31 2012 +0200

    [all] use g_list_free() and g_strcmp0 instead of eel functions
    
     Was: general: use g_list_free_full() instead of eel functions
     http://git.gnome.org/browse/nautilus/commit/?id=5e669515fd7f760382e6b7aa1449734a35a2d7f4
     .
     Instead of g_list_free_full(), we use g_list_foreach and g_list_free() to avoid
     unnecessary glib dependency bump to 2.28

 eel/eel-gdk-pixbuf-extensions.c                 | 12 ---
 eel/eel-gdk-pixbuf-extensions.h                 |  2 -
 eel/eel-glib-extensions.c                       | 97 +++----------------------
 eel/eel-glib-extensions.h                       | 14 ----
 libcaja-private/caja-autorun.c                  |  4 +-
 libcaja-private/caja-bookmark.c                 |  4 +-
 libcaja-private/caja-clipboard.c                | 19 ++---
 libcaja-private/caja-customization-data.c       | 12 +--
 libcaja-private/caja-debug-log.c                |  4 +-
 libcaja-private/caja-directory-async.c          | 22 ++++--
 libcaja-private/caja-directory.c                | 19 +++--
 libcaja-private/caja-dnd.c                      |  7 +-
 libcaja-private/caja-emblem-utils.c             |  4 +-
 libcaja-private/caja-file-changes-queue.c       | 16 ++--
 libcaja-private/caja-file-dnd.c                 |  4 +-
 libcaja-private/caja-file-operations.c          | 24 ++++--
 libcaja-private/caja-file-utilities.c           |  3 +-
 libcaja-private/caja-file.c                     | 28 ++++---
 libcaja-private/caja-icon-canvas-item.c         | 10 ++-
 libcaja-private/caja-icon-container.c           |  7 +-
 libcaja-private/caja-merged-directory.c         |  3 +-
 libcaja-private/caja-mime-actions.c             |  9 ++-
 libcaja-private/caja-mime-application-chooser.c |  8 +-
 libcaja-private/caja-open-with-dialog.c         |  4 +-
 libcaja-private/caja-program-choosing.c         | 14 ++--
 libcaja-private/caja-progress-info.c            | 10 +--
 libcaja-private/caja-query.c                    |  5 +-
 libcaja-private/caja-search-engine-beagle.c     |  4 +-
 libcaja-private/caja-search-engine-simple.c     | 10 ++-
 libcaja-private/caja-search-engine-tracker.c    |  4 +-
 libcaja-private/caja-undostack-manager.c        | 25 ++++---
 src/caja-application.c                          |  3 +-
 src/caja-bookmark-list.c                        |  9 ++-
 src/caja-emblem-sidebar.c                       |  5 +-
 src/caja-history-sidebar.c                      |  5 +-
 src/caja-information-panel.c                    |  3 +-
 src/caja-navigation-window-slot.c               |  6 +-
 src/caja-notes-viewer.c                         |  5 +-
 src/caja-pathbar.c                              |  9 +--
 src/caja-places-sidebar.c                       |  7 +-
 src/caja-property-browser.c                     | 10 ++-
 src/caja-query-editor.c                         |  4 +-
 src/caja-spatial-window.c                       |  4 +-
 src/caja-trash-bar.c                            |  3 +-
 src/caja-window-manage-views.c                  | 22 ++++--
 src/caja-window-slot.c                          |  3 +-
 src/caja-window.c                               | 11 +--
 src/file-manager/fm-directory-view.c            | 38 +++++++---
 src/file-manager/fm-list-model.c                | 11 +--
 src/file-manager/fm-list-view.c                 |  6 +-
 src/file-manager/fm-properties-window.c         | 35 +++++----
 src/file-manager/fm-tree-model.c                |  4 +-
 src/file-manager/fm-tree-view.c                 | 11 +--
 53 files changed, 302 insertions(+), 320 deletions(-)

commit decb73c787a2709f977305a4a6da052227d7b37d
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 08:42:47 2012 +0200

    [editable-label] don't use deprecated size_request vfunc
    
    http://git.gnome.org/browse/nautilus/commit/?id=12c7a03bfe3c49078cb5b44ff2651eb9ce1edce4

 eel/eel-editable-label.c | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

commit cb95554ed52fc0c5d996de6ae821999d92e15b65
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 08:36:39 2012 +0200

    [window] don't use deprecated size_request vfunc
    
    http://git.gnome.org/browse/nautilus/commit/?id=b532d0d9290d1731203d971e7c679979265f0a43

 src/caja-window.c | 74 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 17 deletions(-)

commit 743a7522519fb3c3ac69dae3789d4f0873252779
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 08:25:46 2012 +0200

    [icon-container] remove size_request vfunc impl
    
    It doesn't seem to do anything useful.
    http://git.gnome.org/browse/nautilus/commit/?id=1cdd0b41bf9de69a93cb166636d7eccff9f5355f

 libcaja-private/caja-icon-container.c | 10 ----------
 1 file changed, 10 deletions(-)

commit 7ec82bee955b65550ce806186c7f01070170e2de
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 08:22:02 2012 +0200

    [pathbar] don't use deprecated size_request vfunc
    
    http://git.gnome.org/browse/nautilus/commit/?id=22cb1accd98c1ae10938eac10cc6beda8fb6b145

 src/caja-pathbar.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 186 insertions(+), 13 deletions(-)

commit 5ee6f114f83b68d02e7d5b723090f1dfe8c443ca
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 06:40:35 2012 +0200

    [general] use new GtkScrollable interface
    
    http://git.gnome.org/browse/nautilus/commit/?id=d811553a4e74106efdf8bf6c91c6d29944ed6df7
    
    canvas: use GTK_LAYOUT casts instead of going through the parent struct
    http://git.gnome.org/browse/nautilus/commit/?id=2260005986d8c620669e56c4b9f2fba12e8e0625

 eel/eel-canvas.c                           | 54 +++++++++++++++++-------------
 libcaja-private/caja-icon-container.c      | 52 +++++++++++++++-------------
 libcaja-private/caja-icon-dnd.c            | 42 +++++++++++++++--------
 libcaja-private/caja-tree-view-drag-dest.c |  4 +--
 src/file-manager/fm-desktop-icon-view.c    | 10 ++++--
 5 files changed, 98 insertions(+), 64 deletions(-)

commit b7f2233c06be6506e6913fcd02ae9c9e2183c9d3
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 19:42:49 2012 +0200

    [fm-properties] use GtkComboBoxText in the GtkBuilder file
    
    http://git.gnome.org/browse/nautilus/commit/?id=18fc6dd2516f9091570902640032e68b263cfddf
    
    Also include subsequent commit:
    preferences: cleanup expand/fill flags
    Probably a change in GTK+ requires fixing this flags, so that the
    dialog doesn't look odd.
    http://git.gnome.org/browse/nautilus/commit/?id=6669f155734c320617bcf79f3b5d8f315f4886f9

 src/caja-file-management-properties.ui | 247 +++++++++------------------------
 1 file changed, 69 insertions(+), 178 deletions(-)

commit 345bf975a496493161baf455af07977d57cbf709
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 25 14:13:07 2012 +0200

    [src] replace deprecated GtkComboBox text APIs with GtkComboBoxText
    
    [src] don't use GtkComboBox text APIs (#632651)
    They got replaced by GtkComboBoxText. Thanks to Mathias Clasen and Flo Gravo.
    http://git.gnome.org/browse/nautilus/commit/?id=f123f99bee1005cd279783f9d441f538fcf85542

 src/caja-file-management-properties.c   | 21 +++++++++++----------
 src/caja-query-editor.c                 |  4 ++--
 src/caja-view-as-action.c               |  8 ++++----
 src/file-manager/fm-properties-window.c | 10 +++++-----
 4 files changed, 22 insertions(+), 21 deletions(-)

commit bd5fe64bb5ec8a9cdca866d7bc78baf8f725a9f9
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 17:39:45 2012 +0200

    [image-properties-page] call gdk_pixbuf_loader_close() earlier
    
    This helps smaller images (>8192 bytes) to signal size_prepared before
    reading image geometry. (#558267)
    http://git.gnome.org/browse/nautilus/commit/?id=d3ab8e137ae957e5afef54bf0ec1e275b96caab5

 src/caja-image-properties-page.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

commit 01a922551d410ecb11e4eb1477cfe3f33bff3491
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 7 01:54:48 2012 +0200

    [column-utilities] fix a TODO about a missing description string
    
    http://git.gnome.org/browse/nautilus/commit/?id=0f8dcf2ac394121c488afdf0fecc2b7afeb673b6

 libcaja-private/caja-column-utilities.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 29bf2205fbea100f3b799560a4d5b4ffece1ac53
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 7 01:53:16 2012 +0200

    [column-utilities] disable SELinux column if !HAVE_SELINUX
    
    http://git.gnome.org/browse/nautilus/commit/?id=b0550951f461c2033f4d1aaa4404078c7a70f220

 libcaja-private/caja-column-utilities.c | 2 ++
 1 file changed, 2 insertions(+)

commit 43dad9d04402b97de8440366d03d43dbe954528a
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 7 01:50:57 2012 +0200

    [icon-view] if possible, use the local path for the preview
    
    This solves issues where the audio previewer is not capable of
    understanding some GVfs URIs. (#624841)
    http://git.gnome.org/browse/nautilus/commit/?id=ebcbb167876f8b4491af0bc86bc29015c211b3af

 src/file-manager/fm-icon-view.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

commit aa6696e05a7c2614eccde660bf06554735ace3e2
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 7 01:43:35 2012 +0200

    [horizontal-splitter] remove, and use a regular GtkPaned instead
    
    The feature it was bringing in (shrink when the paned handle is
    double-clicked) is even confusing.
    http://git.gnome.org/browse/nautilus/commit/?id=1620bd8a4e4ab1760c5c518dd954a4471645ce87

 libcaja-private/Makefile.am                |   2 -
 libcaja-private/caja-horizontal-splitter.c | 307 -----------------------------
 libcaja-private/caja-horizontal-splitter.h |  76 -------
 src/caja-navigation-window.c               |   8 +-
 src/caja-spatial-window.c                  |   1 -
 src/caja-window.c                          |   1 -
 6 files changed, 4 insertions(+), 391 deletions(-)

commit add2dd8b06d33c6c9cb73b1fdcccf66e81ae2749
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 04:07:00 2012 +0200

    [editable-label] fix cairo drawing regressions
    
    http://git.gnome.org/browse/nautilus/commit/?id=407666719856127547f5c2f3f03f6a050858239a

 eel/eel-editable-label.c | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

commit 767734608e245a3a6684e1087fa9e11280296004
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 03:51:08 2012 +0200

    [cell-renderer-text-ellipsized] use new GtkSizeRequest vfunctions
    
    This fixes the 'Name' column being too thin in list view.
    http://git.gnome.org/browse/nautilus/commit/?id=33c9b6d24a60079fe6c4c1be281c76f43def6fee

 .../caja-cell-renderer-text-ellipsized.c           | 88 ++++++++++++++--------
 1 file changed, 57 insertions(+), 31 deletions(-)

commit 4d27e091b87bc08fee257fda6cb3f928c3aee39f
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 17:30:19 2012 +0200

    [build] fix distcheck
    
    http://git.gnome.org/browse/nautilus/commit/?id=74a0311e65f2c9fc2d03967b0607633dcb652f88

 eel/Makefile.am | 1 +
 src/Makefile.am | 1 +
 2 files changed, 2 insertions(+)

commit 61cb94240f5844596fa0e061af83646355d3484b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 03:23:01 2012 +0200

    [properties-window] split some long lines
    
    http://git.gnome.org/browse/nautilus/commit/?id=64819695a13eb636df535e08e0eed6e896a8821c

 src/file-manager/fm-properties-window.c | 40 ++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 8 deletions(-)

commit 452e4c3b65141bc819d3f7de2d6522d166de65b0
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 03:17:41 2012 +0200

    [properties-window] don't use expose-event to draw the pie chart
    
    Use GtkWidget::draw instead
    http://git.gnome.org/browse/nautilus/commit/?id=5ece5d67163e30a91e600d2f2bcf0d657d365dc4

 src/file-manager/fm-properties-window.c | 62 ++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 12 deletions(-)

commit 9dc0c0cf31bbd72f0545ae79e724f2c98e38f43f
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 17:02:32 2012 +0200

    [window-toolbars] show/hide the spinner when changing its state
    
    http://git.gnome.org/browse/nautilus/commit/?id=d72087b74c871ef82b1f6a13bb5bb72b38670a52
    
    Including followup commit:
    
    window-toolbars: show/hide the spinner in the right order
    Apparently calling them in the wrong order makes new GTK+ crash.
    http://git.gnome.org/browse/nautilus/commit/?id=61906b05ec90d5d4759ae7ff7fc7aca40fb18f15

 src/caja-window-toolbars.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

commit b1cb355a3a65d11101d55846803cbf0296e22da5
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 02:57:24 2012 +0200

    [icon-dnd] cleanup useless comment
    
    removing old comment, keeping old pixmap/mask code around for GTK2
    
    was: icon-dnd: cleanup useless code
    http://git.gnome.org/browse/nautilus/commit/?id=098057414b38aeeddd3fcd81942324336628d341

 libcaja-private/caja-icon-dnd.c | 4 ----
 1 file changed, 4 deletions(-)

commit 07bbb722c57b1f985a8750db9776099f1fadf7f6
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 02:53:55 2012 +0200

    [icon-dnd] use negative device offsets to set the drag surface
    
    http://git.gnome.org/browse/nautilus/commit/?id=f38bad2536faf497fe56c9a491ab852cb00514c0

 libcaja-private/caja-icon-dnd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b6b774806a7198d46edd701054cc73989dc3e200
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 02:51:02 2012 +0200

    [icon-canvas-item] use cairo directly instead of gdk_pixbuf_composite()
    
    http://git.gnome.org/browse/nautilus/commit/?id=a136af0a01c160cdfb513c531b910b49a4a62973

 libcaja-private/caja-icon-canvas-item.c | 45 ++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 18 deletions(-)

commit f4babe394d101d2053b3358fcb6bfb489b1e2d58
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 02:15:15 2012 +0200

    [icon-canvas-item] set transparent background for highlight
    
    http://git.gnome.org/browse/nautilus/commit/?id=c6860491c432e311d585a6d92443ef821afd46d2

 libcaja-private/caja-icon-canvas-item.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit eb4866501e0ab9114c3ea459d3d4aa437194d961
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Oct 31 08:58:28 2012 +0200

    [desktop-icon-view] don't use gdk_drawable_get_screen()
    
    http://git.gnome.org/browse/nautilus/commit/?id=b1aac113ef867846fb39ee4187378c6f1a13f33e

 src/file-manager/fm-desktop-icon-view.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 48d2f19ea2b821d1f3b3017afc912154ab2ee7da
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 01:03:47 2012 +0200

    [src] use gtk_widget_get_preferred_size()
    
    http://git.gnome.org/browse/nautilus/commit/?id=c47d18f566fa9518ca7750922da7da66d3211f3e

 src/caja-pathbar.c        | 27 ++++++++++++++++++---------
 src/caja-side-pane.c      |  8 ++++++--
 src/caja-spatial-window.c |  8 ++++++--
 src/caja-zoom-control.c   |  8 ++++++--
 4 files changed, 36 insertions(+), 15 deletions(-)

commit e5b2fbf43e1c1ad5552abb004e5ebc4beb17ce2c
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 00:14:30 2012 +0200

    [icon-container] use gtk_widget_get_preferred_size()
    
    http://git.gnome.org/browse/nautilus/commit/?id=e56241830bfd2ca470ec2b1da53313c2230bc2b9

 libcaja-private/caja-icon-container.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

commit 2a4433a562b4a9fde5f81961c67fbee8810d63f0
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 8 00:05:37 2012 +0200

    [libcaja-private] Port to rendering-cleanup-next
    
    http://git.gnome.org/browse/nautilus/commit/?id=910191ea13e5647e1b8c793e7585530c6ae4c9b1

 libcaja-private/caja-icon-canvas-item.c    | 282 ++++++++++++++++++++++++-----
 libcaja-private/caja-icon-canvas-item.h    |   8 +-
 libcaja-private/caja-icon-container.c      |  16 +-
 libcaja-private/caja-icon-dnd.c            |  56 +++++-
 libcaja-private/caja-tree-view-drag-dest.c |  44 +++--
 5 files changed, 325 insertions(+), 81 deletions(-)

commit 40d77d2c4a371a546a35cbc8aa24bf9261e30fc0
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 7 19:52:40 2012 +0200

    [eel] Port EelEditableLabel to rendering-cleanup-next
    
    http://git.gnome.org/browse/nautilus/commit/?id=2b7659ac4fcaa8b93ad8f409e1560aaa60dcdc12

 eel/eel-editable-label.c | 82 ++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 69 insertions(+), 13 deletions(-)

commit 7e395411a8ef934accc205f34b4c67e03282a2dc
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 7 19:27:12 2012 +0200

    [editable-label] use gtk_widget_get_preferred_size() for GTK3
    
    and gtk_widget_size_request() for GTK2
    
    http://git.gnome.org/browse/nautilus/commit/?id=4963a3c9e5526ffd139b1b0b5bff18b6ea91a717

 eel/eel-editable-label.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

commit aebf60348dd7675678c28a5c850d1900b7b95e8c
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 7 19:19:10 2012 +0200

    [eel-canvas] Port the eel canvas to rendering-cleanup-next
    
    http://git.gnome.org/browse/nautilus/commit/?id=58832e54b6a4e596693527d577e4f8fa2f3e4ccf

 eel/eel-canvas-rect-ellipse.c |  38 +++++++++-
 eel/eel-canvas.c              | 173 ++++++++++++++++++++++++++++++++++++------
 eel/eel-canvas.h              |   8 ++
 3 files changed, 193 insertions(+), 26 deletions(-)

commit 8af0b94b1f4df47364abc9f7f02cc467ecd1cdee
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 7 17:27:04 2012 +0200

    [eel-gdk-extensions] Add eel_cairo_draw_layout_with_drop_shadow for GTK3
    
    keeping eel_gdk_draw_layout_with_drop_shadow for GTK2
    
    http://git.gnome.org/browse/nautilus/commit/?id=d2f141f4a5435b10b43abea0822e3d0569b67886

 eel/eel-gdk-extensions.c | 13 ++++++++++++-
 eel/eel-gdk-extensions.h | 18 +++++++++++++-----
 2 files changed, 25 insertions(+), 6 deletions(-)

commit 2e0b6b0a2e689d5af0ca719ee0ef29f90c4f2e0c
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 16:33:39 2012 +0200

    [icon-dnd] remove commented out obsolete code
    
    http://git.gnome.org/browse/nautilus/commit/?id=c5eba3314c99059aa1fff13aedcb1004966fdd55

 libcaja-private/caja-icon-dnd.c | 63 +----------------------------------------
 1 file changed, 1 insertion(+), 62 deletions(-)

commit 765d89de748d29e99e0babf08091985133f9c377
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 6 18:07:07 2012 +0200

    [emblem-sidebar] Don't include eel-gtk-macros, minor cleanup

 src/caja-emblem-sidebar.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

commit 5d46e2a7bed077a365f4df32e8ef2ef20323871c
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Nov 3 18:26:46 2012 +0200

    [property-browser] Don't use GtkObject nor eel-gtk-macros

 src/caja-property-browser.c | 149 ++++++++++++++++++++------------------------
 1 file changed, 69 insertions(+), 80 deletions(-)

commit 700c0c288247d4cecaeb0ea340437779faf64edb
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 13 07:53:03 2012 +0200

    [information-panel] Don't use eel-gtk-macros

 src/caja-information-panel.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

commit 079f01d120988b1b6549a0b815cd0fad65bdc424
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 13 12:11:05 2012 +0200

    [KeepLastVerticalBox] Don't use eel-gtk-macros

 libcaja-private/caja-keep-last-vertical-box.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

commit dc5517f0b74d260129753417f7f36b06ef9f4121
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 13 07:25:36 2012 +0200

    [sidebar-title] Don't use GtkObject nor eel-gtk-macros

 src/caja-sidebar-title.c | 65 +++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 36 deletions(-)

commit ad104e7b749949455f88cb47a082a16ae00fee77
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 13 06:13:50 2012 +0200

    [eel-background-box] Don't use eel-gtk-macros

 eel/eel-background-box.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 5347614b1dae2a8edad9f8cebc073c4a282de7b7
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 6 17:28:49 2012 +0200

    [eel-debug-drawing] Don't use eel-gtk-macros

 eel/eel-debug-drawing.c | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

commit 9bb422fbed4667c1540889091960f7ee9ebd89ed
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 6 17:14:03 2012 +0200

    [eel-(image|wrap)-table] Don't use GtkObject nor eel-gtk-macros
    
    the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3
    (after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html
    So, we use conditionals in eel-image-table's case, to keep working with GTK2

 eel/eel-image-table.c | 215 ++++++++++++++++++++++++--------------------------
 eel/eel-wrap-table.c  | 175 +++++++++++++++++-----------------------
 2 files changed, 175 insertions(+), 215 deletions(-)

commit ca03cc6c6b01a8a9b42a6e5b0f3096e5b792a531
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Oct 31 03:43:42 2012 +0200

    [eel-labeled-image] Don't use GtkObject nor eel-gtk-macros

 eel/eel-labeled-image.c | 360 +++++++++++++++++++++---------------------------
 1 file changed, 160 insertions(+), 200 deletions(-)

commit 2472d52a0f28dd84d362dcc5570e747a82aa8ba6
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Oct 31 04:42:15 2012 +0200

    [src] don't use GtkObject (GTK3)
    
    the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3
    (after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html
    So we use conditionals in this case, to keep it working with GTK2.
    
    A tad similar:
    http://git.gnome.org/browse/nautilus/commit/?id=cc6cb51e827c0b15d4ef09f12d37b9f331ddcef8

 src/caja-application.c                  |  6 +++++-
 src/caja-bookmarks-window.c             |  8 ++++----
 src/caja-location-bar.c                 | 20 ++++++++++++++------
 src/caja-location-dialog.c              | 19 +------------------
 src/caja-location-entry.c               | 29 ++++++++++++++++-------------
 src/caja-main.c                         | 12 ++++++++----
 src/caja-main.h                         |  6 +++++-
 src/caja-navigation-bar.c               |  9 +++------
 src/caja-navigation-window-menus.c      |  2 +-
 src/caja-navigation-window.c            | 12 ++++++++++++
 src/caja-pathbar.c                      |  6 ++----
 src/caja-window-bookmarks.c             |  2 +-
 src/caja-window-manage-views.c          |  4 ++--
 src/caja-window.c                       | 23 ++++++++++++++++++++---
 src/file-manager/fm-desktop-icon-view.c |  3 ++-
 src/file-manager/fm-directory-view.c    | 32 +++++++++++++++++++++-----------
 src/file-manager/fm-icon-view.c         | 18 +++++++++++++-----
 src/file-manager/fm-properties-window.c | 12 ++++++++++++
 18 files changed, 142 insertions(+), 81 deletions(-)

commit ae33b1c624c008ca0818ab08735968c8d01fae1c
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Nov 3 19:03:17 2012 +0200

    [lc-p] use eel_canvas_item_destroy instead of gtk_object_destroy()
    
    http://git.gnome.org/browse/nautilus/commit/?id=f5192b6990cd9240d126974dd587b7b7525ae714

 libcaja-private/caja-icon-container.c | 4 ++--
 libcaja-private/caja-icon-dnd.c       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

commit 4895118afc287dc511792a5f91f109a2e1f868d0
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Oct 31 04:23:12 2012 +0200

    [lc-p] don't use GtkObject (GTK3)
    
    the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3
    (after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html
    So, we use conditionals in this case, to keep working with GTK2
    
    Original commit:
    http://git.gnome.org/browse/nautilus/commit/?id=aef4cfcf93ef34a0b2d4c87b40fcec2b7a66dd06

 libcaja-private/caja-autorun.c                  |  2 +-
 libcaja-private/caja-clipboard.c                |  4 ++--
 libcaja-private/caja-entry.c                    | 12 ++++--------
 libcaja-private/caja-icon-container.c           | 16 +++++++++++++---
 libcaja-private/caja-mime-actions.c             |  6 +++---
 libcaja-private/caja-mime-application-chooser.c | 10 ----------
 libcaja-private/caja-open-with-dialog.c         | 12 +-----------
 libcaja-private/caja-program-choosing.c         |  2 +-
 8 files changed, 25 insertions(+), 39 deletions(-)

commit ca47debc4ffe4f3ec5b8d6094261dbef02b73dcd
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Oct 30 23:45:15 2012 +0200

    [eel-editable-label] don't use GtkObject
    
    http://git.gnome.org/browse/nautilus/commit/?id=b5f9acb9029c015558ab678e01fc2c8dcc8c6c82

 eel/eel-editable-label.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

commit 5f7d0e33a04e69778509edb93beabbe0e62ab69b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Oct 30 23:42:48 2012 +0200

    [eel-canvas] don't use GtkObject (GTK3)
    
    the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3
    (after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html
    So, we conditionals in this case, to keep working with GTK2
    
    Nautilus commit message: This implies adding a 'destroy' signal to EelCanvasItem,
    with similar semantics to gtk_object_destroy()
    http://git.gnome.org/browse/nautilus/commit/?id=1f615321613751a5dbc84d5ef7f20edd104b8dc4

 eel/eel-canvas-rect-ellipse.c | 21 ----------
 eel/eel-canvas.c              | 91 +++++++++++++++++++++++++++----------------
 eel/eel-canvas.h              |  8 +++-
 3 files changed, 63 insertions(+), 57 deletions(-)

commit 4fe815f4dc825928008a1fc09e53ebcbbc22569d
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Oct 30 23:31:43 2012 +0200

    [eel-stock-dialogs] don't use GtkObject
    
    http://git.gnome.org/browse/nautilus/commit/?id=5edcd42e503623c11bf55c6afba437b3013c7f45

 eel/eel-stock-dialogs.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 20ceebe17ffc956f59ce28834d528d436e66f796
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Nov 15 10:56:33 2012 +0200

    [directory-background] Use weak refs instead of EelBackground destroy signal
    
    i.e. don't connect to the destroy signal of EelBackground, in favor of
    g_object_weak_ref() and g_object_weak_unref()
    
    Though Nautilus removed code for setting non-desktop window backgrounds:
    http://git.gnome.org/browse/nautilus/commit/?id=c9be35b3ee6c468a9a102b317b82b8b639637d0f
    ..this is a tad similar:
    directory-background: don't user the 'destroy' signal of EelBackground
    http://git.gnome.org/browse/nautilus/commit/?id=fbb6b024128e3c35aeb1d74f8e287e8870c9999f&context=12

 libcaja-private/caja-directory-background.c | 52 +++++++++++++++++------------
 1 file changed, 30 insertions(+), 22 deletions(-)

commit b6dc7b5cfbcc1f619084293d462f3f359c2e7121
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Oct 30 20:45:27 2012 +0200

    [eel-background] Don't use GtkObject nor eel-gtk-macros
    
    http://git.gnome.org/browse/nautilus/commit/?id=60044f8ef457036560fb94ad6b20cdf7bedb4f77
    http://git.gnome.org/browse/nautilus/commit/?id=2e59a60800a9bc837af9132b0ac234d9d14668c6

 eel/eel-background.c | 149 ++++++++++++++++++++++++---------------------------
 eel/eel-background.h |   4 +-
 2 files changed, 72 insertions(+), 81 deletions(-)

commit 1cd48341ea01f8c8e0c2adb240c6703b6f6e9848
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Oct 30 20:14:01 2012 +0200

    [icon-view] Don't use GtkObject nor eel-gtk-macros
    
    Similar to the commit linked below, but without moving background-setting code
    to FMDesktopIconView
    http://git.gnome.org/browse/nautilus/commit/?id=ab0616de55f6f817a745caac26fd2b38ae41b71b

 src/file-manager/fm-desktop-icon-view.c | 44 +++++++++------------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

commit 6268feb7e18013e204c2ddfd5c17f9d8a1c127ef
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 06:23:37 2012 +0200

    [connect-dialog] add a missing gtk_widget_show()
    
    http://git.gnome.org/browse/nautilus/commit/?id=f3bbee79b915276068e0a0d6ed9590c212e11a0a

 src/caja-connect-server-dialog.c | 1 +
 1 file changed, 1 insertion(+)

commit c9507784924598f54275cd88ff408f53944b9549
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 06:21:33 2012 +0200

    [connect-dialog] make the code more readable
    
    Move bits around and rename methods; no actual code change.
    http://git.gnome.org/browse/nautilus/commit/?id=24100d075f747e8fc9ca3cc43a32489177f35459

 src/caja-connect-server-dialog.c | 141 ++++++++++++++++++++-------------------
 1 file changed, 71 insertions(+), 70 deletions(-)

commit cd93992b95b9b16f0c41ad200da7cdfc05ded71b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 06:17:00 2012 +0200

    [connect-dialog] display a fatal error if GVfs doesn't have methods
    
    I.e. when GVfs is not installed.
    http://git.gnome.org/browse/nautilus/commit/?id=1b79a8666fee56cdb704e8757f28acf486f7dc54

 src/caja-connect-server-dialog.c | 41 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

commit 337155137426e1a07049f59f8a7ec63ec4b94c80
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 06:14:17 2012 +0200

    [connect-dialog] fixes for the handling of iconized entries
    
    http://git.gnome.org/browse/nautilus/commit/?id=1c826ed78bde5f34fd4a0f72d788b8d0824d6099

 src/caja-connect-server-dialog.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

commit 2218501731180797c5e29ce677f31fd2b2d3ecea
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 06:11:08 2012 +0200

    [connect-dialog] handle psswds, display warns/errs in info bar, tweak UI details
    
    connect-dialog: integrate password handling
    Also, use the info bar to display warnings/errors, and tweak the UI details.
    http://git.gnome.org/browse/nautilus/commit/?id=7d004452f333b7b8b804d87de49c858e8743a115

 src/caja-connect-server-dialog-main.c    | 127 ++----
 src/caja-connect-server-dialog-nonmain.c |  76 +++-
 src/caja-connect-server-dialog.c         | 680 +++++++++++++++++++++++++++----
 src/caja-connect-server-dialog.h         |  47 ++-
 4 files changed, 723 insertions(+), 207 deletions(-)

commit eade711fe26dc22391a60bc33f423817c39d9f43
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 05:46:00 2012 +0200

    [connect-operation] add CajaConnectServerOperation
    
    This is a GtkMountOperation subclass to handle
    password/username/domain requests directly from inside of
    the 'Connect to Server' dialog.
    http://git.gnome.org/browse/nautilus/commit/?id=c1bebe3a29bc2dc3b01ad2277a9802d9d0bc25cd

 src/Makefile.am                     |   6 +-
 src/caja-connect-server-operation.c | 140 ++++++++++++++++++++++++++++++++++++
 src/caja-connect-server-operation.h |  63 ++++++++++++++++
 3 files changed, 207 insertions(+), 2 deletions(-)

commit 71c4af286ce5fab422537202081103aded078692
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 05:41:59 2012 +0200

    [window-menus] use new connect dialog API
    
    http://git.gnome.org/browse/nautilus/commit/?id=156615f8d9f8b99dea3459cdd76392d01b9d80df

 src/caja-window-menus.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

commit 1638bc87bac1eb0bcf842872767d4cc953153a4e
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 05:40:18 2012 +0200

    [connect-dialog] redesign the dialog
    
    According to Allan Day's mockups.
    http://git.gnome.org/browse/nautilus/commit/?id=7848e74d812c22299962a8ae22b01dbd403929c0

 src/caja-connect-server-dialog-main.c |   23 +-
 src/caja-connect-server-dialog.c      | 1000 +++++++++++----------------------
 src/caja-connect-server-dialog.h      |    3 +-
 3 files changed, 317 insertions(+), 709 deletions(-)

commit 32ebe8fbfd23e8cae92c487f5c91eff60ec8ec99
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 05:00:52 2012 +0200

    [nav-win-menus] use new CajaApplication API
    
    http://git.gnome.org/browse/nautilus/commit/?id=d5350003ac927bd683d4e18f7c0513b94f9220d7

 src/caja-navigation-window-menus.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

commit d92e8f674131476d7382496cbc37a5827cef0c84
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Oct 19 01:45:59 2012 +0200

    [bookmarks-window] use new CajaApplication API
    
    http://git.gnome.org/browse/nautilus/commit/?id=a3ce22ec6e8fcb39dafb35e04e445f4a94b8c394

 src/caja-bookmarks-window.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

commit dd924575b8e1fd4c99acf3c8f3860fc38798f0e8
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Oct 19 01:41:16 2012 +0200

    [window] call the callback during the location change
    
    http://git.gnome.org/browse/nautilus/commit/?id=adedf859ec47296106f0f0d938e70b32f0120f7c

 src/caja-window-manage-views.c | 57 +++++++++++++++++++++++++++++-------------
 src/caja-window-slot.h         |  2 ++
 2 files changed, 42 insertions(+), 17 deletions(-)

commit 867bdfb4c9f899358e82d9511300fde541172967
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Oct 19 01:22:08 2012 +0200

    [application] change the way spatial windows are created
    
    Use a _get() function + the standard caja_window_go_to() instead of
    using _present(). The new functions in caja-window-manage-views are
    smart enough to take care of re-using an existent window.
    
    http://git.gnome.org/browse/nautilus/commit/?id=d070d631545aac9114bc271481da603587c07c7c

 src/caja-application.c | 174 ++++++++++++++++++++-----------------------------
 src/caja-application.h |  15 ++---
 2 files changed, 74 insertions(+), 115 deletions(-)

commit f1f85813b51e79b0be816a28dba61bbdef5a6df5
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Oct 19 00:47:14 2012 +0200

    [spatial-window] remove affect_location_on_next_change hack
    
    http://git.gnome.org/browse/nautilus/commit/?id=1936e668c73b932f8cb018e278f8b7f46442fda2

 src/caja-spatial-window.c | 2 --
 src/caja-spatial-window.h | 2 --
 2 files changed, 4 deletions(-)

commit e4ff799b046b0f7740619c7ddd0ef4f770f7102e
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Oct 19 00:44:38 2012 +0200

    [desktop-window] add a 'loaded' flag
    
    http://git.gnome.org/browse/nautilus/commit/?id=f95927360079b1c05efb9cea0de62457eea307ab&context=6

 src/caja-desktop-window.c | 12 +++++++++++-
 src/caja-desktop-window.h |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

commit 11c358d779c6c0913cf9d784a8adbb663c6b8bd9
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Oct 19 00:19:18 2012 +0200

    [window] rewrite window-opening policies
    
    The code there was very hackish and convoluted. Rewrite it to make
    it at least cleaner. This will allow further cleanup later.
    http://git.gnome.org/browse/nautilus/commit/?id=54e0a1f21513babc89f980b5b02af2bf7a6ebe85

 src/caja-window-manage-views.c | 144 +++++++++++++++++++++--------------------
 1 file changed, 74 insertions(+), 70 deletions(-)

commit 662d2326c5ce63c867b3d94fb2bb44d9a244399b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Oct 19 00:01:23 2012 +0200

    [window] add _full() versions of _go_to and _open() methods
    
    These also have a callback to get the result of the operation.
    http://git.gnome.org/browse/nautilus/commit/?id=24515b87a91afd32885e07e32e2b4080584673a4

 libcaja-private/caja-window-info.h      |  4 ++++
 libcaja-private/caja-window-slot-info.c | 14 +++++++++-----
 libcaja-private/caja-window-slot-info.h | 19 ++++++++++++++-----
 src/caja-window-manage-views.c          |  8 ++++----
 src/caja-window-slot.h                  | 11 +++++++++--
 src/caja-window.c                       | 14 +++++++++++++-
 src/caja-window.h                       |  4 ++++
 7 files changed, 57 insertions(+), 17 deletions(-)

commit 2a1ef1efb5434f189e0463c834d5926bd931184e
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 15:32:31 2012 +0200

    [window-info] move include to caja-window-private
    
    http://git.gnome.org/browse/nautilus/commit/?id=42cc7bd181d2f57dbc008bea54a40f02be40ce39

 libcaja-private/caja-window-info.h | 1 -
 src/caja-window-private.h          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

commit df6ac41622e955bfc2e3d3d38624dceaf4436df5
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 15:29:36 2012 +0200

    [build] don't include marshals we don't own
    
    http://git.gnome.org/browse/nautilus/commit/?id=8d07a73b28767b7c866fe403e9ac706b8affb8a2

 libcaja-private/caja-directory.c      | 1 -
 libcaja-private/caja-icon-container.c | 1 -
 src/caja-pathbar.c                    | 1 -
 src/caja-window.c                     | 1 -
 src/caja-zoom-control.c               | 1 -
 src/file-manager/fm-directory-view.c  | 1 -
 6 files changed, 6 deletions(-)

commit 1915c80f583c8d09322bc0ed91159743b7ccaf56
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 23:17:14 2012 +0200

    [ui] remove 'has_separator' properties from Glade files
    
    http://git.gnome.org/browse/nautilus/commit/?id=78e37ae9a18925d75cf90424d92c8d3ba502848a

 src/caja-bookmarks-window.ui           | 1 -
 src/caja-file-management-properties.ui | 1 -
 2 files changed, 2 deletions(-)

commit b24f066e23fb5b204c940c229c5cdebffd2f7600
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 23:14:35 2012 +0200

    [src] convert to new GDK_KEY prefix
    
    http://git.gnome.org/browse/nautilus/commit/?id=71fa1a50145a6f06da3b805a29e75c1295fd546b
    
    Also, make sure we use GDK_KEY prefix in places-sidebar where this patch was previously
    applied to Caja but with old prefix:
    places-sidebar: allow keyboard navigation with Enter/Space (#637768)
    http://git.gnome.org/browse/nautilus/commit/?id=fd03c910a73ba18459e68baaf15e8dd295acd5c1

 src/caja-bookmarks-window.c             |  4 ++--
 src/caja-location-entry.c               | 28 ++++++++++++++--------------
 src/caja-navigation-bar.c               |  2 +-
 src/caja-places-sidebar.c               | 16 ++++++++--------
 src/caja-query-editor.c                 |  2 +-
 src/caja-search-bar.c                   |  6 +++---
 src/caja-side-pane.c                    |  8 ++++----
 src/caja-spatial-window.c               |  4 ++--
 src/caja-window.c                       |  8 ++++----
 src/caja-zoom-control.c                 | 12 ++++++------
 src/file-manager/fm-directory-view.c    |  6 +++---
 src/file-manager/fm-list-view.c         | 16 ++++++++--------
 src/file-manager/fm-properties-window.c |  2 +-
 13 files changed, 57 insertions(+), 57 deletions(-)

commit 360d966dfa2a9ebe579e77d4f59a1e3b37ead28c
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 23:11:40 2012 +0200

    [lc-p] Use gdk_threads_enter/leave in thumbnail_thread_notify_file_changed
    
    This was supposed to be a change from the GDK_THREADS_* macros.
    But, the macros weren't there, so we adapt from:
    
    thumbnails: don't use GDK_THREADS_* macros
    http://git.gnome.org/browse/nautilus/commit/?id=8ee5d37f2b4776730247af75a6ce4cebcba4c550&context=12

 libcaja-private/caja-thumbnails.c | 4 ++++
 1 file changed, 4 insertions(+)

commit c97aca046a4f75e73e5d82a814337eef950efce3
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 14:29:50 2012 +0200

    [autorun] use gdk_error_trap_pop_ignored() for GTK3
    
    http://git.gnome.org/browse/nautilus/commit/?id=8dd87483bd187bfac80a606233b769c230343980

 libcaja-private/caja-autorun.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 0d0641f10e84e0de0b39e63789508c260913cc98
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 14:20:13 2012 +0200

    [lc-p] convert to new GDK_KEY prefix
    
    http://git.gnome.org/browse/nautilus/commit/?id=64dcbea2a005e4ed8bb4945d06a943058b8c7ba8

 libcaja-private/caja-autorun.c        |  2 +-
 libcaja-private/caja-entry.c          |  2 +-
 libcaja-private/caja-icon-container.c | 96 +++++++++++++++++------------------
 3 files changed, 50 insertions(+), 50 deletions(-)

commit 99699a1670fa6281cea8ce8612bb9866163059e7
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 14:09:22 2012 +0200

    [eel-labeled-image] convert to new GDK_KEY prefix

 eel/eel-labeled-image.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit aa81b74fa5297c28f6a83f926c1b6587781c7603
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 14:05:08 2012 +0200

    [eel-editable-label] convert to new GDK_KEY prefix
    
    http://git.gnome.org/browse/nautilus/commit/?id=499c54a20b64051e427ff5746fc7c8dd1a1885c2

 eel/eel-editable-label.c | 86 ++++++++++++++++++++++++------------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

commit 42e70735c78d12d88ff9ec2d1c44d3edbadd29b5
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 13:56:30 2012 +0200

    [editable-label|entry] use GtkEditableClass on GTK2, GtkEditableInterface on GTK3
    
    editable-label: rename GtkEditableClass->GtkEditableInterface
    http://git.gnome.org/browse/nautilus/commit/?id=a58bbde4ca6b11eeb1bca5fa4e62e60c0b26271b
    
    entry: rename GtkEditableClass->GtkEditableInterface
    http://git.gnome.org/browse/nautilus/commit/?id=aeb53075ed55dc2a2ef3228917ded1b8029bfdff

 eel/eel-editable-label.c     |  5 +++--
 libcaja-private/caja-entry.c | 10 +++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

commit 40cd5a93ced42275631a3d86ad68219aa73cb7a3
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 22:56:14 2012 +0200

    [all] Don't use gtk_dialog_set_has_separator()
    
    http://git.gnome.org/browse/nautilus/commit/?id=73e2941f9b837d5d0326e6e88caa7a1e3fdcabeb

 libcaja-private/caja-autorun.c              | 1 -
 libcaja-private/caja-file-conflict-dialog.c | 1 -
 libcaja-private/caja-open-with-dialog.c     | 1 -
 src/caja-connect-server-dialog.c            | 1 -
 src/caja-location-dialog.c                  | 1 -
 src/caja-query-editor.c                     | 2 +-
 src/file-manager/fm-directory-view.c        | 5 ++---
 src/file-manager/fm-properties-window.c     | 1 -
 8 files changed, 3 insertions(+), 10 deletions(-)

commit 0819a3d1982403935eb70b958ad515494d1b9a0a
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 22:52:00 2012 +0200

    [lc-p/fm] Replace deprecated GDK_DISPLAY with GDK_DISPLAY_XDISPLAY
    
    Don't use GDK_DISPLAY ()
    http://git.gnome.org/browse/nautilus/commit/?id=b66ce0fd23500f9727c1aac93366430285575697

 libcaja-private/caja-autorun.c          | 3 ++-
 src/file-manager/fm-desktop-icon-view.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

commit 9cc5e9489fd7285759d7f4ed0d43028dabc7bd87
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 14:49:53 2012 +0200

    [fm-properties] use right link for the 'Media' help page
    
    preferences: use right link for the 'Media' help page (#564866).
    http://git.gnome.org/browse/nautilus/commit/?id=46544c9885b7064c216f1a9401d42bdb9816bdd2

 src/caja-file-management-properties.c | 4 ++++
 1 file changed, 4 insertions(+)

commit 6297e7ac4167b57e0e3076ae2648cdced4c2a5b8
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 04:51:45 2012 +0200

    [connect-dialog] don't use EEL boilerplate
    
    http://git.gnome.org/browse/nautilus/commit/?id=f233f2aeb78e5fd14c0b18f7a3c5e80b5e7c84c5

 src/caja-connect-server-dialog.c | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

commit 938724fe165f8d1be66121b7d22c42ea3e258dbf
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 13:48:55 2012 +0200

    [places-sidebar] redesign the Places sidebar
    
    According to http://live.gnome.org/Nautilus/UIRoadmap/Places
    http://git.gnome.org/browse/nautilus/commit/?id=a59e586adf32eea64c9c4ae08a5482d2a9c37fb1
    
    Small followup commits also included in this commit:
    
    icon-names: fix a typo
    http://git.gnome.org/browse/nautilus/commit/?id=2f847f37f429062d58df3927d10bc52c67a4524f
    
    sidebar: fix bookmark renaming
    http://git.gnome.org/browse/nautilus/commit/?id=1fdfa522da3e7c672fe4202c591a928c8796bb06
    
    sidebar: add myself to the authors (Cosimo Cecchi <cosimoc@gnome.org>)
    http://git.gnome.org/browse/nautilus/commit/?id=0f7e56b5e0ae5134ed1d8caeadcb3c684ae7f661
    
    sidebar: don't allow selecting headers
    http://git.gnome.org/browse/nautilus/commit/?id=8277ddc798fc78793364b54444fa53e9a287b5cc
    
    sidebar: don't try to add non-existing special dirs
    http://git.gnome.org/browse/nautilus/commit/?id=0f70ac4bb782b3c3fb0f5e8a24032cb344fdb2cc

 libcaja-private/caja-icon-names.h |   2 +-
 src/caja-places-sidebar.c         | 820 ++++++++++++++++++++++++++------------
 2 files changed, 557 insertions(+), 265 deletions(-)

commit f30de91c1ccc7f3cbaeb3c00c0f89e4443b01238
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 13:16:20 2012 +0200

    [places-sidebar] fix eject button highlighting
    
    http://git.gnome.org/browse/nautilus/commit/?id=2d9d47254908533d1eb20e16e091f91310052e93

 src/caja-places-sidebar.c | 56 ++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

commit 5680dbcc4995bd860e0e7659481e3d2079b09382
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 13:14:25 2012 +0200

    [icon-info] add a method to fetch GIcons for user special dirs
    
    http://git.gnome.org/browse/nautilus/commit/?id=1df83c6586560a8ae5efc96037e673e52b4b119b

 libcaja-private/caja-icon-info.c  | 27 +++++++++++++++++++++++++++
 libcaja-private/caja-icon-info.h  |  2 ++
 libcaja-private/caja-icon-names.h |  9 +++++++++
 3 files changed, 38 insertions(+)

commit c7814e5022409a72afe03743b0198d964e0338b5
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 11:35:52 2012 +0200

    [pathbar] release the highlight path on dispose
    
    http://git.gnome.org/browse/nautilus/commit/?id=fd75e8f5e8b160eaba22ca4ed7efc852dba612a0

 src/caja-places-sidebar.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit bf89f7f0ec597cfc2458338643f9c6c00e80689b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 11:33:02 2012 +0200

    [places-sidebar] don't update the icon if it's not visible
    
    This greatly reduces the number of times we have to create a pixbuf
    (only once-per-highlight now).
    http://git.gnome.org/browse/nautilus/commit/?id=6f5777b81958ce6f3dbc6bac3323d423d3dcc20b

 src/caja-places-sidebar.c | 58 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 21 deletions(-)

commit 3434cb86b4a292da136bccd86d5ab9a10707b113
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 11:30:45 2012 +0200

    [pathbar] make sure |path| is always valid and memory released
    
    http://git.gnome.org/browse/nautilus/commit/?id=a43bc7def3976947b9624113d18167211e76f9b8

 src/caja-places-sidebar.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

commit e9f10bb18e0b8e0c39c28630b7aab6d739afc80b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 11:25:12 2012 +0200

    [places-sidebar] use _icon_info_lookup_from_name()
    
    http://git.gnome.org/browse/nautilus/commit/?id=f4ae07c8741d2e8cc6b96450c8bb86e532b59137

 src/caja-places-sidebar.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 408fb6c29f23b58f5fba2704b378c2d58151490b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 11:21:31 2012 +0200

    [places-sidebar] Add highlight to eject icon
    
    Add highlight to eject icon in places sidebar (#544103)
    http://git.gnome.org/browse/nautilus/commit/?id=63b2cac301970847f76f7bdbd12835117958d9be

 src/caja-places-sidebar.c | 158 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 136 insertions(+), 22 deletions(-)

commit aaa289476ee990743ef573797736d7e42595a251
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 04:48:40 2012 +0200

    [eel] reorganize Makefile.am
    
    http://git.gnome.org/browse/nautilus/commit/?id=ad5e896e1ce04485a115ee684a695b42ea0378a5

 eel/Makefile.am | 71 +++++++++++++++++++++++++++------------------------------
 1 file changed, 34 insertions(+), 37 deletions(-)

commit 235ac60d2e47057b7e1943c19e9126927888a301
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 11:00:28 2012 +0200

    [eel] remove eel_gdk_window_focus
    
    http://git.gnome.org/browse/nautilus/commit/?id=7e8d1dfa6a17fe9189bf2489b735cd6462f03571\

 eel/eel-gdk-extensions.c | 12 ------------
 eel/eel-gdk-extensions.h |  5 -----
 2 files changed, 17 deletions(-)

commit b50a7e051df6589e2d9059ec26329ec7be39a724
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 10:58:49 2012 +0200

    [icon-container] use gdk_window_focus
    
    http://git.gnome.org/browse/nautilus/commit/?id=6b06e0e27ca1cf29afd4fac716c58e15928a8ff8

 libcaja-private/caja-icon-container.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 8030e5c8d2dc8bd03215584c7e433bafbe6e265a
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 10:55:15 2012 +0200

    [eel] remove EelAlertDialog. It is unused now
    
    http://git.gnome.org/browse/nautilus/commit/?id=fe94a33657d55a2463fa066e09a8ecbfc637c4bd

 eel/Makefile.am        |   2 -
 eel/eel-alert-dialog.c | 492 -------------------------------------------------
 eel/eel-alert-dialog.h |  60 ------
 3 files changed, 554 deletions(-)

commit a71f882835029bbcbd2f46f54f18407606a558a3
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 10:49:31 2012 +0200

    [all] use GtkMessageDialog instead of EelAlertDialog (going away)
    
    This covers 4 commits:
    
    file-operations: use GtkMessageDialog
    http://git.gnome.org/browse/nautilus/commit/?id=51ec5861ca0697e802e8c003053211ac12f2fd54
    
    mime-actions: use GtkMessageDialog
    http://git.gnome.org/browse/nautilus/commit/?id=7a3dcdd4bf667aac271be74988770e18575a7df2
    
    tree-view: don't include eel-alert-dialog.h
    http://git.gnome.org/browse/nautilus/commit/?id=930af7f3058eed256a42c0c1558c7307bb93f411
    
    [eel] use GtkMessageDialog for stock dialogs
    http://git.gnome.org/browse/nautilus/commit/?id=82c5b6c0d82ebd8a705d542fcc9aa58e6e9b0da4

 eel/eel-stock-dialogs.c                | 62 ++++++++++++++++++++--------------
 libcaja-private/caja-file-operations.c | 23 +++++++------
 libcaja-private/caja-mime-actions.c    | 53 ++++++++++++++++-------------
 src/file-manager/fm-tree-view.c        |  1 -
 4 files changed, 79 insertions(+), 60 deletions(-)

commit cebbe2c78c33b41e164d8e5318d7a51d8cd8839b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 10:35:57 2012 +0200

    [eel] add a utility to pack details into a message dialog
    
    So that we can remove EelAlertDialog.
    http://git.gnome.org/browse/nautilus/commit/?id=a2b4de80a94b4e049f1d2a7ef00a174865b5c9ec

 eel/eel-gtk-extensions.c | 27 +++++++++++++++++++++++++--
 eel/eel-gtk-extensions.h |  4 ++++
 2 files changed, 29 insertions(+), 2 deletions(-)

commit e6b8ac93464b85b77b9a3cbcc932ab60a5a2b75c
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 03:16:44 2012 +0200

    [eel-gtk-extensions] remove eel_gtk_signal* utilities
    
    They're now unused.
    
    http://git.gnome.org/browse/nautilus/commit/?id=394cb741c3e59df66f924771d4ef68866e602faa

 eel/eel-gtk-extensions.c | 76 ------------------------------------------------
 eel/eel-gtk-extensions.h | 16 ----------
 2 files changed, 92 deletions(-)

commit 654e3c45484f0f082e5ba3ef097219476205caa4
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 03:13:26 2012 +0200

    [eel] remove functions to set widget backgrounds
    
    Now that we've removed eel_gtk_widget_set_background_color
    calls in eel-debug-drawing.c and test-eel-image-table.c,
    both it and _set_foreground_color are unused.
    
    Original commit:
    http://git.gnome.org/browse/nautilus/commit/?id=57b66862a53298468755e12ca3712569274f0a32

 eel/eel-debug-drawing.c     |  2 --
 eel/eel-gtk-extensions.c    | 32 --------------------------------
 eel/eel-gtk-extensions.h    |  4 ----
 test/test-eel-image-table.c | 16 +++++++---------
 4 files changed, 7 insertions(+), 47 deletions(-)

commit 5b952b5d19dc17b42845c78cd4b3d5f1b3243756
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 10:10:59 2012 +0200

    [eel] remove functions to handle accelerators
    
    These are unused now
    http://git.gnome.org/browse/nautilus/commit/?id=472f3e1433ecb3d5e1a7fc8707975f45dd8d0469

 eel/eel-gtk-extensions.c | 97 ------------------------------------------------
 eel/eel-gtk-extensions.h |  3 --
 2 files changed, 100 deletions(-)

commit a8ffe6f91bb6d67410fe886ef90deef1d5639aa9
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 09:45:11 2012 +0200

    [bkmrks-win/prop-brwsr] don't use eel_gtk_window_*_close_accelerator()
    
    bk-window: don't use _event_is_close_accelerator()
    http://git.gnome.org/browse/nautilus/commit/?id=cab696f7d760f5ee63f0a623b13d27b76d2f2d00
    
    Also needed to drop eel_gtk_window_set_up_close_accelerator() instance
    in src/caja-property-browser.c

 src/caja-bookmarks-window.c | 3 +--
 src/caja-property-browser.c | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

commit 5d8273c1bc7e355e4f032bdc9d40363e01c689b6
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 09:42:40 2012 +0200

    [spatial-window] cleanups
    
    - Don't do anything other than checking/scheduling a source in the
      configure-event callback
    - Avoid useless roundtrips through GFile
    - Avoid some casts, so we don't do useless type-checking in a row on the
      same object
    
    http://git.gnome.org/browse/nautilus/commit/?id=93798c75a1ae3cbd3a85a4ce79b5521b562a7074

 src/caja-spatial-window.c | 290 ++++++++++++++++++----------------------------
 1 file changed, 114 insertions(+), 176 deletions(-)

commit f45deb706fa21131ae7fc1948be8ca735733e819
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 09:10:32 2012 +0200

    [window] remove dead prototypes
    
    http://git.gnome.org/browse/nautilus/commit/?id=5973bc50618d1fe69247e3e2ec6eb8cf3213000b

 src/caja-window-private.h | 3 ---
 src/caja-window.h         | 4 ----
 2 files changed, 7 deletions(-)

commit eebb24f7a768b7dc94705a2d6094ce043d105788
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 09:06:08 2012 +0200

    [desktop-window] cleanups
    
    http://git.gnome.org/browse/nautilus/commit/?id=ef13366e667f848adc6b96509612e3321554d188

 src/caja-desktop-window.c | 64 +++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 36 deletions(-)

commit 014c77b4c14c17454bfae71d8ba0b68e9911ecf6
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 09:01:45 2012 +0200

    [window] remove dead function caja_window_has_menubar_and_statusbar()
    
    http://git.gnome.org/browse/nautilus/commit/?id=eb88f44bd27e11607cb5466c943b9caad0202110

 src/caja-window.c | 16 ----------------
 src/caja-window.h |  1 -
 2 files changed, 17 deletions(-)

commit acc5445faffbaca14c2b325318e034cd6d8a5d73
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 08:58:31 2012 +0200

    [file-manager] autogenerate marshallers
    
    http://git.gnome.org/browse/nautilus/commit/?id=21e75511d2466bd814a31031472323d3cd8ae6c1

 src/file-manager/Makefile.am         | 37 +++++++++++++++++++++++++++++++++++-
 src/file-manager/fm-directory-view.c | 12 ++++++------
 2 files changed, 42 insertions(+), 7 deletions(-)

commit 40167f57fa40d667514b805d6253c372a4a1b9a4
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 25 13:15:36 2012 +0200

    [src] autogenerate marshallers
    
    http://git.gnome.org/browse/nautilus/commit/?id=608918449f548b0d3ea3e7916c944b077ac43e87

 src/Makefile.am         | 32 +++++++++++++++++++++++++++++---
 src/caja-query-editor.c |  4 ++--
 src/caja-window.c       |  6 +++---
 3 files changed, 34 insertions(+), 8 deletions(-)

commit ce96467ba24b0dc13262fb5cb7ae8eb674c2099e
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Oct 27 08:54:18 2012 +0200

    [lc-p] autogenerate marshallers
    
    http://git.gnome.org/browse/nautilus/commit/?id=6509c91b48f52c72c868f2ca7a9b47c46b9e0bc6

 libcaja-private/Makefile.am           | 40 +++++++++++++++++++++++------------
 libcaja-private/caja-icon-container.c | 14 ++++++------
 libcaja-private/caja-marshal.c        |  2 --
 libcaja-private/caja-marshal.list     | 23 --------------------
 4 files changed, 34 insertions(+), 45 deletions(-)

commit 628b15b81b856d42bf00339d317cdcdc3200bbc4
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sun Oct 28 14:08:09 2012 +0200

    [eel] simplify build system
    
    Note:
    remove eel-types.h include in eel-wrap-table.c (which was removed
    upstream prior, along with eel-image-table.[ch], after removal of
    emblems/background-setting stuff, which we're not doing, yet).
    So change EEL_TYPE_JUSTIFICATION to GTK_TYPE_JUSTIFICATION, and
    EEL_JUSTIFICATION_BEGINNING to GTK_JUSTIFY_LEFT.
    
    Upstream commit/message:
    We don't need the enumtypes anymore, and the marshallers can easily be
    autogenerated.
    http://git.gnome.org/browse/nautilus/commit/?id=75a03a440ebff23ccbf8674ca4a0e9f6475ebbb8

 eel/Makefile.am      |  90 ++++++---------------
 eel/eel-background.c |   4 -
 eel/eel-types.c      |  82 -------------------
 eel/eel-types.h      |  32 --------
 eel/eel-wrap-table.c |  12 +--
 eel/eel.h            |   1 -
 eel/eelmarshal.list  |  13 ---
 eel/makeenums.pl     | 220 ---------------------------------------------------
 eel/maketypes.awk    | 155 ------------------------------------
 9 files changed, 30 insertions(+), 579 deletions(-)

commit 09766159b53c812ddf55485511cdca457d89d80d
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 21:50:34 2012 +0200

    [lc-p] remove unused caja-iso9660.h
    
    http://git.gnome.org/browse/nautilus/commit/?id=52a37d6e46fc34cef6061bc91aa02847652f3c9d

 libcaja-private/Makefile.am    |   1 -
 libcaja-private/caja-iso9660.h | 110 -----------------------------------------
 2 files changed, 111 deletions(-)

commit f170ef87e7968633dd4fb3e166e2e2ff0cfbba70
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 21:48:25 2012 +0200

    [tree-model] ony display the first emblem
    
    Only display the first emblem we can render.
    http://git.gnome.org/browse/nautilus/commit/?id=1d660252b408f3628a2d3d5943abcf6bfdd9091b

 src/file-manager/fm-tree-model.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

commit 935e1fed604f48e68d125d205c890a59f46f8f21
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Nov 14 23:05:53 2012 +0100

    new thumbnail frame
    from https://github.com/linuxmint/nemo/commit/fd6dd5d8bea7faf25eae9b80c94955f805e37c04

 icons/thumbnail_frame.png | Bin 482 -> 2232 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

commit 1a056cc77b431b2a013c052c78c0309ee52bc32b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 21:31:20 2012 +0200

    [icon-info] add caja_icon_theme_can_render()
    
    http://git.gnome.org/browse/nautilus/commit/?id=110a0e8f2b9ec96b34e4b76390e3f78adc9cda30

 libcaja-private/caja-icon-info.c | 21 +++++++++++++++++++++
 libcaja-private/caja-icon-info.h |  2 ++
 2 files changed, 23 insertions(+)

commit 4799c0deb39be1abc4fadc693e73cd44aa7c4d36
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 21:19:09 2012 +0200

    [ln-p] remove NautilusCellRendererPixbufEmblem
    
    it's useless now
    http://git.gnome.org/browse/nautilus/commit/?id=25b48e9d1f4c847e2fc95b9b9893e63ba7081658

 libcaja-private/Makefile.am                        |   2 -
 libcaja-private/caja-cell-renderer-pixbuf-emblem.c | 502 ---------------------
 libcaja-private/caja-cell-renderer-pixbuf-emblem.h |  68 ---
 3 files changed, 572 deletions(-)

commit 8e93e7838483152c96e7451292f1336f4ff67b40
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 21:17:08 2012 +0200

    [tree-view] don't use NautilusCellRendererPixbufEmblem
    
    http://git.gnome.org/browse/nautilus/commit/?id=d2cbf993766d7b63f50431ab483035d01c267cdb

 src/file-manager/fm-tree-view.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

commit eb1623a8c930746536a6119be9b30cecc6bf782d
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 21:12:07 2012 +0200

    [tree-model] use GEmblemedIcon to render emblems.
    
    Use GEmblemedIcon instead of a separate column to render emblems.
    http://git.gnome.org/browse/nautilus/commit/?id=1694d7141bbe4a29e54cff77def697a6c9b4e118

 src/file-manager/fm-tree-model.c | 135 ++++++++++++++-------------------------
 src/file-manager/fm-tree-model.h |   1 -
 2 files changed, 49 insertions(+), 87 deletions(-)

commit b88f11c7af8f45328425594b633144f723c2b276
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 20:49:48 2012 +0200

    [list-view] don't use NautilusCellRendererPixbufEmblem
    
    http://git.gnome.org/browse/nautilus/commit/?id=69740a3c7fd3a2e1cea99c0dc61b3c735993e4bb

 src/file-manager/fm-list-view.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

commit 6986f1b631d2979ce0af28dc138537eed1a7b26b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 20:24:12 2012 +0200

    [list-model] use GEmblemedIcon to render emblems
    
    Use GEmblemedIcon instead of other columns to render emblems.
    http://git.gnome.org/browse/nautilus/commit/?id=a187f8a4cdcc46f56c0cb03c31b9b7c92c747a88&context=6

 src/file-manager/fm-list-model.c | 149 +++++++++++++--------------------------
 src/file-manager/fm-list-model.h |   9 ---
 2 files changed, 49 insertions(+), 109 deletions(-)

commit c4e8827c8b614de43f10c7c6c3f50830b93b4fb9
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sat Nov 3 02:01:54 2012 +0200

    [eel] remove eel-pango-extensions
    
    http://git.gnome.org/browse/nautilus/commit/?id=e42ddad5109f193bf8a5b3c0c6cd7cf4b1408300

 eel/Makefile.am                    |   2 -
 eel/eel-lib-self-check-functions.h |   1 -
 eel/eel-pango-extensions.c         | 615 -------------------------------------
 eel/eel-pango-extensions.h         |  55 ----
 eel/eel.h                          |   1 -
 5 files changed, 674 deletions(-)

commit 74206714b6a34f49d5fa8f0b7b50f845f3836924
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Nov 13 15:52:16 2012 +0200

    [sidebar-title] Use pango directly to set largest-fitting font size
    
    and don't include eel-pango-extensions, which is to be dropped.

 src/caja-sidebar-title.c | 48 +++++++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 19 deletions(-)

commit 4c9e9bc2b097323bd7b0717f055d5ee034260d22
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 16:31:50 2012 +0200

    [lc-p|eel-gtk-extensions] Don't include eel-pango-extensions.h
    
    http://git.gnome.org/browse/nautilus/commit/?id=f080b86daeb571def4c092e1524e9adfc7700699

 eel/eel-gtk-extensions.c                  | 1 -
 libcaja-private/caja-customization-data.c | 1 -
 libcaja-private/caja-file-operations.c    | 1 -
 libcaja-private/caja-icon-canvas-item.c   | 1 -
 4 files changed, 4 deletions(-)

commit cbdd65ce75e49a8c0cc4055bf0c02dad66cab0cd
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 16:43:59 2012 +0200

    [test] remove test-eel-image-scrolled
    
    http://git.gnome.org/browse/nautilus/commit/?id=931644a649175b1886dce5cc8e50c21380f8b8b0

 test/Makefile.am               |   2 -
 test/test-eel-image-scrolled.c | 187 -----------------------------------------
 2 files changed, 189 deletions(-)

commit aefeca5ceaf9350c7e7f4a89637dc775d4207d76
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 16:30:13 2012 +0200

    [eel] cleanup eel-vfs-extensions
    
    http://git.gnome.org/browse/nautilus/commit/?id=2f202206fee4e1917494e3f4652e22648097c765

 eel/eel-vfs-extensions.c | 28 ----------------------------
 eel/eel-vfs-extensions.h |  1 -
 2 files changed, 29 deletions(-)

commit 8a2b2890d08a7443f2272fdafce5f9c35c306add
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 16:29:02 2012 +0200

    [eel] cleanup eel-glib-extensions
    
    http://git.gnome.org/browse/nautilus/commit/?id=230581b5d58650c1f50f7d9fda9ab3a1f211361a

 eel/eel-glib-extensions.c | 89 -----------------------------------------------
 eel/eel-glib-extensions.h | 18 ----------
 2 files changed, 107 deletions(-)

commit ac338998d82df4082b6092135fa03d0e55282e6b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 16:25:12 2012 +0200

    [eel] cleanup eel-mate-extensions
    
    http://git.gnome.org/browse/nautilus/commit/?id=fbccd9bfaa9c983dccc60d040b63b86521306788

 eel/eel-mate-extensions.c | 19 ++-----------------
 eel/eel-mate-extensions.h |  4 ----
 2 files changed, 2 insertions(+), 21 deletions(-)

commit 739bd11c7853e0e760c2373d44ff934729e5cbe0
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 16:23:26 2012 +0200

    [eel] remove unused eel_make_semitransparent()
    
    http://git.gnome.org/browse/nautilus/commit/?id=48c6012e89fb1362e418d4bf56c05614f1515eab

 eel/eel-graphic-effects.c | 84 -----------------------------------------------
 eel/eel-graphic-effects.h |  4 ---
 2 files changed, 88 deletions(-)

commit f61503852a1ba50b0a258438e7ce3ca4c7545f45
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 16:07:45 2012 +0200

    [eel] remove unused code from eel-gdk-extensions
    
    http://git.gnome.org/browse/nautilus/commit/?id=6b2a053985b8c37aa1038e7a01ab05d7dd15aa2e

 eel/eel-gdk-extensions.c | 197 -----------------------------------------------
 eel/eel-gdk-extensions.h |  27 -------
 2 files changed, 224 deletions(-)

commit 1e18c64a21b04f1ecb56d763614fb0da36a38408
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 04:36:53 2012 +0200

    [eel-gdk-pixbuf-extensions] don't include eel-art-gtk-extensions.h
    
    http://git.gnome.org/browse/nautilus/commit/?id=2bfd4e3694e2f726592bae5341d7e4c7464ec415

 eel/eel-gdk-pixbuf-extensions.c | 2 --
 1 file changed, 2 deletions(-)

commit 516b5208e0b3c368130334dbdf01b810486cd8d3
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 15:54:11 2012 +0200

    [eel] use glib's i18n API instead of eel's
    
    http://git.gnome.org/browse/nautilus/commit/?id=8447fd3670021530b6340829f27f1d689b633d3a

 eel/eel-alert-dialog.c    | 4 +++-
 eel/eel-canvas.c          | 2 +-
 eel/eel-editable-label.c  | 2 +-
 eel/eel-glib-extensions.c | 1 -
 eel/eel-mate-extensions.c | 1 -
 eel/eel-stock-dialogs.c   | 2 +-
 eel/eel-vfs-extensions.c  | 2 +-
 eel/eel-xml-extensions.c  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

commit 27a47dfbe833e8ae08ce6f1bab75e1e0edec09dd
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 15:47:17 2012 +0200

    [eel] remove unused eel-i18n.[ch]
    
    was: [eel] remove eel-i18n.[ch]
    http://git.gnome.org/browse/nautilus/commit/?id=742b9fb1550ceec9284f581c3741c0a864ca82fd

 eel/Makefile.am |  2 --
 eel/eel-i18n.c  | 52 ----------------------------------------------------
 eel/eel-i18n.h  | 55 -------------------------------------------------------
 3 files changed, 109 deletions(-)

commit dc5d53f773d3a7fa9a0c5ce4e99185cc97789960
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 15:25:58 2012 +0200

    [lc-p] use the 'outline-stippling' property on DnD
    
    http://git.gnome.org/browse/nautilus/commit/?id=aa43821e73d60804a3f0f2ebafb66aab53b440e1

 libcaja-private/caja-icon-dnd.c | 1 +
 1 file changed, 1 insertion(+)

commit 250d31f0d9f533dee96c91859c54883179a896eb
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 15:24:25 2012 +0200

    [eel] add an 'outline-stippling' property to the rect item
    
    http://git.gnome.org/browse/nautilus/commit/?id=b453aaacb0b17392eacacd8a9e378b7227da6413

 eel/eel-canvas-rect-ellipse.c | 24 ++++++++++++++++++++++++
 eel/eel-canvas-rect-ellipse.h |  2 ++
 2 files changed, 26 insertions(+)

commit d602f60fa4df0d2913e2d6b45f32c4bb1020583a
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 15:18:56 2012 +0200

    [lc-p] properly dash the icon when resizing it
    
    http://git.gnome.org/browse/nautilus/commit/?id=b10d8c00395026719dc0840e9d82e682c7c4e436

 libcaja-private/caja-icon-canvas-item.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

commit b8b05eb092ded402d9b0d1b0a80e0627ddbc657a
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 15:15:34 2012 +0200

    [lc-p] make drawing of resize knobs work again
    
    http://git.gnome.org/browse/nautilus/commit/?id=29d7b86087f6ab86f6abd6c3c08c4e1d94b92b36

 libcaja-private/caja-icon-canvas-item.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

commit 3b6a715fca493281fdb2d0c83d69ce28a21732dc
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 15:02:37 2012 +0200

    [lc-p] port caja-icon-private to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=cbdf5829637093c0a5c0a4ff4d303ad184847627

 libcaja-private/caja-icon-private.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

commit c28f508865f21658ad4319a561f999c87cf94703
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 15:00:30 2012 +0200

    [lc-p] port caja-icon-dnd to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=34a376c97717cb05187b3d880e991c2d23511109

 libcaja-private/caja-icon-dnd.c | 46 +++++++----------------------------------
 libcaja-private/caja-icon-dnd.h |  8 +------
 2 files changed, 9 insertions(+), 45 deletions(-)

commit a694648f1a1a373f96e97b632627bb30d1c5646b
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 14:52:27 2012 +0200

    [lc-p] port CajaIconContainer to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=8eab39c06628da7cf919be77d922024198105f0a

 libcaja-private/caja-icon-container.c | 40 ++++-------------------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

commit d51a2a8235d5d6dc380e0482d2fdddeb60b29dc1
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 14:47:33 2012 +0200

    [lc-p] port CajaIconCanvasItem to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=89bd44de6bb11450b88d9d160593b65d62467579

 libcaja-private/caja-icon-canvas-item.c | 181 ++++++++++++++------------------
 1 file changed, 77 insertions(+), 104 deletions(-)

commit fada3fccfa2e72360fc932a9d58a01268bff0fea
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 14:05:37 2012 +0200

    [lc-p] port CajaDirectoryBackground to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=6c691075c09ec23620484da00ffd43d3dfe0b75b

 libcaja-private/caja-directory-background.c | 2 --
 1 file changed, 2 deletions(-)

commit 3731b35d212b5efed3835efe7e50be55970dfe8e
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 14:02:27 2012 +0200

    [lc-p] port CajaCellRendererPixbufEmblem to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=dfbf8b9b5636dceb3d6291c980d2c349afc849d7

 libcaja-private/caja-cell-renderer-pixbuf-emblem.c | 49 +++++++---------------
 1 file changed, 16 insertions(+), 33 deletions(-)

commit 299c8466cdf47ae0468a216c2392b719330a1971
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 02:32:23 2012 +0200

    [eel-image-table] remove useless GdkGC clear_gc, and unrealize method
    
    Not upstream as image-table was removed.

 eel/eel-image-table.c | 22 ----------------------
 1 file changed, 22 deletions(-)

commit ae0deb0d1da0060fa0bba24b0fb6a65e53dc94ee
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Oct 31 01:30:30 2012 +0200

    [eel-gtk-extensions] remove dead code
    
    As in the commit below, except move a few we still need around to
    eel-image-table, which has been removed upstream. Specifically moving:
    eel_gtk_widget_find_windowed_ancestor to: find_windowed_ancestor()
    eel_gtk_signal_connect_while_realized to: signal_connect_while_realized()
    Also move while_realized_disconnecter(), as it's needed by the latter.
    
    http://git.gnome.org/browse/nautilus/commit/?id=a904f4acd546151ab37ee03bcce87869a805c323

 eel/eel-gtk-extensions.c | 553 -----------------------------------------------
 eel/eel-gtk-extensions.h |  38 ----
 eel/eel-image-table.c    | 168 +++++++++++---
 3 files changed, 138 insertions(+), 621 deletions(-)

commit f9c3a1bd9499c47db2b32a0487ad3c91dbafeea9
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 14 07:30:55 2012 +0200

    [information-panel] don't use eel_point_in_widget()
    
    nor in sidebar-title. the eel function is deprecated.

 src/caja-information-panel.c | 14 +++++++++++++-
 src/caja-sidebar-title.c     | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

commit e96bb83cdc1ed0753d2547463a4e6ec61f41de12
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 14 07:29:08 2012 +0200

    [sidebar-title] use gtk_label_set_attributes, obsolete eel_gtk_label_set_scale

 src/caja-sidebar-title.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

commit 638df47ee07a8f5b3ad4cea9639ac05713ab328f
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Nov 14 07:20:41 2012 +0200

    [sidebar-title] try to use GtkStyle in _select_text_color()
    
    Hopefully this will play better with themes, when a custom (EelBackground)
    background is not set in the widget.

 src/caja-information-panel.c |   4 +-
 src/caja-sidebar-title.c     | 126 ++++++++++++++++++++++++++++---------------
 src/caja-sidebar-title.h     |   3 +-
 3 files changed, 84 insertions(+), 49 deletions(-)

commit 4822b93ad236a03564af286f8a65984e9020f53c
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Sun Nov 4 15:58:07 2012 +0200

    [eel] add wrap_table_child_visible_in, replace eel_gtk_viewport_*_rect
    
    Not upstream, as wrap-table have been removed, and the said functions are
    marked for removal from eel-gtk-extensions

 eel/eel-wrap-table.c | 66 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 48 insertions(+), 18 deletions(-)

commit 7dd50ac5969408e7f1fd1d452c13537a45731c58
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Nov 2 22:32:24 2012 +0200

    [property-browser] use gtk_label_set_attributes, obsolete eel_gtk_label_set_scale
    
    Not upstream because property-browser removed. But as in upstream,
    eel_gtk_label_set_scale() is going away in next eel-gtk-extensions.[ch]
    cleanup.

 src/caja-property-browser.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

commit ef8b06eaa8c26e592e9028b8a93361653abfb8ed
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 13:26:31 2012 +0200

    [eel] port eel-gdk-pixbuf-extensions to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=172af77cfbdc4910034a100a99aa1ec2cb843495

 eel/eel-gdk-pixbuf-extensions.c | 28 +++++++++-------------------
 eel/eel-gdk-pixbuf-extensions.h |  7 +------
 2 files changed, 10 insertions(+), 25 deletions(-)

commit 92ff8b1860812a2cb58bfb492765b109411d8fd5
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 13:22:16 2012 +0200

    [eel] port eel-gdk-extensions to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=917a27a6f69509720fadd0d50e40dbc87ae9f5d2

 eel/eel-gdk-extensions.c | 92 ++++++++----------------------------------------
 eel/eel-gdk-extensions.h |  5 ---
 2 files changed, 14 insertions(+), 83 deletions(-)

commit 0fdc303dd11b419465d299b36307010ce3221cfa
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 13:12:33 2012 +0200

    [eel] port EelEditableLabel to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=6cb78fb15c89e53e60ee54dc8b773db6ca0def73

 eel/eel-editable-label.c | 221 ++++++++++-------------------------------------
 eel/eel-editable-label.h |   3 -
 2 files changed, 48 insertions(+), 176 deletions(-)

commit e68ea5c0a9cd2f4f1d88cc9fd38f1e80b2399291
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 12:31:22 2012 +0200

    [eel] port eel-debug-drawing to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=e716f82eea847e5298d773e2689642813db3d36e

 eel/eel-debug-drawing.c | 53 ++++++++++++++++++-------------------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

commit adfba98c507fd731a96a0551176050b697c14379
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 12:26:02 2012 +0200

    [eel] port EelCanvas to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=759f3401bee333caf6d0ae6ae9820cdadda440e4

 eel/eel-canvas.c | 77 +++++++-------------------------------------------------
 eel/eel-canvas.h | 13 ----------
 2 files changed, 9 insertions(+), 81 deletions(-)

commit 51cc028ce329709ad18a1bafcfeafe09d042e1f6
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Nov 2 17:47:27 2012 +0200

    [eel] port EelCanvasRE to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=820d4088a4d1768cf7e16de3c8ec0d7ff383f473

 eel/eel-canvas-rect-ellipse.c | 404 +++++++-----------------------------------
 eel/eel-canvas-rect-ellipse.h |   9 -
 2 files changed, 68 insertions(+), 345 deletions(-)

commit 550088d1a2c753fde171f8cb2d6d2fa97ddef4ea
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Thu Oct 18 11:55:38 2012 +0200

    [eel] port EelBackground to cairo drawing
    
    http://git.gnome.org/browse/nautilus/commit/?id=28b6813b77c4776b789231d3c64be3be01748608

 eel/eel-background.c | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

commit cd3a526a667083e24dd0d98c9b33ee42dd85f081
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Mon Nov 5 04:07:50 2012 +0200

    [general] Adds option to open new tab in tab bar context menu
    
    http://git.gnome.org/browse/nautilus/commit/?id=8598d769993843e1e6529a661fea034785ca0091

 src/caja-navigation-window-menus.c | 33 +--------------------------------
 src/caja-navigation-window-pane.c  | 20 ++++++++++++++++++++
 src/caja-window.c                  | 35 +++++++++++++++++++++++++++++++++++
 src/caja-window.h                  |  1 +
 4 files changed, 57 insertions(+), 32 deletions(-)

commit 96ce55723c4916ed17bc8c69e12b99fdac2ad6af
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Tue Oct 30 18:51:39 2012 +0200

    [src] remove 2 unused includes

 src/caja-navigation-window-menus.c      | 1 -
 src/file-manager/fm-properties-window.c | 1 -
 2 files changed, 2 deletions(-)

commit ea7bc87871154c2239f25d84191add2d4b630022
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Wed Oct 31 07:16:33 2012 +0200

    [eel] Use GdkRegion on GTK2, cairo_region_t on GTK3
    
    http://git.gnome.org/browse/nautilus/commit/?id=3b671558f1d8ac1ee72e8af13d4ede6ab549a400

 eel/eel-canvas-rect-ellipse.c | 24 +++++++++++++++---------
 eel/eel-canvas.c              |  8 +++++++-
 eel/eel-editable-label.c      | 14 ++++++++++----
 3 files changed, 32 insertions(+), 14 deletions(-)

commit ec92a520965f420af7d00ad8e347f62106bbc578
Author: Jasmine Hassan <jasmine.aura@gmail.com>
Date:   Fri Oct 26 18:12:05 2012 +0200

    [configure] bump GTK version to 2.24.0
    
    About time, no?

 configure.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit f46c1eaa4736787fe7f48191b87b780588dedf99
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Oct 25 23:17:33 2012 +0200

    remove unused profiling in configure.in
    https://bugzilla.gnome.org/show_bug.cgi?id=661632

 configure.in | 21 ---------------------
 1 file changed, 21 deletions(-)

commit 3e95aa47a6803de559a84f7b896d59bebdecfd26
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Oct 23 19:34:50 2012 +0200

    update POTFILES.in

 po/POTFILES.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 1606182d019b29680eb6401f96137e89605a059e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Oct 23 19:29:10 2012 +0200

    fix MATE => GNOME Documentation team

 src/caja-window-menus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit f16ff1f02c2a2f08974233ba134379bcee5a038a
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Oct 23 19:28:00 2012 +0200

    set default font in gsettings schema

 libcaja-private/org.mate.caja.gschema.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 79c06c0d58b7aa60e8e9308547ae9341c3f13d1b
Author: Nelson Marques <nmo.marques@gmail.com>
Date:   Mon Oct 22 00:31:31 2012 +0100

    update licences files:
     - COPYING-DOCS, http://www.gnu.org/licenses/fdl-1.1.txt
     - COPYING, http://www.gnu.org/licenses/gpl-2.0.txt
     - COPYING.LIB, http://www.gnu.org/licenses/lgpl-2.0.txt

 COPYING      | 38 ++++++++++++++++----------------------
 COPYING-DOCS |  6 +++---
 COPYING.LIB  | 21 ++++++++++-----------
 3 files changed, 29 insertions(+), 36 deletions(-)

commit 6a9dafae3830f46636e016c3c741b2f3df131620
Author: Nelson Marques <nmo.marques@gmail.com>
Date:   Thu Oct 18 16:31:17 2012 +0100

    remove MATE from Categories in .desktop files

 data/caja-browser.desktop.in.in                    | 2 +-
 data/caja-computer.desktop.in.in                   | 2 +-
 data/caja-file-management-properties.desktop.in.in | 2 +-
 data/caja-home.desktop.in.in                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

commit 7a1bfda3d13786aa8e94da64f875f9acd623d3b3
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Oct 17 10:59:06 2012 +0200

    add missing include

 libcaja-private/caja-ui-utilities.c | 1 +
 1 file changed, 1 insertion(+)

commit 8b512df6f66ae1c68f3232070fffba0df9a7506d
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Oct 15 11:44:44 2012 +0200

    add missing includes

 libcaja-private/caja-ui-utilities.c | 2 ++
 1 file changed, 2 insertions(+)

commit 2bad19e7888648507079d10340a01a4aa6b24e12
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Oct 10 19:35:21 2012 +0200

    refactor thumbnails code

 libcaja-private/caja-directory-async.c |   2 +-
 libcaja-private/caja-file.c            |  23 +-
 libcaja-private/caja-thumbnails.c      | 498 +--------------------------------
 libcaja-private/caja-thumbnails.h      |  37 ---
 libcaja-private/caja-ui-utilities.c    |  57 ++++
 libcaja-private/caja-ui-utilities.h    |   1 +
 6 files changed, 85 insertions(+), 533 deletions(-)

commit 2fbc016ecf597878e7a650db8f80ed91a49176b8
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Sep 6 23:35:18 2012 +0200

    replace mate-open with gvfs-open

 libcaja-private/caja-recent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 278df62878f2981dea980c5f48e791e047b9d5f1
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Sep 6 23:34:12 2012 +0200

    remove old undo code

 libcaja-private/Makefile.am                 |   9 -
 libcaja-private/caja-entry.c                |   3 -
 libcaja-private/caja-undo-manager.c         | 320 --------------------------
 libcaja-private/caja-undo-manager.h         |  82 -------
 libcaja-private/caja-undo-private.h         |  36 ---
 libcaja-private/caja-undo-signal-handlers.c | 345 ----------------------------
 libcaja-private/caja-undo-signal-handlers.h |  37 ---
 libcaja-private/caja-undo-transaction.c     | 343 ---------------------------
 libcaja-private/caja-undo-transaction.h     |  80 -------
 libcaja-private/caja-undo.c                 | 218 ------------------
 libcaja-private/caja-undo.h                 |  77 -------
 po/POTFILES.in                              |   1 -
 src/caja-application.c                      |   6 -
 src/caja-application.h                      |   2 -
 src/caja-bookmarks-window.c                 |  33 +--
 src/caja-bookmarks-window.h                 |   7 +-
 src/caja-navigation-window-menus.c          |   1 -
 src/caja-navigation-window.c                |   1 -
 src/caja-spatial-window.c                   |   1 -
 src/caja-window-bookmarks.c                 |   9 +-
 src/caja-window-menus.c                     |  17 --
 src/caja-window.c                           |   2 -
 src/caja-window.h                           |   1 +
 src/file-manager/fm-properties-window.c     |  23 --
 24 files changed, 19 insertions(+), 1635 deletions(-)

commit f426641aacea9d5f7683be776536bc6301c7baef
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Sep 6 14:14:59 2012 +0200

    remove latest mateconf usage
    metadata saved in files instead of migrate to gsettings
    (caja-desktop-metadata.c is from nautilus)

 configure.in                                  |   2 +-
 eel/eel-background.c                          |   6 +-
 eel/eel-background.h                          |   2 +-
 libcaja-private/Makefile.am                   |   2 +
 libcaja-private/caja-desktop-directory-file.c | 157 +-------------
 libcaja-private/caja-desktop-directory-file.h |  10 -
 libcaja-private/caja-desktop-icon-file.c      |   5 +-
 libcaja-private/caja-desktop-metadata.c       | 294 ++++++++++++++++++++++++++
 libcaja-private/caja-desktop-metadata.h       |  47 ++++
 libcaja-private/caja-directory-background.c   | 130 +++---------
 libcaja-private/caja-global-preferences.c     |  19 +-
 libcaja-private/caja-global-preferences.h     |   4 +-
 libcaja-private/caja-metadata.h               |   3 -
 src/caja-convert-metadata.c                   | 121 +----------
 src/caja-emblem-sidebar.c                     |   9 -
 15 files changed, 395 insertions(+), 416 deletions(-)

commit 465e6ae56a2a81cd346d573532dc4a39c16df225
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 22:35:13 2012 +0200

    bump minimum mate-desktop version (for gsettings schemas)

 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9ae0bb2d19e638a86eaead0d387e572733d38771
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 22:27:22 2012 +0200

    remove lockdown from monitored MateConf paths

 libcaja-private/caja-global-preferences.c | 1 -
 1 file changed, 1 deletion(-)

commit 79b4d49087d25ce067e9e40ab5e9ee7a70228f6a
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 22:26:43 2012 +0200

    convert disable-command-line lockdown to gsettings

 libcaja-private/caja-global-preferences.c |  2 ++
 libcaja-private/caja-global-preferences.h |  5 +++--
 src/file-manager/fm-desktop-icon-view.c   | 29 ++++++++---------------------
 src/file-manager/fm-directory-view.c      | 29 ++++++-----------------------
 4 files changed, 19 insertions(+), 46 deletions(-)

commit 2c7506960cf25b2e35347a95e0eabf9d6acbd8a1
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 22:18:47 2012 +0200

    removed eel_mateconf_monitor_add occurrence

 libcaja-private/caja-directory-background.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

commit ff794577433f03b7edc6d4ee164f753583882b8b
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 22:09:18 2012 +0200

    remove unused gsettings schema keys

 libcaja-private/org.mate.caja.gschema.xml.in | 13 -------------
 1 file changed, 13 deletions(-)

commit 24354f61c1cd37d393e67817bbb73da69563c51d
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 22:03:28 2012 +0200

    delete mateconf schema

 configure.in                                     |    2 +-
 libcaja-private/apps_caja_preferences.schemas.in | 1205 ----------------------
 2 files changed, 1 insertion(+), 1206 deletions(-)

commit be3f666650c0da1aac5232291d83a51e127b005e
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 21:59:16 2012 +0200

    remove latest mateconf stuff

 eel/Makefile.am                             |    7 -
 eel/eel-enumeration.c                       |  555 ---------
 eel/eel-enumeration.h                       |   63 -
 eel/eel-lib-self-check-functions.h          |    4 +-
 eel/eel-mateconf-extensions.c               |  687 -----------
 eel/eel-mateconf-extensions.h               |   78 --
 eel/eel-preferences-builder.c               |  646 ----------
 eel/eel-preferences.c                       | 1764 ---------------------------
 eel/eel-preferences.h                       |  165 ---
 eel/eel.h                                   |    3 -
 libcaja-private/caja-desktop-link-monitor.c |   12 +-
 libcaja-private/caja-directory-background.c |    2 +-
 libcaja-private/caja-global-preferences.c   |   52 -
 libcaja-private/caja-global-preferences.h   |    2 +-
 libcaja-private/caja-icon-container.c       |   27 +-
 libcaja-private/caja-program-choosing.c     |    1 -
 po/POTFILES.in                              |    1 -
 src/caja-connect-server-dialog-main.c       |    2 -
 src/caja-file-management-properties-main.c  |    3 -
 src/caja-file-management-properties.c       |   23 +-
 src/caja-history-sidebar.c                  |    1 -
 src/caja-navigation-window-pane.c           |    2 -
 src/caja-pathbar.c                          |    1 -
 src/caja-places-sidebar.c                   |    1 -
 src/caja-window-menus.c                     |    1 -
 src/file-manager/fm-tree-view.c             |    1 -
 test/test.c                                 |    2 -
 27 files changed, 26 insertions(+), 4080 deletions(-)

commit 45742f8351e2991d54b00189f6e0c772e257f395
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 21:43:27 2012 +0200

    convert last eel_preference users to raw mateconf
    from nautilus patch:
    This is moslty the lockdown stuff, but we also access the background
    setting. This should be converted to use the new gsettings when they
    land.

 libcaja-private/caja-global-preferences.c    | 255 ++-------------------------
 libcaja-private/caja-global-preferences.h    |   4 +
 libcaja-private/org.mate.caja.gschema.xml.in |   2 +-
 src/caja-connect-server-dialog-main.c        |   1 +
 src/file-manager/fm-desktop-icon-view.c      |  25 ++-
 src/file-manager/fm-directory-view.c         |  21 ++-
 6 files changed, 47 insertions(+), 261 deletions(-)

commit 3674c4ca12e2e33cf6669bc3701acd98c3643ec5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:55:00 2012 +0200

    initialize gsettings in nautilus-connect-server

 src/caja-connect-server-dialog-main.c | 1 +
 1 file changed, 1 insertion(+)

commit e97eba684fb1b1bbe2b65624beee2402d2199004
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:54:05 2012 +0200

    remove old file-limit preference

 libcaja-private/caja-directory-async.c |  3 +--
 libcaja-private/caja-directory.c       | 27 -------------------
 libcaja-private/caja-directory.h       |  1 -
 src/file-manager/fm-directory-view.c   | 47 ----------------------------------
 src/file-manager/fm-directory-view.h   |  9 -------
 5 files changed, 1 insertion(+), 86 deletions(-)

commit bb2f625689b6ffc91ab93eecb4da96a10ecdabdc
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:50:26 2012 +0200

    fix conversion of enable-delete

 src/file-manager/fm-directory-view.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

commit e4a0de637eb7c3ae3bbbcbe323c3f858161487e9
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:48:07 2012 +0200

    move desktop-font preference to desktop settings

 libcaja-private/caja-global-preferences.h    |  2 +-
 libcaja-private/org.mate.caja.gschema.xml.in | 10 +++++-----
 src/file-manager/fm-desktop-icon-view.c      |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

commit e13142565949e577ae589c0e93527b6698614281
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:43:59 2012 +0200

    convert list-view preferences to gsettings
    also move the sort order prefs from view-specific to common prefs
    we already only have one UI setting that controls both, so it makes
    no sense to have two settings.
    
    (from nautilus 3.0)

 libcaja-private/caja-global-preferences.c    | 55 +----------------
 libcaja-private/caja-global-preferences.h    | 24 +++-----
 libcaja-private/org.mate.caja.gschema.xml.in | 44 ++++----------
 src/caja-file-management-properties.c        | 41 +++++++------
 src/file-manager/fm-icon-view.c              | 82 ++++---------------------
 src/file-manager/fm-list-view.c              | 91 +++++++++++++++++++---------
 6 files changed, 119 insertions(+), 218 deletions(-)

commit db145cb919be1242260d06095660405f415774d6
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:21:31 2012 +0200

    add eel_g_settings_add_auto_strv

 eel/eel-glib-extensions.c | 26 ++++++++++++++++++++++++++
 eel/eel-glib-extensions.h |  3 +++
 2 files changed, 29 insertions(+)

commit 23061821f52497d45a066da966cef5c9e6024cab
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:19:18 2012 +0200

    remove unused news side pane preferences

 libcaja-private/caja-global-preferences.h | 4 ----
 1 file changed, 4 deletions(-)

commit 617f5c6f7115357f4c5f92175c9ff4c9be99359c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:18:19 2012 +0200

    convert compact view prefs to gsettings

 libcaja-private/caja-global-preferences.c | 10 +---------
 libcaja-private/caja-global-preferences.h |  5 +++--
 src/caja-file-management-properties.c     | 14 +++++++-------
 src/file-manager/fm-icon-view.c           | 29 +++++++++++++++++++----------
 4 files changed, 30 insertions(+), 28 deletions(-)

commit c042e64ccabe8da21f2251301bc0536922d44560
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:10:22 2012 +0200

    convert tree sidebar prefs to gsettings

 libcaja-private/caja-global-preferences.c |  7 +------
 libcaja-private/caja-global-preferences.h |  3 ++-
 src/caja-file-management-properties.c     |  6 +++---
 src/file-manager/fm-tree-view.c           | 12 ++++++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

commit 245d15cb31565d31bdb380b8a689489732748ac5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 20:05:27 2012 +0200

    fix typo

 libcaja-private/caja-desktop-link-monitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 4ce75a73f8a69f906a784a7704be7891e7519d81
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 19:50:04 2012 +0200

    convert desktop preferences to gsettings

 libcaja-private/caja-desktop-link-monitor.c  |  41 ++++++----
 libcaja-private/caja-desktop-link.c          |  86 ++++++++++++--------
 libcaja-private/caja-global-preferences.c    | 116 +--------------------------
 libcaja-private/caja-global-preferences.h    |  21 ++---
 libcaja-private/caja-icon-container.c        |  19 +++--
 libcaja-private/org.mate.caja.gschema.xml.in |   6 +-
 src/caja-file-management-properties.c        |   6 +-
 src/caja-file-management-properties.ui       |   9 +++
 8 files changed, 119 insertions(+), 185 deletions(-)

commit 1a64f79e50328465453567515ddd62c3ea394662
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 19:17:02 2012 +0200

    fix desktop-is-home-dir gsettings conversion

 libcaja-private/caja-file-utilities.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

commit a114197e7fd0a8dba9fbafccac03c795d3819a9b
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 19:14:13 2012 +0200

    fix desktop-font gsettings conversion

 src/file-manager/fm-desktop-icon-view.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 12e085081592626b01721bebd07c22b69d1b4262
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 19:08:00 2012 +0200

    convert icon-view preferences to gsettings

 libcaja-private/caja-file.c               |  9 +--
 libcaja-private/caja-global-preferences.c | 72 ++++-------------------
 libcaja-private/caja-global-preferences.h | 21 +++----
 libcaja-private/caja-icon-container.c     | 21 ++++---
 libcaja-private/caja-thumbnails.c         |  5 +-
 src/caja-file-management-properties.c     | 37 ++++++------
 src/file-manager/fm-desktop-icon-view.c   | 18 +++---
 src/file-manager/fm-directory-view.c      | 10 ++--
 src/file-manager/fm-icon-container.c      |  6 +-
 src/file-manager/fm-icon-view.c           | 95 +++++++++++++++++++++----------
 10 files changed, 147 insertions(+), 147 deletions(-)

commit d66d6c4b4f07b9a18a81b0ac369a779c74af6e39
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 17:26:04 2012 +0200

    add some more g_settings auto helpers to eel-glib-extensions

 NEWS                      |  1 +
 eel/eel-glib-extensions.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++
 eel/eel-glib-extensions.h |  9 +++++
 3 files changed, 95 insertions(+)

commit 16be9e9816c2201c049c411572343b0c4c408552
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 17:20:48 2012 +0200

    convert preview settings to gsettings

 libcaja-private/caja-file.c               | 22 ++++----
 libcaja-private/caja-global-preferences.c | 32 ------------
 libcaja-private/caja-global-preferences.h |  8 +--
 src/caja-file-management-properties.c     | 85 ++++++++++++++++++++++++++-----
 src/file-manager/fm-directory-view.c      | 10 ++--
 src/file-manager/fm-icon-view.c           |  5 +-
 6 files changed, 97 insertions(+), 65 deletions(-)

commit 562875c2ed80bd7501fb161564ab88c731ac497c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 16:55:12 2012 +0200

    convert show-directory-item-counts to gsettings

 libcaja-private/caja-directory.c          |  7 ++++---
 libcaja-private/caja-file.c               |  9 +++++----
 libcaja-private/caja-global-preferences.c | 12 ------------
 libcaja-private/caja-global-preferences.h |  2 +-
 src/caja-file-management-properties.c     |  8 ++++----
 src/caja-sidebar-title.c                  | 11 +++++++----
 6 files changed, 21 insertions(+), 28 deletions(-)

commit 46925062b04255e723ff931ac82aefda9cfc516d
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 16:48:07 2012 +0200

    convert show-text-in-icons to gsettings

 libcaja-private/caja-directory.c          |  7 ++++---
 libcaja-private/caja-file.c               |  9 +++++----
 libcaja-private/caja-global-preferences.c |  7 -------
 libcaja-private/caja-global-preferences.h |  2 +-
 src/caja-file-management-properties.c     | 10 +++++-----
 5 files changed, 15 insertions(+), 20 deletions(-)

commit f0ca3e5a0329fa0c4a2fe5b6b941e660b547e113
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 16:43:01 2012 +0200

    remove unused search-bar-type setting

 libcaja-private/caja-global-preferences.c | 24 ------------------------
 libcaja-private/caja-global-preferences.h |  3 ---
 2 files changed, 27 deletions(-)

commit bd2d552864805962945aee83d4591019dbffaebc
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 16:41:03 2012 +0200

    convert default-folder-view to gsettings

 libcaja-private/caja-global-preferences.c | 19 +------------------
 libcaja-private/caja-global-preferences.h |  2 +-
 src/caja-file-management-properties.c     | 14 +++++++-------
 3 files changed, 9 insertions(+), 26 deletions(-)

commit 463bd5ef2cbba8d6c3c84a610d26fb5e427c6cab
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 16:18:41 2012 +0200

    fix media gsettings keys names

 libcaja-private/caja-global-preferences.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 3f1231c4539d2dfb3620b89e978157be6302ef53
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 16:17:30 2012 +0200

    convert sort-directories-first to gsettings

 libcaja-private/caja-global-preferences.c |  5 -----
 libcaja-private/caja-global-preferences.h |  2 +-
 src/caja-file-management-properties.c     |  6 +++---
 src/file-manager/fm-directory-view.c      | 14 ++++++++------
 4 files changed, 12 insertions(+), 15 deletions(-)

commit bf5ae0b15f125d949e4e8cc2a52abb94f809dc94
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 15:57:35 2012 +0200

    convert window-state to gsettings

 libcaja-private/caja-global-preferences.c |  36 +----------
 libcaja-private/caja-global-preferences.h |  21 +++---
 src/caja-application.c                    |   8 +--
 src/caja-navigation-window-pane.c         |  16 ++---
 src/caja-navigation-window.c              | 102 +++++++++++-------------------
 5 files changed, 60 insertions(+), 123 deletions(-)

commit 5164b9fd8c316da50ec10ef944c389dc98f140dd
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 15:11:30 2012 +0200

    convert install-mime-activation to gsettings

 libcaja-private/caja-global-preferences.c | 5 -----
 libcaja-private/caja-global-preferences.h | 2 +-
 libcaja-private/caja-mime-actions.c       | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

commit 3f9a8ff95dd0632f52ecdbe4067fffd7b3c0df20
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 15:09:52 2012 +0200

    convert exit with last window to gsettings

 libcaja-private/caja-global-preferences.c | 5 -----
 libcaja-private/caja-global-preferences.h | 2 +-
 src/caja-main.c                           | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

commit f0ef6466ec0987807fcffdd41b09e88fc1292802
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 15:07:40 2012 +0200

    convert new tab position to gsettings

 libcaja-private/caja-global-preferences.c | 17 -----------------
 libcaja-private/caja-global-preferences.h |  2 +-
 libcaja-private/caja-mime-actions.c       |  2 +-
 src/caja-navigation-window-menus.c        |  2 +-
 src/caja-window-manage-views.c            |  2 +-
 5 files changed, 4 insertions(+), 21 deletions(-)

commit ab3a27b67b830897c49ecf395ee5e63e4dfdfc26
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 15:00:29 2012 +0200

    convert always-use-browser to gsettings

 libcaja-private/caja-global-preferences.c |  5 -----
 libcaja-private/caja-global-preferences.h |  2 +-
 src/caja-application.c                    |  6 ++---
 src/caja-bookmarks-window.c               |  2 +-
 src/caja-connect-server-dialog-nonmain.c  |  2 +-
 src/caja-file-management-properties.c     | 37 ++++++++++++++++++++++++++++---
 src/caja-navigation-window-menus.c        |  2 +-
 src/caja-navigation-window.c              | 13 +++++++----
 src/caja-window-manage-views.c            |  2 +-
 src/file-manager/fm-directory-view.c      | 10 ++++-----
 10 files changed, 56 insertions(+), 25 deletions(-)

commit b10e30db918ff889bb06540e129b3f31b2815da2
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 14:44:07 2012 +0200

    convert click-policy to gsettings

 libcaja-private/caja-global-preferences.c | 24 ------------------------
 libcaja-private/caja-global-preferences.h |  2 +-
 libcaja-private/caja-icon-canvas-item.c   |  7 ++++---
 src/caja-file-management-properties.c     |  8 ++++----
 src/caja-history-sidebar.c                | 15 ++++++++-------
 src/file-manager/fm-directory-view.c      | 10 ++++++----
 src/file-manager/fm-icon-view.c           |  2 +-
 src/file-manager/fm-list-view.c           |  5 +++--
 8 files changed, 27 insertions(+), 46 deletions(-)

commit f82a305cde0842e53d7468ce37b4cd02161838c5
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 14:19:23 2012 +0200

    convert executable-text-activation to gsettings

 libcaja-private/caja-global-preferences.c | 29 -----------
 libcaja-private/caja-global-preferences.h |  2 +-
 libcaja-private/caja-mime-actions.c       |  8 +--
 src/caja-file-management-properties.c     | 85 +++++++++++++++++++++++++++++--
 4 files changed, 86 insertions(+), 38 deletions(-)

commit f3fda69cae01b52e65a5608ed7c86d2abbb8f80a
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 14:13:02 2012 +0200

    convert mouse preferences to gsettings

 libcaja-private/caja-global-preferences.c | 15 ---------------
 libcaja-private/caja-global-preferences.h |  6 +++---
 src/caja-navigation-window.c              | 28 +++++++++++++++-------------
 3 files changed, 18 insertions(+), 31 deletions(-)

commit 8e8764286d4a3f65839dfdd4019b4f22fe3eabe4
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 14:00:24 2012 +0200

    convert date-format to gsettings
    add eel_g_settings_add_auto_enum in eel/eel-glib-extensions.c

 eel/eel-glib-extensions.c                 | 24 ++++++++++++++
 eel/eel-glib-extensions.h                 |  4 +++
 libcaja-private/caja-directory.c          |  7 ++--
 libcaja-private/caja-file.c               |  6 ++--
 libcaja-private/caja-global-preferences.c | 17 ----------
 libcaja-private/caja-global-preferences.h |  2 +-
 src/caja-file-management-properties.c     | 53 ++++++++++++++++++++++++++++---
 7 files changed, 85 insertions(+), 28 deletions(-)

commit cf3e02237f89593e6e03065ced3af2835e915ee0
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 12:44:38 2012 +0200

    convert show-advanced-persmissions to gsettings

 libcaja-private/caja-global-preferences.c | 5 -----
 libcaja-private/caja-global-preferences.h | 2 +-
 src/file-manager/fm-properties-window.c   | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

commit 6f15dc7cc1be8b98bbc1f5edd963ff89076295ee
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Sep 5 12:36:04 2012 +0200

    start migration to gsettings

 NEWS                                               |   4 +
 configure.in                                       |  18 +-
 libcaja-private/Makefile.am                        |  22 +-
 libcaja-private/caja-autorun.c                     |  22 +-
 libcaja-private/caja-desktop-directory-file.c      |   2 +-
 libcaja-private/caja-desktop-directory.c           |  17 +-
 libcaja-private/caja-desktop-icon-file.c           |   2 +-
 libcaja-private/caja-directory-async.c             |  39 +-
 libcaja-private/caja-directory-background.c        |  89 ++--
 libcaja-private/caja-directory-private.h           |   1 -
 libcaja-private/caja-directory.c                   |  14 +-
 libcaja-private/caja-directory.h                   |   2 -
 libcaja-private/caja-file-operations.c             |  36 +-
 libcaja-private/caja-file-private.h                |   1 -
 libcaja-private/caja-file-utilities.c              |  10 +-
 libcaja-private/caja-file-utilities.h              |   4 -
 libcaja-private/caja-file.c                        |  34 +-
 libcaja-private/caja-file.h                        |   7 +-
 libcaja-private/caja-global-preferences.c          |  85 +---
 libcaja-private/caja-global-preferences.h          |  59 ++-
 libcaja-private/caja-icon-container.c              |   7 -
 libcaja-private/caja-merged-directory.c            |   6 +-
 libcaja-private/caja-search-directory.c            |   3 -
 libcaja-private/caja-vfs-directory.c               |   2 -
 libcaja-private/caja-vfs-file.c                    |   2 +-
 libcaja-private/org.mate.caja.gschema.xml.in       | 491 +++++++++++++++++++++
 .../org.mate.media-handling.gschema.xml.in         |  34 ++
 src/caja-application.c                             |  23 +-
 src/caja-emblem-sidebar.h                          |   2 +-
 src/caja-file-management-properties-main.c         |   2 +
 src/caja-file-management-properties.c              |  61 ++-
 src/caja-history-sidebar.h                         |   2 +-
 src/caja-information-panel.c                       |  70 +--
 src/caja-information-panel.h                       |   2 +-
 src/caja-main.c                                    |   8 -
 src/caja-navigation-window.c                       |  25 +-
 src/caja-notes-viewer.h                            |   2 +-
 src/caja-pathbar.c                                 |  10 +-
 src/caja-places-sidebar.c                          |  11 +-
 src/caja-places-sidebar.h                          |   2 +-
 src/caja-property-browser.c                        |  21 -
 src/caja-window-menus.c                            |  10 +-
 src/file-manager/Makefile.am                       |   2 -
 src/file-manager/fm-desktop-icon-view.c            |  12 +-
 src/file-manager/fm-directory-view.c               |  36 +-
 src/file-manager/fm-tree-model.c                   |   4 -
 src/file-manager/fm-tree-view.c                    |  22 +-
 src/file-manager/fm-tree-view.h                    |   2 +-
 test/test-caja-directory-async.c                   |   2 +-
 49 files changed, 833 insertions(+), 511 deletions(-)

commit 373da58a33a4242f3d91771fd304ba8bb3d55e61
Author: Perberos <perberos@gmail.com>
Date:   Tue Aug 14 14:41:29 2012 -0300

    Update configure.in
    
    set libcaja-extension to 1.4.0

 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 0251b0f018c0860bafdd621f7be5eb395b510f5c
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Sun Aug 12 14:46:29 2012 -0400

    Fixed incorrect fsf addresses. Closes #28.

 cut-n-paste-code/libegg/eggdesktopfile.c             | 4 ++--
 cut-n-paste-code/libegg/eggdesktopfile.h             | 4 ++--
 cut-n-paste-code/libegg/eggsmclient-private.h        | 4 ++--
 cut-n-paste-code/libegg/eggsmclient-xsmp.c           | 4 ++--
 cut-n-paste-code/libegg/eggsmclient.c                | 4 ++--
 cut-n-paste-code/libegg/eggsmclient.h                | 4 ++--
 cut-n-paste-code/libegg/eggtreemultidnd.c            | 4 ++--
 cut-n-paste-code/libegg/eggtreemultidnd.h            | 4 ++--
 eel/check-program.c                                  | 4 ++--
 eel/eel-accessibility.c                              | 4 ++--
 eel/eel-accessibility.h                              | 4 ++--
 eel/eel-alert-dialog.c                               | 4 ++--
 eel/eel-alert-dialog.h                               | 4 ++--
 eel/eel-art-extensions.c                             | 4 ++--
 eel/eel-art-extensions.h                             | 4 ++--
 eel/eel-art-gtk-extensions.c                         | 4 ++--
 eel/eel-art-gtk-extensions.h                         | 4 ++--
 eel/eel-background-box.c                             | 4 ++--
 eel/eel-background-box.h                             | 4 ++--
 eel/eel-background.c                                 | 4 ++--
 eel/eel-background.h                                 | 4 ++--
 eel/eel-canvas-rect-ellipse.c                        | 4 ++--
 eel/eel-canvas-rect-ellipse.h                        | 4 ++--
 eel/eel-canvas-util.c                                | 4 ++--
 eel/eel-canvas-util.h                                | 4 ++--
 eel/eel-canvas.c                                     | 4 ++--
 eel/eel-canvas.h                                     | 4 ++--
 eel/eel-debug-drawing.c                              | 4 ++--
 eel/eel-debug-drawing.h                              | 4 ++--
 eel/eel-debug.c                                      | 4 ++--
 eel/eel-debug.h                                      | 4 ++--
 eel/eel-editable-label.c                             | 2 +-
 eel/eel-editable-label.h                             | 2 +-
 eel/eel-enumeration.c                                | 4 ++--
 eel/eel-enumeration.h                                | 4 ++--
 eel/eel-gdk-extensions.c                             | 4 ++--
 eel/eel-gdk-extensions.h                             | 4 ++--
 eel/eel-gdk-pixbuf-extensions.c                      | 4 ++--
 eel/eel-gdk-pixbuf-extensions.h                      | 4 ++--
 eel/eel-glib-extensions.c                            | 4 ++--
 eel/eel-glib-extensions.h                            | 4 ++--
 eel/eel-graphic-effects.c                            | 4 ++--
 eel/eel-graphic-effects.h                            | 4 ++--
 eel/eel-gtk-container.c                              | 4 ++--
 eel/eel-gtk-container.h                              | 4 ++--
 eel/eel-gtk-extensions.c                             | 4 ++--
 eel/eel-gtk-extensions.h                             | 4 ++--
 eel/eel-gtk-macros.h                                 | 4 ++--
 eel/eel-i18n.c                                       | 4 ++--
 eel/eel-i18n.h                                       | 4 ++--
 eel/eel-image-table.c                                | 4 ++--
 eel/eel-image-table.h                                | 4 ++--
 eel/eel-labeled-image.c                              | 4 ++--
 eel/eel-labeled-image.h                              | 4 ++--
 eel/eel-lib-self-check-functions.c                   | 4 ++--
 eel/eel-lib-self-check-functions.h                   | 4 ++--
 eel/eel-mate-extensions.c                            | 4 ++--
 eel/eel-mate-extensions.h                            | 4 ++--
 eel/eel-mateconf-extensions.c                        | 4 ++--
 eel/eel-mateconf-extensions.h                        | 4 ++--
 eel/eel-pango-extensions.c                           | 4 ++--
 eel/eel-pango-extensions.h                           | 4 ++--
 eel/eel-preferences-builder.c                        | 4 ++--
 eel/eel-preferences.c                                | 4 ++--
 eel/eel-preferences.h                                | 4 ++--
 eel/eel-self-checks.c                                | 4 ++--
 eel/eel-self-checks.h                                | 4 ++--
 eel/eel-stock-dialogs.c                              | 4 ++--
 eel/eel-stock-dialogs.h                              | 4 ++--
 eel/eel-string.c                                     | 4 ++--
 eel/eel-string.h                                     | 4 ++--
 eel/eel-types.c                                      | 4 ++--
 eel/eel-types.h                                      | 4 ++--
 eel/eel-vfs-extensions.c                             | 4 ++--
 eel/eel-vfs-extensions.h                             | 4 ++--
 eel/eel-wrap-table.c                                 | 4 ++--
 eel/eel-wrap-table.h                                 | 4 ++--
 eel/eel-xml-extensions.c                             | 4 ++--
 eel/eel-xml-extensions.h                             | 4 ++--
 eel/eel.h                                            | 4 ++--
 libcaja-extension/caja-column-provider.c             | 2 +-
 libcaja-extension/caja-column-provider.h             | 2 +-
 libcaja-extension/caja-column.c                      | 2 +-
 libcaja-extension/caja-column.h                      | 2 +-
 libcaja-extension/caja-extension-private.h           | 2 +-
 libcaja-extension/caja-extension-types.c             | 2 +-
 libcaja-extension/caja-extension-types.h             | 2 +-
 libcaja-extension/caja-file-info.c                   | 2 +-
 libcaja-extension/caja-file-info.h                   | 2 +-
 libcaja-extension/caja-info-provider.c               | 2 +-
 libcaja-extension/caja-info-provider.h               | 2 +-
 libcaja-extension/caja-location-widget-provider.c    | 2 +-
 libcaja-extension/caja-location-widget-provider.h    | 2 +-
 libcaja-extension/caja-menu-item.c                   | 2 +-
 libcaja-extension/caja-menu-item.h                   | 2 +-
 libcaja-extension/caja-menu-provider.c               | 2 +-
 libcaja-extension/caja-menu-provider.h               | 2 +-
 libcaja-extension/caja-menu.c                        | 2 +-
 libcaja-extension/caja-menu.h                        | 2 +-
 libcaja-extension/caja-property-page-provider.c      | 2 +-
 libcaja-extension/caja-property-page-provider.h      | 2 +-
 libcaja-extension/caja-property-page.c               | 2 +-
 libcaja-extension/caja-property-page.h               | 2 +-
 libcaja-private/caja-autorun.c                       | 2 +-
 libcaja-private/caja-autorun.h                       | 2 +-
 libcaja-private/caja-bookmark.c                      | 4 ++--
 libcaja-private/caja-bookmark.h                      | 4 ++--
 libcaja-private/caja-cell-renderer-pixbuf-emblem.c   | 4 ++--
 libcaja-private/caja-cell-renderer-pixbuf-emblem.h   | 4 ++--
 libcaja-private/caja-cell-renderer-text-ellipsized.c | 4 ++--
 libcaja-private/caja-cell-renderer-text-ellipsized.h | 4 ++--
 libcaja-private/caja-clipboard-monitor.c             | 4 ++--
 libcaja-private/caja-clipboard-monitor.h             | 4 ++--
 libcaja-private/caja-clipboard.c                     | 4 ++--
 libcaja-private/caja-clipboard.h                     | 4 ++--
 libcaja-private/caja-column-chooser.c                | 4 ++--
 libcaja-private/caja-column-chooser.h                | 4 ++--
 libcaja-private/caja-column-utilities.c              | 4 ++--
 libcaja-private/caja-column-utilities.h              | 4 ++--
 libcaja-private/caja-customization-data.c            | 2 +-
 libcaja-private/caja-customization-data.h            | 2 +-
 libcaja-private/caja-debug-log.c                     | 4 ++--
 libcaja-private/caja-debug-log.h                     | 4 ++--
 libcaja-private/caja-default-file-icon.c             | 4 ++--
 libcaja-private/caja-default-file-icon.h             | 4 ++--
 libcaja-private/caja-desktop-directory-file.c        | 4 ++--
 libcaja-private/caja-desktop-directory-file.h        | 4 ++--
 libcaja-private/caja-desktop-directory.c             | 4 ++--
 libcaja-private/caja-desktop-directory.h             | 4 ++--
 libcaja-private/caja-desktop-icon-file.c             | 4 ++--
 libcaja-private/caja-desktop-icon-file.h             | 4 ++--
 libcaja-private/caja-desktop-link-monitor.c          | 4 ++--
 libcaja-private/caja-desktop-link-monitor.h          | 4 ++--
 libcaja-private/caja-desktop-link.c                  | 4 ++--
 libcaja-private/caja-desktop-link.h                  | 4 ++--
 libcaja-private/caja-directory-async.c               | 4 ++--
 libcaja-private/caja-directory-background.c          | 4 ++--
 libcaja-private/caja-directory-background.h          | 4 ++--
 libcaja-private/caja-directory-notify.h              | 4 ++--
 libcaja-private/caja-directory-private.h             | 4 ++--
 libcaja-private/caja-directory.c                     | 4 ++--
 libcaja-private/caja-directory.h                     | 4 ++--
 libcaja-private/caja-dnd.c                           | 4 ++--
 libcaja-private/caja-dnd.h                           | 4 ++--
 libcaja-private/caja-emblem-utils.c                  | 4 ++--
 libcaja-private/caja-emblem-utils.h                  | 4 ++--
 libcaja-private/caja-entry.c                         | 4 ++--
 libcaja-private/caja-entry.h                         | 4 ++--
 libcaja-private/caja-file-attributes.h               | 4 ++--
 libcaja-private/caja-file-changes-queue.c            | 4 ++--
 libcaja-private/caja-file-changes-queue.h            | 4 ++--
 libcaja-private/caja-file-conflict-dialog.c          | 4 ++--
 libcaja-private/caja-file-conflict-dialog.h          | 4 ++--
 libcaja-private/caja-file-dnd.c                      | 4 ++--
 libcaja-private/caja-file-dnd.h                      | 4 ++--
 libcaja-private/caja-file-operations.c               | 4 ++--
 libcaja-private/caja-file-operations.h               | 4 ++--
 libcaja-private/caja-file-private.h                  | 4 ++--
 libcaja-private/caja-file-queue.c                    | 4 ++--
 libcaja-private/caja-file-queue.h                    | 4 ++--
 libcaja-private/caja-file-utilities.c                | 4 ++--
 libcaja-private/caja-file-utilities.h                | 4 ++--
 libcaja-private/caja-file.c                          | 4 ++--
 libcaja-private/caja-file.h                          | 4 ++--
 libcaja-private/caja-global-preferences.c            | 4 ++--
 libcaja-private/caja-global-preferences.h            | 4 ++--
 libcaja-private/caja-horizontal-splitter.c           | 4 ++--
 libcaja-private/caja-horizontal-splitter.h           | 4 ++--
 libcaja-private/caja-icon-canvas-item.c              | 4 ++--
 libcaja-private/caja-icon-canvas-item.h              | 4 ++--
 libcaja-private/caja-icon-container.c                | 4 ++--
 libcaja-private/caja-icon-container.h                | 4 ++--
 libcaja-private/caja-icon-dnd.c                      | 4 ++--
 libcaja-private/caja-icon-dnd.h                      | 4 ++--
 libcaja-private/caja-icon-info.c                     | 4 ++--
 libcaja-private/caja-icon-private.h                  | 4 ++--
 libcaja-private/caja-idle-queue.c                    | 2 +-
 libcaja-private/caja-idle-queue.h                    | 2 +-
 libcaja-private/caja-iso9660.h                       | 2 +-
 libcaja-private/caja-keep-last-vertical-box.c        | 4 ++--
 libcaja-private/caja-keep-last-vertical-box.h        | 4 ++--
 libcaja-private/caja-lib-self-check-functions.c      | 4 ++--
 libcaja-private/caja-lib-self-check-functions.h      | 4 ++--
 libcaja-private/caja-link.c                          | 4 ++--
 libcaja-private/caja-link.h                          | 4 ++--
 libcaja-private/caja-merged-directory.c              | 4 ++--
 libcaja-private/caja-merged-directory.h              | 4 ++--
 libcaja-private/caja-metadata.c                      | 4 ++--
 libcaja-private/caja-metadata.h                      | 4 ++--
 libcaja-private/caja-mime-actions.c                  | 4 ++--
 libcaja-private/caja-mime-actions.h                  | 4 ++--
 libcaja-private/caja-mime-application-chooser.c      | 4 ++--
 libcaja-private/caja-mime-application-chooser.h      | 4 ++--
 libcaja-private/caja-module.c                        | 2 +-
 libcaja-private/caja-module.h                        | 2 +-
 libcaja-private/caja-monitor.c                       | 4 ++--
 libcaja-private/caja-monitor.h                       | 4 ++--
 libcaja-private/caja-open-with-dialog.c              | 4 ++--
 libcaja-private/caja-open-with-dialog.h              | 4 ++--
 libcaja-private/caja-program-choosing.c              | 4 ++--
 libcaja-private/caja-program-choosing.h              | 4 ++--
 libcaja-private/caja-progress-info.c                 | 4 ++--
 libcaja-private/caja-progress-info.h                 | 4 ++--
 libcaja-private/caja-query.c                         | 4 ++--
 libcaja-private/caja-query.h                         | 4 ++--
 libcaja-private/caja-recent.c                        | 4 ++--
 libcaja-private/caja-saved-search-file.c             | 4 ++--
 libcaja-private/caja-saved-search-file.h             | 4 ++--
 libcaja-private/caja-search-directory-file.c         | 4 ++--
 libcaja-private/caja-search-directory-file.h         | 4 ++--
 libcaja-private/caja-search-directory.c              | 4 ++--
 libcaja-private/caja-search-directory.h              | 4 ++--
 libcaja-private/caja-search-engine-beagle.c          | 4 ++--
 libcaja-private/caja-search-engine-beagle.h          | 4 ++--
 libcaja-private/caja-search-engine-simple.c          | 4 ++--
 libcaja-private/caja-search-engine-simple.h          | 4 ++--
 libcaja-private/caja-search-engine-tracker.c         | 4 ++--
 libcaja-private/caja-search-engine-tracker.h         | 4 ++--
 libcaja-private/caja-search-engine.c                 | 4 ++--
 libcaja-private/caja-search-engine.h                 | 4 ++--
 libcaja-private/caja-sidebar-provider.c              | 4 ++--
 libcaja-private/caja-sidebar-provider.h              | 4 ++--
 libcaja-private/caja-sidebar.c                       | 4 ++--
 libcaja-private/caja-sidebar.h                       | 4 ++--
 libcaja-private/caja-signaller.c                     | 2 +-
 libcaja-private/caja-signaller.h                     | 2 +-
 libcaja-private/caja-thumbnails.c                    | 4 ++--
 libcaja-private/caja-thumbnails.h                    | 4 ++--
 libcaja-private/caja-trash-monitor.c                 | 4 ++--
 libcaja-private/caja-trash-monitor.h                 | 4 ++--
 libcaja-private/caja-tree-view-drag-dest.c           | 4 ++--
 libcaja-private/caja-tree-view-drag-dest.h           | 4 ++--
 libcaja-private/caja-ui-utilities.c                  | 4 ++--
 libcaja-private/caja-ui-utilities.h                  | 4 ++--
 libcaja-private/caja-undo-manager.c                  | 4 ++--
 libcaja-private/caja-undo-manager.h                  | 4 ++--
 libcaja-private/caja-undo-private.h                  | 4 ++--
 libcaja-private/caja-undo-signal-handlers.c          | 4 ++--
 libcaja-private/caja-undo-signal-handlers.h          | 4 ++--
 libcaja-private/caja-undo-transaction.c              | 4 ++--
 libcaja-private/caja-undo-transaction.h              | 4 ++--
 libcaja-private/caja-undo.c                          | 4 ++--
 libcaja-private/caja-undo.h                          | 4 ++--
 libcaja-private/caja-undostack-manager.c             | 4 ++--
 libcaja-private/caja-undostack-manager.h             | 4 ++--
 libcaja-private/caja-users-groups-cache.c            | 4 ++--
 libcaja-private/caja-users-groups-cache.h            | 4 ++--
 libcaja-private/caja-vfs-directory.c                 | 4 ++--
 libcaja-private/caja-vfs-directory.h                 | 4 ++--
 libcaja-private/caja-vfs-file.c                      | 4 ++--
 libcaja-private/caja-vfs-file.h                      | 4 ++--
 libcaja-private/caja-view-factory.c                  | 4 ++--
 libcaja-private/caja-view-factory.h                  | 4 ++--
 libcaja-private/caja-view.c                          | 4 ++--
 libcaja-private/caja-view.h                          | 4 ++--
 libcaja-private/caja-window-info.c                   | 4 ++--
 libcaja-private/caja-window-info.h                   | 4 ++--
 libcaja-private/caja-window-slot-info.c              | 4 ++--
 libcaja-private/caja-window-slot-info.h              | 4 ++--
 src/caja-actions.h                                   | 2 +-
 src/caja-application.c                               | 2 +-
 src/caja-application.h                               | 4 ++--
 src/caja-autorun-software.c                          | 4 ++--
 src/caja-bookmark-list.c                             | 2 +-
 src/caja-bookmark-list.h                             | 2 +-
 src/caja-bookmarks-window.c                          | 2 +-
 src/caja-bookmarks-window.h                          | 2 +-
 src/caja-connect-server-dialog-main.c                | 4 ++--
 src/caja-connect-server-dialog-nonmain.c             | 4 ++--
 src/caja-connect-server-dialog.c                     | 4 ++--
 src/caja-connect-server-dialog.h                     | 4 ++--
 src/caja-convert-metadata.c                          | 4 ++--
 src/caja-desktop-window.c                            | 2 +-
 src/caja-desktop-window.h                            | 2 +-
 src/caja-emblem-sidebar.c                            | 2 +-
 src/caja-emblem-sidebar.h                            | 2 +-
 src/caja-file-management-properties-main.c           | 4 ++--
 src/caja-file-management-properties.c                | 4 ++--
 src/caja-file-management-properties.h                | 4 ++--
 src/caja-history-sidebar.c                           | 2 +-
 src/caja-history-sidebar.h                           | 2 +-
 src/caja-image-properties-page.c                     | 4 ++--
 src/caja-image-properties-page.h                     | 4 ++--
 src/caja-information-panel.c                         | 2 +-
 src/caja-information-panel.h                         | 2 +-
 src/caja-location-bar.c                              | 4 ++--
 src/caja-location-bar.h                              | 4 ++--
 src/caja-location-dialog.c                           | 4 ++--
 src/caja-location-dialog.h                           | 4 ++--
 src/caja-location-entry.c                            | 4 ++--
 src/caja-location-entry.h                            | 4 ++--
 src/caja-main.c                                      | 2 +-
 src/caja-main.h                                      | 2 +-
 src/caja-navigation-action.c                         | 2 +-
 src/caja-navigation-action.h                         | 2 +-
 src/caja-navigation-bar.c                            | 4 ++--
 src/caja-navigation-bar.h                            | 4 ++--
 src/caja-navigation-window-menus.c                   | 2 +-
 src/caja-navigation-window-pane.c                    | 4 ++--
 src/caja-navigation-window-pane.h                    | 4 ++--
 src/caja-navigation-window-slot.c                    | 4 ++--
 src/caja-navigation-window-slot.h                    | 4 ++--
 src/caja-navigation-window.c                         | 2 +-
 src/caja-navigation-window.h                         | 2 +-
 src/caja-notes-viewer.c                              | 2 +-
 src/caja-notes-viewer.h                              | 2 +-
 src/caja-pathbar.c                                   | 4 ++--
 src/caja-pathbar.h                                   | 4 ++--
 src/caja-places-sidebar.c                            | 2 +-
 src/caja-places-sidebar.h                            | 2 +-
 src/caja-property-browser.c                          | 2 +-
 src/caja-property-browser.h                          | 2 +-
 src/caja-query-editor.c                              | 4 ++--
 src/caja-query-editor.h                              | 4 ++--
 src/caja-search-bar.c                                | 4 ++--
 src/caja-search-bar.h                                | 4 ++--
 src/caja-self-check-functions.c                      | 2 +-
 src/caja-self-check-functions.h                      | 2 +-
 src/caja-side-pane.c                                 | 2 +-
 src/caja-side-pane.h                                 | 2 +-
 src/caja-sidebar-title.c                             | 2 +-
 src/caja-sidebar-title.h                             | 2 +-
 src/caja-spatial-window.c                            | 2 +-
 src/caja-spatial-window.h                            | 2 +-
 src/caja-trash-bar.c                                 | 2 +-
 src/caja-trash-bar.h                                 | 2 +-
 src/caja-view-as-action.c                            | 2 +-
 src/caja-view-as-action.h                            | 2 +-
 src/caja-window-bookmarks.c                          | 2 +-
 src/caja-window-bookmarks.h                          | 2 +-
 src/caja-window-manage-views.c                       | 2 +-
 src/caja-window-manage-views.h                       | 2 +-
 src/caja-window-menus.c                              | 2 +-
 src/caja-window-pane.c                               | 4 ++--
 src/caja-window-pane.h                               | 4 ++--
 src/caja-window-private.h                            | 2 +-
 src/caja-window-slot.c                               | 4 ++--
 src/caja-window-slot.h                               | 4 ++--
 src/caja-window-toolbars.c                           | 2 +-
 src/caja-window.c                                    | 2 +-
 src/caja-window.h                                    | 2 +-
 src/caja-x-content-bar.c                             | 2 +-
 src/caja-x-content-bar.h                             | 2 +-
 src/caja-zoom-action.c                               | 2 +-
 src/caja-zoom-action.h                               | 2 +-
 src/caja-zoom-control.c                              | 2 +-
 src/caja-zoom-control.h                              | 2 +-
 src/file-manager/fm-actions.h                        | 4 ++--
 src/file-manager/fm-desktop-icon-view.c              | 4 ++--
 src/file-manager/fm-desktop-icon-view.h              | 4 ++--
 src/file-manager/fm-directory-view.c                 | 4 ++--
 src/file-manager/fm-directory-view.h                 | 4 ++--
 src/file-manager/fm-ditem-page.c                     | 2 +-
 src/file-manager/fm-ditem-page.h                     | 2 +-
 src/file-manager/fm-empty-view.c                     | 4 ++--
 src/file-manager/fm-empty-view.h                     | 4 ++--
 src/file-manager/fm-error-reporting.c                | 4 ++--
 src/file-manager/fm-error-reporting.h                | 4 ++--
 src/file-manager/fm-icon-container.c                 | 4 ++--
 src/file-manager/fm-icon-container.h                 | 4 ++--
 src/file-manager/fm-icon-view.c                      | 4 ++--
 src/file-manager/fm-icon-view.h                      | 4 ++--
 src/file-manager/fm-list-model.c                     | 4 ++--
 src/file-manager/fm-list-model.h                     | 4 ++--
 src/file-manager/fm-list-view-private.h              | 4 ++--
 src/file-manager/fm-list-view.c                      | 4 ++--
 src/file-manager/fm-list-view.h                      | 4 ++--
 src/file-manager/fm-properties-window.c              | 4 ++--
 src/file-manager/fm-properties-window.h              | 4 ++--
 src/file-manager/fm-tree-model.c                     | 4 ++--
 src/file-manager/fm-tree-model.h                     | 4 ++--
 src/file-manager/fm-tree-view.c                      | 4 ++--
 src/file-manager/fm-tree-view.h                      | 4 ++--
 373 files changed, 654 insertions(+), 654 deletions(-)

commit b6f29cf3fb7fe333a48f555819111cc8f6a21d3e
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Thu Jul 5 13:58:13 2012 -0400

    Preparing for 1.4 release.

 ChangeLog    | 271 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 configure.in |   4 +-
 2 files changed, 237 insertions(+), 38 deletions(-)

commit ea1d20ed8d53b647bf2f0365ae0eb7b223a125b7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Jun 17 13:27:46 2012 +0200

    sync translations with Transifex

 po/af.po          | 11394 ++++++++++++++++++++--------------------------
 po/am.po          |  9905 +++++++++++++++++++++-------------------
 po/ar.po          |  5493 +++++++++++-----------
 po/as.po          |  6444 +++++++++++++-------------
 po/ast.po         |  6012 ++++++++++++------------
 po/az.po          | 10863 +++++++++++++++++++++++---------------------
 po/be.po          | 10246 +++++++++++++++++++++--------------------
 po/bg.po          |  1727 +++----
 po/bn.po          |  5840 ++++++++++++------------
 po/bn_IN.po       |  5818 ++++++++++++------------
 po/br.po          |  5418 ++++++++++++----------
 po/bs.po          | 11188 +++++++++++++++++++++++----------------------
 po/ca.po          |  6078 +++++++++++--------------
 po/ca@valencia.po |  6282 ++++++++++++-------------
 po/crh.po         |  7654 ++++++++++++-------------------
 po/cs.po          |  5783 +++++++++++------------
 po/da.po          |  6078 ++++++++++++-------------
 po/de.po          |  2444 ++++------
 po/dz.po          | 10695 +++++++++++++++++++++++--------------------
 po/el.po          |  5457 +++++++++++-----------
 po/en_CA.po       |  9232 +++++++++++++++++++++----------------
 po/en_GB.po       |  6366 +++++++++++---------------
 po/eo.po          |  5658 +++++++++++------------
 po/es.po          |  6741 ++++++++++++---------------
 po/et.po          |  1793 ++++----
 po/eu.po          |  2236 ++++-----
 po/fa.po          |  8634 ++++++++++++++++-------------------
 po/fi.po          |  5558 +++++++++++------------
 po/fr.po          |  5696 ++++++++++++-----------
 po/fur.po         |  6165 +++++++++++++++----------
 po/fy.po          |  4850 +++++++++++---------
 po/ga.po          |  5423 ++++++++++++----------
 po/gl.po          |  5826 ++++++++++++------------
 po/gu.po          |  5737 ++++++++++++-----------
 po/ha.po          | 10507 ++++++++++++++++++++----------------------
 po/he.po          |  8732 +++++++++++++++--------------------
 po/hi.po          |  5986 ++++++++++++------------
 po/hr.po          |  6798 +++++++++++++++-------------
 po/hu.po          |  5706 +++++++++++------------
 po/hy.po          |  8854 ++++++++++++++++++++++--------------
 po/id.po          |  5533 +++++++++++-----------
 po/ig.po          | 10426 ++++++++++++++++++++----------------------
 po/is.po          |  6042 ++++++++++++------------
 po/it.po          |  2327 ++++------
 po/ja.po          |  5543 +++++++++++------------
 po/ka.po          |  6562 +++++++++++++++------------
 po/kk.po          |  4933 ++++++++++----------
 po/km.po          |  7939 ++++++++++++++++++++------------
 po/kn.po          |  6052 ++++++++++++-------------
 po/ko.po          |  5252 ++++++++++-----------
 po/ku.po          |  9276 +++++++++++++++++++++----------------
 po/li.po          | 12840 +++++++++++++++++++++++-----------------------------
 po/lt.po          |  5836 ++++++++++++------------
 po/lv.po          |  5995 ++++++++++++------------
 po/mai.po         |  6139 ++++++++++++++-----------
 po/mg.po          |  8510 ++++++++++++++++++++--------------
 po/mi.po          |  8895 +++++++++++++++++++++---------------
 po/mk.po          |  6644 +++++++++++++--------------
 po/ml.po          |  5701 ++++++++++++-----------
 po/mn.po          | 11510 ++++++++++++++++++++++++----------------------
 po/mr.po          |  5705 ++++++++++++-----------
 po/ms.po          |  8510 +++++++++++++++-------------------
 po/nb.po          |  5583 ++++++++++++-----------
 po/nds.po         |  5268 ++++++++++++---------
 po/ne.po          |  8827 +++++++++++++++++++++---------------
 po/nl.po          |  1727 +++----
 po/nn.po          |  7329 +++++++++++++-----------------
 po/nso.po         | 11533 ++++++++++++++++++++--------------------------
 po/oc.po          |  6287 ++++++++++++-------------
 po/or.po          |  5726 ++++++++++++-----------
 po/pa.po          |  5816 +++++++++++-------------
 po/pl.po          |  5732 +++++++++++------------
 po/ps.po          |  5700 +++++++++++++----------
 po/pt.po          |  8532 ++++++++++++----------------------
 po/pt_BR.po       |  6063 +++++++++++--------------
 po/ro.po          |  5947 ++++++++++++------------
 po/ru.po          |  2251 ++++-----
 po/rw.po          | 11739 ++++++++++++++++++++++++-----------------------
 po/si.po          |  7826 +++++++++++++++++++-------------
 po/sk.po          |  6521 ++++++++++++++------------
 po/sl.po          |  5459 +++++++++++-----------
 po/sq.po          |  6757 ++++++++++++++-------------
 po/sr.po          |  6351 ++++++++++++--------------
 po/sr@latin.po    |  6351 ++++++++++++--------------
 po/sv.po          |  5101 +++++++++++----------
 po/ta.po          |  6566 +++++++++++++++------------
 po/te.po          |  5821 +++++++++++++-----------
 po/th.po          |  5358 +++++++++++-----------
 po/tk.po          | 10953 ++++++++++++++++++++++++--------------------
 po/tr.po          |  6725 +++++++++++++--------------
 po/ug.po          |  5756 +++++++++++------------
 po/uk.po          |  5792 ++++++++++++------------
 po/uz.po          |  5548 ++++++++++++++---------
 po/vi.po          |  5645 ++++++++++++++---------
 po/wa.po          | 10801 ++++++++++++++++++++++---------------------
 po/xh.po          | 10081 ++++++++++++++++++++++-------------------
 po/yi.po          |  8183 ++++++++++++++++++++-------------
 po/yo.po          | 10433 ++++++++++++++++++++----------------------
 po/zh_CN.po       |  5249 ++++++++++-----------
 po/zh_HK.po       |  6142 ++++++++++++-------------
 po/zh_TW.po       |  6302 ++++++++++++--------------
 po/zu.po          | 10712 +++++++++++++++++++++++--------------------
 102 files changed, 356350 insertions(+), 341630 deletions(-)

commit 284192b5fc88484f877dd8033bb40a12e8191cf2
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Jun 17 13:13:05 2012 +0200

    add backup of gnome copyrights for po files

 po/gnome-copyrights.txt | 1864 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1864 insertions(+)

commit 16379e27f5cc8a254f766b591b7b208bf5a59d55
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Jun 16 11:57:48 2012 +0200

    revert version to 1.3.0, update NEWS file

 NEWS         | 7 ++++++-
 configure.in | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

commit a8789710c20b11eeae3cabe35ea58f77af5f0617
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Jun 16 11:41:58 2012 +0200

    use engrampa instead of file-roller

 libcaja-private/caja-file-dnd.c       | 2 +-
 libcaja-private/caja-file-utilities.c | 4 ++--
 libcaja-private/caja-file-utilities.h | 2 +-
 src/file-manager/fm-directory-view.c  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

commit cbbe010884fe1e3ad1deabbed7f89a77b0098a2f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sat Jun 16 11:31:39 2012 +0200

    add diff button for text files in file conflict dialog

 libcaja-private/caja-file-conflict-dialog.c | 67 +++++++++++++++++++++++++++++
 libcaja-private/caja-file.c                 | 45 +++++++++++++++++++
 libcaja-private/caja-file.h                 |  1 +
 3 files changed, 113 insertions(+)

commit dec2e9160bdc72ff9b44582d5484e673e60e27bb
Merge: 7509b2a d69f6a0
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jun 14 00:44:18 2012 -0700

    Merge pull request #23 from haxar/patch-1
    
    remove extra bracket

commit d69f6a09152b52c371216592936ff9ed6bb6f36c
Author: haxar <haxaraxah@gmail.com>
Date:   Wed Jun 13 21:30:39 2012 -0700

    remove extra bracket

 src/caja-location-entry.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 7509b2aba6103d4c3c88b82b36b12a8a3a9329be
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Jun 13 00:05:10 2012 +0200

    fix autocompletion for remote locations
    patch from http://git.gnome.org/browse/nautilus/commit/src/nautilus-location-entry.c?id=82fb99a34a6c27f6881e0a049d9882756b615f42

 src/caja-location-entry.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

commit 1b5fa0a349182cd854396bf071a2706ed89d16f1
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Fri Jun 8 13:37:36 2012 -0400

    Applied a patch that makes the filename column expand to its maximum instead of shrinking to a hardcoded value.

 src/file-manager/fm-list-view.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

commit cfef75e230da0d56d8677be3d3b3478f54c62e57
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Mon May 28 15:06:42 2012 -0400

    Bump to 1.3.2

 ChangeLog    | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.in |  2 +-
 2 files changed, 66 insertions(+), 1 deletion(-)

commit 9b299865250365f948b523f45a874dce52d125d5
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Mon May 28 15:05:27 2012 -0400

    Bookmarks can now be opened via the enter or space key.

 src/caja-places-sidebar.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

commit 03680f2d95687c0f336993bb44663af3bb0c2ffa
Merge: 896872d 1558f59
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed May 16 02:52:20 2012 -0700

    Merge pull request #16 from MDykstra/master
    
    better backward compatible dependency on gmodule-2.0

commit 1558f59456ae8abe428c8378910e6a1f26bf9411
Author: Marcel Dijkstra <marcel.dykstra@gmail.com>
Date:   Wed May 16 04:13:53 2012 +0200

    only depend on gmodule-2.0 if it exists

 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 896872d030fa0ab1fb7c62161c327146e0ad609a
Merge: f269a73 a57d08c
Author: Perberos <perberos@gmail.com>
Date:   Thu May 10 06:24:09 2012 -0700

    Merge pull request #10 from MDykstra/master
    
    now linking under up-to-date Arch Linux system

commit f269a73f7bbee46a2217f9d0aa6714605b11ec59
Author: Perberos <perberos@gmail.com>
Date:   Wed May 9 06:48:01 2012 -0300

    updating PKGBUILD

 distro/archlinux/PKGBUILD | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

commit a7a3d8e25a4a156e4b7cf8ff2c0d85bca94c5f17
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Wed May 9 12:05:35 2012 -0400

    Fixed keep aligned issue. Bumped version to 1.3.1

 ChangeLog                                     | 113 ++++++++++++++++++++++++++
 configure.in                                  |   2 +-
 libcaja-private/caja-desktop-directory-file.c |   6 +-
 3 files changed, 118 insertions(+), 3 deletions(-)

commit c36dd05635062e69090670f4c125f5834e82eba4
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon May 7 17:47:06 2012 +0200

    fix issues in location bar

 src/caja-navigation-window-pane.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 01100fab944b30226de97ac964171808b91ee9be
Merge: 66a32c7 4dbd82c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed May 2 10:56:10 2012 -0700

    Merge pull request #11 from NiceandGently/master
    
    fix obsoletes mime data in caja-folder-handler.desktop.in.in
    http://git.gnome.org/browse/nautilus/commit/?id=e939b36481815dbdf4053dba070f17d02a1efc38

commit 4dbd82c4d77f2327cd86fc16b314652cf0b76b13
Author: chat-to-me@raveit.de <Nice&Gently>
Date:   Wed May 2 19:39:25 2012 +0200

    fix obsoletes mime data in caja-folder-handler.desktop.in.in

 data/caja-folder-handler.desktop.in.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 66a32c73c581695a0767b248859d10ea78651dfd
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Apr 27 17:36:16 2012 +0200

    start of 1.3 version

 configure.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 416237607d4985738feaede3b7e1b49cae9be149
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Apr 27 17:35:23 2012 +0200

    restore location toggle button
    patch from http://git.gnome.org/browse/nautilus/commit/?id=4b49aab5aa6a9ef9ab288ff2ce463affca1eacf2

 src/caja-navigation-window-pane.c | 75 +++++++++++++++++++++++++++++++++++++++
 src/caja-navigation-window-pane.h |  1 +
 2 files changed, 76 insertions(+)

commit a57d08ce5672bcabae2de9a31d6660eac1c5880a
Author: Marcel Dijkstra <marcel.dykstra@gmail.com>
Date:   Thu Apr 26 22:16:37 2012 +0200

    linker now requires gmodule-2.0 in mate-file-manager

 configure.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit aaf4c05d9a382b18eb2eced119eff8fbf0f4c763
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Fri Apr 6 00:55:50 2012 -0400

    Removed ubuntu folder from distro.

 distro/ubuntu/build    | 36 ------------------------------------
 distro/ubuntu/postinst | 15 ---------------
 distro/ubuntu/postrm   | 10 ----------
 distro/ubuntu/preinst  |  8 --------
 distro/ubuntu/prerm    | 11 -----------
 5 files changed, 80 deletions(-)

commit 471bb189349ce7c4fd9ad78f054f140a52978604
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Apr 6 00:18:47 2012 +0200

    fix missing spaces due to caja => nautilus rename

 docs/architecture.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

commit 8a6466a545c33e358ccdec400f53c5d3473a6bbb
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Tue Apr 3 23:21:04 2012 -0400

    Removed acconfig.h and replaced with AH_TEMPLATE AND AC_DEFINE.

 acconfig.h   | 27 ---------------------------
 configure.in | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 28 deletions(-)

commit b8da9626e7a3f1bc0ec8f53dc1559ae81396c926
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Mar 11 13:57:56 2012 +0100

    fix README file for MATE (thanks to awillson)

 HACKING | 57 ++++-----------------------------------------------------
 README  | 23 +++--------------------
 2 files changed, 7 insertions(+), 73 deletions(-)

commit bc154ccd1f47fd8a2bd1e282659e94e6893f4b70
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Feb 23 13:23:46 2012 +0100

    update translations (bg, et, nl)

 po/bg.po | 4452 ++++++++++++++++++++++++++--------------------------
 po/et.po | 3094 ++++++++++++++++++++++++++++--------
 po/nl.po | 5279 ++++++++++++++++++++++++++------------------------------------
 3 files changed, 6852 insertions(+), 5973 deletions(-)

commit 853c0d3f6c79eb5dfc6130ffde4d345f66ec51d4
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Wed Feb 22 21:16:34 2012 -0500

    Preparing for 1.2 release

 AUTHORS      |    2 +-
 ChangeLog    | 1035 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 autogen.sh   |    4 +-
 configure.in |    2 +-
 4 files changed, 1039 insertions(+), 4 deletions(-)

commit f3100ba42ca406a33d5019a5527b08871e58cd90
Author: Perberos <perberos@gmail.com>
Date:   Mon Jan 30 08:12:51 2012 -0300

    adding empty tab page on preferences

 src/caja-file-management-properties.ui | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

commit 81ad1b3760e41292620093a4cd143740f6af4f3a
Merge: 31fb21b 1ee8111
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Sun Jan 15 13:24:41 2012 -0800

    Merge pull request #1 from benpicco/master
    
    list-view: make sure not to select the extension on rename

commit 1ee81114ffe669470ae5db8d8b2ce92659cb7633
Author: Benjamin Valentin <benpicco@zedat.fu-berlin.de>
Date:   Sun Jan 15 06:21:28 2012 +0100

    list-view: make sure not to select the extension on rename
    Delay calling gtk_editable_select_region() until after
    gtk_tree_view_set_cursor()
    
    https://bugzilla.gnome.org/show_bug.cgi?id=627110
    (cherry picked from commit 5e2edee2e8dc6b4eababdff993176d591cc2a6e6)
    
    taken from http://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=0fa8f53c89b84a47fac33eb923a5fb196ca564ee

 src/file-manager/fm-list-view.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

commit 31fb21b2dd8821af384279245baa518d80a57e0b
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jan 12 17:56:37 2012 +0100

    icon-container: use the right signature for the 'preedit-changed' cb (nautilus patch)
    this bug is related to ibus
    http://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=af981252fad7ea623f5e0ec1814408cda8244ff2
    it solves http://bugzilla.gnome.org/show_bug.cgi?id=629159 on nautilus
    we have this also on caja: http://forums.linuxmint.com/viewtopic.php?f=206&t=86481&start=160#p525315

 libcaja-private/caja-icon-container.c | 1 +
 1 file changed, 1 insertion(+)

commit cd65216e37d8cf33e468ad8a2f7714ef1bd6596f
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jan 12 17:52:42 2012 +0100

    updated de translation

 po/de.po | 217 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 111 insertions(+), 106 deletions(-)

commit 3c43eac494842d438733e738ee2ac1155abaea98
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Tue Jan 10 13:51:56 2012 -0500

    Changed mate.gr.jp to gnome.gr.jp as requested in Issue #86

 po/ChangeLog | 640 +++++++++++++++++++++++++++++------------------------------
 po/ja.po     |   2 +-
 2 files changed, 321 insertions(+), 321 deletions(-)

commit 827876affd63a117f802cb38706aadfc7cd38ff9
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jan 5 13:51:29 2012 +0100

    release 1.1.2

 configure.in              | 2 +-
 distro/archlinux/PKGBUILD | 2 +-
 distro/ubuntu/build       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 637c191d190376919631cfbd2398adc05b4a3b75
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jan 5 13:47:54 2012 +0100

    updated translations (eu, it, ru)

 po/eu.po | 405 ++++++++++++++++++++++++++++++++-------------------------------
 po/it.po | 226 ++++++++++++++++++-----------------
 po/ru.po | 218 +++++++++++++++++-----------------
 3 files changed, 432 insertions(+), 417 deletions(-)

commit ed06682bcd7a122b3b4ada110c152ccb3bbd0208
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jan 5 13:24:04 2012 +0100

    pathbar: remove buttons only if the gone file is below the current
    This should fix once and for all the crashers when ejecting devices
    Patch by Cosimo Cecchi <cosimoc@gnome.org>
    http://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=c3b54e662b52ca15d1dcbe68386b8fa82b12adc5

 src/caja-pathbar.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

commit b375acb5643b75e65f2573f686f1ad5ad635726c
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jan 5 13:11:17 2012 +0100

    pathbar: fix crasher when unmounting volumes
    https://bugzilla.gnome.org/show_bug.cgi?id=627901
    http://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=1dc416887bf1e88c4b49bd1ac2101e0fb8460af8

 src/caja-pathbar.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

commit 63a4ddb0bb1d98b54dd962831e4ca95365bc7123
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jan 5 13:00:45 2012 +0100

    location-entry: don't treat '~' as a relative path
    Based on a patch by Reed Lipman <rmlipman@gmail.com>
    https://bugzilla.gnome.org/show_bug.cgi?id=628802
    http://git.gnome.org/browse/nautilus/commit/?h=gnome-2-32&id=5e91bd11bea315b258839890a4ccf4d4b1c49a17

 libcaja-private/caja-icon-info.c | 2 +-
 src/caja-location-entry.c        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

commit 637b3475d9c8b5ff7c4dbf863c9c6b5953a6150b
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Thu Jan 5 00:07:26 2012 +0100

    applied 96_no-null-in-g-str-hash.patch from ubuntu natty nautilus

 libcaja-private/caja-icon-info.c | 8 ++++++++
 1 file changed, 8 insertions(+)

commit 4a58c31e2fad6731f31c314609dc9d7ec30066d9
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Jan 4 21:28:52 2012 +0100

    applied 15_nautilus_file_peek_crash.patch from debian nautilus 2.30.1
    it solves https://bugzilla.gnome.org/show_bug.cgi?id=602500

 libcaja-private/caja-file.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

commit c514038bc3e83e37a1fb3259a61fa100bc86ba88
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Wed Jan 4 21:03:16 2012 +0100

    updated translations (de, eu)

 po/de.po | 4629 ++++++++++++++++++++++++++++++------------------------------
 po/eu.po | 4781 +++++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 4804 insertions(+), 4606 deletions(-)

commit bd8c97baee24975ad863d86968994e8b92b3f405
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Dec 27 23:02:01 2011 +0100

    fixed about for MATE, use theme icon instead of old nautilus one

 src/caja-window-menus.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

commit 1bd5f79286dc74de9987f15e17fdb2fcbc49d81a
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Tue Dec 27 22:30:31 2011 +0100

    updated it and ru translations (thanks OpenRevan, thanks transifex!)

 po/it.po | 4417 ++++++++++++++++++++++++++++++++------------------------------
 po/ru.po | 4194 +++++++++++++++++++++++++++++++---------------------------
 2 files changed, 4553 insertions(+), 4058 deletions(-)

commit 473ed493eb72fcf0ae0d0a0ca3fce7e83b3aacde
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Dec 26 22:44:59 2011 +0100

    add undo file in POTFILES.in

 po/POTFILES.in | 1 +
 1 file changed, 1 insertion(+)

commit 584a7c426aafaa0df7ecb7ca907726b94c1e65e7
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Dec 26 21:40:05 2011 +0100

    fix some forgotten things

 libcaja-private/caja-file.c              | 2 +-
 libcaja-private/caja-undostack-manager.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 085a8e5bc07254127ab728fc14d64c8245a13575
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Dec 26 20:29:25 2011 +0100

    prepare for 1.1.1 release

 AUTHORS                   | 17 ++++++++++++-----
 configure.in              |  2 +-
 distro/archlinux/PKGBUILD |  2 +-
 distro/ubuntu/build       |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

commit 1ecbd2cd9339b1a13551a945f35b4be05f18cb43
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Dec 26 20:10:02 2011 +0100

    updated UNDO-REDO with nautilus-elementary bzr rev 137

 libcaja-private/caja-undostack-manager.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit bd5fd70b498e935886c0325e51b9962a4e8e5c7a
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Dec 26 20:05:47 2011 +0100

    updated UNDO-REDO with nautilus-elementary bzr rev 138

 libcaja-private/caja-undostack-manager.c | 88 ++++++++++++++++++++++++--------
 1 file changed, 68 insertions(+), 20 deletions(-)

commit cdd4cad2ce3930bf1d484ab12371a5d6a354ea00
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Mon Dec 26 19:52:59 2011 +0100

    ported nautilus-elementary UNDO-REDO (bzr rev 60)

 libcaja-private/Makefile.am                 |    2 +
 libcaja-private/caja-file-operations.c      |  137 ++
 libcaja-private/caja-file-private.h         |    2 +
 libcaja-private/caja-file.c                 |   44 +
 libcaja-private/caja-undostack-manager.c    | 1988 +++++++++++++++++++++++++++
 libcaja-private/caja-undostack-manager.h    |  184 +++
 src/caja-shell-ui.xml                       |    4 +-
 src/caja-window-menus.c                     |    4 +
 src/file-manager/caja-directory-view-ui.xml |    4 +
 src/file-manager/fm-actions.h               |    2 +
 src/file-manager/fm-directory-view.c        |  171 +++
 11 files changed, 2541 insertions(+), 1 deletion(-)

commit 390b49cb93699309e1250143e744b2e61ac81cfe
Author: Stefano Karapetsas <stefano@karapetsas.com>
Date:   Fri Dec 9 23:28:13 2011 +0100

    remove autogenerated files

 INSTALL                                      |  365 ------
 aclocal.m4                                   | 1812 --------------------------
 config.sub                                   | 1705 ------------------------
 cut-n-paste-code/Makefile.in                 |  646 ---------
 cut-n-paste-code/libegg/Makefile.in          |  657 ----------
 docs/reference/Makefile.in                   |  646 ---------
 docs/reference/libcaja-extension/Makefile.in |  797 -----------
 gtk-doc.make                                 |  280 ----
 install-sh                                   |  520 --------
 9 files changed, 7428 deletions(-)

commit 9885ec0e487f9a485408de81813a57df23389b58
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Thu Dec 8 22:55:27 2011 -0500

    version updated

 configure.in              | 4 ++--
 distro/archlinux/PKGBUILD | 2 +-
 distro/ubuntu/build       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 55d22ad6ea2f1fb943794fbc2225e1cc41f9edfc
Author: Perberos <perberos@gmail.com>
Date:   Mon Dec 5 13:08:10 2011 -0300

    removing autogenerated file

 config.guess        | 1501 ---------------------------------------------------
 config.h.in         |  185 -------
 depcomp             |  630 ---------------------
 intltool-extract.in |    0
 intltool-merge.in   |    0
 intltool-update.in  |    0
 missing             |  376 -------------
 mkinstalldirs       |  162 ------
 8 files changed, 2854 deletions(-)

commit 4732ed0c09ee3d96fc8b09b3099a72d6748b86fc
Author: Perberos <perberos@gmail.com>
Date:   Mon Dec 5 13:06:31 2011 -0300

    the ghost of the past

 libnautilus-extension/README | 1 +
 1 file changed, 1 insertion(+)

commit 682347c43d016885ad0abd86a7edaec20d57b044
Author: Perberos <perberos@gmail.com>
Date:   Sun Dec 4 04:25:45 2011 -0300

    wrong translations

 NEWS         | 1712 ----------------------------------------------------------
 po/am.po     |    4 +-
 po/az.po     |    4 +-
 po/bs.po     |    4 +-
 po/ha.po     |    2 +-
 po/ig.po     |    2 +-
 po/li.po     |    4 +-
 po/mi.po     |    2 +-
 po/mn.po     |    4 +-
 po/sr@ije.po |    4 +-
 po/tk.po     |    4 +-
 po/wa.po     |    2 +-
 po/xh.po     |    3 +-
 po/yi.po     |    2 +-
 po/yo.po     |    2 +-
 po/zu.po     |    4 +-
 16 files changed, 23 insertions(+), 1736 deletions(-)

commit 88b35394e2675ffc682ed9cbc66c51b02ae1a2a7
Author: Steve Zesch <stevezesch2@gmail.com>
Date:   Fri Dec 2 20:28:37 2011 -0500

    Changed version to 2011.12.01

 configure.in              | 2 +-
 distro/archlinux/PKGBUILD | 2 +-
 distro/ubuntu/build       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit 0e004c696b0e68b2cff37a4c3315b022a35eaf43
Author: Perberos <perberos@gmail.com>
Date:   Thu Dec 1 22:24:23 2011 -0300

    moving from https://github.com/perberos/mate-desktop-environment

 AUTHORS                                            |    60 +
 COPYING                                            |   351 +
 COPYING-DOCS                                       |   355 +
 COPYING.EXTENSIONS                                 |    10 +
 COPYING.LIB                                        |   482 +
 ChangeLog                                          |     0
 HACKING                                            |    57 +
 INSTALL                                            |   365 +
 MAINTAINERS                                        |    23 +
 Makefile.am                                        |    44 +
 Makefile.shared                                    |     1 +
 NEWS                                               |  1713 +++
 README                                             |    31 +
 README.commits                                     |    68 +
 THANKS                                             |   621 +
 TODO                                               |    19 +
 acconfig.h                                         |    27 +
 aclocal.m4                                         |  1812 +++
 add-include-prefix                                 |     1 +
 autogen.sh                                         |    25 +
 config.guess                                       |  1501 ++
 config.h.in                                        |   185 +
 config.sub                                         |  1705 +++
 configure.in                                       |   483 +
 cut-n-paste-code/Makefile.am                       |     2 +
 cut-n-paste-code/Makefile.in                       |   646 +
 cut-n-paste-code/README                            |    21 +
 cut-n-paste-code/libegg/Makefile.am                |    46 +
 cut-n-paste-code/libegg/Makefile.in                |   657 +
 cut-n-paste-code/libegg/eggdesktopfile.c           |  1477 ++
 cut-n-paste-code/libegg/eggdesktopfile.h           |   166 +
 cut-n-paste-code/libegg/eggsmclient-private.h      |    57 +
 cut-n-paste-code/libegg/eggsmclient-xsmp.c         |  1371 ++
 cut-n-paste-code/libegg/eggsmclient.c              |   602 +
 cut-n-paste-code/libegg/eggsmclient.h              |   123 +
 cut-n-paste-code/libegg/eggtreemultidnd.c          |   415 +
 cut-n-paste-code/libegg/eggtreemultidnd.h          |    78 +
 cut-n-paste-code/libegg/update-from-egg.sh         |    25 +
 data/Makefile.am                                   |    54 +
 data/browser.xml                                   |    76 +
 data/caja-autorun-software.desktop.in.in           |    14 +
 data/caja-browser.desktop.in.in                    |    15 +
 data/caja-computer.desktop.in.in                   |    15 +
 data/caja-extras.placeholder                       |     2 +
 data/caja-file-management-properties.desktop.in.in |    14 +
 data/caja-folder-handler.desktop.in.in             |    15 +
 data/caja-home.desktop.in.in                       |    14 +
 data/caja-suggested.placeholder                    |     2 +
 data/caja.desktop.in.in                            |    17 +
 data/caja.xml.in                                   |     8 +
 data/icons/Makefile.am                             |    86 +
 data/icons/hicolor_apps_16x16_caja.png             |   Bin 0 -> 874 bytes
 data/icons/hicolor_apps_16x16_caja.svg             |   262 +
 data/icons/hicolor_apps_22x22_caja.png             |   Bin 0 -> 1270 bytes
 data/icons/hicolor_apps_22x22_caja.svg             |   323 +
 data/icons/hicolor_apps_24x24_caja.png             |   Bin 0 -> 1310 bytes
 data/icons/hicolor_apps_32x32_caja.png             |   Bin 0 -> 2345 bytes
 data/icons/hicolor_apps_32x32_caja.svg             |   314 +
 data/icons/hicolor_apps_scalable_caja.svg          |   275 +
 data/icons/hicolor_emblems_16x16_emblem-note.png   |   Bin 0 -> 534 bytes
 data/icons/hicolor_emblems_24x24_emblem-note.png   |   Bin 0 -> 913 bytes
 data/icons/hicolor_emblems_48x48_emblem-note.png   |   Bin 0 -> 2454 bytes
 data/patterns/Makefile.am                          |    39 +
 data/patterns/blue_gray_rough.png                  |   Bin 0 -> 22418 bytes
 data/patterns/blue_ridge.png                       |   Bin 0 -> 263 bytes
 data/patterns/blue_type.png                        |   Bin 0 -> 11060 bytes
 data/patterns/brushed_metal.png                    |   Bin 0 -> 29181 bytes
 data/patterns/burlap.jpg                           |   Bin 0 -> 1611 bytes
 data/patterns/camouflage.png                       |   Bin 0 -> 29561 bytes
 data/patterns/chalk.jpg                            |   Bin 0 -> 821 bytes
 data/patterns/cork.png                             |   Bin 0 -> 20928 bytes
 data/patterns/countertop.png                       |   Bin 0 -> 4787 bytes
 data/patterns/dark-mate.jpg                        |   Bin 0 -> 9877 bytes
 data/patterns/dots.png                             |   Bin 0 -> 922 bytes
 data/patterns/fibers.png                           |   Bin 0 -> 28188 bytes
 data/patterns/fleur_de_lis.png                     |   Bin 0 -> 28890 bytes
 data/patterns/floral.png                           |   Bin 0 -> 73080 bytes
 data/patterns/fossil.png                           |   Bin 0 -> 14478 bytes
 data/patterns/green_weave.png                      |   Bin 0 -> 8088 bytes
 data/patterns/ice.png                              |   Bin 0 -> 19562 bytes
 data/patterns/manila_paper.png                     |   Bin 0 -> 21751 bytes
 data/patterns/mate.jpg                             |   Bin 0 -> 8316 bytes
 data/patterns/moss_ridge.png                       |   Bin 0 -> 274 bytes
 data/patterns/numbers.png                          |   Bin 0 -> 8993 bytes
 data/patterns/ocean_stripes.png                    |   Bin 0 -> 274 bytes
 data/patterns/purple_marble.png                    |   Bin 0 -> 12288 bytes
 data/patterns/reset.png                            |   Bin 0 -> 441 bytes
 data/patterns/ridged_paper.png                     |   Bin 0 -> 10353 bytes
 data/patterns/rough_paper.png                      |   Bin 0 -> 3955 bytes
 data/patterns/sky_ridge.png                        |   Bin 0 -> 264 bytes
 data/patterns/snow_ridge.png                       |   Bin 0 -> 274 bytes
 data/patterns/stucco.jpg                           |   Bin 0 -> 2499 bytes
 data/patterns/terracotta.png                       |   Bin 0 -> 32001 bytes
 data/patterns/wavy_white.png                       |   Bin 0 -> 1522 bytes
 depcomp                                            |   630 +
 distro/archlinux/PKGBUILD                          |    41 +
 distro/archlinux/mate-file-manager.install         |    28 +
 distro/ubuntu/build                                |    36 +
 distro/ubuntu/postinst                             |    15 +
 distro/ubuntu/postrm                               |    10 +
 distro/ubuntu/preinst                              |     8 +
 distro/ubuntu/prerm                                |    11 +
 docs/Makefile.am                                   |    25 +
 docs/architecture.txt                              |   160 +
 docs/caja-connect-server.1                         |    50 +
 docs/caja-file-management-properties.1             |    49 +
 docs/caja-internals.pdf                            |   Bin 0 -> 307912 bytes
 docs/caja-internals.sxw                            |   Bin 0 -> 59282 bytes
 docs/caja-io.txt                                   |   255 +
 docs/caja.1                                        |    77 +
 docs/caja.faq                                      |     7 +
 docs/dnd.txt                                       |    92 +
 docs/key_mouse_navigation.txt                      |   112 +
 docs/load-states.dia                               |   Bin 0 -> 2026 bytes
 docs/recommended-books.html                        |   167 +
 docs/reference/Makefile.am                         |     1 +
 docs/reference/Makefile.in                         |   646 +
 docs/reference/libcaja-extension/Makefile.am       |    84 +
 docs/reference/libcaja-extension/Makefile.in       |   797 +
 docs/reference/libcaja-extension/html/ch01.html    |    63 +
 docs/reference/libcaja-extension/html/home.png     |   Bin 0 -> 654 bytes
 docs/reference/libcaja-extension/html/index.html   |    66 +
 docs/reference/libcaja-extension/html/index.sgml   |   170 +
 docs/reference/libcaja-extension/html/ix01.html    |   224 +
 docs/reference/libcaja-extension/html/left.png     |   Bin 0 -> 459 bytes
 .../libcaja-extension-caja-column-provider.html    |   117 +
 .../html/libcaja-extension-caja-column.html        |   182 +
 .../libcaja-extension-caja-extension-types.html    |   158 +
 .../html/libcaja-extension-caja-file-info.html     |   643 +
 .../html/libcaja-extension-caja-info-provider.html |   252 +
 ...ja-extension-caja-location-widget-provider.html |   133 +
 .../html/libcaja-extension-caja-menu-provider.html |   267 +
 .../html/libcaja-extension-caja-menu.html          |   473 +
 ...caja-extension-caja-property-page-provider.html |   131 +
 .../html/libcaja-extension-caja-property-page.html |   148 +
 .../html/libcaja-extension.devhelp                 |   118 +
 .../html/libcaja-extension.devhelp2                |   118 +
 docs/reference/libcaja-extension/html/pt01.html    |    68 +
 docs/reference/libcaja-extension/html/right.png    |   Bin 0 -> 472 bytes
 docs/reference/libcaja-extension/html/style.css    |   265 +
 docs/reference/libcaja-extension/html/up.png       |   Bin 0 -> 406 bytes
 .../libcaja-extension/libcaja-extension-docs.xml   |    36 +
 .../libcaja-extension-overrides.txt                |     0
 .../libcaja-extension-sections.txt                 |   185 +
 .../libcaja-extension/libcaja-extension.types      |    11 +
 .../tmpl/caja-column-provider.sgml                 |    45 +
 .../libcaja-extension/tmpl/caja-column.sgml        |    76 +
 .../tmpl/caja-extension-types.sgml                 |    78 +
 .../libcaja-extension/tmpl/caja-file-info.sgml     |   257 +
 .../libcaja-extension/tmpl/caja-info-provider.sgml |    80 +
 .../tmpl/caja-location-widget-provider.sgml        |    47 +
 .../libcaja-extension/tmpl/caja-menu-item.sgml     |    22 +
 .../libcaja-extension/tmpl/caja-menu-provider.sgml |    86 +
 .../libcaja-extension/tmpl/caja-menu.sgml          |   208 +
 .../tmpl/caja-property-page-provider.sgml          |    46 +
 .../libcaja-extension/tmpl/caja-property-page.sgml |    60 +
 .../tmpl/libcaja-extension-unused.sgml             |     0
 docs/reference/libcaja-extension/version.xml.in    |     1 +
 docs/smoketests.html                               |   555 +
 docs/state-machines.txt                            |    77 +
 docs/style-guide.html                              |   137 +
 eel/ChangeLog                                      |  9642 ++++++++++++
 eel/Makefile.am                                    |   186 +
 eel/README                                         |     4 +
 eel/check-eel                                      |     3 +
 eel/check-program.c                                |    60 +
 eel/eel-accessibility.c                            |   432 +
 eel/eel-accessibility.h                            |   153 +
 eel/eel-alert-dialog.c                             |   490 +
 eel/eel-alert-dialog.h                             |    60 +
 eel/eel-art-extensions.c                           |   321 +
 eel/eel-art-extensions.h                           |   120 +
 eel/eel-art-gtk-extensions.c                       |   346 +
 eel/eel-art-gtk-extensions.h                       |    74 +
 eel/eel-background-box.c                           |    70 +
 eel/eel-background-box.h                           |    71 +
 eel/eel-background.c                               |  1273 ++
 eel/eel-background.h                               |   162 +
 eel/eel-canvas-rect-ellipse.c                      |  1550 ++
 eel/eel-canvas-rect-ellipse.h                      |   184 +
 eel/eel-canvas-util.c                              |   426 +
 eel/eel-canvas-util.h                              |   110 +
 eel/eel-canvas.c                                   |  4213 ++++++
 eel/eel-canvas.h                                   |   545 +
 eel/eel-debug-drawing.c                            |   566 +
 eel/eel-debug-drawing.h                            |    72 +
 eel/eel-debug.c                                    |   135 +
 eel/eel-debug.h                                    |    52 +
 eel/eel-editable-label.c                           |  4402 ++++++
 eel/eel-editable-label.h                           |   145 +
 eel/eel-enumeration.c                              |   555 +
 eel/eel-enumeration.h                              |    63 +
 eel/eel-gdk-extensions.c                           |   971 ++
 eel/eel-gdk-extensions.h                           |   164 +
 eel/eel-gdk-pixbuf-extensions.c                    |  1510 ++
 eel/eel-gdk-pixbuf-extensions.h                    |   162 +
 eel/eel-glib-extensions.c                          |  1231 ++
 eel/eel-glib-extensions.h                          |   128 +
 eel/eel-graphic-effects.c                          |   421 +
 eel/eel-graphic-effects.h                          |    66 +
 eel/eel-gtk-container.c                            |   225 +
 eel/eel-gtk-container.h                            |    47 +
 eel/eel-gtk-extensions.c                           |  1247 ++
 eel/eel-gtk-extensions.h                           |   141 +
 eel/eel-gtk-macros.h                               |   178 +
 eel/eel-i18n.c                                     |    52 +
 eel/eel-i18n.h                                     |    55 +
 eel/eel-image-table.c                              |   601 +
 eel/eel-image-table.h                              |    99 +
 eel/eel-labeled-image.c                            |  2493 ++++
 eel/eel-labeled-image.h                            |   166 +
 eel/eel-lib-self-check-functions.c                 |    38 +
 eel/eel-lib-self-check-functions.h                 |    53 +
 eel/eel-mate-extensions.c                          |   221 +
 eel/eel-mate-extensions.h                          |    44 +
 eel/eel-mateconf-extensions.c                      |   687 +
 eel/eel-mateconf-extensions.h                      |    78 +
 eel/eel-pango-extensions.c                         |   615 +
 eel/eel-pango-extensions.h                         |    55 +
 eel/eel-preferences-builder.c                      |   646 +
 eel/eel-preferences.c                              |  1764 +++
 eel/eel-preferences.h                              |   165 +
 eel/eel-self-checks.c                              |   237 +
 eel/eel-self-checks.h                              |   101 +
 eel/eel-stock-dialogs.c                            |   588 +
 eel/eel-stock-dialogs.h                            |    91 +
 eel/eel-string.c                                   |  1275 ++
 eel/eel-string.h                                   |   122 +
 eel/eel-types.c                                    |    82 +
 eel/eel-types.h                                    |    32 +
 eel/eel-vfs-extensions.c                           |   187 +
 eel/eel-vfs-extensions.h                           |    59 +
 eel/eel-wrap-table.c                               |  1108 ++
 eel/eel-wrap-table.h                               |   108 +
 eel/eel-xml-extensions.c                           |   199 +
 eel/eel-xml-extensions.h                           |    49 +
 eel/eel.h                                          |    53 +
 eel/eelmarshal.list                                |    13 +
 eel/makeenums.pl                                   |   220 +
 eel/maketypes.awk                                  |   155 +
 gtk-doc.make                                       |   280 +
 icons/Makefile.am                                  |    16 +
 icons/audio.svg                                    |    43 +
 icons/backgrounds.png                              |   Bin 0 -> 3735 bytes
 icons/chit_frame.png                               |   Bin 0 -> 751 bytes
 icons/colors.png                                   |   Bin 0 -> 3115 bytes
 icons/emblems.png                                  |   Bin 0 -> 3122 bytes
 icons/erase.png                                    |   Bin 0 -> 3441 bytes
 icons/knob.png                                     |   Bin 0 -> 206 bytes
 icons/thumbnail_frame.png                          |   Bin 0 -> 482 bytes
 install-sh                                         |   520 +
 intltool-extract.in                                |     0
 intltool-merge.in                                  |     0
 intltool-update.in                                 |     0
 libcaja-extension/Makefile.am                      |    89 +
 libcaja-extension/caja-column-provider.c           |    74 +
 libcaja-extension/caja-column-provider.h           |    65 +
 libcaja-extension/caja-column.c                    |   240 +
 libcaja-extension/caja-column.h                    |    77 +
 libcaja-extension/caja-extension-i18n.h            |    24 +
 libcaja-extension/caja-extension-private.h         |    39 +
 libcaja-extension/caja-extension-types.c           |    59 +
 libcaja-extension/caja-extension-types.h           |    72 +
 libcaja-extension/caja-file-info.c                 |   308 +
 libcaja-extension/caja-file-info.h                 |   140 +
 libcaja-extension/caja-info-provider.c             |   122 +
 libcaja-extension/caja-info-provider.h             |    87 +
 libcaja-extension/caja-location-widget-provider.c  |    74 +
 libcaja-extension/caja-location-widget-provider.h  |    69 +
 libcaja-extension/caja-menu-item.c                 |   342 +
 libcaja-extension/caja-menu-item.h                 |    30 +
 libcaja-extension/caja-menu-provider.c             |   143 +
 libcaja-extension/caja-menu-provider.h             |    85 +
 libcaja-extension/caja-menu.c                      |   112 +
 libcaja-extension/caja-menu.h                      |   125 +
 libcaja-extension/caja-property-page-provider.c    |    89 +
 libcaja-extension/caja-property-page-provider.h    |    68 +
 libcaja-extension/caja-property-page.c             |   246 +
 libcaja-extension/caja-property-page.h             |    74 +
 .../libcaja-extension-uninstalled.pc.in            |    12 +
 libcaja-extension/libcaja-extension.pc.in          |    12 +
 libcaja-private/Makefile.am                        |   246 +
 libcaja-private/README                             |    13 +
 libcaja-private/apps_caja_preferences.schemas.in   |  1205 ++
 libcaja-private/caja-autorun.c                     |  1434 ++
 libcaja-private/caja-autorun.h                     |    81 +
 libcaja-private/caja-bookmark.c                    |   672 +
 libcaja-private/caja-bookmark.h                    |   100 +
 libcaja-private/caja-cell-renderer-pixbuf-emblem.c |   519 +
 libcaja-private/caja-cell-renderer-pixbuf-emblem.h |    68 +
 .../caja-cell-renderer-text-ellipsized.c           |    80 +
 .../caja-cell-renderer-text-ellipsized.h           |    61 +
 libcaja-private/caja-clipboard-monitor.c           |   338 +
 libcaja-private/caja-clipboard-monitor.h           |    85 +
 libcaja-private/caja-clipboard.c                   |   692 +
 libcaja-private/caja-clipboard.h                   |    54 +
 libcaja-private/caja-column-chooser.c              |   670 +
 libcaja-private/caja-column-chooser.h              |    69 +
 libcaja-private/caja-column-utilities.c            |   327 +
 libcaja-private/caja-column-utilities.h            |    41 +
 libcaja-private/caja-customization-data.c          |   498 +
 libcaja-private/caja-customization-data.h          |    68 +
 libcaja-private/caja-debug-log.c                   |   760 +
 libcaja-private/caja-debug-log.h                   |    58 +
 libcaja-private/caja-default-file-icon.c           |   537 +
 libcaja-private/caja-default-file-icon.h           |    32 +
 libcaja-private/caja-desktop-directory-file.c      |   731 +
 libcaja-private/caja-desktop-directory-file.h      |    68 +
 libcaja-private/caja-desktop-directory.c           |   560 +
 libcaja-private/caja-desktop-directory.h           |    61 +
 libcaja-private/caja-desktop-icon-file.c           |   410 +
 libcaja-private/caja-desktop-icon-file.h           |    64 +
 libcaja-private/caja-desktop-link-monitor.c        |   575 +
 libcaja-private/caja-desktop-link-monitor.h        |    67 +
 libcaja-private/caja-desktop-link.c                |   479 +
 libcaja-private/caja-desktop-link.h                |    84 +
 libcaja-private/caja-directory-async.c             |  5410 +++++++
 libcaja-private/caja-directory-background.c        |   731 +
 libcaja-private/caja-directory-background.h        |    36 +
 libcaja-private/caja-directory-notify.h            |    74 +
 libcaja-private/caja-directory-private.h           |   249 +
 libcaja-private/caja-directory.c                   |  2004 +++
 libcaja-private/caja-directory.h                   |   244 +
 libcaja-private/caja-dnd.c                         |  1446 ++
 libcaja-private/caja-dnd.h                         |   200 +
 libcaja-private/caja-emblem-utils.c                |   511 +
 libcaja-private/caja-emblem-utils.h                |    53 +
 libcaja-private/caja-entry.c                       |   442 +
 libcaja-private/caja-entry.h                       |    78 +
 libcaja-private/caja-file-attributes.h             |    47 +
 libcaja-private/caja-file-changes-queue.c          |   475 +
 libcaja-private/caja-file-changes-queue.h          |    42 +
 libcaja-private/caja-file-conflict-dialog.c        |   670 +
 libcaja-private/caja-file-conflict-dialog.h        |    80 +
 libcaja-private/caja-file-dnd.c                    |   186 +
 libcaja-private/caja-file-dnd.h                    |    44 +
 libcaja-private/caja-file-operations.c             |  6469 +++++++++
 libcaja-private/caja-file-operations.h             |   142 +
 libcaja-private/caja-file-private.h                |   316 +
 libcaja-private/caja-file-queue.c                  |   133 +
 libcaja-private/caja-file-queue.h                  |    52 +
 libcaja-private/caja-file-utilities.c              |  1449 ++
 libcaja-private/caja-file-utilities.h              |   111 +
 libcaja-private/caja-file.c                        |  8411 +++++++++++
 libcaja-private/caja-file.h                        |   590 +
 libcaja-private/caja-global-preferences.c          |   954 ++
 libcaja-private/caja-global-preferences.h          |   242 +
 libcaja-private/caja-horizontal-splitter.c         |   307 +
 libcaja-private/caja-horizontal-splitter.h         |    76 +
 libcaja-private/caja-icon-canvas-item.c            |  3874 +++++
 libcaja-private/caja-icon-canvas-item.h            |   123 +
 libcaja-private/caja-icon-container.c              | 10612 ++++++++++++++
 libcaja-private/caja-icon-container.h              |   371 +
 libcaja-private/caja-icon-dnd.c                    |  2123 +++
 libcaja-private/caja-icon-dnd.h                    |    63 +
 libcaja-private/caja-icon-info.c                   |   751 +
 libcaja-private/caja-icon-info.h                   |    99 +
 libcaja-private/caja-icon-names.h                  |    30 +
 libcaja-private/caja-icon-private.h                |   336 +
 libcaja-private/caja-idle-queue.c                  |   156 +
 libcaja-private/caja-idle-queue.h                  |    49 +
 libcaja-private/caja-iso9660.h                     |   110 +
 libcaja-private/caja-keep-last-vertical-box.c      |   166 +
 libcaja-private/caja-keep-last-vertical-box.h      |    59 +
 libcaja-private/caja-lib-self-check-functions.c    |    38 +
 libcaja-private/caja-lib-self-check-functions.h    |    50 +
 libcaja-private/caja-link.c                        |   642 +
 libcaja-private/caja-link.h                        |    54 +
 libcaja-private/caja-marshal.c                     |     2 +
 libcaja-private/caja-marshal.list                  |    23 +
 libcaja-private/caja-merged-directory.c            |   735 +
 libcaja-private/caja-merged-directory.h            |    69 +
 libcaja-private/caja-metadata.c                    |    80 +
 libcaja-private/caja-metadata.h                    |    82 +
 libcaja-private/caja-mime-actions.c                |  2597 ++++
 libcaja-private/caja-mime-actions.h                |    62 +
 libcaja-private/caja-mime-application-chooser.c    |   746 +
 libcaja-private/caja-mime-application-chooser.h    |    57 +
 libcaja-private/caja-module.c                      |   293 +
 libcaja-private/caja-module.h                      |    46 +
 libcaja-private/caja-monitor.c                     |   157 +
 libcaja-private/caja-monitor.h                     |    38 +
 libcaja-private/caja-open-with-dialog.c            |  1183 ++
 libcaja-private/caja-open-with-dialog.h            |    66 +
 libcaja-private/caja-program-choosing.c            |   509 +
 libcaja-private/caja-program-choosing.h            |    57 +
 libcaja-private/caja-progress-info.c               |   930 ++
 libcaja-private/caja-progress-info.h               |    85 +
 libcaja-private/caja-query.c                       |   395 +
 libcaja-private/caja-query.h                       |    68 +
 libcaja-private/caja-recent.c                      |    80 +
 libcaja-private/caja-recent.h                      |    13 +
 libcaja-private/caja-saved-search-file.c           |    49 +
 libcaja-private/caja-saved-search-file.h           |    58 +
 libcaja-private/caja-search-directory-file.c       |   260 +
 libcaja-private/caja-search-directory-file.h       |    59 +
 libcaja-private/caja-search-directory.c            |   934 ++
 libcaja-private/caja-search-directory.h            |    73 +
 libcaja-private/caja-search-engine-beagle.c        |   443 +
 libcaja-private/caja-search-engine-beagle.h        |    53 +
 libcaja-private/caja-search-engine-simple.c        |   464 +
 libcaja-private/caja-search-engine-simple.h        |    53 +
 libcaja-private/caja-search-engine-tracker.c       |   580 +
 libcaja-private/caja-search-engine-tracker.h       |    53 +
 libcaja-private/caja-search-engine.c               |   216 +
 libcaja-private/caja-search-engine.h               |    77 +
 libcaja-private/caja-sidebar-provider.c            |    74 +
 libcaja-private/caja-sidebar-provider.h            |    61 +
 libcaja-private/caja-sidebar.c                     |   128 +
 libcaja-private/caja-sidebar.h                     |    84 +
 libcaja-private/caja-signaller.c                   |   115 +
 libcaja-private/caja-signaller.h                   |    46 +
 libcaja-private/caja-thumbnails.c                  |  1084 ++
 libcaja-private/caja-thumbnails.h                  |    80 +
 libcaja-private/caja-trash-monitor.c               |   250 +
 libcaja-private/caja-trash-monitor.h               |    70 +
 libcaja-private/caja-tree-view-drag-dest.c         |  1306 ++
 libcaja-private/caja-tree-view-drag-dest.h         |   106 +
 libcaja-private/caja-ui-utilities.c                |   256 +
 libcaja-private/caja-ui-utilities.h                |    43 +
 libcaja-private/caja-undo-manager.c                |   320 +
 libcaja-private/caja-undo-manager.h                |    82 +
 libcaja-private/caja-undo-private.h                |    36 +
 libcaja-private/caja-undo-signal-handlers.c        |   345 +
 libcaja-private/caja-undo-signal-handlers.h        |    37 +
 libcaja-private/caja-undo-transaction.c            |   343 +
 libcaja-private/caja-undo-transaction.h            |    80 +
 libcaja-private/caja-undo.c                        |   218 +
 libcaja-private/caja-undo.h                        |    77 +
 libcaja-private/caja-users-groups-cache.c          |   295 +
 libcaja-private/caja-users-groups-cache.h          |    34 +
 libcaja-private/caja-vfs-directory.c               |   170 +
 libcaja-private/caja-vfs-directory.h               |    57 +
 libcaja-private/caja-vfs-file.c                    |   781 +
 libcaja-private/caja-vfs-file.h                    |    57 +
 libcaja-private/caja-view-factory.c                |   126 +
 libcaja-private/caja-view-factory.h                |    75 +
 libcaja-private/caja-view.c                        |   330 +
 libcaja-private/caja-view.h                        |   193 +
 libcaja-private/caja-window-info.c                 |   291 +
 libcaja-private/caja-window-info.h                 |   189 +
 libcaja-private/caja-window-slot-info.c            |   157 +
 libcaja-private/caja-window-slot-info.h            |    97 +
 ltmain.sh                                          |  9655 ++++++++++++
 m4/gtk-doc.m4                                      |    67 +
 m4/intltool.m4                                     |   216 +
 m4/libtool.m4                                      |  7982 ++++++++++
 m4/ltoptions.m4                                    |   384 +
 m4/ltsugar.m4                                      |   123 +
 m4/ltversion.m4                                    |    23 +
 m4/lt~obsolete.m4                                  |    98 +
 missing                                            |   376 +
 mkinstalldirs                                      |   162 +
 po/ChangeLog                                       | 14540 +++++++++++++++++++
 po/LINGUAS                                         |   111 +
 po/POTFILES.in                                     |   116 +
 po/POTFILES.skip                                   |    10 +
 po/af.po                                           |  9108 ++++++++++++
 po/am.po                                           |  6957 +++++++++
 po/ar.po                                           |  7816 ++++++++++
 po/as.po                                           |  7860 ++++++++++
 po/ast.po                                          |  7372 ++++++++++
 po/az.po                                           |  6869 +++++++++
 po/be.po                                           |  7584 ++++++++++
 po/be@latin.po                                     |  6875 +++++++++
 po/bg.po                                           |  7634 ++++++++++
 po/bn.po                                           |  7490 ++++++++++
 po/bn_IN.po                                        |  7456 ++++++++++
 po/br.po                                           |  6898 +++++++++
 po/bs.po                                           |  7124 +++++++++
 po/ca.po                                           |  8182 +++++++++++
 po/ca@valencia.po                                  |  7992 ++++++++++
 po/crh.po                                          |  9240 ++++++++++++
 po/cs.po                                           |  7499 ++++++++++
 po/cy.po                                           |  8976 ++++++++++++
 po/da.po                                           |  7982 ++++++++++
 po/de.po                                           |  8137 +++++++++++
 po/dz.po                                           |  6901 +++++++++
 po/el.po                                           |  7334 ++++++++++
 po/en@shaw.po                                      |  7478 ++++++++++
 po/en_CA.po                                        |  6248 ++++++++
 po/en_GB.po                                        |  8484 +++++++++++
 po/eo.po                                           |  7520 ++++++++++
 po/es.po                                           |  8824 +++++++++++
 po/et.po                                           |  5838 ++++++++
 po/eu.po                                           |  7729 ++++++++++
 po/fa.po                                           |  8218 +++++++++++
 po/fi.po                                           |  7706 ++++++++++
 po/fr.po                                           |  7733 ++++++++++
 po/fur.po                                          |  6349 ++++++++
 po/fy.po                                           |  6980 +++++++++
 po/ga.po                                           |  7167 +++++++++
 po/gl.po                                           |  7732 ++++++++++
 po/gu.po                                           |  7335 ++++++++++
 po/gv.po                                           |  7811 ++++++++++
 po/ha.po                                           |  8321 +++++++++++
 po/he.po                                           |  9223 ++++++++++++
 po/hi.po                                           |  7304 ++++++++++
 po/hr.po                                           |  7061 +++++++++
 po/hu.po                                           |  7616 ++++++++++
 po/hy.po                                           |  5520 +++++++
 po/id.po                                           |  7621 ++++++++++
 po/ig.po                                           |  8168 +++++++++++
 po/io.po                                           |  5852 ++++++++
 po/is.po                                           |  7393 ++++++++++
 po/it.po                                           |  7905 ++++++++++
 po/ja.po                                           |  7627 ++++++++++
 po/ka.po                                           |  6894 +++++++++
 po/kk.po                                           |  7335 ++++++++++
 po/km.po                                           |  5533 +++++++
 po/kn.po                                           |  7606 ++++++++++
 po/ko.po                                           |  7418 ++++++++++
 po/ku.po                                           |  6232 ++++++++
 po/li.po                                           |  8928 ++++++++++++
 po/lt.po                                           |  7826 ++++++++++
 po/lv.po                                           |  7695 ++++++++++
 po/mai.po                                          |  6627 +++++++++
 po/mg.po                                           |  5752 ++++++++
 po/mi.po                                           |  6017 ++++++++
 po/mk.po                                           |  7830 ++++++++++
 po/ml.po                                           |  7351 ++++++++++
 po/mn.po                                           |  7140 +++++++++
 po/mr.po                                           |  7321 ++++++++++
 po/ms.po                                           |  8896 ++++++++++++
 po/nb.po                                           |  7519 ++++++++++
 po/nds.po                                          |  6746 +++++++++
 po/ne.po                                           |  6235 ++++++++
 po/nl.po                                           |  8497 +++++++++++
 po/nn.po                                           |  8891 ++++++++++++
 po/nso.po                                          |  9291 ++++++++++++
 po/oc.po                                           |  7903 ++++++++++
 po/or.po                                           |  7378 ++++++++++
 po/pa.po                                           |  7988 ++++++++++
 po/pl.po                                           |  7675 ++++++++++
 po/ps.po                                           |  6634 +++++++++
 po/pt.po                                           | 10496 +++++++++++++
 po/pt_BR.po                                        |  8162 +++++++++++
 po/ro.po                                           |  7815 ++++++++++
 po/ru.po                                           |  7688 ++++++++++
 po/rw.po                                           |  7205 +++++++++
 po/si.po                                           |  5962 ++++++++
 po/sk.po                                           |  6909 +++++++++
 po/sl.po                                           |  7512 ++++++++++
 po/sq.po                                           |  7075 +++++++++
 po/sr.po                                           |  8059 ++++++++++
 po/sr@ije.po                                       |  7459 ++++++++++
 po/sr@latin.po                                     |  8059 ++++++++++
 po/sv.po                                           |  7095 +++++++++
 po/ta.po                                           |  6616 +++++++++
 po/te.po                                           |  7137 +++++++++
 po/th.po                                           |  7388 ++++++++++
 po/tk.po                                           |  6623 +++++++++
 po/tr.po                                           |  8164 +++++++++++
 po/ug.po                                           |  7378 ++++++++++
 po/uk.po                                           |  7488 ++++++++++
 po/uz.po                                           |  6214 ++++++++
 po/uz@cyrillic.po                                  |  6214 ++++++++
 po/vi.po                                           |  6265 ++++++++
 po/wa.po                                           |  7277 ++++++++++
 po/xh.po                                           |  6776 +++++++++
 po/yi.po                                           |  5857 ++++++++
 po/yo.po                                           |  8147 +++++++++++
 po/zh_CN.po                                        |  7439 ++++++++++
 po/zh_HK.po                                        |  8114 +++++++++++
 po/zh_TW.po                                        |  8240 +++++++++++
 po/zu.po                                           |  6638 +++++++++
 src/Makefile.am                                    |   197 +
 src/caja-actions.h                                 |    56 +
 src/caja-application.c                             |  2338 +++
 src/caja-application.h                             |   117 +
 src/caja-autorun-software.c                        |   316 +
 src/caja-bookmark-list.c                           |   775 +
 src/caja-bookmark-list.h                           |    87 +
 src/caja-bookmarks-window.c                        |  1112 ++
 src/caja-bookmarks-window.h                        |    39 +
 src/caja-bookmarks-window.ui                       |   370 +
 src/caja-connect-server-dialog-main.c              |   235 +
 src/caja-connect-server-dialog-nonmain.c           |    59 +
 src/caja-connect-server-dialog.c                   |  1075 ++
 src/caja-connect-server-dialog.h                   |    61 +
 src/caja-convert-metadata.c                        |   492 +
 src/caja-desktop-window.c                          |   277 +
 src/caja-desktop-window.h                          |    66 +
 src/caja-emblem-sidebar.c                          |  1174 ++
 src/caja-emblem-sidebar.h                          |    63 +
 src/caja-file-management-properties-main.c         |    64 +
 src/caja-file-management-properties.c              |   891 ++
 src/caja-file-management-properties.h              |    41 +
 src/caja-file-management-properties.ui             |  3080 ++++
 src/caja-history-sidebar.c                         |   423 +
 src/caja-history-sidebar.h                         |    50 +
 src/caja-image-properties-page.c                   |   745 +
 src/caja-image-properties-page.h                   |    57 +
 src/caja-information-panel.c                       |  1271 ++
 src/caja-information-panel.h                       |    66 +
 src/caja-location-bar.c                            |   617 +
 src/caja-location-bar.h                            |    70 +
 src/caja-location-dialog.c                         |   275 +
 src/caja-location-dialog.h                         |    55 +
 src/caja-location-entry.c                          |   485 +
 src/caja-location-entry.h                          |    72 +
 src/caja-main.c                                    |   590 +
 src/caja-main.h                                    |    37 +
 src/caja-navigation-action.c                       |   381 +
 src/caja-navigation-action.h                       |    68 +
 src/caja-navigation-bar.c                          |   170 +
 src/caja-navigation-bar.h                          |    77 +
 src/caja-navigation-window-menus.c                 |  1099 ++
 src/caja-navigation-window-pane.c                  |   946 ++
 src/caja-navigation-window-pane.h                  |    92 +
 src/caja-navigation-window-slot.c                  |   241 +
 src/caja-navigation-window-slot.h                  |    78 +
 src/caja-navigation-window-ui.xml                  |    77 +
 src/caja-navigation-window.c                       |  1426 ++
 src/caja-navigation-window.h                       |   119 +
 src/caja-notebook.c                                |   570 +
 src/caja-notebook.h                                |    99 +
 src/caja-notes-viewer.c                            |   535 +
 src/caja-notes-viewer.h                            |    50 +
 src/caja-pathbar.c                                 |  2165 +++
 src/caja-pathbar.h                                 |    90 +
 src/caja-places-sidebar.c                          |  3092 ++++
 src/caja-places-sidebar.h                          |    49 +
 src/caja-property-browser.c                        |  2492 ++++
 src/caja-property-browser.h                        |    71 +
 src/caja-query-editor.c                            |  1397 ++
 src/caja-query-editor.h                            |    81 +
 src/caja-search-bar.c                              |   256 +
 src/caja-search-bar.h                              |    68 +
 src/caja-self-check-functions.c                    |    40 +
 src/caja-self-check-functions.h                    |    47 +
 src/caja-shell-ui.xml                              |    87 +
 src/caja-side-pane.c                               |   675 +
 src/caja-side-pane.h                               |    82 +
 src/caja-sidebar-title.c                           |   732 +
 src/caja-sidebar-title.h                           |    76 +
 src/caja-spatial-window-ui.xml                     |    29 +
 src/caja-spatial-window.c                          |  1209 ++
 src/caja-spatial-window.h                          |    71 +
 src/caja-trash-bar.c                               |   236 +
 src/caja-trash-bar.h                               |    64 +
 src/caja-view-as-action.c                          |   288 +
 src/caja-view-as-action.h                          |    57 +
 src/caja-window-bookmarks.c                        |   295 +
 src/caja-window-bookmarks.h                        |    37 +
 src/caja-window-manage-views.c                     |  2337 +++
 src/caja-window-manage-views.h                     |    49 +
 src/caja-window-menus.c                            |  1163 ++
 src/caja-window-pane.c                             |   305 +
 src/caja-window-pane.h                             |    97 +
 src/caja-window-private.h                          |   250 +
 src/caja-window-slot.c                             |   710 +
 src/caja-window-slot.h                             |   186 +
 src/caja-window-toolbars.c                         |   204 +
 src/caja-window.c                                  |  2164 +++
 src/caja-window.h                                  |   164 +
 src/caja-x-content-bar.c                           |   331 +
 src/caja-x-content-bar.h                           |    71 +
 src/caja-zoom-action.c                             |   211 +
 src/caja-zoom-action.h                             |    57 +
 src/caja-zoom-control.c                            |   996 ++
 src/caja-zoom-control.h                            |    91 +
 src/check-caja                                     |     2 +
 src/file-manager/Makefile.am                       |    61 +
 src/file-manager/caja-audio-mime-types.h           |    46 +
 src/file-manager/caja-desktop-icon-view-ui.xml     |    21 +
 src/file-manager/caja-directory-view-ui.xml        |   231 +
 src/file-manager/caja-icon-view-ui.xml             |    56 +
 src/file-manager/caja-list-view-ui.xml             |     9 +
 src/file-manager/fm-actions.h                      |   110 +
 src/file-manager/fm-desktop-icon-view.c            |   881 ++
 src/file-manager/fm-desktop-icon-view.h            |    60 +
 src/file-manager/fm-directory-view.c               | 10936 ++++++++++++++
 src/file-manager/fm-directory-view.h               |   495 +
 src/file-manager/fm-ditem-page.c                   |   563 +
 src/file-manager/fm-ditem-page.h                   |    51 +
 src/file-manager/fm-empty-view.c                   |   412 +
 src/file-manager/fm-empty-view.h                   |    60 +
 src/file-manager/fm-error-reporting.c              |   380 +
 src/file-manager/fm-error-reporting.h              |    55 +
 src/file-manager/fm-icon-container.c               |   625 +
 src/file-manager/fm-icon-container.h               |    68 +
 src/file-manager/fm-icon-view.c                    |  3439 +++++
 src/file-manager/fm-icon-view.h                    |   135 +
 src/file-manager/fm-list-model.c                   |  1882 +++
 src/file-manager/fm-list-model.h                   |   148 +
 src/file-manager/fm-list-view-private.h            |    43 +
 src/file-manager/fm-list-view.c                    |  3415 +++++
 src/file-manager/fm-list-view.h                    |    63 +
 src/file-manager/fm-properties-window.c            |  5835 ++++++++
 src/file-manager/fm-properties-window.h            |    69 +
 src/file-manager/fm-tree-model.c                   |  2152 +++
 src/file-manager/fm-tree-model.h                   |   104 +
 src/file-manager/fm-tree-view.c                    |  1814 +++
 src/file-manager/fm-tree-view.h                    |    65 +
 src/mate-network-scheme.desktop.in                 |    11 +
 test/Makefile.am                                   |    46 +
 test/test-caja-directory-async.c                   |   104 +
 test/test-caja-search-engine.c                     |    58 +
 test/test-caja-wrap-table.c                        |    96 +
 test/test-copy.c                                   |    93 +
 test/test-eel-background.c                         |    38 +
 test/test-eel-editable-label.c                     |    58 +
 test/test-eel-image-scrolled.c                     |   187 +
 test/test-eel-image-table.c                        |   304 +
 test/test-eel-labeled-image.c                      |    79 +
 test/test-eel-pixbuf-scale.c                       |    83 +
 test/test.c                                        |   152 +
 test/test.h                                        |    38 +
 709 files changed, 1088094 insertions(+)
