7 files changed, 215 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 921ff040..d9c290a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 e96d8465..4e7f4c88 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.2.1], [http://www.mate-desktop.org])
+AC_INIT([caja], [1.3.1], [http://www.mate-desktop.org])
 
 dnl ---------------------------------------------------------------------------
 dnl GTK library version
diff --git a/data/caja-folder-handler.desktop.in.in b/data/caja-folder-handler.desktop.in.in
index c873baf0..a4f0a5a6 100644
--- a/data/caja-folder-handler.desktop.in.in
+++ b/data/caja-folder-handler.desktop.in.in
@@ -7,7 +7,7 @@ Terminal=false
 Icon=folder-open
 StartupNotify=true
 Type=Application
-MimeType=x-directory/mate-default-handler;x-directory/normal;inode/directory;application/x-mate-saved-search;
+MimeType=inode/directory;application/x-mate-saved-search;
 OnlyShowIn=MATE;
 X-MATE-Bugzilla-Bugzilla=MATE
 X-MATE-Bugzilla-Product=caja
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
index 9e388273..8a70e9fd 100644
--- a/distro/archlinux/PKGBUILD
+++ b/distro/archlinux/PKGBUILD
@@ -1,41 +1,41 @@
 pkgname=mate-file-manager
-pkgver=1.1.2
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="The MATE shell and file manager"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libexif' 'exempi' 'mate-icon-theme' 'shared-mime-info'
 'desktop-file-utils' 'gvfs' 'libunique' 'mate-desktop')
-makedepends=('pkgconfig' 'intltool')
-url="http://matsusoft.com.ar/projects"
+makedepends=('pkgconfig' 'intltool' 'mate-common')
+url="http://matsusoft.com.ar/projects/mate/"
 options=('!libtool' '!emptydirs')
 install=mate-file-manager.install
-source=(http://sourceforge.net/projects/matede/files/${pkgver}/${pkgname}.tar.gz/download)
-sha256sums=('d13e08c13178629d38328783704890073b650d5b19c457ea3009cc13f6eea4e1')
+source=()
+sha256sums=()
 groups=('mate')
 
 build() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/../../../"
 
- ./autogen.sh \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-static \
- --libexecdir=/usr/lib/caja \
- --enable-unique \
- --disable-update-mimedb || return 1
+ ./autogen.sh \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --libexecdir=/usr/lib/caja \
+ --enable-unique \
+ --disable-update-mimedb || return 1
 
- make || return 1
+ make || return 1
 }
 
 package() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/../../../"
 
- make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+ make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
 
- install -m755 -d ${pkgdir}/usr/share/mateconf/schemas
+ install -m755 -d ${pkgdir}/usr/share/mateconf/schemas
 
- mateconf-merge-schema ${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
- rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
+ mateconf-merge-schema ${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
+ rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
 }
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);
 }
diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c
index 021a1798..e2e6541a 100644
--- a/src/caja-navigation-window-pane.c
+++ b/src/caja-navigation-window-pane.c
@@ -64,6 +64,9 @@ real_set_active (CajaWindowPane *pane, gboolean is_active)
 
 /* navigation bar (manual entry) */
 caja_location_bar_set_active (CAJA_LOCATION_BAR (nav_pane->navigation_bar), is_active);
+ 
+ /* location button */
+ gtk_widget_set_sensitive (gtk_bin_get_child (GTK_BIN (nav_pane->location_button)), is_active);
 }
 
 static gboolean
@@ -214,6 +217,51 @@ path_bar_location_changed_callback (GtkWidget *widget,
 }
 
 static gboolean
