diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/ChangeLog nautilus-2.30.1/ChangeLog
--- nautilus-2.30.0/ChangeLog 2010-03-29 11:11:56.000000000 +0200
+++ nautilus-2.30.1/ChangeLog 2010-04-26 13:27:44.000000000 +0200
@@ -1,6 +1,346 @@
+commit 2e79c499851757bf6da55c735268e36fcc4f2552
+Author: Alexander Larsson
+Date: 2010-04-26
+
+ Update NEWS for release
+
+M NEWS
+
+commit 7411a0f07a6505ca5205a819b2539fe95bb1a1c0
+Author: Andy Owen
+Date: 2010-04-26
+
+ Update split view menu item sensitivity when closing extra pane
+
+M src/nautilus-navigation-window.c
+
+commit 39547f935a4f766eece11513eee175fffcbad2c1
+Author: Andy Owen
+Date: 2010-04-26
+
+ Don't crash if there is no next_pane
+
+ This happened due to menu sensitivity being wrongs (bug 616179)
+
+M src/nautilus-navigation-window-menus.c
+
+commit bae7b352ae02233e5f3368818bf4daa864ad9a2e
+Author: Mattias Põldaru
+Date: 2010-04-26
+
+ Estonian translation updated
+
+M po/et.po
+
+commit dae9a5f81eec0ea5ededecb4375ca76c8f3ed9d1
+Author: Maxim V. Dziumanenko
+Date: 2010-04-24
+
+ Updated Ukrainian translation
+
+M po/uk.po
+
+commit bf052548334dc7eae0b01131a4771c9fc34301f6
+Author: Maxim V. Dziumanenko
+Date: 2010-04-22
+
+ Updated Ukrainian translation
+
+M po/uk.po
+
+commit 3c336f6968ed198c89eaeeae8d44a71312b5682b
+Author: Carles Ferrando
+Date: 2010-04-21
+
+ Updated Catalan (Valencian) translation
+
+M po/ca@valencia.po
+
+commit 17e388240fd5947cf21081c1d3971b2c9a66eeb1
+Author: Shankar Prasad
+Date: 2010-04-21
+
+ Updated the kn translations
+
+M po/kn.po
+
+commit 2514148ef1a3d8a22caeb2f80989d29441e816e0
+Author: Jorge González
+Date: 2010-04-17
+
+ Updated Spanish translation
+
+M po/es.po
+
+commit 32327339b335e71f661f5f51c6f66ddb95cbd099
+Author: Paolo Borelli
+Date: 2010-04-17
+
+ Do not use "if (spatial) ..." in window superclass
+
+ Delegate behavior specific to the window type to an appopriate
+ subclass
+ method.
+
+M src/nautilus-application.c
+M src/nautilus-navigation-window.c
+M src/nautilus-spatial-window.c
+M src/nautilus-window-private.h
+M src/nautilus-window.c
+M src/nautilus-window.h
+
+commit 90c1b707ce4ab0a96dc4200537ef9fae17e45e60
+Author: Andika Triwidada
+Date: 2010-04-17
+
+ Updated Indonesian translation due bug #569491
+
+M po/id.po
+
+commit fc18d0bfc4f6001be311be63993a90129f02520a
+Author: Holger Berndt
+Date: 2010-04-06
+
+ Let w close the extra pane
+
+ The keybinding w closes the active slot until no slot is
+ remaining, in which case it closes the window. This commit includes
+ the extra pane layer in this chain.
+
+ Fixes bug 615593
+
+M src/nautilus-window-pane.c
+M src/nautilus-window.c
+
+commit 719c524c571fc0742382bff1c04174bb585326b8
+Author: Manoj Kumar Giri
+Date: 2010-04-16
+
+ Updated Oriya Translation
+
+M po/or.po
+
+commit 85c0047c370b06473026b2920dc53428bd3c30ae
+Author: Holger Berndt
+Date: 2010-03-22
+
+ Fix sensitivity of "{Copy|Move} to other pane after enable/disable
+ of extra pane"
+
+ Add an "update_menus" signal to the NautilusView interface, so that
+ external events
+ can trigger a menu sensitivity update.
+ Fixes bug 613257.
+
+M libnautilus-private/nautilus-view.c
+M libnautilus-private/nautilus-view.h
+M src/file-manager/fm-directory-view.c
+M src/nautilus-navigation-window-menus.c
+
+commit 543d3ddd5131546fbbb2e3e2a504d9800c4f0d62
+Author: Peteris Krisjanis
+Date: 2010-04-15
+
+ Updated Latvian translation.
+
+M po/lv.po
+
+commit 1ec432f114b357822256349b85c7401d1ade4cf5
+Author: Runa Bhattacharjee
+Date: 2010-04-15
+
+ Updated Bengali India Translation
+
+M po/bn_IN.po
+
+commit 183b65d95d7c6418ba74104e6c718572ae518af3
+Author: Andika Triwidada
+Date: 2010-04-15
+
+ Updated Indonesian translation
+
+M po/id.po
+
+commit 00de9e84618738f2f41c5ac5e01e7bddc953423b
+Author: Reşat SABIQ
+Date: 2010-04-14
+
+ Minor update for Crimean Tatar/Turkish translation
+
+M po/crh.po
+
+commit 9a45cd408e177c49bfbd7bced2f117c2b5f87e75
+Author: Yannig Marchegay
+Date: 2010-04-14
+
+ Updated Occitan translation
+
+M po/oc.po
+
+commit 7fb83086b3c39aa6555b3fe2b0c3a59449cab5f2
+Author: Yannig Marchegay
+Date: 2010-04-14
+
+ Updated Occitan translation
+
+M po/oc.po
+
+commit 73fc9b35508b3be5d959c568e92ae6870817dee2
+Author: Yannig Marchegay
+Date: 2010-04-14
+
+ Updated Occitan translation
+
+M po/oc.po
+
+commit 27850a638a0075fb35b49c0621363bcb9ffd50d3
+Author: Ani Peter
+Date: 2010-04-14
+
+ Updated Malayalam Translation
+
+M po/ml.po
+
+commit d88eca5a81988d62fbcbcc60037abbaae124b407
+Author: Sandeep Shedmake
+Date: 2010-04-14
+
+ Updated Marathi Translations
+
+M po/mr.po
+
+commit 95b2c6e322a9bd15320fd6cdb37394e645b85ef4
+Author: Yannig Marchegay
+Date: 2010-04-13
+
+ Occitan translation update
+
+M po/oc.po
+
+commit 89953c7140b285cc27a0dc4f8a771a58bee21e20
+Author: Yannig Marchegay
+Date: 2010-04-13
+
+ Occitan translation update
+
+M po/oc.po
+
+commit 36586cd1ad3f0c12c707f052964b3c188343e78a
+Author: Francisco Diéguez
+Date: 2010-04-09
+
+ Updated Galician translations
+
+M po/gl.po
+
+commit cb4097700ddfc5992544528cc4e412ec345131aa
+Author: Tomas Bzatek
+Date: 2010-04-09
+
+ Tracker: Fix filtering by location, code cleanup
+
+ This also involves code cleanup to maintain consistency with
+ gtksearchenginetracker.c
+
+ Related: bug 612725
+
+M libnautilus-private/nautilus-search-engine-tracker.c
+
+commit 31b4b4adda7a9da23b611966176c7f7b7ae552cd
+Author: Cosimo Cecchi
+Date: 2010-04-09
+
+ Don't use LDFLAGS for the eel library.
+
+ libeel is a convenience library now, so it should pull its dependecies
+ using LIBADD, not LDFLAGS. Patch by Josselin Mouette (#604575).
+
+M eel/Makefile.am
+
+commit 496d3f15de295482e158194e1fe1dae3569f4524
+Author: Cosimo Cecchi
+Date: 2010-04-09
+
+ Use gtk_widget_get_state() (#612423).
+
+ Instead of the deprecated GTK_WIDGET_STATE macro.
+ Patch by Dominique Leuenberger.
+
+M eel/eel-editable-label.c
+M eel/eel-gtk-extensions.c
+M eel/eel-labeled-image.c
+
+commit 305cf9768bd716ba9bbcd3e773511536243a9cc5
+Author: Marcus Carlson
+Date: 2010-04-07
+
+ Fix emblem scaling with zoom >= 150%
+
+ Emblem handling did not properly take zoom into account (#343540)
+
+M libnautilus-private/nautilus-icon-canvas-item.c
+
+commit 263051df98aace0b59fb2bd1772711dceba8e404
+Author: Marcus Carlson
+Date: 2010-04-07
+
+ Fix crash when middle click on an invalid network share in Places
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=579627
+
+M src/nautilus-window-manage-views.c
+
+commit 1698377dcad6762bc0b32c4efa75d7e2c4b3fb67
+Author: Tomas Bzatek
+Date: 2010-04-06
+
+ Support for tracker 0.8 stable release
+
+M libnautilus-private/nautilus-search-engine-tracker.c
+
+commit 323124d88ba4bf2d39466ee11c3f166ffebb0a01
+Author: Sweta Kothari
+Date: 2010-04-06
+
+ Updated Gujarati Translations
+
+M po/gu.po
+
+commit ae2b3bffcb1bb5f333bc6654af3c0a3719d50b70
+Author: Jordi Serratosa
+Date: 2010-04-02
+
+ Fixes to Catalan translation
+
+M po/ca.po
+
+commit 1b252c84a9f1efaab652679f2511d5d5a63593f4
+Author: Wouter Bolsterlee
+Date: 2010-03-30
+
+ Dutch translation updated by Wouter Bolsterlee
+
+M po/nl.po
+
+commit 09b695b4cab81b239a3934e6c53222299fc61137
+Author: Jordi Serratosa
+Date: 2010-03-29
+
+ Fixes to Catalan translation
+
+M po/ca.po
+
+commit 3bdca4a2c5720e239a8947348b8390da0ac7b998
+Author: Alexander Larsson
+Date: 2010-03-29
+
+ Post release version bump
+
+M configure.in
+
commit e414801ab9c3baba23ce82df02f59ec7fdf2f7d8
Author: Alexander Larsson
-Date: 2010-03-29
+Date: 2010-03-29
Bump version to 2.30.0
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/configure.in nautilus-2.30.1/configure.in
--- nautilus-2.30.0/configure.in 2010-03-29 10:30:52.000000000 +0200
+++ nautilus-2.30.1/configure.in 2010-03-29 11:15:33.000000000 +0200
@@ -19,7 +19,7 @@
m4_define(nautilus_extension_current, 2)
m4_define(nautilus_extension_revision, 0)
-AC_INIT([nautilus],[2.30.0],
+AC_INIT([nautilus],[2.30.1],
[http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus])
dnl ===========================================================================
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/data/nautilus-autorun-software.desktop.in nautilus-2.30.1/data/nautilus-autorun-software.desktop.in
--- nautilus-2.30.0/data/nautilus-autorun-software.desktop.in 2010-03-29 11:10:20.000000000 +0200
+++ nautilus-2.30.1/data/nautilus-autorun-software.desktop.in 2010-04-26 13:24:24.000000000 +0200
@@ -11,4 +11,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=nautilus
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.30.0
+X-GNOME-Bugzilla-Version=2.30.1
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/data/nautilus-browser.desktop.in nautilus-2.30.1/data/nautilus-browser.desktop.in
--- nautilus-2.30.0/data/nautilus-browser.desktop.in 2010-03-29 11:10:20.000000000 +0200
+++ nautilus-2.30.1/data/nautilus-browser.desktop.in 2010-04-26 13:24:24.000000000 +0200
@@ -12,4 +12,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=nautilus
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.30.0
+X-GNOME-Bugzilla-Version=2.30.1
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/data/nautilus-computer.desktop.in nautilus-2.30.1/data/nautilus-computer.desktop.in
--- nautilus-2.30.0/data/nautilus-computer.desktop.in 2010-03-29 11:10:20.000000000 +0200
+++ nautilus-2.30.1/data/nautilus-computer.desktop.in 2010-04-26 13:24:24.000000000 +0200
@@ -12,4 +12,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=nautilus
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.30.0
+X-GNOME-Bugzilla-Version=2.30.1
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/data/nautilus.desktop nautilus-2.30.1/data/nautilus.desktop
--- nautilus-2.30.0/data/nautilus.desktop 2010-03-29 11:11:20.000000000 +0200
+++ nautilus-2.30.1/data/nautilus.desktop 2010-04-26 13:26:59.000000000 +0200
@@ -14,7 +14,7 @@
Name[bs]=Upravitelj datoteka
Name[ca]=Gestor de fitxers
Name[ca@valencia]=Gestor de fitxers
-Name[crh]=Dosye İdareçisi
+Name[crh]=Dosye İdarecisi
Name[cs]=Správce souborů
Name[cy]=Trefnydd Ffeiliau
Name[da]=Filhåndtering
@@ -109,7 +109,7 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=nautilus
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.30.0
+X-GNOME-Bugzilla-Version=2.30.1
X-GNOME-Autostart-Phase=Desktop
X-GNOME-Autostart-Notify=true
X-GNOME-AutoRestart=true
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/data/nautilus.desktop.in nautilus-2.30.1/data/nautilus.desktop.in
--- nautilus-2.30.0/data/nautilus.desktop.in 2010-03-29 11:10:20.000000000 +0200
+++ nautilus-2.30.1/data/nautilus.desktop.in 2010-04-26 13:24:24.000000000 +0200
@@ -10,7 +10,7 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=nautilus
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.30.0
+X-GNOME-Bugzilla-Version=2.30.1
X-GNOME-Autostart-Phase=Desktop
X-GNOME-Autostart-Notify=true
X-GNOME-AutoRestart=true
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/data/nautilus-file-management-properties.desktop.in nautilus-2.30.1/data/nautilus-file-management-properties.desktop.in
--- nautilus-2.30.0/data/nautilus-file-management-properties.desktop.in 2010-03-29 11:10:20.000000000 +0200
+++ nautilus-2.30.1/data/nautilus-file-management-properties.desktop.in 2010-04-26 13:24:24.000000000 +0200
@@ -11,4 +11,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=nautilus
X-GNOME-Bugzilla-Component=Preferences
-X-GNOME-Bugzilla-Version=2.30.0
+X-GNOME-Bugzilla-Version=2.30.1
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/data/nautilus-folder-handler.desktop.in nautilus-2.30.1/data/nautilus-folder-handler.desktop.in
--- nautilus-2.30.0/data/nautilus-folder-handler.desktop.in 2010-03-29 11:10:20.000000000 +0200
+++ nautilus-2.30.1/data/nautilus-folder-handler.desktop.in 2010-04-26 13:24:24.000000000 +0200
@@ -12,4 +12,4 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=nautilus
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.30.0
+X-GNOME-Bugzilla-Version=2.30.1
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/debian/changelog nautilus-2.30.1/debian/changelog
--- nautilus-2.30.0/debian/changelog 2010-04-28 12:03:19.000000000 +0200
+++ nautilus-2.30.1/debian/changelog 2010-04-28 12:03:21.000000000 +0200
@@ -1,3 +1,21 @@
+nautilus (1:2.30.1-0ubuntu1) lucid-proposed; urgency=low
+
+ * New upstream version:
+ - Translation updates
+ - Support for tracker 0.8.0
+ - Fix crashes (lp: #560706)
+ - Fix emblem scaling in zoomed view
+ - Fix sensitivity of split-view related menu items
+ - Control-L closes the extra view first, not the window
+ * debian/patches/02_eel_libadd.patch,
+ debian/patches/91_git_middleclick_crash.patch,
+ debian/patches/92_git_emblems_cut.patch:
+ - the changes are in the new version
+ * debian/patches/90_relibtoolize.patch:
+ - new version update
+
+ -- Sebastien Bacher Wed, 28 Apr 2010 11:24:30 +0200
+
nautilus (1:2.30.0-0ubuntu4) lucid; urgency=low
* debian/patches/91_git_middleclick_crash.patch:
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/debian/patches/02_eel_libadd.patch nautilus-2.30.1/debian/patches/02_eel_libadd.patch
--- nautilus-2.30.0/debian/patches/02_eel_libadd.patch 2010-04-28 12:03:19.000000000 +0200
+++ nautilus-2.30.1/debian/patches/02_eel_libadd.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-Index: nautilus-2.29.92.1/eel/Makefile.am
-===================================================================
---- nautilus-2.29.92.1.orig/eel/Makefile.am 2010-03-10 14:59:13.000000000 +0100
-+++ nautilus-2.29.92.1/eel/Makefile.am 2010-03-10 21:54:59.000000000 +0100
-@@ -17,6 +17,9 @@
-
- libeel_2_la_LDFLAGS = \
- -no-undefined \
-+ $(NULL)
-+
-+libeel_2_la_LIBADD = \
- $(CORE_LIBS) \
- $(RENDER_LIBS) \
- $(X_LIBS) \
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/debian/patches/90_relibtoolize.patch nautilus-2.30.1/debian/patches/90_relibtoolize.patch
--- nautilus-2.30.0/debian/patches/90_relibtoolize.patch 2010-04-28 12:03:19.000000000 +0200
+++ nautilus-2.30.1/debian/patches/90_relibtoolize.patch 2010-04-28 12:03:21.000000000 +0200
@@ -1,6 +1,6 @@
-diff -Nur nautilus-2.30.0/aclocal.m4 nautilus-2.30.0.ubuntu/aclocal.m4
---- nautilus-2.30.0/aclocal.m4 2010-03-29 11:10:12.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/aclocal.m4 2010-03-29 11:49:34.000000000 +0200
+diff -Nur nautilus-2.30.1/aclocal.m4 nautilus-2.30.1.ubuntu/aclocal.m4
+--- nautilus-2.30.1/aclocal.m4 2010-04-26 13:24:09.000000000 +0200
++++ nautilus-2.30.1.ubuntu/aclocal.m4 2010-04-28 11:46:13.000000000 +0200
@@ -13,1691 +13,1693 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -3199,9 +3199,9 @@
m4_include([m4/gtk-doc.m4])
m4_include([m4/intltool.m4])
-diff -Nur nautilus-2.30.0/config.h.in nautilus-2.30.0.ubuntu/config.h.in
---- nautilus-2.30.0/config.h.in 2010-03-29 11:10:13.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/config.h.in 2010-03-29 11:49:38.000000000 +0200
+diff -Nur nautilus-2.30.1/config.h.in nautilus-2.30.1.ubuntu/config.h.in
+--- nautilus-2.30.1/config.h.in 2010-04-26 13:24:11.000000000 +0200
++++ nautilus-2.30.1.ubuntu/config.h.in 2010-04-28 11:46:16.000000000 +0200
@@ -48,6 +48,9 @@
/* Define the location where the catalogs will be installed */
#undef GNOMELOCALEDIR
@@ -3222,14 +3222,200 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -Nur nautilus-2.30.0/configure nautilus-2.30.0.ubuntu/configure
---- nautilus-2.30.0/configure 2010-03-29 11:10:13.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/configure 2010-03-29 11:49:37.000000000 +0200
+diff -Nur nautilus-2.30.1/config.h.in~ nautilus-2.30.1.ubuntu/config.h.in~
+--- nautilus-2.30.1/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
++++ nautilus-2.30.1.ubuntu/config.h.in~ 2010-04-28 11:46:01.000000000 +0200
+@@ -0,0 +1,182 @@
++/* config.h.in. Generated from configure.in by autoheader. */
++#undef ENABLE_INSTALLER
++#undef ENABLE_NLS
++#undef ENABLE_PROFILER
++#undef GETTEXT_PACKAGE
++#undef HAVE_CATGETS
++#undef HAVE_GETTEXT
++#undef HAVE_LC_MESSAGES
++#undef HAVE_LIBBZ2
++#undef HAVE_LIBJPEG
++#undef HAVE_MEDUSA
++#undef HAVE_STPCPY
++#undef bzclose
++#undef bzCompress
++#undef bzCompressInit
++#undef bzDecompress
++#undef bzDecompressInit
++#undef bzdopen
++#undef bzerror
++#undef bzflush
++#undef bzopen
++#undef bzread
++#undef bzwrite
++#define HAVE_GTK_MULTIHEAD /* needed for egg-screen-exec functions */
++#undef HAVE_STARTUP_NOTIFICATION
++#undef HAVE_EXIF
++#undef HAVE_OLD_EXIF
++#undef HAVE_RENDER
++
++/* Define if building universal (internal helper macro) */
++#undef AC_APPLE_UNIVERSAL_BUILD
++
++/* define to enable the empty view that is used for performance measurement */
++#undef ENABLE_EMPTY_VIEW
++
++/* always defined to indicate that i18n is enabled */
++#undef ENABLE_NLS
++
++/* define to enable PackageKit mimetype installer */
++#undef ENABLE_PACKAGEKIT
++
++/* define to enable the profiler */
++#undef ENABLE_PROFILER
++
++/* the gettext translation domain */
++#undef GETTEXT_PACKAGE
++
++/* Define the location where the catalogs will be installed */
++#undef GNOMELOCALEDIR
++
++/* Define to 1 if you have the `bind_textdomain_codeset' function. */
++#undef HAVE_BIND_TEXTDOMAIN_CODESET
++
++/* Define to 1 if you have the `dcgettext' function. */
++#undef HAVE_DCGETTEXT
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_DLFCN_H
++
++/* Define to enable xmp support */
++#undef HAVE_EXEMPI
++
++/* Define if we have exempi with the new API */
++#undef HAVE_EXEMPI_NEW_API
++
++/* Define to enable EXIF support */
++#undef HAVE_EXIF
++
++/* Define if the GNU gettext() function is already present or preinstalled. */
++#undef HAVE_GETTEXT
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_INTTYPES_H
++
++/* Define if your file defines LC_MESSAGES. */
++#undef HAVE_LC_MESSAGES
++
++/* Define to 1 if you have the `m' library (-lm). */
++#undef HAVE_LIBM
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_LOCALE_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_MALLOC_H
++
++/* Define to 1 if you have the `mallopt' function. */
++#undef HAVE_MALLOPT
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_MEMORY_H
++
++/* Define if your EXIF library has old API */
++#undef HAVE_OLD_EXIF
++
++/* Define to 1 if libselinux is available */
++#undef HAVE_SELINUX
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_SELINUX_SELINUX_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_STDINT_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_STDLIB_H
++
++/* Define if strftime supports %E and %O modifiers. */
++#undef HAVE_STRFTIME_EXTENSION
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_STRINGS_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_STRING_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_SYS_MOUNT_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_SYS_PARAM_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_SYS_STAT_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_SYS_TYPES_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_SYS_VFS_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_UNISTD_H
++
++/* Define to 1 if you have the header file. */
++#undef HAVE_X11_XF86KEYSYM_H
++
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++ */
++#undef LT_OBJDIR
++
++/* Name of package */
++#undef PACKAGE
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS
++
++/* Version number of package */
++#undef VERSION
++
++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
++ significant byte first (like Motorola and SPARC, unlike Intel). */
++#if defined AC_APPLE_UNIVERSAL_BUILD
++# if defined __BIG_ENDIAN__
++# define WORDS_BIGENDIAN 1
++# endif
++#else
++# ifndef WORDS_BIGENDIAN
++# undef WORDS_BIGENDIAN
++# endif
++#endif
++
++/* Define to 1 if the X Window System is missing or not being used. */
++#undef X_DISPLAY_MISSING
++
++/* Define to empty if `const' does not conform to ANSI C. */
++#undef const
+diff -Nur nautilus-2.30.1/configure nautilus-2.30.1.ubuntu/configure
+--- nautilus-2.30.1/configure 2010-04-26 13:24:11.000000000 +0200
++++ nautilus-2.30.1.ubuntu/configure 2010-04-28 11:46:16.000000000 +0200
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for nautilus 2.30.0.
-+# Generated by GNU Autoconf 2.65 for nautilus 2.30.0.
+-# Generated by GNU Autoconf 2.63 for nautilus 2.30.1.
++# Generated by GNU Autoconf 2.65 for nautilus 2.30.1.
#
# Report bugs to .
#
@@ -4035,8 +4221,8 @@
# Identity of this package.
PACKAGE_NAME='nautilus'
@@ -748,6 +705,7 @@
- PACKAGE_VERSION='2.30.0'
- PACKAGE_STRING='nautilus 2.30.0'
+ PACKAGE_VERSION='2.30.1'
+ PACKAGE_STRING='nautilus 2.30.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=nautilus'
+PACKAGE_URL=''
@@ -4249,7 +4435,7 @@
@@ -1817,21 +1777,378 @@
if $ac_init_version; then
cat <<\_ACEOF
- nautilus configure 2.30.0
+ nautilus configure 2.30.1
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -4623,7 +4809,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by nautilus $as_me 2.30.0, which was
+ It was created by nautilus $as_me 2.30.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -18475,7 +18661,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by nautilus $as_me 2.30.0, which was
+ This file was extended by nautilus $as_me 2.30.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
@@ -18511,7 +18697,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- nautilus config.status 2.30.0
+ nautilus config.status 2.30.1
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -18995,9 +19181,9 @@
profiling support: ${profiling_support}
nautilus-extension documentation: ${enable_gtk_doc}
-diff -Nur nautilus-2.30.0/cut-n-paste-code/libegg/Makefile.in nautilus-2.30.0.ubuntu/cut-n-paste-code/libegg/Makefile.in
---- nautilus-2.30.0/cut-n-paste-code/libegg/Makefile.in 2010-03-29 11:10:14.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/cut-n-paste-code/libegg/Makefile.in 2010-03-29 11:49:38.000000000 +0200
+diff -Nur nautilus-2.30.1/cut-n-paste-code/libegg/Makefile.in nautilus-2.30.1.ubuntu/cut-n-paste-code/libegg/Makefile.in
+--- nautilus-2.30.1/cut-n-paste-code/libegg/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/cut-n-paste-code/libegg/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -102,6 +102,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19015,9 +19201,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/cut-n-paste-code/Makefile.in nautilus-2.30.0.ubuntu/cut-n-paste-code/Makefile.in
---- nautilus-2.30.0/cut-n-paste-code/Makefile.in 2010-03-29 11:10:14.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/cut-n-paste-code/Makefile.in 2010-03-29 11:49:38.000000000 +0200
+diff -Nur nautilus-2.30.1/cut-n-paste-code/Makefile.in nautilus-2.30.1.ubuntu/cut-n-paste-code/Makefile.in
+--- nautilus-2.30.1/cut-n-paste-code/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/cut-n-paste-code/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -103,6 +103,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19035,9 +19221,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/data/icons/Makefile.in nautilus-2.30.0.ubuntu/data/icons/Makefile.in
---- nautilus-2.30.0/data/icons/Makefile.in 2010-03-29 11:10:14.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/data/icons/Makefile.in 2010-03-29 11:49:38.000000000 +0200
+diff -Nur nautilus-2.30.1/data/icons/Makefile.in nautilus-2.30.1.ubuntu/data/icons/Makefile.in
+--- nautilus-2.30.1/data/icons/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/data/icons/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -65,6 +65,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19055,9 +19241,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/data/Makefile.in nautilus-2.30.0.ubuntu/data/Makefile.in
---- nautilus-2.30.0/data/Makefile.in 2010-03-29 11:10:14.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/data/Makefile.in 2010-03-29 11:49:38.000000000 +0200
+diff -Nur nautilus-2.30.1/data/Makefile.in nautilus-2.30.1.ubuntu/data/Makefile.in
+--- nautilus-2.30.1/data/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/data/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -139,6 +139,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19075,9 +19261,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/data/patterns/Makefile.in nautilus-2.30.0.ubuntu/data/patterns/Makefile.in
---- nautilus-2.30.0/data/patterns/Makefile.in 2010-03-29 11:10:14.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/data/patterns/Makefile.in 2010-03-29 11:49:38.000000000 +0200
+diff -Nur nautilus-2.30.1/data/patterns/Makefile.in nautilus-2.30.1.ubuntu/data/patterns/Makefile.in
+--- nautilus-2.30.1/data/patterns/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/data/patterns/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -87,6 +87,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19095,9 +19281,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/docs/Makefile.in nautilus-2.30.0.ubuntu/docs/Makefile.in
---- nautilus-2.30.0/docs/Makefile.in 2010-03-29 11:10:14.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/docs/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/docs/Makefile.in nautilus-2.30.1.ubuntu/docs/Makefile.in
+--- nautilus-2.30.1/docs/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/docs/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -128,6 +128,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19115,9 +19301,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/docs/reference/libnautilus-extension/Makefile.in nautilus-2.30.0.ubuntu/docs/reference/libnautilus-extension/Makefile.in
---- nautilus-2.30.0/docs/reference/libnautilus-extension/Makefile.in 2010-03-29 11:10:14.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/docs/reference/libnautilus-extension/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/docs/reference/libnautilus-extension/Makefile.in nautilus-2.30.1.ubuntu/docs/reference/libnautilus-extension/Makefile.in
+--- nautilus-2.30.1/docs/reference/libnautilus-extension/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/docs/reference/libnautilus-extension/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -70,6 +70,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19135,9 +19321,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/docs/reference/Makefile.in nautilus-2.30.0.ubuntu/docs/reference/Makefile.in
---- nautilus-2.30.0/docs/reference/Makefile.in 2010-03-29 11:10:14.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/docs/reference/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/docs/reference/Makefile.in nautilus-2.30.1.ubuntu/docs/reference/Makefile.in
+--- nautilus-2.30.1/docs/reference/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/docs/reference/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -103,6 +103,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19155,21 +19341,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/eel/Makefile.in nautilus-2.30.0.ubuntu/eel/Makefile.in
---- nautilus-2.30.0/eel/Makefile.in 2010-03-29 11:10:15.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/eel/Makefile.in 2010-03-29 11:49:39.000000000 +0200
-@@ -52,7 +52,9 @@
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
--libeel_2_la_LIBADD =
-+am__DEPENDENCIES_1 =
-+libeel_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am__objects_1 =
- am_libeel_2_la_OBJECTS = eel-accessibility.lo eel-alert-dialog.lo \
- eel-art-extensions.lo eel-art-gtk-extensions.lo \
-@@ -122,6 +124,8 @@
+diff -Nur nautilus-2.30.1/eel/Makefile.in nautilus-2.30.1.ubuntu/eel/Makefile.in
+--- nautilus-2.30.1/eel/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/eel/Makefile.in 2010-04-28 11:46:17.000000000 +0200
+@@ -124,6 +124,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -19178,7 +19353,7 @@
AR = @AR@
AS = @AS@
AUTOCONF = @AUTOCONF@
-@@ -217,6 +221,7 @@
+@@ -219,6 +221,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19186,19 +19361,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-@@ -312,6 +317,9 @@
-
- libeel_2_la_LDFLAGS = \
- -no-undefined \
-+ $(NULL)
-+
-+libeel_2_la_LIBADD = \
- $(CORE_LIBS) \
- $(RENDER_LIBS) \
- $(X_LIBS) \
-diff -Nur nautilus-2.30.0/icons/Makefile.in nautilus-2.30.0.ubuntu/icons/Makefile.in
---- nautilus-2.30.0/icons/Makefile.in 2010-03-29 11:10:15.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/icons/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/icons/Makefile.in nautilus-2.30.1.ubuntu/icons/Makefile.in
+--- nautilus-2.30.1/icons/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/icons/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -87,6 +87,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19216,9 +19381,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/libnautilus-extension/Makefile.in nautilus-2.30.0.ubuntu/libnautilus-extension/Makefile.in
---- nautilus-2.30.0/libnautilus-extension/Makefile.in 2010-03-29 11:10:15.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/libnautilus-extension/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/libnautilus-extension/Makefile.in nautilus-2.30.1.ubuntu/libnautilus-extension/Makefile.in
+--- nautilus-2.30.1/libnautilus-extension/Makefile.in 2010-04-26 13:24:12.000000000 +0200
++++ nautilus-2.30.1.ubuntu/libnautilus-extension/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -137,6 +137,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19236,9 +19401,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/libnautilus-private/Makefile.in nautilus-2.30.0.ubuntu/libnautilus-private/Makefile.in
---- nautilus-2.30.0/libnautilus-private/Makefile.in 2010-03-29 11:49:07.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/libnautilus-private/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/libnautilus-private/Makefile.in nautilus-2.30.1.ubuntu/libnautilus-private/Makefile.in
+--- nautilus-2.30.1/libnautilus-private/Makefile.in 2010-04-28 11:45:25.000000000 +0200
++++ nautilus-2.30.1.ubuntu/libnautilus-private/Makefile.in 2010-04-28 11:46:17.000000000 +0200
@@ -58,7 +58,8 @@
libnautilus_private_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1) $(top_builddir)/eel/libeel-2.la \
@@ -19257,9 +19422,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/Makefile.in nautilus-2.30.0.ubuntu/Makefile.in
---- nautilus-2.30.0/Makefile.in 2010-03-29 11:10:15.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/Makefile.in nautilus-2.30.1.ubuntu/Makefile.in
+--- nautilus-2.30.1/Makefile.in 2010-04-26 13:24:13.000000000 +0200
++++ nautilus-2.30.1.ubuntu/Makefile.in 2010-04-28 11:46:18.000000000 +0200
@@ -120,6 +120,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19277,9 +19442,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/src/file-manager/Makefile.in nautilus-2.30.0.ubuntu/src/file-manager/Makefile.in
---- nautilus-2.30.0/src/file-manager/Makefile.in 2010-03-29 11:10:15.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/src/file-manager/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/src/file-manager/Makefile.in nautilus-2.30.1.ubuntu/src/file-manager/Makefile.in
+--- nautilus-2.30.1/src/file-manager/Makefile.in 2010-04-26 13:24:13.000000000 +0200
++++ nautilus-2.30.1.ubuntu/src/file-manager/Makefile.in 2010-04-28 11:46:18.000000000 +0200
@@ -137,6 +137,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19297,9 +19462,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/src/Makefile.in nautilus-2.30.0.ubuntu/src/Makefile.in
---- nautilus-2.30.0/src/Makefile.in 2010-03-29 11:10:15.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/src/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/src/Makefile.in nautilus-2.30.1.ubuntu/src/Makefile.in
+--- nautilus-2.30.1/src/Makefile.in 2010-04-26 13:24:13.000000000 +0200
++++ nautilus-2.30.1.ubuntu/src/Makefile.in 2010-04-28 11:46:18.000000000 +0200
@@ -258,6 +258,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
@@ -19317,9 +19482,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGO_REQUIRED = @PANGO_REQUIRED@
PATH_SEPARATOR = @PATH_SEPARATOR@
-diff -Nur nautilus-2.30.0/test/Makefile.in nautilus-2.30.0.ubuntu/test/Makefile.in
---- nautilus-2.30.0/test/Makefile.in 2010-03-29 11:10:15.000000000 +0200
-+++ nautilus-2.30.0.ubuntu/test/Makefile.in 2010-03-29 11:49:39.000000000 +0200
+diff -Nur nautilus-2.30.1/test/Makefile.in nautilus-2.30.1.ubuntu/test/Makefile.in
+--- nautilus-2.30.1/test/Makefile.in 2010-04-26 13:24:13.000000000 +0200
++++ nautilus-2.30.1.ubuntu/test/Makefile.in 2010-04-28 11:46:18.000000000 +0200
@@ -185,6 +185,8 @@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/debian/patches/91_git_middleclick_crash.patch nautilus-2.30.1/debian/patches/91_git_middleclick_crash.patch
--- nautilus-2.30.0/debian/patches/91_git_middleclick_crash.patch 2010-04-28 12:03:19.000000000 +0200
+++ nautilus-2.30.1/debian/patches/91_git_middleclick_crash.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-From 263051df98aace0b59fb2bd1772711dceba8e404 Mon Sep 17 00:00:00 2001
-From: Marcus Carlson
-Date: Wed, 07 Apr 2010 07:55:49 +0000
-Subject: Fix crash when middle click on an invalid network share in Places
-
-https://bugzilla.gnome.org/show_bug.cgi?id=579627
----
-diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
-index ac3d6bc..b57b973 100644
---- a/src/nautilus-window-manage-views.c
-+++ b/src/nautilus-window-manage-views.c
-@@ -1172,20 +1172,25 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
- * cancel_viewed_file_changed_callback (slot);
- * at this point, or in end_location_change()
- */
--
-- /* We disconnected this, so we need to re-connect it */
-- viewed_file = nautilus_file_get (slot->location);
-- nautilus_window_slot_set_viewed_file (slot, viewed_file);
-- nautilus_file_monitor_add (viewed_file, &slot->viewed_file, 0);
-- g_signal_connect_object (viewed_file, "changed",
-- G_CALLBACK (viewed_file_changed_callback), slot, 0);
-- nautilus_file_unref (viewed_file);
-+ /* We're missing a previous location (if opened location
-+ * in a new tab) so close it and return */
-+ if (slot->location == NULL) {
-+ nautilus_window_slot_close (slot);
-+ } else {
-+ /* We disconnected this, so we need to re-connect it */
-+ viewed_file = nautilus_file_get (slot->location);
-+ nautilus_window_slot_set_viewed_file (slot, viewed_file);
-+ nautilus_file_monitor_add (viewed_file, &slot->viewed_file, 0);
-+ g_signal_connect_object (viewed_file, "changed",
-+ G_CALLBACK (viewed_file_changed_callback), slot, 0);
-+ nautilus_file_unref (viewed_file);
-
-- /* Leave the location bar showing the bad location that the user
-- * typed (or maybe achieved by dragging or something). Many times
-- * the mistake will just be an easily-correctable typo. The user
-- * can choose "Refresh" to get the original URI back in the location bar.
-- */
-+ /* Leave the location bar showing the bad location that the user
-+ * typed (or maybe achieved by dragging or something). Many times
-+ * the mistake will just be an easily-correctable typo. The user
-+ * can choose "Refresh" to get the original URI back in the location bar.
-+ */
-+ }
- }
- }
-
-
-
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/debian/patches/92_git_emblems_cut.patch nautilus-2.30.1/debian/patches/92_git_emblems_cut.patch
--- nautilus-2.30.0/debian/patches/92_git_emblems_cut.patch 2010-04-28 12:03:19.000000000 +0200
+++ nautilus-2.30.1/debian/patches/92_git_emblems_cut.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-From 305cf9768bd716ba9bbcd3e773511536243a9cc5 Mon Sep 17 00:00:00 2001
-From: Marcus Carlson
-Date: Wed, 07 Apr 2010 07:58:04 +0000
-Subject: Fix emblem scaling with zoom >= 150%
-
-Emblem handling did not properly take zoom into account (#343540)
----
-diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
-index 0e08d31..8c8de44 100644
---- a/libnautilus-private/nautilus-icon-canvas-item.c
-+++ b/libnautilus-private/nautilus-icon-canvas-item.c
-@@ -2488,7 +2488,7 @@ static void
- nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIconCanvasItem *icon_item)
- {
- NautilusIconCanvasItemDetails *details;
-- EelIRect icon_rect, emblem_rect;
-+ EelIRect icon_rect, emblem_rect, icon_rect_raw;
- EelIRect text_rect, text_rect_for_layout, text_rect_for_entire_text;
- EelIRect total_rect, total_rect_for_layout, total_rect_for_entire_text;
- EelCanvasItem *item;
-@@ -2505,15 +2505,21 @@ nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIconCanvasItem *icon
-
- pixels_per_unit = EEL_CANVAS_ITEM (item)->canvas->pixels_per_unit;
-
-- /* Compute icon rectangle. */
-+ /* Compute raw and scaled icon rectangle. */
- icon_rect.x0 = 0;
- icon_rect.y0 = 0;
-+ icon_rect_raw.x0 = 0;
-+ icon_rect_raw.y0 = 0;
- if (details->pixbuf == NULL) {
- icon_rect.x1 = icon_rect.x0;
- icon_rect.y1 = icon_rect.y0;
-+ icon_rect_raw.x1 = icon_rect_raw.x0;
-+ icon_rect_raw.y1 = icon_rect_raw.y0;
- } else {
-- icon_rect.x1 = icon_rect.x0 + gdk_pixbuf_get_width (details->pixbuf) / pixels_per_unit;
-- icon_rect.y1 = icon_rect.y0 + gdk_pixbuf_get_height (details->pixbuf) / pixels_per_unit;
-+ icon_rect_raw.x1 = icon_rect_raw.x0 + gdk_pixbuf_get_width (details->pixbuf);
-+ icon_rect_raw.y1 = icon_rect_raw.y0 + gdk_pixbuf_get_height (details->pixbuf);
-+ icon_rect.x1 = icon_rect_raw.x1 / pixels_per_unit;
-+ icon_rect.y1 = icon_rect_raw.y1 / pixels_per_unit;
- }
-
- /* Compute text rectangle. */
-@@ -2527,7 +2533,7 @@ nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIconCanvasItem *icon
- eel_irect_union (&total_rect, &icon_rect, &text_rect);
- eel_irect_union (&total_rect_for_layout, &icon_rect, &text_rect_for_layout);
- eel_irect_union (&total_rect_for_entire_text, &icon_rect, &text_rect_for_entire_text);
-- emblem_layout_reset (&emblem_layout, icon_item, icon_rect, is_rtl);
-+ emblem_layout_reset (&emblem_layout, icon_item, icon_rect_raw, is_rtl);
- while (emblem_layout_next (&emblem_layout, &emblem_pixbuf, &emblem_rect, is_rtl)) {
- emblem_rect.x0 = floor (emblem_rect.x0 / pixels_per_unit);
- emblem_rect.y0 = floor (emblem_rect.y0 / pixels_per_unit);
---
-
-
-
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/debian/patches/series nautilus-2.30.1/debian/patches/series
--- nautilus-2.30.0/debian/patches/series 2010-04-28 12:03:19.000000000 +0200
+++ nautilus-2.30.1/debian/patches/series 2010-04-28 12:03:21.000000000 +0200
@@ -1,7 +1,6 @@
01_lpi.patch
03_menu_entry.patch
#10_location_titlebar.patch
-02_eel_libadd.patch
10_load_session.patch
11_no_session_delay.patch
12_list-view_expand.patch
@@ -14,8 +13,6 @@
89_use_application_indicator.patch
90_relibtoolize.patch
#91_correct_rgba_use.patch
-91_git_middleclick_crash.patch
-92_git_emblems_cut.patch
95_no-initial-fade.patch
99_ltmain_as-needed.patch
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/docs/reference/libnautilus-extension/html/style.css nautilus-2.30.1/docs/reference/libnautilus-extension/html/style.css
--- nautilus-2.30.0/docs/reference/libnautilus-extension/html/style.css 2010-03-29 11:11:58.000000000 +0200
+++ nautilus-2.30.1/docs/reference/libnautilus-extension/html/style.css 2010-04-26 13:27:46.000000000 +0200
@@ -211,19 +211,19 @@
/* code listings */
-.programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */
-.programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */
-.programlisting .function { color: #000000; font-weight: bold; }
-.programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
-.programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */
-.programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */
-.programlisting .normal { color: #000000; }
-.programlisting .number { color: #75507b; } /* tango: plum 2 */
-.programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */
-.programlisting .string { color: #c17d11; } /* tango: chocolate 2 */
-.programlisting .type { color: #000000; }
-.programlisting .type a { color: #11326b; } /* tango: sky blue 4 */
-.programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */
+.listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */
+.listing_code .programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */
+.listing_code .programlisting .function { color: #000000; font-weight: bold; }
+.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
+.listing_code .programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */
+.listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */
+.listing_code .programlisting .normal { color: #000000; }
+.listing_code .programlisting .number { color: #75507b; } /* tango: plum 2 */
+.listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */
+.listing_code .programlisting .string { color: #c17d11; } /* tango: chocolate 2 */
+.listing_code .programlisting .type { color: #000000; }
+.listing_code .programlisting .type a { color: #11326b; } /* tango: sky blue 4 */
+.listing_code .programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */
.listing_frame {
/* tango:sky blue 1 */
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/eel/eel-editable-label.c nautilus-2.30.1/eel/eel-editable-label.c
--- nautilus-2.30.0/eel/eel-editable-label.c 2010-01-19 17:14:02.000000000 +0100
+++ nautilus-2.30.1/eel/eel-editable-label.c 2010-04-12 12:43:44.000000000 +0200
@@ -1173,7 +1173,7 @@
*/
if (GTK_WIDGET_REALIZED (widget))
{
- gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ gdk_window_set_background (widget->window, &widget->style->base[gtk_widget_get_state (widget)]);
if (label->primary_cursor_gc != NULL)
{
@@ -1625,7 +1625,7 @@
gtk_paint_layout (widget->style,
widget->window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
TRUE,
&event->area,
widget,
@@ -1689,7 +1689,7 @@
if (label->draw_outline)
gdk_draw_rectangle (widget->window,
- widget->style->text_gc [GTK_WIDGET_STATE (widget)],
+ widget->style->text_gc [gtk_widget_get_state (widget)],
FALSE,
0, 0,
widget->allocation.width - 1,
@@ -1740,7 +1740,7 @@
widget->style = gtk_style_attach (widget->style, widget->window);
- gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ gdk_window_set_background (widget->window, &widget->style->base[gtk_widget_get_state (widget)]);
gtk_im_context_set_client_window (label->im_context, widget->window);
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/eel/eel-gtk-extensions.c nautilus-2.30.1/eel/eel-gtk-extensions.c
--- nautilus-2.30.0/eel/eel-gtk-extensions.c 2009-12-09 12:03:51.000000000 +0100
+++ nautilus-2.30.1/eel/eel-gtk-extensions.c 2010-04-12 12:43:44.000000000 +0200
@@ -886,7 +886,7 @@
gtk_paint_layout (widget->style,
widget->window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
FALSE,
&event->area,
widget,
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/eel/eel-labeled-image.c nautilus-2.30.1/eel/eel-labeled-image.c
--- nautilus-2.30.0/eel/eel-labeled-image.c 2009-11-19 12:46:50.000000000 +0100
+++ nautilus-2.30.1/eel/eel-labeled-image.c 2010-04-12 12:43:44.000000000 +0200
@@ -540,13 +540,13 @@
labeled_image = EEL_LABELED_IMAGE (widget);
- if (GTK_WIDGET_STATE (widget) == GTK_STATE_SELECTED ||
- GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE) {
+ if (gtk_widget_get_state (widget) == GTK_STATE_SELECTED ||
+ gtk_widget_get_state (widget) == GTK_STATE_ACTIVE) {
label_bounds = eel_labeled_image_get_label_bounds (EEL_LABELED_IMAGE (widget));
gtk_paint_flat_box (widget->style,
widget->window,
- GTK_WIDGET_STATE (widget),
+ gtk_widget_get_state (widget),
GTK_SHADOW_NONE,
&event->area,
widget,
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/eel/Makefile.am nautilus-2.30.1/eel/Makefile.am
--- nautilus-2.30.0/eel/Makefile.am 2009-12-17 13:02:45.000000000 +0100
+++ nautilus-2.30.1/eel/Makefile.am 2010-04-12 12:43:44.000000000 +0200
@@ -17,6 +17,9 @@
libeel_2_la_LDFLAGS = \
-no-undefined \
+ $(NULL)
+
+libeel_2_la_LIBADD = \
$(CORE_LIBS) \
$(RENDER_LIBS) \
$(X_LIBS) \
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/eel/Makefile.in nautilus-2.30.1/eel/Makefile.in
--- nautilus-2.30.0/eel/Makefile.in 2010-03-29 11:10:15.000000000 +0200
+++ nautilus-2.30.1/eel/Makefile.in 2010-04-26 13:24:12.000000000 +0200
@@ -52,7 +52,9 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-libeel_2_la_LIBADD =
+am__DEPENDENCIES_1 =
+libeel_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am__objects_1 =
am_libeel_2_la_OBJECTS = eel-accessibility.lo eel-alert-dialog.lo \
eel-art-extensions.lo eel-art-gtk-extensions.lo \
@@ -312,6 +314,9 @@
libeel_2_la_LDFLAGS = \
-no-undefined \
+ $(NULL)
+
+libeel_2_la_LIBADD = \
$(CORE_LIBS) \
$(RENDER_LIBS) \
$(X_LIBS) \
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/libnautilus-private/nautilus-icon-canvas-item.c nautilus-2.30.1/libnautilus-private/nautilus-icon-canvas-item.c
--- nautilus-2.30.0/libnautilus-private/nautilus-icon-canvas-item.c 2010-03-10 14:28:38.000000000 +0100
+++ nautilus-2.30.1/libnautilus-private/nautilus-icon-canvas-item.c 2010-04-07 09:58:01.000000000 +0200
@@ -2488,7 +2488,7 @@
nautilus_icon_canvas_item_ensure_bounds_up_to_date (NautilusIconCanvasItem *icon_item)
{
NautilusIconCanvasItemDetails *details;
- EelIRect icon_rect, emblem_rect;
+ EelIRect icon_rect, emblem_rect, icon_rect_raw;
EelIRect text_rect, text_rect_for_layout, text_rect_for_entire_text;
EelIRect total_rect, total_rect_for_layout, total_rect_for_entire_text;
EelCanvasItem *item;
@@ -2505,15 +2505,21 @@
pixels_per_unit = EEL_CANVAS_ITEM (item)->canvas->pixels_per_unit;
- /* Compute icon rectangle. */
+ /* Compute raw and scaled icon rectangle. */
icon_rect.x0 = 0;
icon_rect.y0 = 0;
+ icon_rect_raw.x0 = 0;
+ icon_rect_raw.y0 = 0;
if (details->pixbuf == NULL) {
icon_rect.x1 = icon_rect.x0;
icon_rect.y1 = icon_rect.y0;
+ icon_rect_raw.x1 = icon_rect_raw.x0;
+ icon_rect_raw.y1 = icon_rect_raw.y0;
} else {
- icon_rect.x1 = icon_rect.x0 + gdk_pixbuf_get_width (details->pixbuf) / pixels_per_unit;
- icon_rect.y1 = icon_rect.y0 + gdk_pixbuf_get_height (details->pixbuf) / pixels_per_unit;
+ icon_rect_raw.x1 = icon_rect_raw.x0 + gdk_pixbuf_get_width (details->pixbuf);
+ icon_rect_raw.y1 = icon_rect_raw.y0 + gdk_pixbuf_get_height (details->pixbuf);
+ icon_rect.x1 = icon_rect_raw.x1 / pixels_per_unit;
+ icon_rect.y1 = icon_rect_raw.y1 / pixels_per_unit;
}
/* Compute text rectangle. */
@@ -2527,7 +2533,7 @@
eel_irect_union (&total_rect, &icon_rect, &text_rect);
eel_irect_union (&total_rect_for_layout, &icon_rect, &text_rect_for_layout);
eel_irect_union (&total_rect_for_entire_text, &icon_rect, &text_rect_for_entire_text);
- emblem_layout_reset (&emblem_layout, icon_item, icon_rect, is_rtl);
+ emblem_layout_reset (&emblem_layout, icon_item, icon_rect_raw, is_rtl);
while (emblem_layout_next (&emblem_layout, &emblem_pixbuf, &emblem_rect, is_rtl)) {
emblem_rect.x0 = floor (emblem_rect.x0 / pixels_per_unit);
emblem_rect.y0 = floor (emblem_rect.y0 / pixels_per_unit);
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/libnautilus-private/nautilus-search-engine-tracker.c nautilus-2.30.1/libnautilus-private/nautilus-search-engine-tracker.c
--- nautilus-2.30.0/libnautilus-private/nautilus-search-engine-tracker.c 2010-03-10 14:28:38.000000000 +0100
+++ nautilus-2.30.1/libnautilus-private/nautilus-search-engine-tracker.c 2010-04-12 12:43:44.000000000 +0200
@@ -31,12 +31,17 @@
typedef struct _TrackerClient TrackerClient;
+typedef enum {
+ TRACKER_0_6 = 1 << 0,
+ TRACKER_0_7 = 1 << 1,
+ TRACKER_0_8 = 1 << 2
+} TrackerVersion;
+
/* tracker 0.6 API */
typedef void (*TrackerArrayReply) (char **result, GError *error, gpointer user_data);
-static TrackerClient * (*tracker_connect) (gboolean enable_warnings) = NULL;
-static TrackerClient * (*tracker_connect_07) (gboolean enable_warnings,
+static TrackerClient * (*tracker_connect) (gboolean enable_warnings,
gint timeout) = NULL;
static void (*tracker_disconnect) (TrackerClient *client) = NULL;
static void (*tracker_cancel_last_call) (TrackerClient *client) = NULL;
@@ -76,109 +81,90 @@
static TrackerClient * (*tracker_client_new) (TrackerClientFlags flags,
gint timeout) = NULL;
-
-static gboolean (*tracker_cancel_call) (TrackerClient *client,
- guint call_id) = NULL;
-
-/* -- we reuse tracker_cancel_last_call() from above, declaration is equal
- *
- * static gboolean (*tracker_cancel_last_call) (TrackerClient *client) = NULL;
- */
-
static gchar * (*tracker_sparql_escape) (const gchar *str) = NULL;
-
static guint (*tracker_resources_sparql_query_async) (TrackerClient *client,
const gchar *query,
TrackerReplyGPtrArray callback,
gpointer user_data) = NULL;
-#define MAP(a, b) { #a, (gpointer *)&a, b }
-
-typedef struct {
+static struct TrackerDlMapping {
const char *fn_name;
gpointer *fn_ptr_ref;
- gboolean mandatory;
-} TrackerDlMapping;
-
-static TrackerDlMapping tracker_dl_mapping[] = {
- MAP (tracker_connect, TRUE),
- MAP (tracker_disconnect, TRUE),
- MAP (tracker_cancel_last_call, TRUE),
- MAP (tracker_search_metadata_by_text_async, TRUE),
- MAP (tracker_search_metadata_by_text_and_mime_async, TRUE),
- MAP (tracker_search_metadata_by_text_and_location_async, TRUE),
- MAP (tracker_search_metadata_by_text_and_mime_and_location_async, TRUE),
- MAP (tracker_get_version, FALSE)
-};
-
-static TrackerDlMapping tracker_dl_mapping_08[] = {
- MAP (tracker_client_new, TRUE),
- MAP (tracker_cancel_call, TRUE),
- MAP (tracker_cancel_last_call, TRUE),
- MAP (tracker_sparql_escape, TRUE),
- MAP (tracker_resources_sparql_query_async, TRUE)
-};
+ TrackerVersion versions;
+} tracker_dl_mapping[] = {
+#define MAP(a,v) { #a, (gpointer *)&a, v }
+ MAP (tracker_connect, TRACKER_0_6 | TRACKER_0_7),
+ MAP (tracker_disconnect, TRACKER_0_6 | TRACKER_0_7),
+ MAP (tracker_get_version, TRACKER_0_6),
+ MAP (tracker_cancel_last_call, TRACKER_0_6 | TRACKER_0_7 | TRACKER_0_8),
+ MAP (tracker_search_metadata_by_text_async, TRACKER_0_6 | TRACKER_0_7),
+ MAP (tracker_search_metadata_by_text_and_location_async, TRACKER_0_6 | TRACKER_0_7),
+ MAP (tracker_client_new, TRACKER_0_8),
+ MAP (tracker_sparql_escape, TRACKER_0_8),
+ MAP (tracker_resources_sparql_query_async, TRACKER_0_8)
#undef MAP
+};
-static gboolean tracker_07;
-static gboolean tracker_08;
+static TrackerVersion
+open_libtracker (void)
+{
+ static gboolean done = FALSE;
+ static TrackerVersion version = 0;
+ gpointer x;
+ if (!done) {
+ int i;
+ GModule *tracker;
+ GModuleFlags flags;
-static gboolean
-load_symbols (GModule *tracker, TrackerDlMapping mapping[], gint num_elements)
-{
- int i;
+ done = TRUE;
+ flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
- for (i = 0; i < num_elements; i++) {
- if (! g_module_symbol (tracker, mapping[i].fn_name,
- mapping[i].fn_ptr_ref) &&
- mapping[i].mandatory) {
- g_warning ("Missing symbol '%s' in libtracker\n",
- mapping[i].fn_name);
- g_module_close (tracker);
+ tracker = g_module_open ("libtracker-client-0.8.so.0", flags);
+ version = TRACKER_0_8;
- for (i = 0; i < num_elements; i++)
- mapping[i].fn_ptr_ref = NULL;
+ if (!tracker) {
+ tracker = g_module_open ("libtracker-client-0.7.so.0", flags);
- return FALSE;
+ if (tracker && !g_module_symbol (tracker, "tracker_resources_sparql_query_async", &x)) {
+ version = TRACKER_0_7;
+ }
}
- }
- return TRUE;
-}
+ if (!tracker) {
+ tracker = g_module_open ("libtrackerclient.so.0", flags);
+ version = TRACKER_0_6;
+ }
-static void
-open_libtracker (void)
-{
- static gboolean done = FALSE;
+ if (!tracker) {
+ tracker = g_module_open ("libtracker.so.0", flags);
+ version = TRACKER_0_6;
+ }
- if (! done) {
- GModule *tracker;
+ if (!tracker)
+ return 0;
- done = TRUE;
- tracker_07 = TRUE;
- tracker_08 = TRUE;
+ for (i = 0; i < G_N_ELEMENTS (tracker_dl_mapping); i++) {
+ if ((tracker_dl_mapping[i].versions & version) == 0)
+ continue;
+
+ if (!g_module_symbol (tracker, tracker_dl_mapping[i].fn_name,
+ tracker_dl_mapping[i].fn_ptr_ref)) {
+ g_warning ("Missing symbol '%s' in libtracker\n",
+ tracker_dl_mapping[i].fn_name);
+ g_module_close (tracker);
- tracker = g_module_open ("libtracker-client-0.7.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
- if (! tracker) {
- tracker = g_module_open ("libtrackerclient.so.0", G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
- tracker_07 = FALSE;
- tracker_08 = FALSE;
- }
- if (! tracker)
- return;
+ for (i = 0; i < G_N_ELEMENTS (tracker_dl_mapping); i++)
+ tracker_dl_mapping[i].fn_ptr_ref = NULL;
- if (tracker_08)
- tracker_08 = load_symbols (tracker, tracker_dl_mapping_08, G_N_ELEMENTS (tracker_dl_mapping_08));
- if (! tracker_08) {
- if (! load_symbols (tracker, tracker_dl_mapping, G_N_ELEMENTS (tracker_dl_mapping)))
- return;
- if (tracker_07)
- tracker_connect_07 = (gpointer)tracker_connect;
+ return 0;
+ }
}
}
+
+ return version;
}
@@ -186,6 +172,7 @@
NautilusQuery *query;
TrackerClient *client;
gboolean query_pending;
+ TrackerVersion version;
};
@@ -210,7 +197,7 @@
tracker->details->query = NULL;
}
- if (tracker_08) {
+ if (tracker->details->version == TRACKER_0_8) {
g_object_unref (tracker->details->client);
} else {
tracker_disconnect (tracker->details->client);
@@ -264,7 +251,7 @@
return;
}
- if (tracker_08) {
+ if (tracker->details->version == TRACKER_0_8) {
/* new tracker 0.8 API */
OUT_result = (GPtrArray*) results;
@@ -281,7 +268,11 @@
} else {
/* old tracker 0.6 API */
for (results_p = results; *results_p; results_p++) {
- uri = tracker_07 ? g_strdup ((char *)*results_p) : g_filename_to_uri ((char *)*results_p, NULL, NULL);
+ if (tracker->details->version == TRACKER_0_6)
+ uri = g_filename_to_uri (*results_p, NULL, NULL);
+ else
+ uri = g_strdup (*results_p);
+
if (uri) {
hit_uris = g_list_prepend (hit_uris, (char *)uri);
}
@@ -291,7 +282,8 @@
nautilus_search_engine_hits_added (NAUTILUS_SEARCH_ENGINE (tracker), hit_uris);
nautilus_search_engine_finished (NAUTILUS_SEARCH_ENGINE (tracker));
- eel_g_list_free_deep (hit_uris);
+ g_list_foreach (hit_uris, (GFunc) g_free, NULL);
+ g_list_free (hit_uris);
}
@@ -323,57 +315,59 @@
location_uri = nautilus_query_get_location (tracker->details->query);
if (location_uri) {
- location = (tracker_07 && !tracker_08) ? g_strdup (location_uri) : g_filename_from_uri (location_uri, NULL, NULL);
+ location = (tracker->details->version == TRACKER_0_6) ?
+ g_filename_from_uri (location_uri, NULL, NULL) :
+ g_strdup (location_uri);
g_free (location_uri);
} else {
location = NULL;
}
- mime_count = g_list_length (mimetypes);
+ mime_count = g_list_length (mimetypes);
i = 0;
sparql = NULL;
- if (tracker_08) {
+ if (tracker->details->version == TRACKER_0_8) {
/* new tracker 0.8 API */
- if (mime_count > 0) {
- sparql = g_string_new ("SELECT nie:url(?file) WHERE { ?file a nfo:FileDataObject ; nie:mimeType ?mime ; fts:match ");
- sparql_append_string_literal (sparql, search_text);
+ sparql = g_string_new ("SELECT ?url WHERE { ?file a nfo:FileDataObject ; nie:url ?url; ");
+ if (mime_count > 0)
+ g_string_append (sparql, "nie:mimeType ?mime ; ");
+ g_string_append (sparql, "fts:match ");
+ sparql_append_string_literal (sparql, search_text);
+ if (location || mime_count > 0) {
g_string_append (sparql, " . FILTER (");
+
if (location) {
- g_string_append (sparql, "fn:starts-with(?file,");
+ g_string_append (sparql, "fn:starts-with(?url, ");
sparql_append_string_literal (sparql, location);
g_string_append (sparql, ")");
- g_string_append (sparql, " && (");
}
-
- for (l = mimetypes; l != NULL; l = l->next) {
- if (l != mimetypes) {
- g_string_append (sparql, " || ");
+ if (mime_count > 0) {
+ if (location)
+ g_string_append (sparql, " && ");
+ g_string_append (sparql, "(");
+ for (l = mimetypes; l != NULL; l = l->next) {
+ if (l != mimetypes)
+ g_string_append (sparql, " || ");
+ g_string_append (sparql, "?mime = ");
+ sparql_append_string_literal (sparql, l->data);
}
-
- g_string_append (sparql, "?mime = ");
- sparql_append_string_literal (sparql, l->data);
- }
-
- if (location)
g_string_append (sparql, ")");
- g_string_append (sparql, ") }");
- } else {
- sparql = g_string_new ("SELECT nie:url(?file) WHERE { ?file a nfo:FileDataObject ; fts:match ");
- sparql_append_string_literal (sparql, search_text);
- if (location) {
- g_string_append (sparql, " . FILTER (fn:starts-with(?file,");
- sparql_append_string_literal (sparql, location);
- g_string_append (sparql, "))");
}
- g_string_append (sparql, " }");
+
+ g_string_append (sparql, ")");
}
+ g_string_append (sparql, " }");
- tracker_resources_sparql_query_async (tracker->details->client, sparql->str, (TrackerReplyGPtrArray) search_callback, tracker);
+ tracker_resources_sparql_query_async (tracker->details->client,
+ sparql->str,
+ (TrackerReplyGPtrArray) search_callback,
+ tracker);
g_string_free (sparql, TRUE);
+
} else {
/* old tracker 0.6 API */
if (mime_count > 0) {
@@ -401,7 +395,6 @@
g_strfreev (mimes);
-
} else {
if (location) {
tracker_search_metadata_by_text_and_location_async (tracker->details->client,
@@ -415,7 +408,6 @@
(TrackerArrayReply) search_callback,
tracker);
}
-
}
}
@@ -493,27 +485,24 @@
{
NautilusSearchEngineTracker *engine;
TrackerClient *tracker_client;
+ TrackerVersion version;
- open_libtracker ();
+ version = open_libtracker ();
- if (tracker_08) {
+ if (version == TRACKER_0_8) {
tracker_client = tracker_client_new (TRACKER_CLIENT_ENABLE_WARNINGS, G_MAXINT);
} else {
if (! tracker_connect)
return NULL;
- if (tracker_07) {
- tracker_client = tracker_connect_07 (FALSE, -1);
- } else {
- tracker_client = tracker_connect (FALSE);
- }
+ tracker_client = tracker_connect (FALSE, -1);
}
if (!tracker_client) {
return NULL;
}
- if (! tracker_07 && ! tracker_08) {
+ if (version == TRACKER_0_6) {
GError *err = NULL;
tracker_get_version (tracker_client, &err);
@@ -528,8 +517,8 @@
engine = g_object_new (NAUTILUS_TYPE_SEARCH_ENGINE_TRACKER, NULL);
engine->details->client = tracker_client;
-
engine->details->query_pending = FALSE;
+ engine->details->version = version;
return NAUTILUS_SEARCH_ENGINE (engine);
}
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/libnautilus-private/nautilus-view.c nautilus-2.30.1/libnautilus-private/nautilus-view.c
--- nautilus-2.30.0/libnautilus-private/nautilus-view.c 2009-12-16 15:47:07.000000000 +0100
+++ nautilus-2.30.1/libnautilus-private/nautilus-view.c 2010-04-26 09:50:42.000000000 +0200
@@ -268,6 +268,16 @@
}
void
+nautilus_view_update_menus (NautilusView *view)
+{
+ g_return_if_fail (NAUTILUS_IS_VIEW (view));
+
+ if (NAUTILUS_VIEW_GET_IFACE (view)->update_menus != NULL) {
+ (* NAUTILUS_VIEW_GET_IFACE (view)->update_menus) (view);
+ }
+}
+
+void
nautilus_view_pop_up_location_context_menu (NautilusView *view,
GdkEventButton *event,
const char *location)
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/libnautilus-private/nautilus-view.h nautilus-2.30.1/libnautilus-private/nautilus-view.h
--- nautilus-2.30.0/libnautilus-private/nautilus-view.h 2009-12-16 18:22:47.000000000 +0100
+++ nautilus-2.30.1/libnautilus-private/nautilus-view.h 2010-04-26 09:50:42.000000000 +0200
@@ -108,6 +108,7 @@
gboolean (* can_zoom_out) (NautilusView *view);
void (* grab_focus) (NautilusView *view);
+ void (* update_menus) (NautilusView *view);
/* Request popup of context menu referring to the open location.
* This is triggered in spatial windows by right-clicking the location button,
@@ -171,6 +172,7 @@
GdkEventButton *event,
const char *location);
void nautilus_view_grab_focus (NautilusView *view);
+void nautilus_view_update_menus (NautilusView *view);
void nautilus_view_drop_proxy_received_uris (NautilusView *view,
GList *uris,
const char *target_location,
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/m4/intltool.m4 nautilus-2.30.1/m4/intltool.m4
--- nautilus-2.30.0/m4/intltool.m4 2010-03-29 11:10:09.000000000 +0200
+++ nautilus-2.30.1/m4/intltool.m4 2010-04-26 13:24:07.000000000 +0200
@@ -172,7 +172,7 @@
AC_DEFUN([IT_PO_SUBDIR],
[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl The following CONFIG_COMMANDS should be executed at the very end
dnl of config.status.
AC_CONFIG_COMMANDS_PRE([
AC_CONFIG_COMMANDS([$1/stamp-it], [
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/NEWS nautilus-2.30.1/NEWS
--- nautilus-2.30.0/NEWS 2010-03-29 10:29:09.000000000 +0200
+++ nautilus-2.30.1/NEWS 2010-04-26 11:40:17.000000000 +0200
@@ -1,3 +1,11 @@
+Major changes in 2.30.1 are:
+* Translation updates
+* Support for tracker 0.8.0
+* Fix crashes
+* Fix emblem scaling in zoomed view
+* Fix sensitivity of split-view related menu items
+* Control-L closes the extra view first, not the window
+
Major changes in 2.30.0 are:
* By default, don't exit with last window even if desktop is
not visible. This way we still run to handle e.g. volume
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/po/Makefile.in.in nautilus-2.30.1/po/Makefile.in.in
--- nautilus-2.30.0/po/Makefile.in.in 2010-03-29 11:10:09.000000000 +0200
+++ nautilus-2.30.1/po/Makefile.in.in 2010-04-26 13:24:07.000000000 +0200
@@ -56,7 +56,7 @@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
@@ -129,7 +129,7 @@
done
# Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
# Define this as empty until I found a useful application.
install-exec installcheck:
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/file-manager/fm-directory-view.c nautilus-2.30.1/src/file-manager/fm-directory-view.c
--- nautilus-2.30.0/src/file-manager/fm-directory-view.c 2010-03-17 11:14:05.000000000 +0100
+++ nautilus-2.30.1/src/file-manager/fm-directory-view.c 2010-04-26 09:50:42.000000000 +0200
@@ -1784,6 +1784,12 @@
}
}
+static void
+view_iface_update_menus (NautilusView *view)
+{
+ fm_directory_view_update_menus (FM_DIRECTORY_VIEW (view));
+}
+
static GtkWidget *
fm_directory_view_get_widget (NautilusView *view)
{
@@ -1872,6 +1878,7 @@
fm_directory_view_init_view_iface (NautilusViewIface *iface)
{
iface->grab_focus = fm_directory_view_grab_focus;
+ iface->update_menus = view_iface_update_menus;
iface->get_widget = fm_directory_view_get_widget;
iface->load_location = fm_directory_view_load_location;
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/nautilus-application.c nautilus-2.30.1/src/nautilus-application.c
--- nautilus-2.30.0/src/nautilus-application.c 2010-03-10 14:28:38.000000000 +0100
+++ nautilus-2.30.1/src/nautilus-application.c 2010-04-26 09:50:42.000000000 +0200
@@ -1413,8 +1413,8 @@
eel_gtk_window_set_initial_geometry_from_string
(GTK_WINDOW (window),
geometry_string,
- NAUTILUS_WINDOW_MIN_WIDTH,
- NAUTILUS_WINDOW_MIN_HEIGHT,
+ NAUTILUS_NAVIGATION_WINDOW_MIN_WIDTH,
+ NAUTILUS_NAVIGATION_WINDOW_MIN_HEIGHT,
another_navigation_window_already_showing (window));
}
g_free (geometry_string);
@@ -1971,8 +1971,8 @@
eel_gtk_window_set_initial_geometry_from_string
(GTK_WINDOW (window),
geometry,
- NAUTILUS_WINDOW_MIN_WIDTH,
- NAUTILUS_WINDOW_MIN_HEIGHT,
+ NAUTILUS_NAVIGATION_WINDOW_MIN_WIDTH,
+ NAUTILUS_NAVIGATION_WINDOW_MIN_HEIGHT,
FALSE);
}
xmlFree (geometry);
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/nautilus-navigation-window.c nautilus-2.30.1/src/nautilus-navigation-window.c
--- nautilus-2.30.0/src/nautilus-navigation-window.c 2010-03-11 14:26:24.000000000 +0100
+++ nautilus-2.30.1/src/nautilus-navigation-window.c 2010-04-26 09:59:53.000000000 +0200
@@ -1113,15 +1113,25 @@
}
}
-
-
static void
real_window_close (NautilusWindow *window)
{
nautilus_navigation_window_save_geometry (NAUTILUS_NAVIGATION_WINDOW (window));
}
-static void
+static void
+real_get_min_size (NautilusWindow *window,
+ guint *min_width, guint *min_height)
+{
+ if (min_width) {
+ *min_width = NAUTILUS_NAVIGATION_WINDOW_MIN_WIDTH;
+ }
+ if (min_height) {
+ *min_height = NAUTILUS_NAVIGATION_WINDOW_MIN_HEIGHT;
+ }
+}
+
+static void
real_get_default_size (NautilusWindow *window,
guint *default_width, guint *default_height)
{
@@ -1187,6 +1197,7 @@
NAUTILUS_WINDOW_CLASS (class)->prompt_for_location = real_prompt_for_location;
NAUTILUS_WINDOW_CLASS (class)->sync_title = real_sync_title;
NAUTILUS_WINDOW_CLASS (class)->get_icon = real_get_icon;
+ NAUTILUS_WINDOW_CLASS (class)->get_min_size = real_get_min_size;
NAUTILUS_WINDOW_CLASS (class)->get_default_size = real_get_default_size;
NAUTILUS_WINDOW_CLASS (class)->close = real_window_close;
@@ -1304,6 +1315,7 @@
}
nautilus_navigation_window_update_show_hide_menu_items (window);
+ nautilus_navigation_window_update_split_view_actions_sensitivity (window);
}
gboolean
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/nautilus-navigation-window-menus.c nautilus-2.30.1/src/nautilus-navigation-window-menus.c
--- nautilus-2.30.0/src/nautilus-navigation-window-menus.c 2010-03-29 10:23:36.000000000 +0200
+++ nautilus-2.30.1/src/nautilus-navigation-window-menus.c 2010-04-26 09:59:53.000000000 +0200
@@ -163,6 +163,9 @@
window = NAUTILUS_WINDOW (user_data);
next_pane = nautilus_window_get_next_pane (window);
+ if (!next_pane) {
+ return;
+ }
location = nautilus_window_slot_get_location (next_pane->active_slot);
if (location) {
nautilus_window_slot_go_to (window->details->active_pane->active_slot, location, FALSE);
@@ -261,11 +264,17 @@
is_active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
if (is_active != nautilus_navigation_window_split_view_showing (window)) {
+ NautilusWindow *nautilus_window;
+
if (is_active) {
nautilus_navigation_window_split_view_on (window);
} else {
nautilus_navigation_window_split_view_off (window);
}
+ nautilus_window = NAUTILUS_WINDOW (window);
+ if (nautilus_window->details->active_pane && nautilus_window->details->active_pane->active_slot) {
+ nautilus_view_update_menus (nautilus_window->details->active_pane->active_slot->content_view);
+ }
}
}
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/nautilus-spatial-window.c nautilus-2.30.1/src/nautilus-spatial-window.c
--- nautilus-2.30.0/src/nautilus-spatial-window.c 2010-03-10 14:28:39.000000000 +0100
+++ nautilus-2.30.1/src/nautilus-spatial-window.c 2010-04-26 09:50:42.000000000 +0200
@@ -411,7 +411,19 @@
sync_window_title (window);
}
-static void
+static void
+real_get_min_size (NautilusWindow *window,
+ guint *min_width, guint *min_height)
+{
+ if (min_width) {
+ *min_width = NAUTILUS_SPATIAL_WINDOW_MIN_WIDTH;
+ }
+ if (min_height) {
+ *min_height = NAUTILUS_SPATIAL_WINDOW_MIN_HEIGHT;
+ }
+}
+
+static void
real_get_default_size (NautilusWindow *window,
guint *default_width, guint *default_height)
{
@@ -1099,6 +1111,7 @@
real_get_icon;
NAUTILUS_WINDOW_CLASS (class)->sync_title =
real_sync_title;
+ NAUTILUS_WINDOW_CLASS(class)->get_min_size = real_get_min_size;
NAUTILUS_WINDOW_CLASS(class)->get_default_size = real_get_default_size;
NAUTILUS_WINDOW_CLASS(class)->sync_allow_stop =
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/nautilus-window.c nautilus-2.30.1/src/nautilus-window.c
--- nautilus-2.30.0/src/nautilus-window.c 2010-03-17 11:14:05.000000000 +0100
+++ nautilus-2.30.1/src/nautilus-window.c 2010-04-26 09:50:42.000000000 +0200
@@ -496,14 +496,9 @@
max_width_for_screen = get_max_forced_width (screen);
max_height_for_screen = get_max_forced_height (screen);
- if (NAUTILUS_IS_SPATIAL_WINDOW (window)) {
- min_width = NAUTILUS_SPATIAL_WINDOW_MIN_WIDTH;
- min_height = NAUTILUS_SPATIAL_WINDOW_MIN_HEIGHT;
- } else {
- min_width = NAUTILUS_WINDOW_MIN_WIDTH;
- min_height = NAUTILUS_WINDOW_MIN_HEIGHT;
- }
-
+ EEL_CALL_METHOD (NAUTILUS_WINDOW_CLASS, window,
+ get_min_size, (window, &min_width, &min_height));
+
gtk_widget_set_size_request (GTK_WIDGET (window),
MIN (min_width,
max_width_for_screen),
@@ -761,17 +756,15 @@
window = pane->window;
- window->details->panes = g_list_remove (window->details->panes, pane);
-
- /* if the pane was active, select the next one, or NULL */
+ /* If the pane was active, set it to NULL. The caller is responsible
+ * for setting a new active pane with nautilus_window_pane_switch_to()
+ * if it wants to continue using the window. */
if (window->details->active_pane == pane) {
- if (window->details->panes) {
- window->details->active_pane = window->details->panes->data;
- } else {
- window->details->active_pane = NULL;
- }
+ window->details->active_pane = NULL;
}
+ window->details->panes = g_list_remove (window->details->panes, pane);
+
g_object_unref (pane);
}
@@ -1536,7 +1529,7 @@
/* get next pane in the (wrapped around) list */
node = g_list_find (window->details->panes, window->details->active_pane);
- g_return_val_if_fail (node, FALSE);
+ g_return_val_if_fail (node, NULL);
if (node->next) {
next_pane = node->next->data;
} else {
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/nautilus-window.h nautilus-2.30.1/src/nautilus-window.h
--- nautilus-2.30.0/src/nautilus-window.h 2009-12-17 10:18:50.000000000 +0100
+++ nautilus-2.30.1/src/nautilus-window.h 2010-04-26 09:50:42.000000000 +0200
@@ -99,6 +99,7 @@
void (* set_allow_up) (NautilusWindow *window, gboolean allow);
void (* reload) (NautilusWindow *window);
void (* prompt_for_location) (NautilusWindow *window, const char *initial);
+ void (* get_min_size) (NautilusWindow *window, guint *default_width, guint *default_height);
void (* get_default_size) (NautilusWindow *window, guint *default_width, guint *default_height);
void (* close) (NautilusWindow *window);
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/nautilus-window-manage-views.c nautilus-2.30.1/src/nautilus-window-manage-views.c
--- nautilus-2.30.0/src/nautilus-window-manage-views.c 2010-03-10 14:28:39.000000000 +0100
+++ nautilus-2.30.1/src/nautilus-window-manage-views.c 2010-04-07 09:52:16.000000000 +0200
@@ -1172,20 +1172,25 @@
* cancel_viewed_file_changed_callback (slot);
* at this point, or in end_location_change()
*/
-
- /* We disconnected this, so we need to re-connect it */
- viewed_file = nautilus_file_get (slot->location);
- nautilus_window_slot_set_viewed_file (slot, viewed_file);
- nautilus_file_monitor_add (viewed_file, &slot->viewed_file, 0);
- g_signal_connect_object (viewed_file, "changed",
- G_CALLBACK (viewed_file_changed_callback), slot, 0);
- nautilus_file_unref (viewed_file);
+ /* We're missing a previous location (if opened location
+ * in a new tab) so close it and return */
+ if (slot->location == NULL) {
+ nautilus_window_slot_close (slot);
+ } else {
+ /* We disconnected this, so we need to re-connect it */
+ viewed_file = nautilus_file_get (slot->location);
+ nautilus_window_slot_set_viewed_file (slot, viewed_file);
+ nautilus_file_monitor_add (viewed_file, &slot->viewed_file, 0);
+ g_signal_connect_object (viewed_file, "changed",
+ G_CALLBACK (viewed_file_changed_callback), slot, 0);
+ nautilus_file_unref (viewed_file);
- /* Leave the location bar showing the bad location that the user
- * typed (or maybe achieved by dragging or something). Many times
- * the mistake will just be an easily-correctable typo. The user
- * can choose "Refresh" to get the original URI back in the location bar.
- */
+ /* Leave the location bar showing the bad location that the user
+ * typed (or maybe achieved by dragging or something). Many times
+ * the mistake will just be an easily-correctable typo. The user
+ * can choose "Refresh" to get the original URI back in the location bar.
+ */
+ }
}
}
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/nautilus-window-pane.c nautilus-2.30.1/src/nautilus-window-pane.c
--- nautilus-2.30.0/src/nautilus-window-pane.c 2010-03-17 11:14:05.000000000 +0100
+++ nautilus-2.30.1/src/nautilus-window-pane.c 2010-04-26 09:50:42.000000000 +0200
@@ -129,6 +129,8 @@
NautilusWindowSlot *next_slot;
if (pane->window) {
+ NautilusWindow *window;
+ window = pane->window;
if (pane->active_slot == slot) {
g_assert (pane->active_slots != NULL);
g_assert (pane->active_slots->data == slot);
@@ -142,12 +144,27 @@
next_slot = get_first_inactive_slot (NAUTILUS_WINDOW_PANE (pane));
}
- nautilus_window_set_active_slot (pane->window, next_slot);
+ nautilus_window_set_active_slot (window, next_slot);
}
nautilus_window_close_slot (slot);
- if (g_list_length (pane->window->details->active_pane->slots) == 0) {
- nautilus_window_close (pane->window);
+ /* If that was the last slot in the active pane, close the pane or even the whole window. */
+ if (window->details->active_pane->slots == NULL) {
+ NautilusWindowPane *next_pane;
+ next_pane = nautilus_window_get_next_pane (window);
+
+ /* If next_pane is non-NULL, we have more than one pane available. In this
+ * case, close the current pane and switch to the next one. If there is
+ * no next pane, close the window. */
+ if(next_pane) {
+ nautilus_window_close_pane (pane);
+ nautilus_window_pane_switch_to (next_pane);
+ if (NAUTILUS_IS_NAVIGATION_WINDOW (window)) {
+ nautilus_navigation_window_update_show_hide_menu_items (NAUTILUS_NAVIGATION_WINDOW (window));
+ }
+ } else {
+ nautilus_window_close (window);
+ }
}
}
}
diff -Nru --exclude configure --exclude '*.html' --exclude '*.po' nautilus-2.30.0/src/nautilus-window-private.h nautilus-2.30.1/src/nautilus-window-private.h
--- nautilus-2.30.0/src/nautilus-window-private.h 2010-03-10 14:28:39.000000000 +0100
+++ nautilus-2.30.1/src/nautilus-window-private.h 2010-04-26 09:50:42.000000000 +0200
@@ -142,20 +142,20 @@
#define NAUTILUS_COMMAND_ZOOM_NORMAL "/commands/Zoom Normal"
/* window geometry */
-/* These are very small, and a Nautilus window at this tiny size is *almost*
+/* Min values are very small, and a Nautilus window at this tiny size is *almost*
* completely unusable. However, if all the extra bits (sidebar, location bar, etc)
* are turned off, you can see an icon or two at this size. See bug 5946.
*/
-#define NAUTILUS_WINDOW_MIN_WIDTH 200
-#define NAUTILUS_WINDOW_MIN_HEIGHT 200
#define NAUTILUS_SPATIAL_WINDOW_MIN_WIDTH 100
#define NAUTILUS_SPATIAL_WINDOW_MIN_HEIGHT 100
#define NAUTILUS_SPATIAL_WINDOW_DEFAULT_WIDTH 500
#define NAUTILUS_SPATIAL_WINDOW_DEFAULT_HEIGHT 300
-#define NAUTILUS_NAVIGATION_WINDOW_DEFAULT_WIDTH 800
-#define NAUTILUS_NAVIGATION_WINDOW_DEFAULT_HEIGHT 550
+#define NAUTILUS_NAVIGATION_WINDOW_MIN_WIDTH 200
+#define NAUTILUS_NAVIGATION_WINDOW_MIN_HEIGHT 200
+#define NAUTILUS_NAVIGATION_WINDOW_DEFAULT_WIDTH 800
+#define NAUTILUS_NAVIGATION_WINDOW_DEFAULT_HEIGHT 550
typedef void (*NautilusBookmarkFailedCallback) (NautilusWindow *window,
NautilusBookmark *bookmark);