From a676dea12ca704578a574c2b31f753891fd3d145bcef1634705f30ffa26a5873 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 7 Feb 2009 16:17:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=53 --- nautilus-181941-i18n.patch | 13 - nautilus-2.24.1.tar.bz2 | 3 - nautilus-2.25.4.tar.bz2 | 3 + nautilus-212649-search-bar-visibility.patch | 74 ------ ...-297983-fix-overlapping-desktop-icons.diff | 86 ------ nautilus-bgo350950-search-desktop.diff | 2 +- ...962-folder-icon-for-menus-and-windows.diff | 39 ++- ...go338933-ignore-foreign-desktop-files.diff | 247 ------------------ nautilus-desktop-icon.patch | 13 - ...zoom-control-and-view-as-option-menu.patch | 61 ----- nautilus-genericname.patch | 13 - nautilus-new-windows-after-mount.patch | 27 -- nautilus.changes | 86 ++++++ nautilus.spec | 128 ++++++--- 14 files changed, 199 insertions(+), 596 deletions(-) delete mode 100644 nautilus-181941-i18n.patch delete mode 100644 nautilus-2.24.1.tar.bz2 create mode 100644 nautilus-2.25.4.tar.bz2 delete mode 100644 nautilus-212649-search-bar-visibility.patch delete mode 100644 nautilus-330298-297983-fix-overlapping-desktop-icons.diff delete mode 100644 nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff delete mode 100644 nautilus-desktop-icon.patch delete mode 100644 nautilus-disable-zoom-control-and-view-as-option-menu.patch delete mode 100644 nautilus-genericname.patch delete mode 100644 nautilus-new-windows-after-mount.patch diff --git a/nautilus-181941-i18n.patch b/nautilus-181941-i18n.patch deleted file mode 100644 index 3488f5b..0000000 --- a/nautilus-181941-i18n.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: nautilus-2.17.91/src/nautilus-property-browser.c -=================================================================== ---- nautilus-2.17.91.orig/src/nautilus-property-browser.c -+++ nautilus-2.17.91/src/nautilus-property-browser.c -@@ -1865,7 +1865,7 @@ add_reset_property (NautilusPropertyBrow - - g_free (reset_image_file_name); - -- reset_image = labeled_image_new (_("Reset"), reset_chit != NULL ? reset_chit : reset_pixbuf, RESET_IMAGE_NAME, PANGO_SCALE_MEDIUM); -+ reset_image = labeled_image_new (_("Reset"), reset_chit, RESET_IMAGE_NAME, PANGO_SCALE_MEDIUM); - gtk_container_add (GTK_CONTAINER (property_browser->details->content_table), reset_image); - eel_wrap_table_reorder_child (EEL_WRAP_TABLE (property_browser->details->content_table), - reset_image, diff --git a/nautilus-2.24.1.tar.bz2 b/nautilus-2.24.1.tar.bz2 deleted file mode 100644 index a554c8e..0000000 --- a/nautilus-2.24.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48f1d25af102d216fdc2ebcd6396ffce963558c119b88730dc02fb1c158fcc4c -size 5330025 diff --git a/nautilus-2.25.4.tar.bz2 b/nautilus-2.25.4.tar.bz2 new file mode 100644 index 0000000..1bacda5 --- /dev/null +++ b/nautilus-2.25.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d2ba5646125f367975dbb82d8f4c803243bc80e6ba803b9526ebca1b9aa8056 +size 5861126 diff --git a/nautilus-212649-search-bar-visibility.patch b/nautilus-212649-search-bar-visibility.patch deleted file mode 100644 index 2f5ed6a..0000000 --- a/nautilus-212649-search-bar-visibility.patch +++ /dev/null @@ -1,74 +0,0 @@ -This patch fixes a problem in which the search bar is not visible and it's not -obvious how to search when you navigate directly to the x-nautilus-search:/// -URI. This also fixes a problem in which focus is stolen away from the search -bar when the window is first displayed. - -This is filed upstream at http://bugzilla.gnome.org/368424 - -Index: src/nautilus-navigation-window.c -=================================================================== -RCS file: /cvs/gnome/nautilus/src/nautilus-navigation-window.c,v -retrieving revision 1.450 -diff -u -p -u -r1.450 nautilus-navigation-window.c ---- src/nautilus-navigation-window.c 2 Oct 2006 10:53:58 -0000 1.450 -+++ src/nautilus-navigation-window.c 31 Oct 2006 17:53:23 -0000 -@@ -1128,8 +1128,7 @@ real_set_search_mode (NautilusWindow *wi - query_editor = nautilus_query_editor_new (TRUE, - nautilus_search_directory_is_indexed (search_directory)); - } else { -- nautilus_navigation_window_show_location_bar_temporarily (nav_window); -- nautilus_navigation_window_set_bar_mode (nav_window, NAUTILUS_BAR_SEARCH); -+ nautilus_navigation_window_show_search (nav_window); - nav_window->details->temporary_search_bar = FALSE; - - query_editor = nautilus_query_editor_new_with_bar (FALSE, -@@ -1145,7 +1144,7 @@ real_set_search_mode (NautilusWindow *wi - nautilus_query_editor_set_query (NAUTILUS_QUERY_EDITOR (query_editor), - query); - g_object_unref (query); -- }else { -+ } else { - nautilus_query_editor_set_default_query (NAUTILUS_QUERY_EDITOR (query_editor)); - } - -@@ -1466,16 +1465,18 @@ nautilus_navigation_window_show (GtkWidg - nautilus_navigation_window_hide_toolbar (window); - } - -- if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { -- nautilus_navigation_window_show_location_bar (window, FALSE); -- } else { -- nautilus_navigation_window_hide_location_bar (window, FALSE); -- } -- -- if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY)) { -- nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_NAVIGATION); -- } else { -- nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_PATH); -+ if (! nautilus_navigation_window_search_bar_showing (window)) { -+ if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { -+ nautilus_navigation_window_show_location_bar (window, FALSE); -+ } else { -+ nautilus_navigation_window_hide_location_bar (window, FALSE); -+ } -+ -+ if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY)) { -+ nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_NAVIGATION); -+ } else { -+ nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_PATH); -+ } - } - - if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { -@@ -1491,6 +1492,11 @@ nautilus_navigation_window_show (GtkWidg - } - - GTK_WIDGET_CLASS (parent_class)->show (widget); -+ -+ /* Lame hack to ensure that the icon view doesn't steal the focus away */ -+ if (nautilus_navigation_window_search_bar_showing (window)) { -+ nautilus_search_bar_grab_focus (NAUTILUS_SEARCH_BAR (window->search_bar)); -+ } - } - - static void diff --git a/nautilus-330298-297983-fix-overlapping-desktop-icons.diff b/nautilus-330298-297983-fix-overlapping-desktop-icons.diff deleted file mode 100644 index a5161ec..0000000 --- a/nautilus-330298-297983-fix-overlapping-desktop-icons.diff +++ /dev/null @@ -1,86 +0,0 @@ -2007-08-10 Federico Mena Quintero - - Fix http://bugzilla.gnome.org/show_bug.cgi?id=330298 once again - (desktop icons overlap when placing a volume icon, and in various - other situations): - - * libnautilus-private/nautilus-icon-container.c (icon_set_position): - Clear icon->has_lazy_position, since the icon will be - well-positioned once this function exits. - (finish_adding_new_icons): Don't clear icon->has_lazy_position - here, since it is now done in icon_set_position(). Emit the - "icon-position-changed" signal so that the upstream code will save - the final position for icons which were semi-positioned. - (finish_adding_new_icons): Remember the original - icon->has_lazy_position before calling assign_icon_position(); - later, if the icon was to be lazily positioned, add it to the - semi_position_icons list. Previously we were ignoring - semi-positioned icons when populating the placement grid; that's - why overlaps would happen. - - * src/file-manager/fm-icon-view.c (file_has_lazy_position): Also - use lazy positioning for drives, not just volumes. - -diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c -index dbf1da5..7a17479 100644 ---- a/libnautilus-private/nautilus-icon-container.c -+++ b/libnautilus-private/nautilus-icon-container.c -@@ -298,6 +298,8 @@ icon_set_position (NautilusIcon *icon, - int x1, y1, x2, y2; - int container_x, container_y, container_width, container_height; - -+ icon->has_lazy_position = FALSE; -+ - if (icon->x == x && icon->y == y) { - return; - } -@@ -5859,9 +5861,13 @@ finish_adding_new_icons (NautilusIconContainer *container) - new_icons = g_list_reverse (new_icons); - no_position_icons = semi_position_icons = NULL; - for (p = new_icons; p != NULL; p = p->next) { -+ gboolean had_lazy_position; -+ - icon = p->data; -+ had_lazy_position = icon->has_lazy_position; -+ - if (assign_icon_position (container, icon)) { -- if (!container->details->auto_layout && icon->has_lazy_position) { -+ if (!container->details->auto_layout && had_lazy_position) { - semi_position_icons = g_list_prepend (semi_position_icons, icon); - } - } else { -@@ -5894,6 +5900,7 @@ finish_adding_new_icons (NautilusIconContainer *container) - for (p = semi_position_icons; p != NULL; p = p->next) { - NautilusIcon *icon; - int x, y; -+ NautilusIconPosition position; - - icon = p->data; - x = icon->x; -@@ -5906,9 +5913,10 @@ finish_adding_new_icons (NautilusIconContainer *container) - - placement_grid_mark_icon (grid, icon); - -- /* ensure that next time we run this code, the formerly semi-positioned -- * icons are treated as being positioned. */ -- icon->has_lazy_position = FALSE; -+ position.x = icon->x; -+ position.y = icon->y; -+ g_signal_emit (container, signals[ICON_POSITION_CHANGED], 0, -+ icon->data, &position); - } - - placement_grid_free (grid); -diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c -index 864382e..efff989 100644 ---- a/src/file-manager/fm-icon-view.c -+++ b/src/file-manager/fm-icon-view.c -@@ -538,7 +538,7 @@ file_has_lazy_position (FMDirectoryView *view, - * icon we don't overlap that one. We don't do this in general though, - * as it can cause icons moving around. - */ -- lazy_position = nautilus_file_has_volume (file); -+ lazy_position = nautilus_file_has_volume (file) || nautilus_file_has_drive (file); - if (lazy_position && fm_directory_view_get_loading (view)) { - /* if volumes are loaded during directory load, don't mark them - * as lazy. This is wrong for files that were mounted during user diff --git a/nautilus-bgo350950-search-desktop.diff b/nautilus-bgo350950-search-desktop.diff index fc8b70b..9c31439 100644 --- a/nautilus-bgo350950-search-desktop.diff +++ b/nautilus-bgo350950-search-desktop.diff @@ -136,7 +136,7 @@ index 0000000..e8bc394 +Comment[zh_CN]=在您的计算机上查找文件、文件夹和文档 +Comment[zh_TW]=在電腦中搜尋檔案、資料夾和文件 +Exec=nautilus --no-desktop x-nautilus-search: -+Icon=stock_search ++Icon=system-search +Terminal=false +Type=Application +StartupNotify=true diff --git a/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff b/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff index d9ee130..8bc168c 100644 --- a/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff +++ b/nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff @@ -15,10 +15,10 @@ folder is more recognizable than a filing cabinet. 4 files changed, 4 insertions(+), 4 deletions(-) -Index: nautilus-2.23.6.1/nautilus-file-management-properties.desktop.in.in +Index: nautilus-2.25.3/nautilus-file-management-properties.desktop.in.in =================================================================== ---- nautilus-2.23.6.1.orig/nautilus-file-management-properties.desktop.in.in -+++ nautilus-2.23.6.1/nautilus-file-management-properties.desktop.in.in +--- nautilus-2.25.3.orig/nautilus-file-management-properties.desktop.in.in ++++ nautilus-2.25.3/nautilus-file-management-properties.desktop.in.in @@ -3,7 +3,7 @@ Encoding=UTF-8 _Name=File Management _Comment=Change the behaviour and appearance of file manager windows @@ -28,24 +28,23 @@ Index: nautilus-2.23.6.1/nautilus-file-management-properties.desktop.in.in Terminal=false Type=Application StartupNotify=true -Index: nautilus-2.23.6.1/nautilus.desktop.in.in +Index: nautilus-2.25.3/nautilus.desktop.in.in =================================================================== ---- nautilus-2.23.6.1.orig/nautilus.desktop.in.in -+++ nautilus-2.23.6.1/nautilus.desktop.in.in -@@ -4,7 +4,7 @@ _Name=File Browser - _Comment=Browse the file system with the file manager - TryExec=nautilus - Exec=nautilus --no-desktop --browser %U --Icon=system-file-manager +--- nautilus-2.25.3.orig/nautilus.desktop.in.in ++++ nautilus-2.25.3/nautilus.desktop.in.in +@@ -3,6 +3,7 @@ Encoding=UTF-8 + _Name=File Manager + Exec=nautilus + Icon=system-file-manager +Icon=gnome-fs-directory Terminal=false - StartupNotify=true Type=Application -Index: nautilus-2.23.6.1/src/nautilus-file-management-properties.c + StartupNotify=true +Index: nautilus-2.25.3/src/nautilus-file-management-properties.c =================================================================== ---- nautilus-2.23.6.1.orig/src/nautilus-file-management-properties.c -+++ nautilus-2.23.6.1/src/nautilus-file-management-properties.c -@@ -802,7 +802,7 @@ nautilus_file_management_properties_dial +--- nautilus-2.25.3.orig/src/nautilus-file-management-properties.c ++++ nautilus-2.25.3/src/nautilus-file-management-properties.c +@@ -806,7 +806,7 @@ nautilus_file_management_properties_dial (GClosureNotify)g_object_unref, 0); @@ -54,11 +53,11 @@ Index: nautilus-2.23.6.1/src/nautilus-file-management-properties.c if (window) { gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window)); -Index: nautilus-2.23.6.1/src/nautilus-navigation-window.c +Index: nautilus-2.25.3/src/nautilus-navigation-window.c =================================================================== ---- nautilus-2.23.6.1.orig/src/nautilus-navigation-window.c -+++ nautilus-2.23.6.1/src/nautilus-navigation-window.c -@@ -1221,7 +1221,7 @@ static NautilusIconInfo * +--- nautilus-2.25.3.orig/src/nautilus-navigation-window.c ++++ nautilus-2.25.3/src/nautilus-navigation-window.c +@@ -1220,7 +1220,7 @@ static NautilusIconInfo * real_get_icon (NautilusWindow *window, NautilusWindowSlot *slot) { diff --git a/nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff b/nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff deleted file mode 100644 index 9d7199b..0000000 --- a/nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff +++ /dev/null @@ -1,247 +0,0 @@ -2008-03-26 Federico Mena Quintero - - Do not show .desktop files in ~/Desktop which are OnlyShowIn=KDE - or similar. - - http://bugzilla.gnome.org/show_bug.cgi?id=338933 - https://bugzilla.novell.com/show_bug.cgi?id=366100 - - * libnautilus-private/nautilus-link.c - (nautilus_link_get_link_info_given_file_contents): Add a return - "is_foreign" argument, which says if OnlyShowIn/NotShowIn within - the .desktop file say that it shouldn't be shown in GNOME. - - * libnautilus-private/nautilus-directory-async.c - (link_info_got_data): Use the is_foreign information. - (link_info_done): Store file->details->is_foreign_link. - - * libnautilus-private/nautilus-file-private.h (struct - NautilusFileDetails): Add an is_foreign_link field. - - * libnautilus-private/nautilus-file.c (nautilus_file_clear_info): - Initialize is_foreign_link. - (nautilus_file_is_foreign_link): New public function. - (nautilus_file_should_show): Don't show foreign links in the - desktop directory. - -Index: nautilus-2.24.1/libnautilus-private/nautilus-directory-async.c -=================================================================== ---- nautilus-2.24.1.orig/libnautilus-private/nautilus-directory-async.c -+++ nautilus-2.24.1/libnautilus-private/nautilus-directory-async.c -@@ -199,7 +199,8 @@ static void link_info_done - const char *uri, - const char *name, - const char *icon, -- gboolean is_launcher); -+ gboolean is_launcher, -+ gboolean is_foreign); - static void move_file_to_low_priority_queue (NautilusDirectory *directory, - NautilusFile *file); - static void move_file_to_extension_queue (NautilusDirectory *directory, -@@ -1717,7 +1718,7 @@ lacks_link_info (NautilusFile *file) - if (nautilus_file_is_nautilus_link (file)) { - return TRUE; - } else { -- link_info_done (file->details->directory, file, NULL, NULL, NULL, FALSE); -+ link_info_done (file->details->directory, file, NULL, NULL, NULL, FALSE, FALSE); - return FALSE; - } - } else { -@@ -3558,7 +3559,8 @@ link_info_done (NautilusDirectory *direc - const char *uri, - const char *name, - const char *icon, -- gboolean is_launcher) -+ gboolean is_launcher, -+ gboolean is_foreign) - { - file->details->link_info_is_up_to_date = TRUE; - -@@ -3576,6 +3578,7 @@ link_info_done (NautilusDirectory *direc - } - file->details->custom_icon = g_strdup (icon); - file->details->is_launcher = is_launcher; -+ file->details->is_foreign_link = is_foreign; - - nautilus_directory_async_state_changed (directory); - } -@@ -3622,6 +3625,7 @@ link_info_got_data (NautilusDirectory *d - { - char *link_uri, *uri, *name, *icon; - gboolean is_launcher; -+ gboolean is_foreign; - - nautilus_directory_ref (directory); - -@@ -3629,19 +3633,20 @@ link_info_got_data (NautilusDirectory *d - name = NULL; - icon = NULL; - is_launcher = FALSE; -+ is_foreign = FALSE; - - /* Handle the case where we read the Nautilus link. */ - if (result) { - link_uri = nautilus_file_get_uri (file); - nautilus_link_get_link_info_given_file_contents (file_contents, bytes_read, link_uri, -- &uri, &name, &icon, &is_launcher); -+ &uri, &name, &icon, &is_launcher, &is_foreign); - g_free (link_uri); - } else { - /* FIXME bugzilla.gnome.org 42433: We should report this error to the user. */ - } - - nautilus_file_ref (file); -- link_info_done (directory, file, uri, name, icon, is_launcher); -+ link_info_done (directory, file, uri, name, icon, is_launcher, is_foreign); - nautilus_file_changed (file); - nautilus_file_unref (file); - -@@ -3729,7 +3734,7 @@ link_info_start (NautilusDirectory *dire - - /* If it's not a link we are done. If it is, we need to read it. */ - if (!nautilus_style_link) { -- link_info_done (directory, file, NULL, NULL, NULL, FALSE); -+ link_info_done (directory, file, NULL, NULL, NULL, FALSE, FALSE); - } else if (should_read_link_info_sync (file)) { - result = g_file_load_contents (location, NULL, &file_contents, &file_size, NULL, NULL); - link_info_got_data (directory, file, result, file_size, file_contents); -Index: nautilus-2.24.1/libnautilus-private/nautilus-file-private.h -=================================================================== ---- nautilus-2.24.1.orig/libnautilus-private/nautilus-file-private.h -+++ nautilus-2.24.1/libnautilus-private/nautilus-file-private.h -@@ -198,6 +198,7 @@ struct NautilusFileDetails - eel_boolean_bit has_open_window : 1; - - eel_boolean_bit is_launcher : 1; -+ eel_boolean_bit is_foreign_link : 1; - eel_boolean_bit is_symlink : 1; - eel_boolean_bit is_mountpoint : 1; - eel_boolean_bit is_hidden : 1; -Index: nautilus-2.24.1/libnautilus-private/nautilus-file.c -=================================================================== ---- nautilus-2.24.1.orig/libnautilus-private/nautilus-file.c -+++ nautilus-2.24.1/libnautilus-private/nautilus-file.c -@@ -332,6 +332,7 @@ nautilus_file_clear_info (NautilusFile * - file->details->thumbnailing_failed = FALSE; - - file->details->is_launcher = FALSE; -+ file->details->is_foreign_link = FALSE; - file->details->is_symlink = FALSE; - file->details->is_hidden = FALSE; - file->details->is_backup = FALSE; -@@ -2791,7 +2792,10 @@ nautilus_file_should_show (NautilusFile - if (nautilus_file_is_in_trash (file)) { - return TRUE; - } else { -- return (show_hidden || (!nautilus_file_is_hidden_file (file) && !is_file_hidden (file))) && -+ return (show_hidden || -+ (!nautilus_file_is_hidden_file (file) && !is_file_hidden (file) && -+ !(nautilus_file_is_in_desktop (file) -+ && nautilus_file_is_foreign_link (file)))) && - (show_backup || !nautilus_file_is_backup_file (file)); - } - } -@@ -3196,6 +3200,12 @@ nautilus_file_is_launcher (NautilusFile - } - - gboolean -+nautilus_file_is_foreign_link (NautilusFile *file) -+{ -+ return file->details->is_foreign_link; -+} -+ -+gboolean - nautilus_file_has_activation_uri (NautilusFile *file) - { - return file->details->activation_location != NULL; -Index: nautilus-2.24.1/libnautilus-private/nautilus-file.h -=================================================================== ---- nautilus-2.24.1.orig/libnautilus-private/nautilus-file.h -+++ nautilus-2.24.1/libnautilus-private/nautilus-file.h -@@ -397,6 +397,7 @@ GList *nautilus_file_li - * Getting this can require reading the contents of the file. - */ - gboolean nautilus_file_is_launcher (NautilusFile *file); -+gboolean nautilus_file_is_foreign_link (NautilusFile *file); - gboolean nautilus_file_has_activation_uri (NautilusFile *file); - char * nautilus_file_get_activation_uri (NautilusFile *file); - GFile * nautilus_file_get_activation_location (NautilusFile *file); -Index: nautilus-2.24.1/libnautilus-private/nautilus-link.c -=================================================================== ---- nautilus-2.24.1.orig/libnautilus-private/nautilus-link.c -+++ nautilus-2.24.1/libnautilus-private/nautilus-link.c -@@ -430,6 +430,23 @@ nautilus_link_local_get_link_uri (const - return retval; - } - -+static gboolean -+string_array_contains (char **array, -+ const char *str) -+{ -+ char **p; -+ -+ if (!array) -+ return FALSE; -+ -+ for (p = array; *p; p++) -+ if (g_ascii_strcasecmp (*p, str) == 0) { -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ - void - nautilus_link_get_link_info_given_file_contents (const char *file_contents, - int link_file_size, -@@ -437,10 +454,13 @@ nautilus_link_get_link_info_given_file_c - char **uri, - char **name, - char **icon, -- gboolean *is_launcher) -+ gboolean *is_launcher, -+ gboolean *is_foreign) - { - GnomeDesktopItem *desktop_file; - const char *type; -+ char **only_show_in; -+ char **not_show_in; - - if (!is_link_data (file_contents, link_file_size)) { - return; -@@ -464,7 +484,20 @@ nautilus_link_get_link_info_given_file_c - gnome_desktop_item_get_string (desktop_file, "Exec") != NULL) { - *is_launcher = TRUE; - } -- -+ -+ *is_foreign = FALSE; -+ only_show_in = gnome_desktop_item_get_strings (desktop_file, GNOME_DESKTOP_ITEM_ONLY_SHOW_IN); -+ if (only_show_in && !string_array_contains (only_show_in, "GNOME")) { -+ *is_foreign = TRUE; -+ } -+ g_strfreev (only_show_in); -+ -+ not_show_in = gnome_desktop_item_get_strings (desktop_file, "NotShowIn"); /* bleh, there isn't GNOME_DESKTOP_ITEM_NO_SHOW_IN */ -+ if (not_show_in && string_array_contains (not_show_in, "GNOME")) { -+ *is_foreign = TRUE; -+ } -+ g_strfreev (not_show_in); -+ - gnome_desktop_item_unref (desktop_file); - } - -Index: nautilus-2.24.1/libnautilus-private/nautilus-link.h -=================================================================== ---- nautilus-2.24.1.orig/libnautilus-private/nautilus-link.h -+++ nautilus-2.24.1/libnautilus-private/nautilus-link.h -@@ -47,7 +47,8 @@ void nautilus_link_get_link_ - char **uri, - char **name, - char **icon, -- gboolean *is_launcher); -+ gboolean *is_launcher, -+ gboolean *is_foreign); - void nautilus_link_local_create_from_gnome_entry (GnomeDesktopItem *entry, - const char *dest_uri, - const GdkPoint *position, diff --git a/nautilus-desktop-icon.patch b/nautilus-desktop-icon.patch deleted file mode 100644 index ed89015..0000000 --- a/nautilus-desktop-icon.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: nautilus-2.19.91/nautilus-search.desktop.in -=================================================================== ---- nautilus-2.19.91.orig/nautilus-search.desktop.in -+++ nautilus-2.19.91/nautilus-search.desktop.in -@@ -103,7 +103,7 @@ Comment[xh]=Ukufumana iifayili, iziqulat - Comment[zh_CN]=在您的计算机上查找文件、文件夹和文档 - Comment[zh_TW]=在電腦中搜尋檔案、資料夾和文件 - Exec=nautilus --no-desktop x-nautilus-search: --Icon=stock_search -+Icon=system-search - Terminal=false - Type=Application - StartupNotify=true diff --git a/nautilus-disable-zoom-control-and-view-as-option-menu.patch b/nautilus-disable-zoom-control-and-view-as-option-menu.patch deleted file mode 100644 index f3df196..0000000 --- a/nautilus-disable-zoom-control-and-view-as-option-menu.patch +++ /dev/null @@ -1,61 +0,0 @@ -? depcomp -? nautilus-disable-zoom-control-and-view-as-option-menu.patch -? nautilus-folder-handler.desktop -? stamp-h1 -? src/.nautilus-navigation-window.c.swp -? src/nautilus-navigation-window.c.joe -Index: src/nautilus-navigation-window.c -=================================================================== ---- src/nautilus-navigation-window.c.orig -+++ src/nautilus-navigation-window.c -@@ -197,7 +197,9 @@ nautilus_navigation_window_init (Nautilu - GtkUIManager *ui_manager; - GtkWidget *toolbar; - GtkWidget *location_bar; -+#if 0 - GtkWidget *view_as_menu_vbox; -+#endif - GtkToolItem *item; - GtkWidget *hbox, *vbox, *eventbox, *extras_vbox; - -@@ -302,6 +304,7 @@ nautilus_navigation_window_init (Nautilu - window->search_bar, - TRUE, TRUE, 0); - -+#if 0 - /* Option menu for content view types; it's empty here, filled in when a uri is set. - * Pack it into vbox so it doesn't grow vertically when location bar does. - */ -@@ -315,12 +318,15 @@ nautilus_navigation_window_init (Nautilu - gtk_toolbar_insert (GTK_TOOLBAR (location_bar), - item, -1); - -+#endif - window->view_as_combo_box = gtk_combo_box_new_text (); -+#if 0 - gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (window->view_as_combo_box), FALSE); - gtk_box_pack_end (GTK_BOX (view_as_menu_vbox), window->view_as_combo_box, TRUE, FALSE, 0); - gtk_widget_show (window->view_as_combo_box); - g_signal_connect_object (window->view_as_combo_box, "changed", - G_CALLBACK (view_as_menu_switch_views_callback), window, 0); -+#endif - - /* Allocate the zoom control and place on the right next to the menu. - * It gets shown later, if the view-frame contains something zoomable. -@@ -338,13 +344,15 @@ nautilus_navigation_window_init (Nautilu - g_signal_connect_object (window->zoom_control, "zoom_to_default", - G_CALLBACK (nautilus_window_zoom_to_default), - window, G_CONNECT_SWAPPED); -- -+ -+#if 0 - item = gtk_tool_item_new (); - gtk_container_set_border_width (GTK_CONTAINER (item), GNOME_PAD_SMALL); - gtk_widget_show (GTK_WIDGET (item)); - gtk_container_add (GTK_CONTAINER (item), window->zoom_control); - gtk_toolbar_insert (GTK_TOOLBAR (location_bar), - item, 1); -+#endif - - gtk_widget_show (location_bar); - diff --git a/nautilus-genericname.patch b/nautilus-genericname.patch deleted file mode 100644 index 8fedf7a..0000000 --- a/nautilus-genericname.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: nautilus.desktop.in -================================================================================ ---- nautilus.desktop.in.in -+++ nautilus.desktop.in.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - Encoding=UTF-8 - _Name=File Browser --_Comment=Browse the file system with the file manager -+_GenericName=Browse the file system with the file manager - TryExec=nautilus - Exec=nautilus --no-desktop --browser %U - Icon=gnome-fs-directory diff --git a/nautilus-new-windows-after-mount.patch b/nautilus-new-windows-after-mount.patch deleted file mode 100644 index e89b543..0000000 --- a/nautilus-new-windows-after-mount.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: libnautilus-private/nautilus-mime-actions.c -=================================================================== ---- libnautilus-private/nautilus-mime-actions.c (revision 14785) -+++ libnautilus-private/nautilus-mime-actions.c (working copy) -@@ -1327,6 +1327,7 @@ - NautilusFile *file; - GFile *location; - GMountOperation *mount_op; -+ GList *l, *next; - - if (parameters->not_mounted != NULL) { - file = parameters->not_mounted->data; -@@ -1348,6 +1349,14 @@ - return; - } - -+ /* once the mount is finished, refresh all attributes */ -+ /* - fixes new windows not appearing after successful mount */ -+ for (l = parameters->files; l != NULL; l = next) { -+ file = NAUTILUS_FILE (l->data); -+ next = l->next; -+ nautilus_file_invalidate_all_attributes (file); -+ } -+ - nautilus_file_list_call_when_ready - (parameters->files, - nautilus_mime_actions_get_required_file_attributes () | NAUTILUS_FILE_ATTRIBUTE_LINK_INFO, diff --git a/nautilus.changes b/nautilus.changes index 665a3d9..a4fb18a 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,89 @@ +------------------------------------------------------------------- +Tue Feb 3 07:47:57 EST 2009 - mboman@suse.de + +- Update to version 2.25.4: + + Don't show desktop files from other desktops than Gnome on the + desktop + + Support crossfades of desktop backgrounds + + Don't snap desktop icons outside right margin + + Fix crashes and leaks +- nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff + was removed. Fixed upstream +- Remove nautilus-456702-trash-restore.patch. Fixed upstream + (See bgo#555234) + +------------------------------------------------------------------- +Wed Jan 28 20:47:27 CET 2009 - vuntz@novell.com + +- Manual merge from GNOME:Factory:Next, and update to 2.25.3. +- Update to version 2.25.3: + + Remove CD/DVD creator from places menu and sidebar + + Allow deleting custom emblems + + Fix crashes + + Don't show read-only emblems in trash + + Trash performance fixes + + General performance fixes + + Update to new PackageKit API +- Changes from version 2.25.2: + + Merged eel into nautilus + + Use single glib/gtk includes + + Support PackageKit application search + + Fix new windows not appearing after successful mount + + Remove support for old KDE trash dirs +- Changes from version 2.25.1: + + Remove depencency on libgnome & gnome-vfs + + Fix crashes + + Chop trailing space characters when moving to FAT file system + + When DnD'ing, COPY instead of MOVE, when the source is not + deletable + + Don't set default when opening with other app, just add to open + with list. + + Don't make copies of files from readonly source (e.g. CDROM) + readonly + + Don't show cancel dialog when showing the "run or display" + dialog +- nautilus-sysadmin-desktop-items.diff needs to be rebased. +- nautilus-146947-rename-bad-parameters-message.diff also needs to + be rebased, also someone needs to investigate if it's still + needed. +- Drop nautilus-genericname.patch: we use %update_desktop_file. +- Drop nautilus-new-windows-after-mount.patch: fixed upstream. +- Drop nautilus-disable-zoom-control-and-view-as-option-menu.patch: + we don't want to diverge from upstream like this. Fix bnc#462077. +- Drop nautilus-181941-i18n.patch: it's already fixed upstream, and + the patch was respinned without any reason. +- Drop nautilus-212649-search-bar-visibility.patch: the search bar + is visible when you go to x-nautilus-search:/// and we didn't + apply the patch anyway. +- Drop nautilus-330298-297983-fix-overlapping-desktop-icons.diff: + the patch wasn't applied and it's been fixed upstream since quite + some time. +- Merge nautilus-desktop-icon.patch in + nautilus-bgo350950-search-desktop.diff since it's what it was + patching. +- Update + nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff + to use GKeyFile. +- Trivial update to + nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff +- Remove useless BuildRequires: cdparanoia, eel-devel (included in + nautilus now), gvfs-devel, libidl-devel, librsvg-devel, and + perl-XML-Parser. +- Note: we keep libgnomeui-devel because the included libbackground + needs it. +- Add BuildRequires on libxml2-devel and unique-devel. + +------------------------------------------------------------------- +Wed Jan 28 18:36:33 CET 2009 - vuntz@novell.com + +- Updated nautilus-456702-trash-restore.patch to use the patch + committed upstream. + +------------------------------------------------------------------- +Thu Jan 22 17:41:39 CST 2009 - mxwu@novell.com + +- Added nautilus-456702-trash-restore.patch (bnc#456702) + ------------------------------------------------------------------- Thu Dec 4 20:39:39 CST 2008 - hpj@novell.com diff --git a/nautilus.spec b/nautilus.spec index 286d314..a42f39e 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.24.1) +# spec file for package nautilus (Version 2.25.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,6 @@ Name: nautilus -BuildRequires: cdparanoia -BuildRequires: eel-devel BuildRequires: fdupes BuildRequires: fontconfig-devel BuildRequires: gnome-common @@ -28,20 +26,18 @@ BuildRequires: gnome-desktop-devel BuildRequires: gnome-icon-theme BuildRequires: gnome-patch-translation BuildRequires: gtk-doc -BuildRequires: gvfs-devel BuildRequires: intltool BuildRequires: libbeagle-devel BuildRequires: libexempi-devel BuildRequires: libexif-devel BuildRequires: libgnomeui-devel -BuildRequires: libidl-devel -BuildRequires: librsvg-devel -BuildRequires: perl-XML-Parser +BuildRequires: libxml2-devel +BuildRequires: unique-devel BuildRequires: update-desktop-files License: GPL v2 or later Group: Productivity/File utilities -Version: 2.24.1 -Release: 7 +Version: 2.25.4 +Release: 1 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -50,29 +46,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch4: nautilus-bgo350950-search-desktop.diff # PATCH-FIX-UPSTREAM nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff bnc117333 bgo350962 federico@novell.com - Use a folder icon instead of a file cabinet window Patch5: nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff -# PATCH-FIX-OPENSUSE nautilus-genericname.patch -Patch6: nautilus-genericname.patch -# PATCH-FIX-OPENSUSE nautilus-disable-zoom-control-and-view-as-option-menu.patch -Patch7: nautilus-disable-zoom-control-and-view-as-option-menu.patch -# PATCH-FIX-UPSTREAM nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com +# PATCH-NEEDS-REBASE nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com -- The upstream bug is still open, so we need to check if it's still needed (you just need a samba share to test). If yes, we should port the patch to gio Patch9: nautilus-146947-rename-bad-parameters-message.diff -# PATCH-FIX-UPSTREAM nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff bnc366100 bgo338933 federico@novell.com - ignore OnlyShowIn=KDE -Patch11: nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff -# PATCH-NEEDS-REBASE nautilus-212649-search-bar-visibility.patch bgo368424 federico@novell.com -- (was PATCH-FIX-UPSTREAM) -Patch12: nautilus-212649-search-bar-visibility.patch # PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bgo335411 federico@novell.com Patch15: nautilus-drives-and-volumes-on-desktop.diff -Patch17: nautilus-181941-i18n.patch -# PATCH-NEEDS-REBASE nautilus-330298-297983-fix-overlapping-desktop-icons.diff bgo330928 federico@novell.com -Patch18: nautilus-330298-297983-fix-overlapping-desktop-icons.diff -# PATCH-FIX-OPENSUSE nautilus-desktop-icon.patch -Patch19: nautilus-desktop-icon.patch # PATCH-FIX-OPENSUSE nautilus-bnc363122-lockdown-context-menus.diff bnc363122 federico@novell.com Patch20: nautilus-bnc363122-lockdown-context-menus.diff -# PATCH-FEATURE-OPENSUSE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items +# PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE) Patch21: nautilus-sysadmin-desktop-items.diff -# PATCH-FIX-UPSTREAM nautilus-new-windows-after-mount.patch bgo524485 bnc437780 hpj@suse.de -- Fix browser windows that sometimes don't show. -Patch22: nautilus-new-windows-after-mount.patch Requires: %{name}-lang = %{version} Requires: gvfs # So that symlinks to icons work: @@ -108,19 +89,11 @@ features of the Nautilus file manager. gnome-patch-translation-prepare %patch4 -p1 %patch5 -p1 -%patch6 -p0 -%patch7 -%patch9 -p0 +#%patch9 -p0 ### %patch10 -%patch11 -p1 -### %patch12 ### %patch15 -p1 -%patch17 -p1 -### %patch18 -p1 -%patch19 -p1 %patch20 -p1 -%patch21 -p1 -%patch22 -p0 +#%patch21 -p1 gnome-patch-translation-update %build @@ -191,13 +164,18 @@ fi %{_datadir}/pixmaps/*.png %{_datadir}/icons/hicolor/*/*/*.* %{_libdir}/*.so.* -%{_libdir}/bonobo/servers/*.server -%{_mandir}/man1/nautilus*.1.gz +%doc %{_mandir}/man1/nautilus*.1.gz %dir %{_libdir}/nautilus %dir %{_libdir}/nautilus/extensions-1.0 %dir %{_libdir}/nautilus/extensions-2.0 %files lang -f %{name}.lang +# remove the comment on the %if once bnc#470409 is fixed +#%if %suse_version <= 1110 +# exclude locales which don't exist on old versions of openSUSE +%exclude %{_datadir}/locale/ha/LC_MESSAGES/* +%exclude %{_datadir}/locale/ig/LC_MESSAGES/* +#%endif %files devel %defattr(-,root,root) @@ -208,6 +186,80 @@ fi %{_datadir}/gtk-doc/html/libnautilus-extension %changelog +* Tue Feb 03 2009 mboman@suse.de +- Update to version 2.25.4: + + Don't show desktop files from other desktops than Gnome on the + desktop + + Support crossfades of desktop backgrounds + + Don't snap desktop icons outside right margin + + Fix crashes and leaks +- nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff + was removed. Fixed upstream +- Remove nautilus-456702-trash-restore.patch. Fixed upstream + (See bgo#555234) +* Wed Jan 28 2009 vuntz@novell.com +- Manual merge from GNOME:Factory:Next, and update to 2.25.3. +- Update to version 2.25.3: + + Remove CD/DVD creator from places menu and sidebar + + Allow deleting custom emblems + + Fix crashes + + Don't show read-only emblems in trash + + Trash performance fixes + + General performance fixes + + Update to new PackageKit API +- Changes from version 2.25.2: + + Merged eel into nautilus + + Use single glib/gtk includes + + Support PackageKit application search + + Fix new windows not appearing after successful mount + + Remove support for old KDE trash dirs +- Changes from version 2.25.1: + + Remove depencency on libgnome & gnome-vfs + + Fix crashes + + Chop trailing space characters when moving to FAT file system + + When DnD'ing, COPY instead of MOVE, when the source is not + deletable + + Don't set default when opening with other app, just add to open + with list. + + Don't make copies of files from readonly source (e.g. CDROM) + readonly + + Don't show cancel dialog when showing the "run or display" + dialog +- nautilus-sysadmin-desktop-items.diff needs to be rebased. +- nautilus-146947-rename-bad-parameters-message.diff also needs to + be rebased, also someone needs to investigate if it's still + needed. +- Drop nautilus-genericname.patch: we use %%update_desktop_file. +- Drop nautilus-new-windows-after-mount.patch: fixed upstream. +- Drop nautilus-disable-zoom-control-and-view-as-option-menu.patch: + we don't want to diverge from upstream like this. Fix bnc#462077. +- Drop nautilus-181941-i18n.patch: it's already fixed upstream, and + the patch was respinned without any reason. +- Drop nautilus-212649-search-bar-visibility.patch: the search bar + is visible when you go to x-nautilus-search:/// and we didn't + apply the patch anyway. +- Drop nautilus-330298-297983-fix-overlapping-desktop-icons.diff: + the patch wasn't applied and it's been fixed upstream since quite + some time. +- Merge nautilus-desktop-icon.patch in + nautilus-bgo350950-search-desktop.diff since it's what it was + patching. +- Update + nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff + to use GKeyFile. +- Trivial update to + nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.diff +- Remove useless BuildRequires: cdparanoia, eel-devel (included in + nautilus now), gvfs-devel, libidl-devel, librsvg-devel, and + perl-XML-Parser. +- Note: we keep libgnomeui-devel because the included libbackground + needs it. +- Add BuildRequires on libxml2-devel and unique-devel. +* Wed Jan 28 2009 vuntz@novell.com +- Updated nautilus-456702-trash-restore.patch to use the patch + committed upstream. +* Thu Jan 22 2009 mxwu@novell.com +- Added nautilus-456702-trash-restore.patch (bnc#456702) * Thu Dec 04 2008 hpj@novell.com - Added nautilus-new-windows-after-mount.patch (bnc#437780, bgo#524485).