Code freeze break request

[Alexander Larsson]

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);


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Vincent Untz]

Hi Alex,

Le vendredi 07 mars 2008, à 12:33 +0100, Alexander Larsson a écrit :

> 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);
>  }

Why aren't you using _()? Else, approval 1 of 2.

> 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.

Looks good to me. Approval 1 of 2.

Vincent

--
Les gens heureux ne sont pas pressés.
_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Alexander Larsson]

On Fri, 2008-03-07 at 12:36 +0100, Vincent Untz wrote:

> > --- 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);
> >  }
>
> Why aren't you using _()? Else, approval 1 of 2.

Wouldn't that mark it for translation?


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Vincent Untz]

Le vendredi 07 mars 2008, à 12:38 +0100, Alexander Larsson a écrit :

>
> On Fri, 2008-03-07 at 12:36 +0100, Vincent Untz wrote:
>
> > > --- 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);
> > >  }
> >
> > Why aren't you using _()? Else, approval 1 of 2.
>
> Wouldn't that mark it for translation?

I think not. It only mark things for translation when they are constant
strings (as in "something") and not when they are variables. At least, I
seriously hope it does this :-)

Vincent

--
Les gens heureux ne sont pas pressés.
_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Kjartan Maraas]

fr., 07.03.2008 kl. 12.40 +0100, skrev Vincent Untz:

> Le vendredi 07 mars 2008, à 12:38 +0100, Alexander Larsson a écrit :
> >
> > On Fri, 2008-03-07 at 12:36 +0100, Vincent Untz wrote:
> >
> > > > --- 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);
> > > >  }
> > >
> > > Why aren't you using _()? Else, approval 1 of 2.
> >
> > Wouldn't that mark it for translation?
>
> I think not. It only mark things for translation when they are constant
> strings (as in "something") and not when they are variables. At least, I
> seriously hope it does this :-)
>
>From gi18n.h:

#define  _(String) gettext (String)

:-)

Cheers
Kjartan


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Alexander Larsson]

On Fri, 2008-03-07 at 12:43 +0100, Kjartan Maraas wrote:

> fr., 07.03.2008 kl. 12.40 +0100, skrev Vincent Untz:
> > Le vendredi 07 mars 2008, à 12:38 +0100, Alexander Larsson a écrit :
> > >
> > > On Fri, 2008-03-07 at 12:36 +0100, Vincent Untz wrote:
> > >
> > > > > --- 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);
> > > > >  }
> > > >
> > > > Why aren't you using _()? Else, approval 1 of 2.
> > >
> > > Wouldn't that mark it for translation?
> >
> > I think not. It only mark things for translation when they are constant
> > strings (as in "something") and not when they are variables. At least, I
> > seriously hope it does this :-)
> >
> >From gi18n.h:
> #define  _(String) gettext (String)

Sure, the question is not what the code does, but how the gettext/pofile
machinery handles it.

_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Kjartan Maraas]

fr., 07.03.2008 kl. 12.51 +0100, skrev Alexander Larsson:

> On Fri, 2008-03-07 at 12:43 +0100, Kjartan Maraas wrote:
> > fr., 07.03.2008 kl. 12.40 +0100, skrev Vincent Untz:
> > > Le vendredi 07 mars 2008, à 12:38 +0100, Alexander Larsson a écrit :
> > > >
> > > > On Fri, 2008-03-07 at 12:36 +0100, Vincent Untz wrote:
> > > >
> > > > > > --- 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);
> > > > > >  }
> > > > >
> > > > > Why aren't you using _()? Else, approval 1 of 2.
> > > >
> > > > Wouldn't that mark it for translation?
> > >
> > > I think not. It only mark things for translation when they are constant
> > > strings (as in "something") and not when they are variables. At least, I
> > > seriously hope it does this :-)
> > >
> > >From gi18n.h:
> > #define  _(String) gettext (String)
>
> Sure, the question is not what the code does, but how the gettext/pofile
> machinery handles it.
>

It handles it with _() as well IIRC. I've seen that used in many places
and never found such things in the po-files.

Cheers
Kjartan


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Alexander Larsson]

On Fri, 2008-03-07 at 13:02 +0100, Kjartan Maraas wrote:

