[arch-commits] Commit in caja/repos (10 files)
Martin Wimpress
flexiondotorg at nymeria.archlinux.org
Mon Apr 21 15:45:57 UTC 2014
Date: Monday, April 21, 2014 @ 17:45:57
Author: flexiondotorg
Revision: 109911
archrelease: copy trunk to community-i686, community-x86_64
Added:
caja/repos/community-i686/4f1e756e08e61840eb9a52de4debee30006ea31e.diff
(from rev 109910, caja/trunk/4f1e756e08e61840eb9a52de4debee30006ea31e.diff)
caja/repos/community-i686/PKGBUILD
(from rev 109910, caja/trunk/PKGBUILD)
caja/repos/community-i686/caja.install
(from rev 109910, caja/trunk/caja.install)
caja/repos/community-x86_64/4f1e756e08e61840eb9a52de4debee30006ea31e.diff
(from rev 109910, caja/trunk/4f1e756e08e61840eb9a52de4debee30006ea31e.diff)
caja/repos/community-x86_64/PKGBUILD
(from rev 109910, caja/trunk/PKGBUILD)
caja/repos/community-x86_64/caja.install
(from rev 109910, caja/trunk/caja.install)
Deleted:
caja/repos/community-i686/PKGBUILD
caja/repos/community-i686/caja.install
caja/repos/community-x86_64/PKGBUILD
caja/repos/community-x86_64/caja.install
----------------------------------------------------------------+
/PKGBUILD | 94 ++++++++++
/caja.install | 28 ++
community-i686/4f1e756e08e61840eb9a52de4debee30006ea31e.diff | 89 +++++++++
community-i686/PKGBUILD | 47 -----
community-i686/caja.install | 14 -
community-x86_64/4f1e756e08e61840eb9a52de4debee30006ea31e.diff | 89 +++++++++
community-x86_64/PKGBUILD | 47 -----
community-x86_64/caja.install | 14 -
8 files changed, 300 insertions(+), 122 deletions(-)
Copied: caja/repos/community-i686/4f1e756e08e61840eb9a52de4debee30006ea31e.diff (from rev 109910, caja/trunk/4f1e756e08e61840eb9a52de4debee30006ea31e.diff)
===================================================================
--- community-i686/4f1e756e08e61840eb9a52de4debee30006ea31e.diff (rev 0)
+++ community-i686/4f1e756e08e61840eb9a52de4debee30006ea31e.diff 2014-04-21 15:45:57 UTC (rev 109911)
@@ -0,0 +1,89 @@
+diff --git a/src/caja-application.c b/src/caja-application.c
+index 3f4282c..47c86c8 100644
+--- a/src/caja-application.c
++++ b/src/caja-application.c
+@@ -961,6 +961,15 @@ queue_accel_map_save_callback (GtkAccelMap *object, gchar *accel_path,
+ }
+ }
+
++static gboolean
++desktop_changed_callback_connect (CajaApplication *application)
++{
++ g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR,
++ G_CALLBACK(desktop_location_changed_callback),
++ G_OBJECT (application));
++ return FALSE;
++}
++
+ void
+ caja_application_startup (CajaApplication *application,
+ gboolean kill_shell,
+@@ -1029,9 +1038,8 @@ caja_application_startup (CajaApplication *application,
+
+ /* Monitor the preference to have the desktop */
+ /* point to the Unix home folder */
+- g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR,
+- G_CALLBACK(desktop_location_changed_callback),
+- G_OBJECT (application));
++ g_timeout_add_seconds (30, (GSourceFunc) desktop_changed_callback_connect, application);
++
+ /* Create the other windows. */
+ if (urls != NULL || !no_default_window)
+ {
+diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
+index c7918e6..616e85b 100644
+--- a/src/caja-window-manage-views.c
++++ b/src/caja-window-manage-views.c
+@@ -49,6 +49,7 @@
+ #include <eel/eel-gtk-macros.h>
+ #include <eel/eel-stock-dialogs.h>
+ #include <eel/eel-string.h>
++#include <eel/eel-vfs-extensions.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
+@@ -527,8 +528,10 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ char *old_uri, *new_uri;
+ int new_slot_position;
+ GList *l;
+- gboolean target_navigation = FALSE, target_same = FALSE;
+- gboolean is_desktop, is_navigation;
++ gboolean target_navigation = FALSE;
++ gboolean target_same = FALSE;
++ gboolean is_desktop = FALSE;
++ gboolean is_navigation = FALSE;
+
+ window = slot->pane->window;
+
+@@ -567,7 +570,12 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ * otherwise it's the same window.
+ */
+ if (is_desktop) {
+- target_navigation = TRUE;
++ new_uri = g_file_get_uri (location);
++ if (g_str_has_prefix (new_uri, EEL_DESKTOP_URI))
++ target_same = TRUE;
++ else
++ target_navigation = TRUE;
++ g_free (new_uri);
+ } else {
+ target_same = TRUE;
+ }
+@@ -676,7 +684,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ }
+ }
+
+- if ((target_window == window && target_slot == slot &&
++ if (!(is_desktop && target_same) && (target_window == window && target_slot == slot &&
+ old_location && g_file_equal (old_location, location))) {
+
+ if (callback != NULL) {
+@@ -688,7 +696,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ }
+
+ begin_location_change (target_slot, location, old_location, new_selection,
+- CAJA_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data);
++ (is_desktop && target_same) ? CAJA_LOCATION_CHANGE_RELOAD : CAJA_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data);
+
+ /* Additionally, load this in all slots that have no location, this means
+ we load both panes in e.g. a newly opened dual pane window. */
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-04-21 15:45:38 UTC (rev 109910)
+++ community-i686/PKGBUILD 2014-04-21 15:45:57 UTC (rev 109911)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-pkgname=caja
-pkgver=1.8.0
-pkgrel=2
-pkgdesc="The MATE shell and file manager"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif' 'libunique'
- 'libxt' 'mate-desktop' 'mate-icon-theme' 'startup-notification')
-makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
-optdepends=('gstreamer0.10-good-plugins: automatic media playback when mouseover'
- 'gvfs-smb: To connect to Samba/Windows shares')
-replaces=('mate-file-manager')
-provides=('mate-file-manager')
-conflicts=('mate-file-manager')
-groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
- "https://github.com/mate-desktop/caja/commit/4f1e756e08e61840eb9a52de4debee30006ea31e.diff")
-sha1sums=('3bfb52dceae4fa7b39eb26099b07326fa4197f3f'
- 'a8ae80fb181c999deeea5d597d7a8f7a174e62c6')
-install=${pkgname}.install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/4f1e756e08e61840eb9a52de4debee30006ea31e.diff"
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/${pkgname} \
- --with-gtk=2.0 \
- --enable-unique \
- --enable-introspection \
- --disable-static \
- --disable-update-mimedb
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: caja/repos/community-i686/PKGBUILD (from rev 109910, caja/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-04-21 15:45:57 UTC (rev 109911)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=caja
+pkgver=1.8.0
+pkgrel=3
+pkgdesc="The MATE shell and file manager"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif' 'libunique'
+ 'libxt' 'mate-desktop' 'mate-icon-theme' 'startup-notification')
+makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
+optdepends=('gstreamer0.10-good-plugins: automatic media playback when mouseover'
+ 'gvfs-smb: To connect to Samba/Windows shares')
+replaces=('mate-file-manager')
+provides=('mate-file-manager')
+conflicts=('mate-file-manager')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
+ "4f1e756e08e61840eb9a52de4debee30006ea31e.diff")
+sha1sums=('3bfb52dceae4fa7b39eb26099b07326fa4197f3f'
+ 'b2b619091643521b1e7263f883780abdf7bd7d71')
+install=${pkgname}.install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/4f1e756e08e61840eb9a52de4debee30006ea31e.diff"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgname} \
+ --with-gtk=2.0 \
+ --enable-unique \
+ --enable-introspection \
+ --disable-static \
+ --disable-update-mimedb
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/caja.install
===================================================================
--- community-i686/caja.install 2014-04-21 15:45:38 UTC (rev 109910)
+++ community-i686/caja.install 2014-04-21 15:45:57 UTC (rev 109911)
@@ -1,14 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas/
- update-mime-database /usr/share/mime/ > /dev/null
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: caja/repos/community-i686/caja.install (from rev 109910, caja/trunk/caja.install)
===================================================================
--- community-i686/caja.install (rev 0)
+++ community-i686/caja.install 2014-04-21 15:45:57 UTC (rev 109911)
@@ -0,0 +1,14 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+ update-mime-database /usr/share/mime/ > /dev/null
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: caja/repos/community-x86_64/4f1e756e08e61840eb9a52de4debee30006ea31e.diff (from rev 109910, caja/trunk/4f1e756e08e61840eb9a52de4debee30006ea31e.diff)
===================================================================
--- community-x86_64/4f1e756e08e61840eb9a52de4debee30006ea31e.diff (rev 0)
+++ community-x86_64/4f1e756e08e61840eb9a52de4debee30006ea31e.diff 2014-04-21 15:45:57 UTC (rev 109911)
@@ -0,0 +1,89 @@
+diff --git a/src/caja-application.c b/src/caja-application.c
+index 3f4282c..47c86c8 100644
+--- a/src/caja-application.c
++++ b/src/caja-application.c
+@@ -961,6 +961,15 @@ queue_accel_map_save_callback (GtkAccelMap *object, gchar *accel_path,
+ }
+ }
+
++static gboolean
++desktop_changed_callback_connect (CajaApplication *application)
++{
++ g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR,
++ G_CALLBACK(desktop_location_changed_callback),
++ G_OBJECT (application));
++ return FALSE;
++}
++
+ void
+ caja_application_startup (CajaApplication *application,
+ gboolean kill_shell,
+@@ -1029,9 +1038,8 @@ caja_application_startup (CajaApplication *application,
+
+ /* Monitor the preference to have the desktop */
+ /* point to the Unix home folder */
+- g_signal_connect_swapped (caja_preferences, "changed::" CAJA_PREFERENCES_DESKTOP_IS_HOME_DIR,
+- G_CALLBACK(desktop_location_changed_callback),
+- G_OBJECT (application));
++ g_timeout_add_seconds (30, (GSourceFunc) desktop_changed_callback_connect, application);
++
+ /* Create the other windows. */
+ if (urls != NULL || !no_default_window)
+ {
+diff --git a/src/caja-window-manage-views.c b/src/caja-window-manage-views.c
+index c7918e6..616e85b 100644
+--- a/src/caja-window-manage-views.c
++++ b/src/caja-window-manage-views.c
+@@ -49,6 +49,7 @@
+ #include <eel/eel-gtk-macros.h>
+ #include <eel/eel-stock-dialogs.h>
+ #include <eel/eel-string.h>
++#include <eel/eel-vfs-extensions.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ #include <glib/gi18n.h>
+@@ -527,8 +528,10 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ char *old_uri, *new_uri;
+ int new_slot_position;
+ GList *l;
+- gboolean target_navigation = FALSE, target_same = FALSE;
+- gboolean is_desktop, is_navigation;
++ gboolean target_navigation = FALSE;
++ gboolean target_same = FALSE;
++ gboolean is_desktop = FALSE;
++ gboolean is_navigation = FALSE;
+
+ window = slot->pane->window;
+
+@@ -567,7 +570,12 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ * otherwise it's the same window.
+ */
+ if (is_desktop) {
+- target_navigation = TRUE;
++ new_uri = g_file_get_uri (location);
++ if (g_str_has_prefix (new_uri, EEL_DESKTOP_URI))
++ target_same = TRUE;
++ else
++ target_navigation = TRUE;
++ g_free (new_uri);
+ } else {
+ target_same = TRUE;
+ }
+@@ -676,7 +684,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ }
+ }
+
+- if ((target_window == window && target_slot == slot &&
++ if (!(is_desktop && target_same) && (target_window == window && target_slot == slot &&
+ old_location && g_file_equal (old_location, location))) {
+
+ if (callback != NULL) {
+@@ -688,7 +696,7 @@ caja_window_slot_open_location_full (CajaWindowSlot *slot,
+ }
+
+ begin_location_change (target_slot, location, old_location, new_selection,
+- CAJA_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data);
++ (is_desktop && target_same) ? CAJA_LOCATION_CHANGE_RELOAD : CAJA_LOCATION_CHANGE_STANDARD, 0, NULL, callback, user_data);
+
+ /* Additionally, load this in all slots that have no location, this means
+ we load both panes in e.g. a newly opened dual pane window. */
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-04-21 15:45:38 UTC (rev 109910)
+++ community-x86_64/PKGBUILD 2014-04-21 15:45:57 UTC (rev 109911)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer : Martin Wimpress <code at flexion.org>
-
-pkgname=caja
-pkgver=1.8.0
-pkgrel=2
-pkgdesc="The MATE shell and file manager"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif' 'libunique'
- 'libxt' 'mate-desktop' 'mate-icon-theme' 'startup-notification')
-makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
-optdepends=('gstreamer0.10-good-plugins: automatic media playback when mouseover'
- 'gvfs-smb: To connect to Samba/Windows shares')
-replaces=('mate-file-manager')
-provides=('mate-file-manager')
-conflicts=('mate-file-manager')
-groups=('mate')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
- "https://github.com/mate-desktop/caja/commit/4f1e756e08e61840eb9a52de4debee30006ea31e.diff")
-sha1sums=('3bfb52dceae4fa7b39eb26099b07326fa4197f3f'
- 'a8ae80fb181c999deeea5d597d7a8f7a174e62c6')
-install=${pkgname}.install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/4f1e756e08e61840eb9a52de4debee30006ea31e.diff"
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --libexecdir=/usr/lib/${pkgname} \
- --with-gtk=2.0 \
- --enable-unique \
- --enable-introspection \
- --disable-static \
- --disable-update-mimedb
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: caja/repos/community-x86_64/PKGBUILD (from rev 109910, caja/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-04-21 15:45:57 UTC (rev 109911)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer : Martin Wimpress <code at flexion.org>
+
+pkgname=caja
+pkgver=1.8.0
+pkgrel=3
+pkgdesc="The MATE shell and file manager"
+url="http://mate-desktop.org"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('dbus' 'desktop-file-utils' 'exempi' 'gtk2' 'gvfs' 'libexif' 'libunique'
+ 'libxt' 'mate-desktop' 'mate-icon-theme' 'startup-notification')
+makedepends=('gobject-introspection' 'mate-common' 'pangox-compat')
+optdepends=('gstreamer0.10-good-plugins: automatic media playback when mouseover'
+ 'gvfs-smb: To connect to Samba/Windows shares')
+replaces=('mate-file-manager')
+provides=('mate-file-manager')
+conflicts=('mate-file-manager')
+groups=('mate')
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz"
+ "4f1e756e08e61840eb9a52de4debee30006ea31e.diff")
+sha1sums=('3bfb52dceae4fa7b39eb26099b07326fa4197f3f'
+ 'b2b619091643521b1e7263f883780abdf7bd7d71')
+install=${pkgname}.install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/4f1e756e08e61840eb9a52de4debee30006ea31e.diff"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure \
+ --prefix=/usr \
+ --libexecdir=/usr/lib/${pkgname} \
+ --with-gtk=2.0 \
+ --enable-unique \
+ --enable-introspection \
+ --disable-static \
+ --disable-update-mimedb
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/caja.install
===================================================================
--- community-x86_64/caja.install 2014-04-21 15:45:38 UTC (rev 109910)
+++ community-x86_64/caja.install 2014-04-21 15:45:57 UTC (rev 109911)
@@ -1,14 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas/
- update-mime-database /usr/share/mime/ > /dev/null
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: caja/repos/community-x86_64/caja.install (from rev 109910, caja/trunk/caja.install)
===================================================================
--- community-x86_64/caja.install (rev 0)
+++ community-x86_64/caja.install 2014-04-21 15:45:57 UTC (rev 109911)
@@ -0,0 +1,14 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas/
+ update-mime-database /usr/share/mime/ > /dev/null
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list