Code freeze break request

[Alexander Larsson <alexl redhat com>]

I'd like request to break the code freeze for two gvfs patches:

1 - Translate cd media names, like N_("Blank CD-ROM Disc"):

--- hal/ghalmount.c	(revision 1602)
+++ hal/ghalmount.c	(working copy)
@@ -209,9 +209,9 @@
     }
   
   if (is_blank)
-    return disc_data[n].ui_name_blank;
+    return gettext(disc_data[n].ui_name_blank);
   else
-    return disc_data[n].ui_name;
+    return gettext(disc_data[n].ui_name);
 }
 

2 - Don't automount gphoto:// volumes. This is problematic,
    as when they are mounted other apps can't access the device.
    Longterm they should ideally use gio to access the files so
    that everyone can share the connection and apps don't need
    gphoto specific code. However, atm the automount is causing
    problem by locking out apps using libgphoto directly.

--- hal/ghalvolume.c	(revision 1602)
+++ hal/ghalvolume.c	(working copy)
@@ -517,7 +517,10 @@
   HalDevice *drive_device;
   const char *storage_udi;
   const char *device_path;
-      
+  gboolean ignore_automount;
+
+  ignore_automount = FALSE;
+  
   if (hal_device_has_capability (device, "block"))
     {
       storage_udi = hal_device_get_property_string (device, "block.storage_device");
@@ -554,6 +557,10 @@
 
       if (foreign_mount_root == NULL)
         return NULL;
+
+      /* We don't want to automount cameras as the gphoto backend
+         blocks access from other apps */
+      ignore_automount = TRUE;
     }
 #endif
   else
@@ -570,7 +577,7 @@
   volume->drive_device = g_object_ref (drive_device);
   volume->foreign_mount_root = foreign_mount_root != NULL ? g_object_ref (foreign_mount_root) : NULL;
   volume->is_mountable = is_mountable;
-  volume->ignore_automount = ! hal_device_is_recently_plugged_in (device);
+  volume->ignore_automount = ignore_automount || ! hal_device_is_recently_plugged_in (device);
   
   g_signal_connect_object (device, "hal_property_changed", (GCallback) hal_changed, volume, 0);
   g_signal_connect_object (drive_device, "hal_property_changed", (GCallback) hal_changed, volume, 0);