> fr., 07.03.2008 kl. 12.51 +0100, skrev Alexander Larsson:
> > On Fri, 2008-03-07 at 12:43 +0100, Kjartan Maraas wrote:
> > > fr., 07.03.2008 kl. 12.40 +0100, skrev Vincent Untz:
> > > > Le vendredi 07 mars 2008, à 12:38 +0100, Alexander Larsson a écrit :
> > > > >
> > > > > On Fri, 2008-03-07 at 12:36 +0100, Vincent Untz wrote:
> > > > >
> > > > > > > --- 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);
> > > > > > >  }
> > > > > >
> > > > > > Why aren't you using _()? Else, approval 1 of 2.
> > > > >
> > > > > Wouldn't that mark it for translation?
> > > >
> > > > I think not. It only mark things for translation when they are constant
> > > > strings (as in "something") and not when they are variables. At least, I
> > > > seriously hope it does this :-)
> > > >
> > > >From gi18n.h:
> > > #define  _(String) gettext (String)
> >
> > Sure, the question is not what the code does, but how the gettext/pofile
> > machinery handles it.
> >
> It handles it with _() as well IIRC. I've seen that used in many places
> and never found such things in the po-files.

Other places in nautilus use gettext() for this case. I doubt it matters
either way. Anyway, can i get a 2nd ack?

_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Andre Klapper]

Am Freitag, den 07.03.2008, 13:49 +0100 schrieb Alexander Larsson:

> On Fri, 2008-03-07 at 13:02 +0100, Kjartan Maraas wrote:
> > fr., 07.03.2008 kl. 12.51 +0100, skrev Alexander Larsson:
> > > On Fri, 2008-03-07 at 12:43 +0100, Kjartan Maraas wrote:
> > > > fr., 07.03.2008 kl. 12.40 +0100, skrev Vincent Untz:
> > > > > Le vendredi 07 mars 2008, à 12:38 +0100, Alexander Larsson a écrit :
> > > > > >
> > > > > > On Fri, 2008-03-07 at 12:36 +0100, Vincent Untz wrote:
> > > > > >
> > > > > > > > --- 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);
> > > > > > > >  }
> > > > > > >
> > > > > > > Why aren't you using _()? Else, approval 1 of 2.
> > > > > >
> > > > > > Wouldn't that mark it for translation?
> > > > >
> > > > > I think not. It only mark things for translation when they are constant
> > > > > strings (as in "something") and not when they are variables. At least, I
> > > > > seriously hope it does this :-)
> > > > >
> > > > >From gi18n.h:
> > > > #define  _(String) gettext (String)
> > >
> > > Sure, the question is not what the code does, but how the gettext/pofile
> > > machinery handles it.
> > >
> > It handles it with _() as well IIRC. I've seen that used in many places
> > and never found such things in the po-files.
>
> Other places in nautilus use gettext() for this case. I doubt it matters
> either way. Anyway, can i get a 2nd ack?

approval 2 of 2.

andre
--
 mailto:ak-47@... | failed
 http://www.iomc.de/  | http://blogs.gnome.org/aklapper


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[David Zeuthen]

On Fri, 2008-03-07 at 12:33 +0100, Alexander Larsson wrote:
> 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.

I'm fundamentally against bending over for broken apps. At the very
least please make a note in the release notes / NEWS / whatever that
states that this thing is only something for 2.22 and it's going to
change for 2.24. Also want to note that, by then, apps then either need
to start using gio or do something else like making sure they can access
the USB device.

Also, a much nicer solution than this hammer is to introduce simple exec
wrapper for each app that unmounts the gphoto2 mount using gvfs-mount.

All in all I'd much rather punt this to the distros.

     David


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[David Zeuthen]

On Fri, 2008-03-07 at 12:21 -0500, David Zeuthen wrote:

> On Fri, 2008-03-07 at 12:33 +0100, Alexander Larsson wrote:
> > 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.
>
> I'm fundamentally against bending over for broken apps. At the very
> least please make a note in the release notes / NEWS / whatever that
> states that this thing is only something for 2.22 and it's going to
> change for 2.24. Also want to note that, by then, apps then either need
> to start using gio or do something else like making sure they can access
> the USB device.

FWIW, there's already a bug I filed Monday

 http://bugzilla.gnome.org/show_bug.cgi?id=520026

    David


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[David Zeuthen]

On Fri, 2008-03-07 at 12:33 +0100, Alexander Larsson wrote:
> 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.

Also, just FYI, this will disable the "you've inserted a device with
pictures" autorun feature that now lives in Nautilus. So if we do this
users will get no feedback, other than icons in computer:/// and the
Nautilus sidebar, about device insertion which is a regression.

       David


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Frederic Crozat]

