[Pkg-xfce-commits] r2116 - desktop/trunk/thunar/debian/patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-06-09 15:21:54 +0000 (Mon, 09 Jun 2008)
New Revision: 2116

Modified:
   desktop/trunk/thunar/debian/patches/06_support-encrypted-volumes.patch
Log:
refresh the patch so it doesn't remove the eject stuff in thunar


Modified: desktop/trunk/thunar/debian/patches/06_support-encrypted-volumes.patch
===================================================================
--- desktop/trunk/thunar/debian/patches/06_support-encrypted-volumes.patch	2008-06-09 14:20:27 UTC (rev 2115)
+++ desktop/trunk/thunar/debian/patches/06_support-encrypted-volumes.patch	2008-06-09 15:21:54 UTC (rev 2116)
@@ -117,24 +117,15 @@
    thunarvfs_volume_class->lookup_icon_name = thunar_vfs_volume_hal_lookup_icon_name;
    thunarvfs_volume_class->eject = thunar_vfs_volume_hal_eject;
    thunarvfs_volume_class->mount = thunar_vfs_volume_hal_mount;
-@@ -207,16 +211,53 @@
- static gboolean
- thunar_vfs_volume_hal_is_ejectable (ThunarVfsVolume *volume)
- {
--  /* check if HAL drive requires eject */
--  if (THUNAR_VFS_VOLUME_HAL (volume)->requires_eject)
--    return TRUE;
-+  return THUNAR_VFS_VOLUME_HAL (volume)->requires_eject;
-+}
+@@ -216,7 +220,49 @@
+ }
  
--  /* otherwise we can only eject removable media, that are present (surprise, surprise) */
--  return (thunar_vfs_volume_is_present (volume) && thunar_vfs_volume_is_removable (volume));
-+
+ 
 +static gboolean
 +thunar_vfs_volume_hal_is_crypto (ThunarVfsVolume *volume)
 +{
 +  return THUNAR_VFS_VOLUME_HAL (volume)->kind == THUNAR_VFS_VOLUME_KIND_CRYPTO;
- }
++}
  
 +static gboolean
 +thunar_vfs_volume_hal_is_crypto_setup (ThunarVfsVolume *volume)
@@ -143,10 +134,10 @@
 +  LibHalContext *hal_context = NULL;
 +  LibHalVolume *hal_volume = NULL;
 +  gchar *plain_udi = NULL;
- 
++
 +  if (THUNAR_VFS_VOLUME_HAL (volume)->kind != THUNAR_VFS_VOLUME_KIND_CRYPTO)
 +    return FALSE;
- 
++
 +  manager = thunar_vfs_volume_manager_get_default();
 +  g_return_val_if_fail(manager != NULL, FALSE);
 +  
@@ -176,7 +167,7 @@
  static const gchar*
  thunar_vfs_volume_hal_lookup_icon_name (ThunarVfsVolume *volume,
                                          GtkIconTheme    *icon_theme)
-@@ -282,25 +323,28 @@
+@@ -282,25 +328,28 @@
    if (G_LIKELY (result))
      {
        /* try to figure out where the device was mounted */
@@ -221,7 +212,7 @@
      }
  
    return result;
-@@ -326,7 +370,7 @@
+@@ -326,7 +375,7 @@
    if (G_LIKELY (result))
      {
        /* reset the status */
@@ -230,7 +221,7 @@
  
        /* emit "changed" on the volume */
        thunar_vfs_volume_changed (THUNAR_VFS_VOLUME (volume_hal));
-@@ -359,7 +403,6 @@
+@@ -359,7 +408,6 @@
        g_slist_foreach (mount_points, (GFunc) exo_mount_point_free, NULL);
        g_slist_free (mount_points);
      }
@@ -238,7 +229,7 @@
    return mount_point;
  }
  
-@@ -541,6 +584,10 @@
+@@ -541,6 +589,10 @@
    if(hv != NULL && libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)
      volume_hal->status |= THUNAR_VFS_VOLUME_STATUS_MOUNTABLE;
  
@@ -249,7 +240,7 @@
    /* check if the drive requires eject */
    volume_hal->requires_eject = libhal_drive_requires_eject (hd);
  
-@@ -686,6 +733,12 @@
+@@ -686,6 +738,12 @@
  }
  
  
@@ -262,7 +253,7 @@
  
  static void
  thunar_vfs_volume_manager_hal_class_init (ThunarVfsVolumeManagerHalClass *klass)
-@@ -1019,7 +1072,8 @@
+@@ -1019,7 +1077,8 @@
    if (G_LIKELY (hv != NULL))
      {
        /* check if we have a mountable file system here */