commit 17b2ff9b002498b8e6ce28c7bf846b0daf3ce206
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:   2011-06-13

    release: update for 3.1.2

M	NEWS
M	configure.in

commit 63e37acc17900e81605b994e8d4e6dd59f1769da
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-06-13

    floating-bar: fix background/frame rendering

M	src/nautilus-floating-bar.c

commit 752ab2718ba4f7e968678facfd8dd0ea6b0e4b26
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-06-13

    css: cleanup the CSS file a bit

M	data/nautilus.css

commit a28a89ab8112a5207d5413e5f767f191d1d13339
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-06-13

    floating-bar: port to GtkOverlay

M	src/Makefile.am
D	src/gedit-overlay.c
D	src/gedit-overlay.h
M	src/nautilus-floating-bar.c
M	src/nautilus-floating-bar.h
M	src/nautilus-icon-view.c
M	src/nautilus-list-view.c
M	src/nautilus-window-slot.c
M	src/nautilus-window-slot.h

commit 6260482af6804adda242d7a8582ccdd155beb9e0
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-06-13

    all: don't use Gtk[H/V]Box in UI files

M	src/nautilus-bookmarks-window.ui
M	src/nautilus-file-management-properties.ui

commit d6de7f5f0ff90775445c3dc353328301c66f0de1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-06-13

    all: don't use deprecated Gtk[H/V]Box

M	libnautilus-private/nautilus-column-chooser.c
M	libnautilus-private/nautilus-column-chooser.h
M	libnautilus-private/nautilus-file-conflict-dialog.c
M	libnautilus-private/nautilus-icon-container.c
M	libnautilus-private/nautilus-mime-application-chooser.h
M	src/nautilus-connect-server-dialog.c
M	src/nautilus-desktop-item-properties.c
M	src/nautilus-image-properties-page.c
M	src/nautilus-image-properties-page.h
M	src/nautilus-location-bar.c
M	src/nautilus-location-bar.h
M	src/nautilus-notebook.c
M	src/nautilus-pathbar.c
M	src/nautilus-progress-info-widget.c
M	src/nautilus-progress-ui-handler.c
M	src/nautilus-properties-window.c
M	src/nautilus-query-editor.c
M	src/nautilus-view.c
M	src/nautilus-window-pane.c
M	src/nautilus-window-slot.c
M	src/nautilus-window.c

commit 2c37855719d90413705bd102ef5a29aac33f598a
Author: Teliute <teliute@163.com>
Date:	2011-06-12

    Update Simplified Chinese translation.

M	po/zh_CN.po

commit e46d446be937d0e43ffea1bbc41381388706cf42
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2011-06-10

    Updated Slovenian translation

M	po/sl.po

commit f657a12a9f1da481e7a580335b682749ac4b01cf
Author: Javier Jardón <jjardon@gnome.org>
Date:	2011-06-09

    libnautilus-private: Use 'const' instead G_CONST_RETURN

M	libnautilus-private/nautilus-icon-canvas-item.c
M	libnautilus-private/nautilus-icon-info.c
M	libnautilus-private/nautilus-icon-info.h

commit a8443f64b6554b640f9bd39b3470284127b7bc3f
Author: Javier Jardón <jjardon@gnome.org>
Date:	2011-06-09

    eel: Use 'const' instead G_CONST_RETURN

M	eel/eel-editable-label.c
M	eel/eel-editable-label.h

commit 253e72f88a85759fe0630aecfb9cea4011e74e5a
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:	2011-06-07

    Updated Norwegian bokmål translation

M	po/nb.po

commit 64d608f8cc2d6e266900e5a33402249b20dfec1e
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	2011-06-06

    Updated Galician translations

M	po/gl.po

commit 12541f6a1ab1fbf30b032dc628aca147d6de2ad0
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	2011-06-04

    Updated Hebrew translation.

M	po/he.po

commit e36c6f5871f6f16833361ce57a4845d46e73f3f1
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	2011-06-04

    Updated Hebrew translation.

M	po/he.po

commit 092ba8f674341769579bc515389e7bb67035824d
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-06-04

    Updated Spanish translation

M	po/es.po

commit f83bdf0081bfb5d6b8caad8848a267fecb95b85b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-06-03

    connect-server: handle closing of the dialog while connecting

    If we start a connect operation, but close the dialog before providing
    the credential details, cancel the operation and hide the dialog,
    instead of segfaulting.
    The dialog will eventually be destroyed when the the mount operation
    terminates (with error).

M	src/nautilus-connect-server-dialog.c
M	src/nautilus-connect-server-operation.c

commit e3f055c886e9db0c105de59e80573a9715c41060
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-06-03

    eel-string: don't use deprecated gatomic API

M	eel/eel-string.c

commit a0d9614d204d0494d329e04c1d7652e451c2573f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-06-03

    toolbar: disconnect the GSettings callback on dispose

M	src/nautilus-toolbar.c

commit b62ab1413cca6694b9b09fc9d241bbf3581a56e6
Author: Djavan Fagundes <djavanf@gnome.org>
Date:	2011-06-03

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit a5a4bddf12ff29205757858af81fd3665a68c3f2
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-31

    application: pass in the array length while looping over it

M	src/nautilus-application.c

commit d0240a4319561551adc5e0cdb94bb5486d3f3308
Author: Carles Ferrando <carles.ferrando@gmail.com>
Date:	2011-05-29

    [l10n]Updated Catalan (Valencian) translation

M	po/ca@valencia.po

commit 1f01e04e135c77722cd3d06065f4ceed20d19219
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	2011-05-29

    Updated Spanish translation

M	po/es.po