Le vendredi 07 mars 2008 à 12:21 -0500, David Zeuthen a écrit :

> On Fri, 2008-03-07 at 12:33 +0100, Alexander Larsson wrote:
> > 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.
>
> I'm fundamentally against bending over for broken apps. At the very
> least please make a note in the release notes / NEWS / whatever that
> states that this thing is only something for 2.22 and it's going to
> change for 2.24. Also want to note that, by then, apps then either need
> to start using gio or do something else like making sure they can access
> the USB device.
>
> Also, a much nicer solution than this hammer is to introduce simple exec
> wrapper for each app that unmounts the gphoto2 mount using gvfs-mount.

I don't see that as a nicer solution.

--
Frederic Crozat <fcrozat@...>
Mandriva

_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Frederic Crozat]

Le vendredi 07 mars 2008 à 12:36 -0500, David Zeuthen a écrit :

> On Fri, 2008-03-07 at 12:33 +0100, Alexander Larsson wrote:
> > 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.
>
> Also, just FYI, this will disable the "you've inserted a device with
> pictures" autorun feature that now lives in Nautilus. So if we do this
> users will get no feedback, other than icons in computer:/// and the
> Nautilus sidebar, about device insertion which is a regression.

Well, since gnome-volume-manager is still not dead and it still managing
digital cameras (even with Matthias patch to disable mount and
multimedia stuff), user will get notification.

--
Frederic Crozat <fcrozat@...>
Mandriva

_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[David Zeuthen]

On Fri, 2008-03-07 at 19:07 +0100, Frederic Crozat wrote:
> Well, since gnome-volume-manager is still not dead and it still managing
> digital cameras (even with Matthias patch to disable mount and
> multimedia stuff), user will get notification.

Think about it. If that is true then we had a bug before Alex's patch to
disable the gphoto2 backend (we'd get multiple notifications). IOW,
probably needs patching of g-v-m. Someone should check that.

(And, on a more general note, it's too bad that GNOME is so worried
about app compat that we're turning off new and shiny gvfs features.
What makes it especially ridiculous (and inexcusable) is that vendors
have the source already and can fix the offending apps.. and there's
always the unmount wrapper too. Kinda makes me wonder what the hell the
point is and why I bothered writing a gphoto2 backend at all.)

       David


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Vincent Untz]

Hi David,

Le vendredi 07 mars 2008, à 13:58 -0500, David Zeuthen a écrit :

> On Fri, 2008-03-07 at 19:07 +0100, Frederic Crozat wrote:
> > Well, since gnome-volume-manager is still not dead and it still managing
> > digital cameras (even with Matthias patch to disable mount and
> > multimedia stuff), user will get notification.
>
> Think about it. If that is true then we had a bug before Alex's patch to
> disable the gphoto2 backend (we'd get multiple notifications). IOW,
> probably needs patching of g-v-m. Someone should check that.
>
> (And, on a more general note, it's too bad that GNOME is so worried
> about app compat that we're turning off new and shiny gvfs features.
> What makes it especially ridiculous (and inexcusable) is that vendors
> have the source already and can fix the offending apps.. and there's
> always the unmount wrapper too. Kinda makes me wonder what the hell the
> point is and why I bothered writing a gphoto2 backend at all.)

Let me disagree: it's bad to give no notice to people that things will
break if they don't update something. We have to notify maintainers of
the relevant applications. Let's give them 6 months.

Vincent

--
Les gens heureux ne sont pas pressés.
_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[David Zeuthen]

On Fri, 2008-03-07 at 20:37 +0100, Vincent Untz wrote:
> > (And, on a more general note, it's too bad that GNOME is so worried
> > about app compat that we're turning off new and shiny gvfs features.
> > What makes it especially ridiculous (and inexcusable) is that vendors
> > have the source already and can fix the offending apps.. and there's
> > always the unmount wrapper too. Kinda makes me wonder what the hell the
> > point is and why I bothered writing a gphoto2 backend at all.)
>
> Let me disagree: it's bad to give no notice

A working gphoto2 backend landed before the freeze (on 2/24); and the
initial work was committed even earlier (on 1/18) ...

> to people that things will
> break if they don't update something. We have to notify maintainers of
> the relevant applications. Let's give them 6 months.

.... however I don't want to paint this black and white because reality
often is a lot more complex. Also gio/gvfs is such a huge feature that
it requires some bending of the rules (in both ways as we have seen).
Also, the request came from Alex and he's the gvfs maintainer and all so
it's really his call.

But I can assure you it's pretty off-putting doing work that ends up,
effectively, not getting used. It's especially annoying because punting
this to the vendors is such an obvious choice. So I still maintain this
is the wrong decision. Anyway, I won't waste your time drama-queeing
more about this as we're going to remove this kludge for 2.23/2.24 and
work with applications authors to make sure their applications work well
with GNOME.

      David


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Christian Kellner-4]

