diff options
| -rw-r--r-- | ChangeLog | 113 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | libcaja-private/caja-desktop-directory-file.c | 6 |
3 files changed, 118 insertions, 3 deletions
@@ -1,3 +1,116 @@ +commit c36dd05635062e69090670f4c125f5834e82eba4 +Author: Stefano Karapetsas <[email protected]> +Date: Mon May 7 17:47:06 2012 +0200 + + fix issues in location bar + + src/caja-navigation-window-pane.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 01100fab944b30226de97ac964171808b91ee9be +Merge: 66a32c7 4dbd82c +Author: Stefano Karapetsas <[email protected]> +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: [email protected] <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 files changed, 1 insertions(+), 1 deletions(-) + +commit 66a32c73c581695a0767b248859d10ea78651dfd +Author: Stefano Karapetsas <[email protected]> +Date: Fri Apr 27 17:36:16 2012 +0200 + + start of 1.3 version + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 416237607d4985738feaede3b7e1b49cae9be149 +Author: Stefano Karapetsas <[email protected]> +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(+), 0 deletions(-) + +commit aaf4c05d9a382b18eb2eced119eff8fbf0f4c763 +Author: Steve Zesch <[email protected]> +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, 0 insertions(+), 80 deletions(-) + +commit 471bb189349ce7c4fd9ad78f054f140a52978604 +Author: Stefano Karapetsas <[email protected]> +Date: Fri Apr 6 00:18:47 2012 +0200 + + fix missing spaces due to caja => nautilus rename + + docs/architecture.txt | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +commit 8a6466a545c33e358ccdec400f53c5d3473a6bbb +Author: Steve Zesch <[email protected]> +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 <[email protected]> +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 <[email protected]> +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 <[email protected]> +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 <[email protected]> Date: Mon Jan 30 08:12:51 2012 -0300 diff --git a/configure.in b/configure.in index bab4f86e..62a986cb 100644 --- a/configure.in +++ b/configure.in @@ -19,7 +19,7 @@ dnl Interface break is not allowed. m4_define(caja_extension_current, 3) m4_define(caja_extension_revision, 0) -AC_INIT([caja], [1.3.0], [http://www.mate-desktop.org]) +AC_INIT([caja], [1.3.1], [http://www.mate-desktop.org]) dnl --------------------------------------------------------------------------- dnl GTK library version diff --git a/libcaja-private/caja-desktop-directory-file.c b/libcaja-private/caja-desktop-directory-file.c index ebfa47ce..a87ec431 100644 --- a/libcaja-private/caja-desktop-directory-file.c +++ b/libcaja-private/caja-desktop-directory-file.c @@ -224,6 +224,10 @@ desktop_callback_check_done (DesktopCallback *desktop_callback) return; } + /* Ensure our metadata is updated before calling back. */ + caja_desktop_update_metadata_from_mateconf(CAJA_FILE (desktop_callback->desktop_file), + "directory"); + /* Remove from the hash table before sending it. */ g_hash_table_remove (desktop_callback->desktop_file->details->callbacks, desktop_callback); @@ -655,8 +659,6 @@ caja_desktop_directory_file_init (gpointer object, gpointer klass) desktop_file->details->real_dir_file = real_dir_file; - caja_desktop_update_metadata_from_mateconf (CAJA_FILE (desktop_file), "directory"); - g_signal_connect_object (real_dir_file, "changed", G_CALLBACK (real_file_changed_callback), desktop_file, 0); } |