+location_button_should_be_active (CajaNavigationWindowPane *pane)
+{
+ return eel_preferences_get_boolean (CAJA_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY);
+}
+
+static void
+location_button_toggled_cb (GtkToggleButton *toggle,
+ CajaNavigationWindowPane *pane)
+{
+ gboolean is_active;
+
+ is_active = gtk_toggle_button_get_active (toggle);
+ eel_preferences_set_boolean (CAJA_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY, is_active);
+
+ if (is_active) {
+ caja_navigation_bar_activate (CAJA_NAVIGATION_BAR (pane->navigation_bar));
+ }
+
+ caja_window_set_active_pane (CAJA_WINDOW_PANE (pane)->window, CAJA_WINDOW_PANE (pane));
+}
+
+static GtkWidget *
+location_button_create (CajaNavigationWindowPane *pane)
+{
+ GtkWidget *image;
+ GtkWidget *button;
+
+ image = gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image);
+
+ button = g_object_new (GTK_TYPE_TOGGLE_BUTTON,
+ "image", image,
+ "focus-on-click", FALSE,
+ "active", location_button_should_be_active (pane),
+ NULL);
+
+ gtk_widget_set_tooltip_text (button,
+ _("Toggle between button and text-based location bar"));
+
+ g_signal_connect (button, "toggled",
+ G_CALLBACK (location_button_toggled_cb), pane);
+ return button;
+}
+
+static gboolean
 path_bar_button_pressed_callback (GtkWidget *widget,
 GdkEventButton *event,
 CajaNavigationWindowPane *pane)
@@ -647,6 +695,14 @@ caja_navigation_window_pane_always_use_location_entry (CajaNavigationWindowPane
 {
 caja_navigation_window_pane_set_bar_mode (pane, CAJA_BAR_PATH);
 }
+ 
+ g_signal_handlers_block_by_func (pane->location_button,
+ G_CALLBACK (location_button_toggled_cb),
+ pane);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pane->location_button), use_entry);
+ g_signal_handlers_unblock_by_func (pane->location_button,
+ G_CALLBACK (location_button_toggled_cb),
+ pane);
 }
 
 void
@@ -667,6 +723,11 @@ caja_navigation_window_pane_setup (CajaNavigationWindowPane *pane)
 
 header_size_group = CAJA_NAVIGATION_WINDOW (CAJA_WINDOW_PANE (pane)->window)->details->header_size_group;
 
+ pane->location_button = location_button_create (pane);
+ gtk_size_group_add_widget (header_size_group, pane->location_button);
+ gtk_box_pack_start (GTK_BOX (hbox), pane->location_button, FALSE, FALSE, 0);
+ gtk_widget_show (pane->location_button);
+
 pane->path_bar = g_object_new (CAJA_TYPE_PATH_BAR, NULL);
 gtk_size_group_add_widget (header_size_group, pane->path_bar);
 gtk_widget_show (pane->path_bar);
@@ -776,6 +837,7 @@ void
 caja_navigation_window_pane_set_bar_mode (CajaNavigationWindowPane *pane,
 CajaBarMode mode)
 {
+ gboolean use_entry;
 GtkWidget *focus_widget;
 CajaNavigationWindow *window;
 
@@ -800,6 +862,19 @@ caja_navigation_window_pane_set_bar_mode (CajaNavigationWindowPane *pane,
 gtk_widget_hide (pane->navigation_bar);
 break;
 }
+ 
+ if (mode == CAJA_BAR_NAVIGATION || mode == CAJA_BAR_PATH) {
+ use_entry = (mode == CAJA_BAR_NAVIGATION);
+
+ g_signal_handlers_block_by_func (pane->location_button,
+ G_CALLBACK (location_button_toggled_cb),
+ pane);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pane->location_button),
+ use_entry);
+ g_signal_handlers_unblock_by_func (pane->location_button,
+ G_CALLBACK (location_button_toggled_cb),
+ pane);
+ }
 
 window = CAJA_NAVIGATION_WINDOW (CAJA_WINDOW_PANE (pane)->window);
 focus_widget = gtk_window_get_focus (GTK_WINDOW (window));
diff --git a/src/caja-navigation-window-pane.h b/src/caja-navigation-window-pane.h
index 87e4ae5d..8824332f 100644
--- a/src/caja-navigation-window-pane.h
+++ b/src/caja-navigation-window-pane.h
@@ -51,6 +51,7 @@ struct _CajaNavigationWindowPane
 
 /* location bar */
 GtkWidget *location_bar;
+ GtkWidget *location_button;
 GtkWidget *navigation_bar;
 GtkWidget *path_bar;
 GtkWidget *search_bar;