Dave Miner-san wrote (10/31/08 07:12 AM):
> Erwann Chenede wrote:
>> Hi Dave,
>>
>> I've fixed the issue.
>> On the install side to avoid having to registration,
>> packagemanager and nextsteps icons
>> you'll need to modify the code that adds the .os-icons-installed
>> to something similar to the code below to cater for locale specific
>> directory names (e.g. Desktop become Bureau in French) :
>> if [ -f $HOME/.config/user-dirs.dirs ] ; then
>> . $HOME/.config/user-dirs.dirs
>> DESKTOP_DIR="$XDG_DESKTOP_DIR"
>> fi
>>
>> DESKTOP_DIR=${DESKTOP_DIR:-"$HOME/Desktop"}
>> MARKER_DIR="$DESKTOP_DIR"
>> MARKER=".os-icons-installed"
>>
>
> It appears that I don't need to go to these lengths, fortunately. We
> already pre-create the Desktop directory for jack as part of the
> construction, and so it ends up not being localized. This is perhaps a
> bug, but one I'll take advantage of for now, because the solution is
> simple in this context.
Yes, it's also a known bug for me.
But this implementation is needed beucase the English directory is the initial
login only.
1. jack log into a live session on locale A from LiveCD.
2. Log out the jack session.
3. Choose another locale B in GDM and log into the session.
4. XDG dialog shows if you change the directory names and choose yes.
5. Log out the session and log into the session on locale B again
Then the Nautilus shows the desktop as the localized one and your icons will be
missed.
I have the plan to fix Nautilus.
fujiwara
>
> Dave
>
>> Thanks,
>>
>> Erwann
>>
>>
>> Takao Fujiwara - Tokyo S/W Center wrote:
>>> Dave Miner-san wrote (10/13/08 11:35 PM):
>>>>> Do you mean three files, ddu.desktop, getting_started.desktop and
>>>>> install_opensolaris.desktop, are copied by the installer?
>>>>> If so, we can check packagemanager.desktop and
>>>>> register-opensolaris.desktop only?
>>>>>
>>>> I don't understand the question.
>>>>
>>>> ddu.desktop, getting_started.desktop, and
>>>> install_opensolaris.desktop are placed on the live CD desktop by the
>>>> SUNWslim-utils package. They will not be present in the desktop of
>>>> any installed user.
>>> I don't talking about the installed system but the LiveCD.
>>> Do you mean the installer put the three .desktop files in
>>> /jack/$DESKTOP ?
>>> I don't check who create the files on the desktop and my previous
>>> trial was to copy /jack/Desktop/*.desktop to the right
>>> /jack/$Desktop/*.desktop.
>>> If yes, probably I don't have to copy the three desktop files and the
>>> right fix is to modify the installer.
>>>
>>>>> Unfortunately jack/.gnome2/.os-icons-installed doesn't work at
>>>>> present and I'm moving it to jack/$DESKTOP/.os-icons-installed .
>>>>> The problem is $DESKTOP is changed when we change the locale in GDM
>>>>> login prompt.
>>>>>
>>>> Why doesn't it work? Why do you need to move the
>>>> .os-icons-installed marker? It would seem to be more correct for it
>>>> to be in .gnome2, not some variable location. This change would
>>>> appear to make it impossible (or at least very difficult) for us to
>>>> disable these icons on the live CD.
>>> The current script checks if the file exists in
>>> jack/.gnome2/.os-icons-installed only.
>>> But users can switch the locale then the problem is the script copied
>>> *.desktop files in /jack/Desktop but no *.desktop files in
>>> /jack/$DESKTOP because jack/.gnome2/.os-icons-installed exists.
>>> It means *.desktop files need to be copied when the jack's locale is
>>> changed because we use XDG.
>>>
>>> I don't think the change is difficult. The attached patch works to
>>> copy packagemanager.desktop and register-opensolaris.desktop in the
>>> right place.
>>> If you provide me the pointer of the souruce code or move the copying
>>> logic to Desktop team, I can fix the problem by myself.
>>>
>>>> Dave
>>>>
>>>>> I think another solution is to check the time stamp of
>>>>> .os-icons-installed and $DESKTOP.
>>> The first option is to move .gnome2/.os-icons-installed to
>>> $DESKTOP/.os-icons-installed and this is the second option which is
>>> used by Nautilus.
>>>
>>> fujiwara
>>>
>>>>> I attached the script to check packagemanager.desktop and
>>>>> register-opensolaris.desktop only.
>>>>>
>>>>> Thanks,
>>>>> fujiwara
>>>>>
>>>>>> Dave
>>>>>>
>>>>>>> Thanks,
>>>>>>>
>>>>>>> Erwann
>>>>>>>> Dave
>>>>>>>>
>>>>>>>>
>>>>>>>>> Erwnan
>>>>>>>>>
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> Takao Fujiwara - Tokyo S/W Center wrote:
>>>>>>>>>> Takao Fujiwara - Tokyo S/W Center-san wrote (10/10/08 04:28 PM):
>>>>>>>>>>
>>>>>>>>>>> Takao Fujiwara - Tokyo S/W Center-san wrote (10/10/08 04:12 PM):
>>>>>>>>>>>
>>>>>>>>>>>> Takao Fujiwara - Tokyo S/W Center-san wrote (10/ 7/08 01:57
>>>>>>>>>>>> PM):
>>>>>>>>>>>>
>>>>>>>>>>>>> I'm fixing opensolaris-icons-copy.sh for locales.
>>>>>>>>>>>>>
>>>>>>>>>>>>> I think the script could be called when the locales are
>>>>>>>>>>>>> changed so $MARKER_DIR is also changed.
>>>>>>>>>>>>>
>>>>>>>>>>>>>
>>>>>>>>>>>>>
>>>>>>>>>>>> I'm revising the patch
>>>>>>>>>>>> opensolaris-welcome-01-g11n-icon-copy.diff to work with LiveCD.
>>>>>>>>>>>> if /jack/Desktop exists, I thought it's LiveCD. Otherwise I
>>>>>>>>>>>> have no idea.
>>>>>>>>>>>>
>>>>>>>>>>> Hmm.., it seems this update doesn't work because
>>>>>>>>>>> register-opensolaris.desktop is in /usr/share/applications
>>>>>>>>>>> but ddu.desktop is in /jack/Desktop.
>>>>>>>>>>> I need to think the fix again..
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>> Attaching the update of
>>>>>>>>>> opensolaris-welcome-01-g11n-icon-copy.diff again.
>>>>>>>>>> If /usr/share/applications doesn't have the .desktop,
>>>>>>>>>> /jack/Desktop is searched.
>>>>>>>>>>
>>>>>>>>>>
>>>>
>>
>>
>
>
