Changeset 3516


Ignore:
Timestamp:
04/09/08 00:29:49 (5 years ago)
Author:
alanbach-guest
Message:
  • New upstream stable release, Sync'd with Debian 2.22.2-1
Location:
pkg/viola/main/nautilus/trunk/debian
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • pkg/viola/main/nautilus/trunk/debian/changelog

    r3436 r3516  
    1 nautilus (2.22.1-parsix1) unstable; urgency=low 
    2  
     1nautilus (2.22.2-parsix1) unstable; urgency=low 
     2 
     3  * New upstream stable release, Sync'd with Debian 2.22.2-1 
     4 
     5 -- Alan Baghumian <alan@technotux.org>  Wed, 09 Apr 2008 00:28:49 +0200 
     6 
     7nautilus (2.22.2-1) experimental; urgency=high 
     8 
     9  * New upstream bugfix release: 
     10    + debian/patches/05_places-sidebar_single-click.patch: 
     11      - Updated to apply cleanly again. 
     12 
     13 -- Sebastian Dröge <slomo@debian.org>  Tue, 08 Apr 2008 18:48:04 +0200 
     14 
     15nautilus (2.22.1-1) experimental; urgency=low 
     16 
     17  * 05_places-sidebar_single-click.patch: Update from bugzilla and enable 
     18    again as it should work good now and is more consistent with the 
     19    GTK file chooser. 
     20  * New upstream bugfix release: 
     21    + debian/patches/03_sftp_connect.patch, 
     22      debian/patches/04_show_backup_files.patch, 
     23      debian/patches/15_tracker_check.patch, 
     24      debian/patches/90_from_svn_mount_connect_to_server_locations.patch, 
     25      debian/patches/90_from_svn_fix_changing_default_application.patch: 
     26      - Dropped, emrged upstream. 
     27 
     28 -- Sebastian Dröge <slomo@debian.org>  Fri, 28 Mar 2008 22:12:12 +0100 
     29 
     30nautilus (2.22.0-3) experimental; urgency=low 
     31 
     32  * Disable 05_places-sidebar_single-click.patch as it's buggy. 
     33  * Remove 18_disable_signal_handler.patch, it's better fixed upstream. 
     34  * Remove 06_dont_create_Desktop.patch, --no-desktop is meant as a switch 
     35    to not show icons on the desktop and not creating the desktop directory 
     36    creates all kinds of broken links in nautilus. 
     37  * Remove 08_folder_handler.patch, this is upstream already. 
     38  * Disable 10_location_titlebar.patch, this gives completely unwanted results 
     39    for thrash:// for example or when the filesystem uses something else 
     40    than UTF8 as encoding (%XX stuff in the title). 
     41    See http://bugzilla.gnome.org/show_bug.cgi?id=142087 
     42  * 90_from_svn_mount_connect_to_server_locations.patch, Added. Mounts location 
     43    in the connect to server dialog. Patch taken from the Ubuntu package. 
     44 
     45 -- Sebastian Dröge <slomo@debian.org>  Wed, 19 Mar 2008 16:22:08 +0100 
     46 
     47nautilus (2.22.0-2) experimental; urgency=low 
     48 
     49  * Disable 07_desktop_file_activation.patch for now, it breaks in an 
     50    unintended way. 
     51 
     52 -- Sebastian Dröge <slomo@debian.org>  Wed, 19 Mar 2008 11:10:42 +0100 
     53 
     54nautilus (2.22.0-1) experimental; urgency=low 
     55 
     56  [ Loic Minier ] 
     57  * Add a nautilus-extensions-1.0 Provide to nautilus to express the fact that 
     58    nautilus will search for extensions in /usr/lib/nautilus/extensions-1.0; 
     59    this might avoid a long list of Conflicts in nautilus when updating to 
     60    extensions-2.0 (nautilus >= 2.21.2). 
     61 
     62  [ Josselin Mouette ] 
     63  * Demote fam to a Suggests; only g-d-e really needs to recommend it. 
     64 
     65  [ Sebastian Dröge ] 
    366  * New upstream stable release: 
    4    - dropped 03_sftp_connect, 04_show_backup_files, 15_tracker_check,  
    5      90_from_svn_fix_changing_default_application and  
    6      90_from_svn_mount_connect_to_server_locations, merged upstream 
    7  
    8  -- Alan Baghumian <alan@technotux.org>  Sat, 29 Mar 2008 14:22:24 +0100 
    9  
    10 nautilus (2.22.0-parsix2) unstable; urgency=low 
    11  
    12   * Added 90_from_svn_mount_connect_to_server_locations.patch 
    13   * Dropped 08_folder_handler.patch, merged upstream 
    14  
    15  -- Alan Baghumian <alan@technotux.org>  Thu, 20 Mar 2008 08:38:18 +0100 
    16  
    17 nautilus (2.22.0-parsix1) unstable; urgency=low 
    18  
    19   * New upstream stable release 
    20   * Merged some updates from Ubuntu 
    21  
    22  -- Alan Baghumian <alan@technotux.org>  Sat, 15 Mar 2008 08:19:37 +0100 
    23  
    24 nautilus (2.20.0-parsix3) unstable; urgency=low 
    25  
    26   * Sync'd with Debian 2.20.0-3 
    27  
    28  -- Alan Baghumian <alan@technotux.org>  Sun, 03 Feb 2008 12:48:11 +0330 
     67    + Upload to experimental first because of intrusive changes. 
     68    + debian/control.in: 
     69      - Update build dependencies and dependencies. 
     70    + debian/rules: 
     71      - Bump shlibs. 
     72    + debian/patches/01_prompt_same_file.patch, 
     73      debian/patches/16_missing_thumbnails.patch, 
     74      debian/patches/20_upstream_nautilus-dnd-user-owned.patch, 
     75      debian/patches/21_nautilus_xmp.patch, 
     76      debian/patches/23_thumbnails_add-border.patch, 
     77      debian/patches/11_gnomevfs_query_eject.patch: 
     78      - Dropped, merged upstream. 
     79    + debian/patches/06_dont_create_Desktop.patch: 
     80      - Updated to apply cleanly again. 
     81    + debian/patches/07_desktop_file_activation.patch: 
     82      - Updated to apply cleanly again. 
     83    + debian/patches/10_location_titlebar.patch: 
     84      - Updated to apply cleanly again. 
     85    + debian/patches/14_sidebar_network-protocol.patch: 
     86      - Updated to apply cleanly again. 
     87    + debian/patches/99_ltmain_as-needed.patch: 
     88      - Updated to apply cleanly again. 
     89    + debian/patches/90_from_svn_fix_changing_default_application.patch: 
     90      - Make changing the default application work again, patch taken from 
     91        the Ubuntu package. 
     92    + debian/patches/18_disable_signal_handler.patch: 
     93      - Don't use the logging code signal handler it's buggy and makes 
     94        nautilus being stuck and eat cpu on crash. Patch taken from the 
     95        Ubuntu package. 
     96 
     97 -- Sebastian Dröge <slomo@debian.org>  Sun, 16 Mar 2008 20:30:48 +0100 
    2998 
    3099nautilus (2.20.0-3) unstable; urgency=low 

  • pkg/viola/main/nautilus/trunk/debian/control

    r3276 r3516  
    22Section: gnome 
    33Priority: optional 
    4 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> 
    5 XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> 
    6 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> 
     4Maintainer: Josselin Mouette <joss@debian.org> 
     5Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Loic Minier <lool@dooz.org>, Sebastian Dröge <slomo@debian.org> 
    76Build-Depends: debhelper (>= 5), 
    87               cdbs (>= 0.4.41), 
    … …  
    3332               libpango1.0-dev (>= 1.1.2), 
    3433               x11proto-core-dev, 
     34               libtrackerclient-dev (>= 0.0.1), 
     35               libbeagle-dev, 
    3536               libexempi-dev (>= 1.99.5), 
    3637               intltool (>= 0.35.0) 
     38Homepage: http://www.gnome.org/projects/nautilus/ 
     39VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/ 
     40VCS-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/nautilus/ 
    3741Standards-Version: 3.7.3 
    3842 
    3943Package: nautilus 
    4044Architecture: any 
    41 Provides: nautilus-extensions-2.0 
    4245Depends: ${shlibs:Depends}, 
    4346         ${misc:Depends}, 
    … …  
    4851         desktop-file-utils (>= 0.7), 
    4952         gvfs-backends 
     53Provides: nautilus-extensions-2.0 
    5054Recommends: desktop-base (>= 0.2), 
    5155            eject, 
    5256            nautilus-cd-burner (>= 2.6), 
    5357            librsvg2-common, 
    54             gamin | fam, 
    5558            xdg-user-dirs 
    5659Suggests: eog, 
    5760          evince | pdf-viewer, 
    58           totem | mp3-decoder 
     61          totem | mp3-decoder, 
     62          tracker, 
     63          fam 
    5964Conflicts: libnautilus2-2, 
    6065           libnautilus2-dev 
    … …  
    6873 Several icon themes and components for viewing different kinds of files 
    6974 are available in separate packages. 
    70  . 
    71  URL: http://www.gnome.org/projects/nautilus/ 
    7275 
    7376Package: nautilus-dbg 
    … …  
    8588 are available in separate packages. 
    8689 . 
    87  URL: http://www.gnome.org/projects/nautilus/ 
    88  .  
    8990 This development package contains unstripped binaries compiled with 
    9091 debugging symbols needed by gdb. 
    … …  
    107108Section: libdevel 
    108109Depends: libnautilus-extension1 (= ${binary:Version}), 
     110         libglib2.0-dev (>= 2.15.6), 
    109111         libgtk2.0-dev (>= 2.10.0), 
    110112         ${shlibs:Depends} 
    … …  
    122124Depends: scrollkeeper, ${misc:Depends} 
    123125Conflicts: nautilus (<< 2.14.1-3) 
    124 Replaces: nautilus (<< 2.16) 
    125126Recommends: nautilus 
    126127Description: data files for nautilus 

  • pkg/viola/main/nautilus/trunk/debian/control.in

    r3276 r3516  
    22Section: gnome 
    33Priority: optional 
    4 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> 
    5 XSBC-Original-Maintainer: Josselin Mouette <joss@debian.org> 
     4Maintainer: Josselin Mouette <joss@debian.org> 
    65Uploaders: @GNOME_TEAM@ 
    76Build-Depends: debhelper (>= 5), 
    … …  
    3332               libpango1.0-dev (>= 1.1.2), 
    3433               x11proto-core-dev, 
     34               libtrackerclient-dev (>= 0.0.1), 
     35               libbeagle-dev, 
    3536               libexempi-dev (>= 1.99.5), 
    3637               intltool (>= 0.35.0) 
     38Homepage: http://www.gnome.org/projects/nautilus/ 
     39VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/ 
     40VCS-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/nautilus/ 
    3741Standards-Version: 3.7.3 
    3842 
    3943Package: nautilus 
    4044Architecture: any 
    41 Provides: nautilus-extensions-2.0 
    4245Depends: ${shlibs:Depends}, 
    4346         ${misc:Depends}, 
    … …  
    4851         desktop-file-utils (>= 0.7), 
    4952         gvfs-backends 
     53Provides: nautilus-extensions-2.0 
    5054Recommends: desktop-base (>= 0.2), 
    5155            eject, 
    5256            nautilus-cd-burner (>= 2.6), 
    5357            librsvg2-common, 
    54             gamin | fam, 
    5558            xdg-user-dirs 
    5659Suggests: eog, 
    5760          evince | pdf-viewer, 
    58           totem | mp3-decoder 
     61          totem | mp3-decoder, 
     62          tracker, 
     63          fam 
    5964Conflicts: libnautilus2-2, 
    6065           libnautilus2-dev 
    … …  
    6873 Several icon themes and components for viewing different kinds of files 
    6974 are available in separate packages. 
    70  . 
    71  URL: http://www.gnome.org/projects/nautilus/ 
    7275 
    7376Package: nautilus-dbg 
    … …  
    8588 are available in separate packages. 
    8689 . 
    87  URL: http://www.gnome.org/projects/nautilus/ 
    88  .  
    8990 This development package contains unstripped binaries compiled with 
    9091 debugging symbols needed by gdb. 
    … …  
    107108Section: libdevel 
    108109Depends: libnautilus-extension1 (= ${binary:Version}), 
     110         libglib2.0-dev (>= 2.15.6), 
    109111         libgtk2.0-dev (>= 2.10.0), 
    110112         ${shlibs:Depends} 
    … …  
    122124Depends: scrollkeeper, ${misc:Depends} 
    123125Conflicts: nautilus (<< 2.14.1-3) 
    124 Replaces: nautilus (<< 2.16) 
    125126Recommends: nautilus 
    126127Description: data files for nautilus 

  • pkg/viola/main/nautilus/trunk/debian/nautilus-connect-server.1

    r3275 r3516  
    33.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection 
    44.\" other parameters are allowed: see man(7), man(1) 
    5 .TH  nautilus-connect-server 1 "01 Jun 2007" 
     5.TH nautilus-connect-server 1 "05 Jan 2008" 
    66.\" Please adjust this date whenever revising the manpage. 
    77.\" 
    … …  
    1717.\" for manpage-specific macros, see man(7) 
    1818.SH NAME 
    19 Nautilus Connect Server - To Access a remote server 
     19Nautilus Connect Server \- To Access a remote server 
    2020.SH SYNOPSIS 
    2121.B nautilus-connect-server 
    2222.RI [ options ] 
    23 .br 
     23.RI [ URI ] 
    2424.SH DESCRIPTION 
    2525This manual page documents briefly the 
    2626.B nautilus-connect-server 
    27 command.  This manual page was written for the Ubuntu distribution 
    28 because the original program does not have a manual page. 
     27command. 
    2928.PP 
    3029Nautilus Connect Server is the connection manager for the GNOME desktop. 
    3130.PP 
    32 You can use the file manager to access a remote server, be it an FTP site,  
     31You can use the file manager to access a remote server, be it an FTP site, 
    3332a Windows share, a WebDav server or an SSH server. 
    34 .br 
    3533.SH OPTIONS 
    3634Nautilus follows the usual GNU command line syntax, with long options starting 
    3735with two dashes (`-'). A summary of options is included below. 
    3836.TP 
    39 .B \-\-display 
    40 X display to use 
    41 .TP 
    4237.B \-\-help 
    4338Show a summary of options. 
     39.TP 
     40.B \-\-version 
     41Show version. 
    4442.TP 
    4543Other standard GNOME options not listed here are also supported. 
    4644.SH SEE ALSO 
    4745Nautilus Connect Server documentation can be found from the "Help" menu, or by pressing the 
    48 F1 key. Nautilus also has a website at 
    49 http://www.gnome.org/projects/nautilus/ 
     46F1 key. Nautilus also has a website at http://www.gnome.org/projects/nautilus/ 
    5047.SH AUTHOR 
    51 This manual page was written by Fernando Ribeiro <fernando@staff.nerdgroup.org>  
    52 for the Ubuntu system (but may be used by others). 
     48This manual page was written by Julian Andres Klode <jak@jak-linux.org> for the 
     49Debian GNU/Linux system (but may be used by others), based on a manpage by 
     50Fernando Ribeiro <fernando@staff.nerdgroup.org>. 

  • pkg/viola/main/nautilus/trunk/debian/nautilus.1

    r3275 r3516  
    1717.\" for manpage-specific macros, see man(7) 
    1818.SH NAME 
    19 nautilus \- the GNOME File Manager 
     19Nautilus \- the GNOME File Manager 
    2020.SH SYNOPSIS 
    2121.B nautilus 

  • pkg/viola/main/nautilus/trunk/debian/patches/05_places-sidebar_single-click.patch

    r3275 r3516  
    1 --- nautilus-2.21.1.orig/src/nautilus-places-sidebar.c  2007-12-20 12:48:15.000000000 +0100 
    2 +++ nautilus-2.21.1/src/nautilus-places-sidebar.c       2008-01-07 14:35:50.000000000 +0100 
    3 @@ -565,11 +565,11 @@ 
     1GNOME #355760 
     2 
     3Index: nautilus/src/nautilus-places-sidebar.c 
     4=================================================================== 
     5--- nautilus/src/nautilus-places-sidebar.c      (revision 13957) 
     6+++ nautilus/src/nautilus-places-sidebar.c      (working copy) 
     7@@ -580,27 +580,6 @@ 
    48 } 
    59  
    610 static void 
    7 -row_activated_callback (GtkTreeView *tree_view, 
    8 -                       GtkTreePath *path, 
    9 -                       GtkTreeViewColumn *column, 
    10 +cursor_changed_callback (GtkTreeView *tree_view, 
    11                         gpointer user_data) 
     11-update_click_policy (NautilusPlacesSidebar *sidebar) 
     12-{ 
     13-       int policy; 
     14-        
     15-       policy = eel_preferences_get_enum (NAUTILUS_PREFERENCES_CLICK_POLICY); 
     16-        
     17-       eel_gtk_tree_view_set_activate_on_single_click 
     18-               (sidebar->tree_view, policy == NAUTILUS_CLICK_POLICY_SINGLE); 
     19-} 
     20- 
     21-static void 
     22-click_policy_changed_callback (gpointer user_data) 
     23-{ 
     24-       NautilusPlacesSidebar *sidebar; 
     25-        
     26-       sidebar = NAUTILUS_PLACES_SIDEBAR (user_data); 
     27- 
     28-       update_click_policy (sidebar); 
     29-} 
     30- 
     31-static void 
     32 desktop_location_changed_callback (gpointer user_data) 
    1233 { 
    13 +       GtkTreePath *path; 
    14 +       gtk_tree_view_get_cursor (tree_view, &path, NULL); 
    15         open_selected_bookmark (NAUTILUS_PLACES_SIDEBAR (user_data), 
    16                                 gtk_tree_view_get_model (tree_view), 
    17                                 path, 
    18 @@ -1944,8 +1944,8 @@ 
    19         gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); 
     34        NautilusPlacesSidebar *sidebar; 
     35@@ -1950,11 +1929,8 @@ 
     36        g_signal_connect (tree_view, "button-press-event", 
     37                          G_CALLBACK (bookmarks_button_press_event_cb), sidebar); 
    2038  
    21         g_signal_connect_object 
    22 -               (tree_view, "row_activated",  
    23 -                G_CALLBACK (row_activated_callback), sidebar, 0); 
    24 +               (tree_view, "cursor_changed",  
    25 +                G_CALLBACK (cursor_changed_callback), sidebar, 0); 
     39-       eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_CLICK_POLICY, 
     40-                                                 click_policy_changed_callback, 
     41-                                                 sidebar, 
     42-                                                 G_OBJECT (sidebar)); 
     43-       update_click_policy (sidebar); 
     44+       eel_gtk_tree_view_set_activate_on_single_click (sidebar->tree_view, 
     45+                                                       TRUE); 
    2646  
    27   
    28         gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (tree_view), 
     47        eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, 
     48                                                  desktop_location_changed_callback, 

  • pkg/viola/main/nautilus/trunk/debian/patches/07_desktop_file_activation.patch

    r3275 r3516  
    1 See Debian #408556, #408948. 
    2  
    3 --- nautilus-2.21.1.orig/libnautilus-private/nautilus-file.c    2007-12-20 16:48:14.000000000 +0100 
    4 +++ nautilus-2.21.1/libnautilus-private/nautilus-file.c 2008-01-07 15:11:12.000000000 +0100 
    5 @@ -40,6 +40,7 @@ 
     1Fixes two security issues about disguised .desktop files. 
     2Debian #408556, GNOME #405291 
     3Debian #408948, GNOME #405052 
     4diff -Naur nautilus-2.22.0.old/libnautilus-private/nautilus-file.c nautilus-2.22.0/libnautilus-private/nautilus-file.c 
     5--- nautilus-2.22.0.old/libnautilus-private/nautilus-file.c     2008-03-19 16:04:39.000000000 +0100 
     6+++ nautilus-2.22.0/libnautilus-private/nautilus-file.c 2008-03-19 16:06:54.000000000 +0100 
     7@@ -41,6 +41,7 @@ 
    68 #include "nautilus-link.h" 
    79 #include "nautilus-metadata.h" 
    … …  
    1113 #include "nautilus-search-directory-file.h" 
    1214 #include "nautilus-thumbnails.h" 
    13 @@ -2978,6 +2979,33 @@ 
    14                  monitor_remove, (file, client)); 
    15  }                             
     15@@ -1084,6 +1085,46 @@ 
     16        return g_file_get_child (dir, eel_ref_str_peek (file->details->name)); 
     17 } 
    1618  
    1719+static gboolean 
    … …  
    1921+{ 
    2022+       gboolean ret = TRUE; 
    21 +       char *uri = nautilus_file_get_uri (file); 
     23+       GFile *uri = nautilus_file_get_location (file); 
    2224+       char *path = NULL; 
     25+       char *scheme = NULL; 
    2326+ 
    2427+       if (uri) { 
    25 +               path = gnome_vfs_get_local_path_from_uri (uri); 
     28+               path = g_file_get_parse_name (uri); 
    2629+       } 
    2730+ 
    … …  
    3235+               ret = FALSE; 
    3336+       } 
     37+        
     38+       scheme = g_file_get_uri_scheme (file); 
     39+       if (scheme != NULL && strncmp (scheme, "file://", 7) == 0) { 
     40+         char *path_tmp = path + 7; 
    3441+ 
    35 +       if (file->details->info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_IDS && 
    36 +           file->details->info->uid && 
    37 +           (uid_t) file->details->info->uid != geteuid ()) 
     42+         if (eel_str_has_prefix (path, "/mnt") || 
     43+             eel_str_has_prefix (path, "/media")) { 
     44+               ret = FALSE; 
     45+         } 
     46+       } 
     47+       g_free (scheme); 
     48+ 
     49+       if (file->details->uid != -1 && 
     50+           file->details->uid != 0 && 
     51+           (uid_t) file->details->uid != geteuid ()) 
    3852+               ret = FALSE; 
    3953+ 
    40 +       g_free (uri); 
     54+       g_object_unref (uri); 
    4155+       g_free (path); 
    4256+       return ret; 
    4357+} 
    44   
    45  /* Return the uri associated with the passed-in file, which may not be 
    46   * the actual uri if the file is an desktop file or a nautilus 
    47 @@ -2988,7 +3016,9 @@ 
     58+ 
     59 /* Return the actual uri associated with the passed-in file. */ 
     60 char * 
     61 nautilus_file_get_uri (NautilusFile *file) 
     62@@ -3053,7 +3094,8 @@ 
    4863 { 
    4964        g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL); 
    5065  
    5166-       if (file->details->activation_location != NULL) { 
    52 +       if ((file->details->activation_location != NULL) && 
    53 +           (!eel_str_has_prefix (file->details->activation_location, NAUTILUS_DESKTOP_COMMAND_SPECIFIER) || 
    54 +                safe_to_launch_desktop_file (file))) { 
     67+       if (file->details->activation_location != NULL && 
     68+           safe_to_launch_desktop_file (file)) { 
    5569                return g_file_get_uri (file->details->activation_location); 
    5670        } 
    5771         
    58 @@ -5764,6 +5794,12 @@ 
    59         return nautilus_file_is_mime_type (file, "application/x-desktop"); 
     72@@ -3065,7 +3107,8 @@ 
     73 { 
     74        g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL); 
     75  
     76-       if (file->details->activation_location != NULL) { 
     77+       if (file->details->activation_location != NULL && 
     78+           safe_to_launch_desktop_file (file)) { 
     79                return g_object_ref (file->details->activation_location); 
     80        } 
     81         
     82diff -Naur nautilus-2.22.0.old/libnautilus-private/nautilus-mime-actions.c nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c 
     83--- nautilus-2.22.0.old/libnautilus-private/nautilus-mime-actions.c     2008-03-19 16:04:39.000000000 +0100 
     84+++ nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c 2008-03-19 16:04:48.000000000 +0100 
     85@@ -727,7 +727,8 @@ 
     86 { 
     87   return (nautilus_file_is_directory (file) || 
     88          NAUTILUS_IS_DESKTOP_ICON_FILE (file) || 
     89-         nautilus_file_is_nautilus_link (file)); 
     90+         (nautilus_file_is_nautilus_link (file) && 
     91+          !nautilus_file_is_launcher (file))); 
    6092 } 
    6193  
    62 +gboolean 
    63 +nautilus_file_is_desktop_launcher (NautilusFile *file) 
    64 +{ 
    65 +       return eel_str_has_prefix (file->details->activation_uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER); 
    66 +} 
    67 + 
    68  /** 
    69   * nautilus_file_is_directory 
    70   *  
    71 --- nautilus-2.21.1.orig/src/file-manager/fm-directory-view.c   2008-01-07 14:35:36.000000000 +0100 
    72 +++ nautilus-2.21.1/src/file-manager/fm-directory-view.c        2008-01-07 15:21:57.000000000 +0100 
    73 @@ -4197,9 +4197,11 @@ 
    74         for (node = selection; node != NULL; node = node->next) { 
     94 static ActivationAction 
     95diff -Naur nautilus-2.22.0.old/src/file-manager/fm-directory-view.c nautilus-2.22.0/src/file-manager/fm-directory-view.c 
     96--- nautilus-2.22.0.old/src/file-manager/fm-directory-view.c    2008-03-19 16:04:39.000000000 +0100 
     97+++ nautilus-2.22.0/src/file-manager/fm-directory-view.c        2008-03-19 16:04:48.000000000 +0100 
     98@@ -4264,9 +4264,11 @@ 
     99  
    75100                file = NAUTILUS_FILE (node->data); 
    76101  
    … …  
    78103-                       (!nautilus_mime_file_opens_in_view (file) || 
    79104-                        nautilus_file_is_directory (file)); 
    80 +               if (activation_action != ACTIVATION_ACTION_OPEN_IN_APPLICATION && 
    81 +                       (NAUTILUS_IS_DESKTOP_ICON_FILE (file) || 
    82 +                            nautilus_file_is_nautilus_link (file))) { 
     105+               if (nautilus_mime_file_opens_in_external_app (file) && 
     106+                   (NAUTILUS_IS_DESKTOP_ICON_FILE (file) || 
     107+                    nautilus_file_is_nautilus_link (file))) { 
    83108+                       other_applications_visible = FALSE; 
    84109+               } 
    … …  
    86111  
    87112        default_app = NULL; 
    88 --- nautilus-2.21.1.orig/libnautilus-private/nautilus-file.h    2007-12-14 11:25:48.000000000 +0100 
    89 +++ nautilus-2.21.1/libnautilus-private/nautilus-file.h 2008-01-07 15:03:55.000000000 +0100 
    90 @@ -177,6 +177,7 @@ 
    91  char *                  nautilus_file_get_symbolic_link_target_uri      (NautilusFile                   *file); 
    92  gboolean                nautilus_file_is_broken_symbolic_link           (NautilusFile                   *file); 
    93  gboolean                nautilus_file_is_nautilus_link                  (NautilusFile                   *file); 
    94 +gboolean                nautilus_file_is_desktop_launcher               (NautilusFile                   *file); 
    95  gboolean                nautilus_file_is_executable                     (NautilusFile                   *file); 
    96  gboolean                nautilus_file_is_directory                      (NautilusFile                   *file); 
    97  gboolean                nautilus_file_is_in_trash                       (NautilusFile                   *file); 
    98 --- nautilus-2.21.1.orig/libnautilus-private/nautilus-mime-actions.c    2008-01-07 15:18:21.000000000 +0100 
    99 +++ nautilus-2.21.1/libnautilus-private/nautilus-mime-actions.c 2008-01-07 15:19:14.000000000 +0100 
    100 @@ -702,7 +702,8 @@ 
    101  { 
    102    return (nautilus_file_is_directory (file) || 
    103           NAUTILUS_IS_DESKTOP_ICON_FILE (file) || 
    104 -         nautilus_file_is_nautilus_link (file)); 
    105 +         (nautilus_file_is_nautilus_link (file) && 
    106 +              !nautilus_file_is_desktop_launcher (file))); 
    107  } 
    108   
    109  static ActivationAction 

  • pkg/viola/main/nautilus/trunk/debian/patches/10_location_titlebar.patch

    r3275 r3516  
    1 See Debian #421027 
    2  
    3 --- nautilus-2.21.1.orig/libnautilus-private/apps_nautilus_preferences.schemas.in       2008-01-07 15:26:35.000000000 +0100 
    4 +++ nautilus-2.21.1/libnautilus-private/apps_nautilus_preferences.schemas.in    2008-01-07 15:28:31.000000000 +0100 
     1Debian #413018 
     2GNOME #142087 
     3Option to show the full location in the title bar 
     4Index: nautilus-2.20.0/libnautilus-private/apps_nautilus_preferences.schemas.in 
     5=================================================================== 
     6--- nautilus-2.20.0.orig/libnautilus-private/apps_nautilus_preferences.schemas.in       2007-09-18 08:51:48.000000000 +0200 
     7+++ nautilus-2.20.0/libnautilus-private/apps_nautilus_preferences.schemas.in    2007-09-24 11:39:14.871645609 +0200 
    58@@ -720,6 +720,21 @@ 
    69       </locale> 
    … …  
    2528       <key>/schemas/apps/nautilus/preferences/start_with_sidebar</key> 
    2629       <applyto>/apps/nautilus/preferences/start_with_sidebar</applyto> 
    27 --- nautilus-2.21.1.orig/libnautilus-private/nautilus-global-preferences.c      2007-12-14 10:36:31.000000000 +0100 
    28 +++ nautilus-2.21.1/libnautilus-private/nautilus-global-preferences.c   2008-01-07 15:28:31.000000000 +0100 
    29 @@ -347,6 +347,10 @@ 
     30Index: nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.c 
     31=================================================================== 
     32--- nautilus-2.20.0.orig/libnautilus-private/nautilus-global-preferences.c      2007-06-27 09:12:34.000000000 +0200 
     33+++ nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.c   2007-09-24 11:39:14.875645837 +0200 
     34@@ -378,6 +378,10 @@ 
    3035          PREFERENCE_BOOLEAN, 
    3136          GINT_TO_POINTER (TRUE) 
    … …  
    3843          PREFERENCE_BOOLEAN, 
    3944          GINT_TO_POINTER (TRUE) 
    40 --- nautilus-2.21.1.orig/libnautilus-private/nautilus-global-preferences.h      2008-01-07 15:26:35.000000000 +0100 
    41 +++ nautilus-2.21.1/libnautilus-private/nautilus-global-preferences.h   2008-01-07 15:28:31.000000000 +0100 
     45Index: nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.h 
     46=================================================================== 
     47--- nautilus-2.20.0.orig/libnautilus-private/nautilus-global-preferences.h      2007-06-27 09:12:34.000000000 +0200 
     48+++ nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.h   2007-09-24 11:39:14.875645837 +0200 
    4249@@ -84,6 +84,7 @@ 
    4350 #define NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR           "preferences/start_with_location_bar" 
    … …  
    4855 #define NAUTILUS_PREFERENCES_START_WITH_TOOLBAR                        "preferences/start_with_toolbar" 
    4956 #define NAUTILUS_PREFERENCES_SIDE_PANE_VIEW                     "preferences/side_pane_view" 
    50 --- nautilus-2.21.1.orig/src/nautilus-navigation-window.c       2007-12-14 11:22:42.000000000 +0100 
    51 +++ nautilus-2.21.1/src/nautilus-navigation-window.c    2008-01-07 15:28:31.000000000 +0100 
    52 @@ -927,20 +927,25 @@ 
     57Index: nautilus-2.20.0/src/nautilus-navigation-window.c 
     58=================================================================== 
     59--- nautilus-2.20.0.orig/src/nautilus-navigation-window.c       2007-09-03 16:49:27.000000000 +0200 
     60+++ nautilus-2.20.0/src/nautilus-navigation-window.c    2007-09-24 11:39:14.875645837 +0200 
     61@@ -914,20 +914,25 @@ 
    5362 static gboolean 
    5463 real_set_title (NautilusWindow *window, const char *title) 
    … …  
    7988  
    8089        return changed; 
    81 --- nautilus-2.21.1.orig/src/nautilus-spatial-window.c  2007-12-10 16:19:17.000000000 +0100 
    82 +++ nautilus-2.21.1/src/nautilus-spatial-window.c       2008-01-07 15:28:31.000000000 +0100 
    83 @@ -420,10 +420,14 @@ 
     90Index: nautilus-2.20.0/src/nautilus-spatial-window.c 
     91=================================================================== 
     92--- nautilus-2.20.0.orig/src/nautilus-spatial-window.c  2007-09-10 08:56:43.000000000 +0200 
     93+++ nautilus-2.20.0/src/nautilus-spatial-window.c       2007-09-24 11:39:14.875645837 +0200 
     94@@ -430,10 +430,14 @@ 
    8495                gtk_window_set_title (GTK_WINDOW (window), _("Nautilus")); 
    8596        } else if (changed) { 
    … …  
    97108  
    98109        return changed; 
    99 --- nautilus-2.21.1.orig/src/nautilus-window.c  2007-12-04 15:11:01.000000000 +0100 
    100 +++ nautilus-2.21.1/src/nautilus-window.c       2008-01-07 15:28:31.000000000 +0100 
    101 @@ -1704,3 +1704,90 @@ 
     110--- nautilus-2.22.0/src/nautilus-window.c.old   2008-03-17 10:49:47.000000000 +0100 
     111+++ nautilus-2.22.0/src/nautilus-window.c       2008-03-17 11:11:29.000000000 +0100 
     112@@ -1709,3 +1709,71 @@ 
    102113 { 
    103114        return (nautilus_window_get_window_type (window) != NAUTILUS_WINDOW_DESKTOP); 
    … …  
    108119+{ 
    109120+       char *location_title; 
    110 +       char *uri = NULL; 
     121+       GFile *uri = NULL; 
    111122+       char *location = NULL; 
    112 +       GnomeVFSURI *vfs_uri = NULL; 
    113123+       const char *path; 
    114124+       const char *scheme = NULL; 
    … …  
    123133+       if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) != TRUE 
    124134+           || (uri = nautilus_window_get_location (window)) == NULL 
    125 +           || (location = gnome_vfs_format_uri_for_display (uri)) == NULL 
     135+           || (location = g_file_get_parse_name (uri)) == NULL 
    126136+           || location[0] == 0 
    127137+           || location[1] == 0) 
    128138+               goto done; 
    129 + 
    130 +       if (location[0] != GNOME_VFS_URI_PATH_CHR) { 
    131 +               if ((vfs_uri = gnome_vfs_uri_new (location)) == NULL 
    132 +                    || (path = gnome_vfs_uri_get_path (vfs_uri)) == NULL 
    133 +                    || (scheme = gnome_vfs_uri_get_scheme (vfs_uri)) == NULL 
    134 +                    || path[0] == 0 
    135 +                    || strcmp (path, GNOME_VFS_URI_PATH_STR) == 0) 
    136 +                       goto done; 
    137 + 
    138 +               g_free(uri); 
    139 + 
    140 +               uri = gnome_vfs_unescape_string_for_display (path); 
    141 + 
    142 +               display_location = uri; 
    143 +               goto construct_title; 
    144 +       } 
    145139+ 
    146140+       if ((tmp_location = g_get_home_dir()) == NULL) { 
    … …  
    157151+       tmp_location_len = strlen (tmp_location); 
    158152+       if (eel_str_has_prefix (location, tmp_location) == FALSE 
    159 +           || location[tmp_location_len] != GNOME_VFS_URI_PATH_CHR) { 
     153+           || location[tmp_location_len] != G_DIR_SEPARATOR) { 
    160154+               display_location = location; 
    161155+               goto construct_title; 
    … …  
    180174+       done: 
    181175+               if (uri != NULL) 
    182 +                       g_free (uri); 
     176+                       g_object_unref (uri); 
    183177+ 
    184178+               if (location != NULL) 
    185179+                       g_free (location); 
    186180+ 
    187 +               if (vfs_uri != NULL) 
    188 +                       gnome_vfs_uri_unref (vfs_uri); 
    189 + 
    190181+               return (location_title); 
    191182+} 
    192 --- nautilus-2.21.1.orig/src/nautilus-window.h  2007-11-30 15:32:47.000000000 +0100 
    193 +++ nautilus-2.21.1/src/nautilus-window.h       2008-01-07 15:28:31.000000000 +0100 
     183+ 
     184--- nautilus-2.22.0/src/nautilus-window.h.old   2008-03-17 10:49:50.000000000 +0100 
     185+++ nautilus-2.22.0/src/nautilus-window.h       2008-03-17 10:51:45.000000000 +0100 
    194186@@ -152,5 +152,7 @@ 
    195187 void             nautilus_window_add_extra_location_widget (NautilusWindow  *window, 
    196188                                                             GtkWidget       *widget); 
    197189 gboolean         nautilus_window_has_menubar_and_statusbar (NautilusWindow *window); 
    198 +char *         nautilus_window_set_location_in_titlebar (NautilusWindow *window, 
    199 +                                                       const char        *title); 
     190+char *           nautilus_window_set_location_in_titlebar (NautilusWindow *window, 
     191+                                                           const char        *title); 
    200192  
    201193 #endif 

  • pkg/viola/main/nautilus/trunk/debian/patches/12_list-view_expand.patch

    r3275 r3516  
    1 --- nautilus-2.21.1.orig/src/file-manager/fm-list-view.c        2007-11-30 15:32:42.000000000 +0100 
    2 +++ nautilus-2.21.1/src/file-manager/fm-list-view.c     2008-01-07 15:50:04.000000000 +0100 
    3 @@ -67,7 +67,6 @@ 
     1Revert upstream commits r12779 and r13045. 
     2We can do this because we fix GNOME #316087 in our GTK+ packages. 
     3Index: nautilus-2.20.0/src/file-manager/fm-list-view.c 
     4=================================================================== 
     5--- nautilus-2.20.0.orig/src/file-manager/fm-list-view.c        2007-08-21 11:37:48.000000000 +0200 
     6+++ nautilus-2.20.0/src/file-manager/fm-list-view.c     2007-09-24 11:55:24.918925454 +0200 
     7@@ -69,7 +69,6 @@ 
    48 #include <libnautilus-private/nautilus-view-factory.h> 
    59 #include <libnautilus-private/nautilus-clipboard.h> 
    … …  
    913 struct FMListViewDetails { 
    1014        GtkTreeView *tree_view; 
    11 @@ -1363,7 +1362,7 @@ 
     15@@ -1338,7 +1337,7 @@ 
    1216  
    1317        for (l = nautilus_columns; l != NULL; l = l->next) { 
    … …  
    1822                char *label; 
    1923                float xalign; 
    20 @@ -1386,6 +1385,9 @@ 
     24@@ -1361,6 +1360,9 @@ 
    2125                        view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell; 
    2226                         
    … …  
    2832                        gtk_object_sink (GTK_OBJECT (view->details->file_name_column)); 
    2933                        view->details->file_name_column_num = column_num; 
    30 @@ -1407,7 +1409,11 @@ 
     34@@ -1382,7 +1384,11 @@ 
    3135                                                             "pixbuf_emblem", FM_LIST_MODEL_SMALLEST_EMBLEM_COLUMN, 
    3236                                                             NULL); 

  • pkg/viola/main/nautilus/trunk/debian/patches/14_sidebar_network-protocol.patch

    r3275 r3516  
    1 See Debian #434123. 
     1GNOME #350974 
    22 
    3 Index: nautilus-2.21.5/src/nautilus-places-sidebar.c 
    4 =================================================================== 
    5 --- nautilus-2.21.5.orig/src/nautilus-places-sidebar.c  2008-01-18 22:56:37.000000000 +0100 
    6 +++ nautilus-2.21.5/src/nautilus-places-sidebar.c       2008-01-18 22:58:52.000000000 +0100 
    7 @@ -364,6 +364,23 @@ 
     3--- nautilus/src/nautilus-places-sidebar.c.old  2008-03-17 10:33:00.000000000 +0100 
     4+++ nautilus/src/nautilus-places-sidebar.c      2008-03-17 10:39:21.000000000 +0100 
     5@@ -407,6 +407,17 @@ 
     6                g_object_unref (volume); 
    87        } 
    9         g_list_free (drives); 
    10   
     8        g_list_free (volumes); 
     9+        
    1110+       icon = g_themed_icon_new ("gnome-fs-network"); 
    1211+       mount_uri = "network:///"; 
    13 +       last_iter = add_place (sidebar, 
    14 +                              PLACES_BUILT_IN, 
    15 +                              _("Network Servers"), 
    16 +                              icon, 
    17 +                              mount_uri, 
    18 +                              NULL, 
    19 +                              NULL, 
    20 +                              NULL, 
    21 +                              0); 
     12+       last_iter = add_place (sidebar, PLACES_BUILT_IN, 
     13+                                     _("Network Servers"), icon, 
     14+                             mount_uri, NULL, NULL, NULL, 0); 
    2215+       g_object_unref (icon); 
    23 + 
     16+        
    2417+       if (strcmp (location, mount_uri) == 0) { 
    2518+               gtk_tree_selection_select_iter (selection, &last_iter); 
    2619+       } 
    27 + 
    28         /* add all volumes that is not associated with a drive */ 
    29         volumes = g_volume_monitor_get_volumes (volume_monitor); 
    30         for (l = volumes; l != NULL; l = l->next) { 
     20  
     21        /* add mounts that has no volume (/etc/mtab mounts, ftp, sftp,...) */ 
     22        mounts = g_volume_monitor_get_mounts (volume_monitor); 

  • pkg/viola/main/nautilus/trunk/debian/patches/99_ltmain_as-needed.patch

    r3275 r3516  
    1 --- nautilus-2.21.1.orig/ltmain.sh      2007-08-29 13:52:51.000000000 +0200 
    2 +++ nautilus-2.21.1/ltmain.sh   2008-01-07 16:39:30.000000000 +0100 
     1--- ltmain.sh.old       2007-10-09 07:38:25.000000000 +0200 
     2+++ ltmain.sh   2007-10-09 07:39:25.000000000 +0200 
    33@@ -1794,6 +1794,11 @@ 
    44        arg=`$echo "X$arg" | $Xsed -e "s/^ //"` 
    … …  
    99+       continue 
    1010+       ;; 
    11 +       
     11+ 
    1212       -Wl,*) 
    1313        args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` 
    1414        arg= 
    15 @@ -2134,6 +2139,15 @@ 
     15@@ -2137,6 +2142,15 @@ 
    1616        lib= 
    1717        found=no 

  • pkg/viola/main/nautilus/trunk/debian/patches/series

    r3436 r3516  
     105_places-sidebar_single-click.patch 
     2#07_desktop_file_activation.patch 
     3#10_location_titlebar.patch 
    1412_list-view_expand.patch 
    2514_sidebar_network-protocol.patch 
    3 99_ltmain_as-needed.patch 
     699_ltmain_as-needed.patch -p0 
Note: See TracChangeset for help on using the changeset viewer.