commit ea223de6187778ce0a0a70356009f1c24c084c57
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	2011-05-29

    Updated Spanish translation

M	po/es.po

commit 178bae2b656b2cae7ad39f81076fca7c65adf429
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date:	2011-05-28

    Updated Russian translation

M	po/ru.po

commit 362696f86bce90dcfa599bf6f4e17ffd0a679860
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-25

    metadata: add a metadata::custom-icon-name metadata key

    It's similar to metadata::custom-icon, only that it works on icon
    names
    instead of URIs.

    https://bugzilla.gnome.org/show_bug.cgi?id=626338

M	libnautilus-private/nautilus-file.c
M	libnautilus-private/nautilus-metadata.c
M	libnautilus-private/nautilus-metadata.h

commit fc3d9af1dff85ef27ff44ea4e71b269a2b700e7d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-24

    autostart: add an autostart desktop file

    It will autostart nautilus automatically based on the GSettings key
    org.gnome.desktop.background show-desktop-icons.

    https://bugzilla.gnome.org/show_bug.cgi?id=647267

M	data/Makefile.am
A	data/nautilus-autostart.desktop.in

commit 636c06bdc3397b1c6bad78afe2094c149c59f6fb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-24

    css: update for new GtkCssParser

M	data/nautilus.css

commit e239f2a150f34b7f7b4730772fae5a372a7924d1
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-23

    floating-bar: copy code from Epiphany to hide the floating bar
    on hover

    This doesn't currently work perfectly if the overlay child is a
    GtkTreeView - more investigation is needed.
    In the meanwhile, it's still better than not hiding the bar ever,
    so here it is.

    https://bugzilla.gnome.org/show_bug.cgi?id=648740

M	src/nautilus-floating-bar.c

commit f0649b5bb808aa71fcab52c3e61f5e6419928432
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-23

    gedit-overlay: update from upstream

M	src/gedit-overlay-child.c
M	src/gedit-overlay.c

commit 5c949fffcb0de62fd5375f546fa94dd50ec7f86f
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-24

    application: rewrite GApplication command line handling

    Do the command line parsing in local_command_line for the set
    of options
    we're interested in parsing there (e.g. directories to open,
    self checks
    and --quit); move the rest of initialization in
    nautilus_application_startup() and use g_application_open() and
    a custom
    "quit" action to forward the requests to the main application.

    This also fixes these two bugs.

    https://bugzilla.gnome.org/show_bug.cgi?id=649336
    https://bugzilla.gnome.org/show_bug.cgi?id=637157

M	src/nautilus-application.c
M	src/nautilus-application.h
M	src/nautilus-connect-server-dialog-nonmain.c
M	src/nautilus-location-bar.c
M	src/nautilus-places-sidebar.c
M	src/nautilus-window-manage-views.c
M	src/nautilus-window-menus.c

commit b9272618934a4c177166e5f7771e6ab6cabcc31b
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	2011-05-24

    po/vi.po: updated UI to match nautilus-preview.page

M	po/vi.po

commit e738e686af858c38ca7c0b32426b3a1dfea0d9a2
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date:	2011-05-24

    po/vi.po: fix up UI to match nautilus-views.page

M	po/vi.po

commit f76c50a0e46aa7786820f76b3f71b57b44b8d7fb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-23

    window: reverse the order of key-press event processing

    Usually the default GtkWindow handler for key-press events processes
    them in the following order:
    - calls gtk_window_activate_key() to process mnemonics/accelerators
    for
      the toplevel window
    - calls gtk_window_propagate_key_event() to propagate the events
    to the
      focus widget
    - chains up to parent if both fail

    We want gtk_window_propagate_key_event() to be called before
    gtk_window_activate_key(), as when we're focusing an editable widget
    (e.g. renaming a file), we want all keybindings to apply to that, e.g.
    Delete, Ctrl+Delete (or Ctrl+W if we're e.g. using an emacs-mode
    GTK+ binding set). This interferes a bit with the type-ahead search
    windows that NautilusIconContainer and GtkTreeView pop up; we can
    control the former, but not the latter, so we need a bit of a hack in
    NautilusListView to prevent the search window to steal the pasted URI,
    and still not handle the event.

    https://bugzilla.gnome.org/show_bug.cgi?id=314431

M	libnautilus-private/nautilus-icon-container.c
M	src/nautilus-list-view.c
M	src/nautilus-window.c

commit fae5d9242e2edf0881a382ed8cb19599c27cdc49
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-23

    query-editor: add a border around the query editor widgets

    https://bugzilla.gnome.org/show_bug.cgi?id=647737

M	src/nautilus-query-editor.c

commit f5e967f964b88ad7e4cc81818e9c0092d842e0a8
Author: Stefano Teso <stefano.teso@gmail.com>
Date:	2011-05-23

    connect-server: strip the scheme if it matches the chosen method

    If e.g. ftp://ftp.example.com is specified as an address, and the FTP
    method is chosen, we should strip "ftp://" automatically from the
    address before connecting.

    https://bugzilla.gnome.org/show_bug.cgi?id=643608

M	src/nautilus-connect-server-dialog.c

commit c17d7bec375b1a8838d6132ccced89da6b092316
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-23

    location-entry: use symbolic icons for the secondary action hint

    https://bugzilla.gnome.org/show_bug.cgi?id=647685

M	src/nautilus-location-entry.c

commit b30bda3e1f341b107fbe4f73f1d7b769504d23cd
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	2011-05-23

    view: add the "view" style class to the icon container

    Not to the NautilusView scrolled windows.

M	src/nautilus-icon-view-container.c
M	src/nautilus-view.c