Hey guys,

> 1 - Translate cd media names, like N_("Blank CD-ROM Disc"):
I have an update version of the first patch. We didnt use the
correct gettext version for it and forgot about another location.
Sebastien Bacher spotted the error and confirmed it works.

Good to commit?

Cheers,
Christian

Index: hal/ghalmount.c
===================================================================
--- hal/ghalmount.c (revision 1611)
+++ hal/ghalmount.c (working copy)
@@ -209,9 +209,9 @@
     }
   
   if (is_blank)
-    return gettext(disc_data[n].ui_name_blank);
+    return dgettext (GETTEXT_PACKAGE, disc_data[n].ui_name_blank);
   else
-    return gettext(disc_data[n].ui_name);
+    return dgettext (GETTEXT_PACKAGE, disc_data[n].ui_name);
 }
 
 typedef struct _MountIconSearchData
Index: hal/ghalvolume.c
===================================================================
--- hal/ghalvolume.c (revision 1611)
+++ hal/ghalvolume.c (working copy)
@@ -184,9 +184,9 @@
     }
   
   if (is_blank)
-    return disc_data[n].ui_name_blank;
+    return dgettext (GETTEXT_PACKAGE, disc_data[n].ui_name_blank);
   else
-    return disc_data[n].ui_name;
+    return dgettext (GETTEXT_PACKAGE, disc_data[n].ui_name);
 }



_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Andre Klapper]

Am Freitag, den 07.03.2008, 21:17 +0100 schrieb Christian Kellner:
> > 1 - Translate cd media names, like N_("Blank CD-ROM Disc"):
> I have an update version of the first patch. We didnt use the
> correct gettext version for it and forgot about another location.
> Sebastien Bacher spotted the error and confirmed it works.
>
> Good to commit?

yes. approval 1 of 2.

andre

> Index: hal/ghalmount.c
> ===================================================================
> --- hal/ghalmount.c (revision 1611)
> +++ hal/ghalmount.c (working copy)
> @@ -209,9 +209,9 @@
>      }
>    
>    if (is_blank)
> -    return gettext(disc_data[n].ui_name_blank);
> +    return dgettext (GETTEXT_PACKAGE, disc_data[n].ui_name_blank);
>    else
> -    return gettext(disc_data[n].ui_name);
> +    return dgettext (GETTEXT_PACKAGE, disc_data[n].ui_name);
>  }
>  
>  typedef struct _MountIconSearchData
> Index: hal/ghalvolume.c
> ===================================================================
> --- hal/ghalvolume.c (revision 1611)
> +++ hal/ghalvolume.c (working copy)
> @@ -184,9 +184,9 @@
>      }
>    
>    if (is_blank)
> -    return disc_data[n].ui_name_blank;
> +    return dgettext (GETTEXT_PACKAGE, disc_data[n].ui_name_blank);
>    else
> -    return disc_data[n].ui_name;
> +    return dgettext (GETTEXT_PACKAGE, disc_data[n].ui_name);
>  }
>
> _______________________________________________
> release-team mailing list
> release-team@...
> http://mail.gnome.org/mailman/listinfo/release-team

--

 mailto:ak-47@... | failed
 http://www.iomc.de/  | http://blogs.gnome.org/aklapper


_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list

[Vincent Untz]

Le vendredi 07 mars 2008, à 22:19 +0100, Andre Klapper a écrit :
> Am Freitag, den 07.03.2008, 21:17 +0100 schrieb Christian Kellner:
> > > 1 - Translate cd media names, like N_("Blank CD-ROM Disc"):
> > I have an update version of the first patch. We didnt use the
> > correct gettext version for it and forgot about another location.
> > Sebastien Bacher spotted the error and confirmed it works.
> >
> > Good to commit?
>
> yes. approval 1 of 2.

Approval 2 of 2. I must say that using _() would have help avoid this
issue ;-) lalalalala :-)

Vincent

--
Les gens heureux ne sont pas pressés.
_______________________________________________
gnome-vfs-list mailing list
gnome-vfs-list@...
http://mail.gnome.org/mailman/listinfo/gnome-vfs-list