r15241 - in /desktop/experimental/nautilus/debian: ./ patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Mar 17 10:51:23 UTC 2008
Author: slomo
Date: Mon Mar 17 10:51:23 2008
New Revision: 15241
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15241
Log:
* update patches
Added:
desktop/experimental/nautilus/debian/patches/18_disable_signal_handler.patch
desktop/experimental/nautilus/debian/patches/90_from_svn_fix_changing_default_application.patch
Removed:
desktop/experimental/nautilus/debian/patches/11_gnomevfs_query_eject.patch
Modified:
desktop/experimental/nautilus/debian/changelog
desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch
desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch
desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch
desktop/experimental/nautilus/debian/patches/series
Modified: desktop/experimental/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/changelog?rev=15241&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/changelog (original)
+++ desktop/experimental/nautilus/debian/changelog Mon Mar 17 10:51:23 2008
@@ -11,7 +11,6 @@
[ Sebastian Dröge ]
* New upstream stable release:
- + TODO: patches 07, 10, 11, 14 don't apply anymore!
+ Upload to experimental first because of intrusive changes.
+ debian/control.in:
- Update build dependencies and dependencies.
@@ -21,12 +20,26 @@
debian/patches/16_missing_thumbnails.patch,
debian/patches/20_upstream_nautilus-dnd-user-owned.patch,
debian/patches/21_nautilus_xmp.patch,
- debian/patches/23_thumbnails_add-border.patch:
+ debian/patches/23_thumbnails_add-border.patch,
+ debian/patches/11_gnomevfs_query_eject.patch:
- Dropped, merged upstream.
+ debian/patches/06_dont_create_Desktop.patch:
- Updated to apply cleanly again.
+ + debian/patches/07_desktop_file_activation.patch:
+ - Updated to apply cleanly again.
+ + debian/patches/10_location_titlebar.patch:
+ - Updated to apply cleanly again.
+ + debian/patches/14_sidebar_network-protocol.patch:
+ - Updated to apply cleanly again.
+ debian/patches/99_ltmain_as-needed.patch:
- Updated to apply cleanly again.
+ + debian/patches/90_from_svn_fix_changing_default_application.patch:
+ - Make changing the default application work again, patch taken from
+ the Ubuntu package.
+ + debian/patches/18_disable_signal_handler.patch:
+ - Don't use the logging code signal handler it's buggy and makes
+ nautilus being stuck and eat cpu on crash. Patch taken from the
+ Ubuntu package.
-- Sebastian Dröge <slomo at debian.org> Sun, 16 Mar 2008 20:30:48 +0100
Modified: desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch?rev=15241&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch (original)
+++ desktop/experimental/nautilus/debian/patches/07_desktop_file_activation.patch Mon Mar 17 10:51:23 2008
@@ -1,31 +1,30 @@
Fixes two security issues about disguised .desktop files.
Debian #408556, GNOME #405291
Debian #408948, GNOME #405052
-Index: nautilus-2.20.0/libnautilus-private/nautilus-file.c
-===================================================================
---- nautilus-2.20.0.orig/libnautilus-private/nautilus-file.c 2007-09-10 09:03:46.000000000 +0200
-+++ nautilus-2.20.0/libnautilus-private/nautilus-file.c 2007-09-24 11:38:54.306473667 +0200
-@@ -40,6 +40,7 @@
- #include "nautilus-link-desktop-file.h"
+--- nautilus-2.22.0/libnautilus-private/nautilus-file.c.old 2008-03-17 11:21:33.000000000 +0100
++++ nautilus-2.22.0/libnautilus-private/nautilus-file.c 2008-03-17 11:36:43.000000000 +0100
+@@ -41,6 +41,7 @@
+ #include "nautilus-link.h"
#include "nautilus-metadata.h"
#include "nautilus-module.h"
+#include "nautilus-program-choosing.h"
#include "nautilus-search-directory.h"
#include "nautilus-search-directory-file.h"
#include "nautilus-thumbnails.h"
-@@ -2757,6 +2758,33 @@
- monitor_remove, (file, client));
- }
+@@ -1084,6 +1085,45 @@
+ return g_file_get_child (dir, eel_ref_str_peek (file->details->name));
+ }
+static gboolean
+safe_to_launch_desktop_file (NautilusFile *file)
+{
+ gboolean ret = TRUE;
-+ char *uri = nautilus_file_get_uri (file);
++ GFile *uri = nautilus_file_get_location (file);
+ char *path = NULL;
++ char *scheme = NULL;
+
+ if (uri) {
-+ path = gnome_vfs_get_local_path_from_uri (uri);
++ path = g_file_get_parse_name (uri);
+ }
+
+ if (!path ||
@@ -34,85 +33,76 @@
+ !eel_str_has_suffix (path, ".desktop")) {
+ ret = FALSE;
+ }
++
++ scheme = g_file_get_uri_scheme (file);
++ if (scheme != NULL && strncmp (scheme, "file://", 7) == 0) {
++ char *path_tmp = path + 7;
+
-+ if (file->details->info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_IDS &&
-+ file->details->info->uid &&
-+ (uid_t) file->details->info->uid != geteuid ())
++ if (eel_str_has_prefix (path, "/mnt") ||
++ eel_str_has_prefix (path, "/media")) {
++ ret = FALSE;
++ }
++ }
++ g_free (scheme);
++
++ if (file->details->uid != -1 &&
++ (uid_t) file->details->uid != geteuid ())
+ ret = FALSE;
+
-+ g_free (uri);
++ g_object_unref (uri);
+ g_free (path);
+ return ret;
+}
++
+ /* Return the actual uri associated with the passed-in file. */
+ char *
+ nautilus_file_get_uri (NautilusFile *file)
+@@ -3053,7 +3093,8 @@
+ {
+ g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
- /* Return the uri associated with the passed-in file, which may not be
- * the actual uri if the file is an desktop file or a nautilus
-@@ -2771,7 +2799,9 @@
- return NULL;
- }
-
-- if (file->details->activation_uri != NULL) {
-+ if (file->details->activation_uri != NULL &&
-+ (!eel_str_has_prefix (file->details->activation_uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER) ||
-+ safe_to_launch_desktop_file (file))) {
- return g_strdup (file->details->activation_uri);
+- if (file->details->activation_location != NULL) {
++ if (file->details->activation_location != NULL &&
++ safe_to_launch_desktop_file (file)) {
+ return g_file_get_uri (file->details->activation_location);
}
-@@ -5229,6 +5259,12 @@
- return nautilus_file_is_mime_type (file, "application/x-desktop");
- }
+@@ -3065,7 +3106,8 @@
+ {
+ g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
-+gboolean
-+nautilus_file_is_desktop_launcher (NautilusFile *file)
-+{
-+ return eel_str_has_prefix (file->details->activation_uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER);
-+}
-+
- /**
- * nautilus_file_is_directory
- *
-Index: nautilus-2.20.0/src/file-manager/fm-directory-view.c
-===================================================================
---- nautilus-2.20.0.orig/src/file-manager/fm-directory-view.c 2007-09-24 11:22:49.619499289 +0200
-+++ nautilus-2.20.0/src/file-manager/fm-directory-view.c 2007-09-24 11:38:54.310473895 +0200
-@@ -4626,7 +4626,8 @@
+- if (file->details->activation_location != NULL) {
++ if (file->details->activation_location != NULL &&
++ safe_to_launch_desktop_file (file)) {
+ return g_object_ref (file->details->activation_location);
+ }
+
+--- nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c.old 2008-03-17 11:43:19.000000000 +0100
++++ nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c 2008-03-17 11:43:33.000000000 +0100
+@@ -727,7 +727,8 @@
{
- return (nautilus_file_is_directory (file) ||
- NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
-- nautilus_file_is_nautilus_link (file));
-+ (nautilus_file_is_nautilus_link (file) &&
-+ !nautilus_file_is_desktop_launcher (file)));
+ return (nautilus_file_is_directory (file) ||
+ NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
+- nautilus_file_is_nautilus_link (file));
++ (nautilus_file_is_nautilus_link (file) &&
++ !nautilus_file_is_launcher (file)));
}
static ActivationAction
-@@ -4707,12 +4708,14 @@
- for (node = selection; node != NULL; node = node->next) {
+--- nautilus-2.22.0/src/file-manager/fm-directory-view.c.old 2008-03-17 11:38:26.000000000 +0100
++++ nautilus-2.22.0/src/file-manager/fm-directory-view.c 2008-03-17 11:45:40.000000000 +0100
+@@ -4264,9 +4264,11 @@
+
file = NAUTILUS_FILE (node->data);
- other_applications_visible &=
-- (!can_use_component_for_file (file) ||
+- (!nautilus_mime_file_opens_in_view (file) ||
- nautilus_file_is_directory (file));
--
- activation_action = get_activation_action (file);
-
-+ if (activation_action != ACTIVATION_ACTION_OPEN_IN_APPLICATION &&
++ if (nautilus_mime_file_opens_in_external_app (file) &&
+ (NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
+ nautilus_file_is_nautilus_link (file))) {
+ other_applications_visible = FALSE;
+ }
-+
- /* Only use the default app for open if there is not
- a mime mismatch, otherwise we can't use it in the
- open with menu */
-Index: nautilus-2.20.0/libnautilus-private/nautilus-file.h
-===================================================================
---- nautilus-2.20.0.orig/libnautilus-private/nautilus-file.h 2007-04-03 12:08:46.000000000 +0200
-+++ nautilus-2.20.0/libnautilus-private/nautilus-file.h 2007-09-24 11:38:54.314474123 +0200
-@@ -155,6 +155,7 @@
- char * nautilus_file_get_symbolic_link_target_uri (NautilusFile *file);
- gboolean nautilus_file_is_broken_symbolic_link (NautilusFile *file);
- gboolean nautilus_file_is_nautilus_link (NautilusFile *file);
-+gboolean nautilus_file_is_desktop_launcher (NautilusFile *file);
- gboolean nautilus_file_is_executable (NautilusFile *file);
- gboolean nautilus_file_is_directory (NautilusFile *file);
- gboolean nautilus_file_is_in_trash (NautilusFile *file);
+ }
+
+ default_app = NULL;
Modified: desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch?rev=15241&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch (original)
+++ desktop/experimental/nautilus/debian/patches/10_location_titlebar.patch Mon Mar 17 10:51:23 2008
@@ -107,19 +107,9 @@
}
return changed;
-Index: nautilus-2.20.0/src/nautilus-window.c
-===================================================================
---- nautilus-2.20.0.orig/src/nautilus-window.c 2007-08-21 11:37:49.000000000 +0200
-+++ nautilus-2.20.0/src/nautilus-window.c 2007-09-24 11:39:14.875645837 +0200
-@@ -57,6 +57,7 @@
- #include <X11/XF86keysym.h>
- #endif
- #include <libgnomevfs/gnome-vfs-uri.h>
-+#include <libgnomevfs/gnome-vfs-utils.h>
- #include <libnautilus-private/nautilus-file-utilities.h>
- #include <libnautilus-private/nautilus-file-attributes.h>
- #include <libnautilus-private/nautilus-global-preferences.h>
-@@ -1701,3 +1702,90 @@
+--- nautilus-2.22.0/src/nautilus-window.c.old 2008-03-17 10:49:47.000000000 +0100
++++ nautilus-2.22.0/src/nautilus-window.c 2008-03-17 11:11:29.000000000 +0100
+@@ -1709,3 +1709,71 @@
{
return (nautilus_window_get_window_type (window) != NAUTILUS_WINDOW_DESKTOP);
}
@@ -128,9 +118,8 @@
+nautilus_window_set_location_in_titlebar (NautilusWindow *window, const char *title)
+{
+ char *location_title;
-+ char *uri = NULL;
++ GFile *uri = NULL;
+ char *location = NULL;
-+ GnomeVFSURI *vfs_uri = NULL;
+ const char *path;
+ const char *scheme = NULL;
+ const char *display_location;
@@ -143,26 +132,10 @@
+
+ if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) != TRUE
+ || (uri = nautilus_window_get_location (window)) == NULL
-+ || (location = gnome_vfs_format_uri_for_display (uri)) == NULL
++ || (location = g_file_get_parse_name (uri)) == NULL
+ || location[0] == 0
+ || location[1] == 0)
+ goto done;
-+
-+ if (location[0] != GNOME_VFS_URI_PATH_CHR) {
-+ if ((vfs_uri = gnome_vfs_uri_new (location)) == NULL
-+ || (path = gnome_vfs_uri_get_path (vfs_uri)) == NULL
-+ || (scheme = gnome_vfs_uri_get_scheme (vfs_uri)) == NULL
-+ || path[0] == 0
-+ || strcmp (path, GNOME_VFS_URI_PATH_STR) == 0)
-+ goto done;
-+
-+ g_free(uri);
-+
-+ uri = gnome_vfs_unescape_string_for_display (path);
-+
-+ display_location = uri;
-+ goto construct_title;
-+ }
+
+ if ((tmp_location = g_get_home_dir()) == NULL) {
+ display_location = location;
@@ -177,7 +150,7 @@
+
+ tmp_location_len = strlen (tmp_location);
+ if (eel_str_has_prefix (location, tmp_location) == FALSE
-+ || location[tmp_location_len] != GNOME_VFS_URI_PATH_CHR) {
++ || location[tmp_location_len] != G_DIR_SEPARATOR) {
+ display_location = location;
+ goto construct_title;
+ }
@@ -200,25 +173,21 @@
+
+ done:
+ if (uri != NULL)
-+ g_free (uri);
++ g_object_unref (uri);
+
+ if (location != NULL)
+ g_free (location);
+
-+ if (vfs_uri != NULL)
-+ gnome_vfs_uri_unref (vfs_uri);
-+
+ return (location_title);
+}
-Index: nautilus-2.20.0/src/nautilus-window.h
-===================================================================
---- nautilus-2.20.0.orig/src/nautilus-window.h 2007-04-03 12:08:06.000000000 +0200
-+++ nautilus-2.20.0/src/nautilus-window.h 2007-09-24 11:39:14.875645837 +0200
-@@ -151,5 +151,7 @@
++
+--- nautilus-2.22.0/src/nautilus-window.h.old 2008-03-17 10:49:50.000000000 +0100
++++ nautilus-2.22.0/src/nautilus-window.h 2008-03-17 10:51:45.000000000 +0100
+@@ -152,5 +152,7 @@
void nautilus_window_add_extra_location_widget (NautilusWindow *window,
GtkWidget *widget);
gboolean nautilus_window_has_menubar_and_statusbar (NautilusWindow *window);
-+char * nautilus_window_set_location_in_titlebar (NautilusWindow *window,
-+ const char *title);
++char * nautilus_window_set_location_in_titlebar (NautilusWindow *window,
++ const char *title);
#endif
Modified: desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch?rev=15241&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch (original)
+++ desktop/experimental/nautilus/debian/patches/14_sidebar_network-protocol.patch Mon Mar 17 10:51:23 2008
@@ -1,20 +1,22 @@
GNOME #350974
-Index: nautilus-2.20.0/src/nautilus-places-sidebar.c
-===================================================================
---- nautilus-2.20.0.orig/src/nautilus-places-sidebar.c 2007-09-24 11:36:56.503760473 +0200
-+++ nautilus-2.20.0/src/nautilus-places-sidebar.c 2007-09-24 11:58:27.629337527 +0200
-@@ -324,6 +324,14 @@
+
+--- nautilus/src/nautilus-places-sidebar.c.old 2008-03-17 10:33:00.000000000 +0100
++++ nautilus/src/nautilus-places-sidebar.c 2008-03-17 10:39:21.000000000 +0100
+@@ -407,6 +407,17 @@
+ g_object_unref (volume);
}
- g_list_free (drives);
+ g_list_free (volumes);
++
++ icon = g_themed_icon_new ("gnome-fs-network");
++ mount_uri = "network:///";
++ last_iter = add_place (sidebar, PLACES_BUILT_IN,
++ _("Network Servers"), icon,
++ mount_uri, NULL, NULL, NULL, 0);
++ g_object_unref (icon);
++
++ if (strcmp (location, mount_uri) == 0) {
++ gtk_tree_selection_select_iter (selection, &last_iter);
++ }
-+ mount_uri = "network:///";
-+ last_iter = add_place (sidebar, PLACES_BUILT_IN,
-+ _("Network Servers"), "gnome-fs-network",
-+ mount_uri, NULL, NULL, 0);
-+ if (strcmp (location, mount_uri) == 0) {
-+ gtk_tree_selection_select_iter (selection, &last_iter);
-+ }
-+
- /* add mounted volumes that has no drive (ftp, sftp,...) */
-
- volumes = gnome_vfs_volume_monitor_get_mounted_volumes (volume_monitor);
+ /* add mounts that has no volume (/etc/mtab mounts, ftp, sftp,...) */
+ mounts = g_volume_monitor_get_mounts (volume_monitor);
Added: desktop/experimental/nautilus/debian/patches/18_disable_signal_handler.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/18_disable_signal_handler.patch?rev=15241&op=file
==============================================================================
--- desktop/experimental/nautilus/debian/patches/18_disable_signal_handler.patch (added)
+++ desktop/experimental/nautilus/debian/patches/18_disable_signal_handler.patch Mon Mar 17 10:51:23 2008
@@ -1,0 +1,14 @@
+--- nautilus-2.21.1.orig/src/nautilus-main.c 2007-12-17 12:14:03.000000000 +0100
++++ nautilus-2.21.1/src/nautilus-main.c 2008-01-07 15:54:23.000000000 +0100
+@@ -359,7 +359,10 @@
+ nautilus_debug_log_load_configuration (config_filename, NULL); /* NULL GError */
+ g_free (config_filename);
+
+- setup_debug_log_signals ();
++ /* Don't use the logging code it's buggy and makes nautilus being stuck
++ * and eat cpu on crash
++ setup_debug_log_signals (); */
++
+ setup_debug_log_glog ();
+ }
+
Added: desktop/experimental/nautilus/debian/patches/90_from_svn_fix_changing_default_application.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/90_from_svn_fix_changing_default_application.patch?rev=15241&op=file
==============================================================================
--- desktop/experimental/nautilus/debian/patches/90_from_svn_fix_changing_default_application.patch (added)
+++ desktop/experimental/nautilus/debian/patches/90_from_svn_fix_changing_default_application.patch Mon Mar 17 10:51:23 2008
@@ -1,0 +1,13 @@
+--- trunk/libnautilus-private/nautilus-mime-application-chooser.c 2008/02/20 15:11:17 13784
++++ trunk/libnautilus-private/nautilus-mime-application-chooser.c 2008/03/13 15:11:05 13931
+@@ -599,9 +599,9 @@
+ const char *extension,
+ const char *mime_type)
+ {
+- chooser->details->extension = g_strdup (extension);
+ if (extension != NULL &&
+ g_content_type_is_unknown (mime_type)) {
++ chooser->details->extension = g_strdup (extension);
+ chooser->details->content_type = g_strdup_printf ("application/x-extension-%s", extension);
+ /* the %s here is a file extension */
+ chooser->details->type_description =
Modified: desktop/experimental/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/nautilus/debian/patches/series?rev=15241&op=diff
==============================================================================
--- desktop/experimental/nautilus/debian/patches/series (original)
+++ desktop/experimental/nautilus/debian/patches/series Mon Mar 17 10:51:23 2008
@@ -2,11 +2,12 @@
04_show_backup_files.patch
05_places-sidebar_single-click.patch
06_dont_create_Desktop.patch -p0
-#07_desktop_file_activation.patch
+07_desktop_file_activation.patch
08_folder_handler.patch
-#10_location_titlebar.patch
-#11_gnomevfs_query_eject.patch
+10_location_titlebar.patch
12_list-view_expand.patch
-#14_sidebar_network-protocol.patch
+14_sidebar_network-protocol.patch
15_tracker_check.patch
+18_disable_signal_handler.patch
+90_from_svn_fix_changing_default_application.patch
99_ltmain_as-needed.patch -p0
More information about the pkg-gnome-commits
mailing list