Merge lp:~alexhenrie24/lubuntu-default-settings/fix-for-1232578 into lp:lubuntu-default-settings

[Alex Henrie]

See Dmitry Shachnev's comment at https://code.launchpad.net/~alexhenrie24/ubuntu/saucy/lubuntu-default-settings/fix-for-1232578/+merge/191047

[Jackson Doak (noskcaj)]

Did you forget to add the new .desktop?

[Alex Henrie (alexhenrie24)]

> Did you forget to add the new .desktop?

lxde-x-www-browser.desktop is already provided by the lxpanel package.

[Jackson Doak (noskcaj)]

ok, should be all good then

On Sun, Nov 3, 2013 at 4:52 PM, Alex Henrie <email address hidden> wrote:

> > Did you forget to add the new .desktop?
>
> lxde-x-www-browser.desktop is already provided by the lxpanel package.
> --
>
> https://code.launchpad.net/~alexhenrie24/lubuntu-default-settings/fix-for-1232578/+merge/193691
> Your team Lubuntu Developers Team is subscribed to branch
> lp:lubuntu-default-settings.
>

[Julien Lavergne (gilir)]

lubuntu.desktop is here to provide internet-web-browser icon, the fix in incorrect :
- If you really need to use the upstream one, you have to fix it to use the icon we want (but modified upstream one is probably not a good idea).
- You can backport the changes from the upstream one to lubuntu.desktop.

review: Needs Fixing

[Dmitry Shachnev (mitya57)]

review: Abstain

[Alex Henrie (alexhenrie24)]

The standard is at http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html

It states: "An application must either use a generic application icon name provided by this specification, or install an icon named the same as the executable for running the application."

I emailed Rodney Dawes, one of the specification's authors, for clarification and got the following reply:

"The browser and mail icons were removed from the spec, because they are always branded applications, and not generic things. Only base generic things go into the spec. Browsers and mail apps should install branded icons in the
hicolor theme, named to match their executables, as stated in the spec.

"If lubuntu wants a generic script that launches the default browser, but always has a generic icon, then it should install it as a named icon to match the name of the wrapper script that runs the default app."

In this case, the executable is named x-www-browser, so according to the specification the icon must be named x-www-browser.png and NOT web-browser.png or internet-web-browser.png.

To fix the icon naming issue, web-browser.png has to be renamed to x-www-browser.png in the lubuntu-icon-theme package, internet-web-browser.png has to be renamed to x-www-browser.png in the lxde-icon-theme package, and lxde-x-www-browser.desktop has to be updated in the lxpanel package.

Because neither web-browser nor internet-web-browser is correct, and it will require the cooperation of many people to fix all the affected packages, would you be willing to put the icon naming issue aside for the moment and accept my patch to address the other issues?

[Julien Lavergne (gilir)]

Ah sorry, I checked again and the lxde-x-www-browser.desktop is part of the debian package, not upstream. So replacing the lubuntu.desktop by this one is not really a big difference. It's actually improving the situation, and the icon is working without any modification. I'll merge in trunk, thanks for your work.

Note : To be perfect, this .desktop should be part of a translation system. Currently, it's not translated because it's part of the debian packages. The situation is better, but not very perfect (not your fault, just a statement about our bad current situation :-()

review: Approve

[Alex Henrie (alexhenrie24)]

Thank you!

=== modified file 'debian/changelog'
--- debian/changelog	2013-11-02 18:22:10 +0000
+++ debian/changelog	2013-11-03 04:56:36 +0000
@@ -1,5 +1,6 @@
 lubuntu-default-settings (0.35) UNRELEASED; urgency=low
 
+  [ Julien Lavergne ]
   * etc/xdg/lxsession/QLubuntu/
    - Update with new names of LXQt components.
   * usr/share/lubuntu/pcmanfm-qt/
@@ -10,7 +11,12 @@
    - Change the name of QLubuntu session file, to match lxsession to launch
      (upstart seems to require this). 
 
- -- Julien Lavergne <[e-mail]>  Fri, 01 Nov 2013 15:04:27 +0100
+  [ Alex Henrie ]
+  * usr/share/lxpanel/profile/Lubuntu/panels/panel
+    - Replace lubuntu-browser.desktop with lxde-x-www-browser.desktop (LP:
+      #1232578)
+
+ -- Alex Henrie <[e-mail]>  Sat, 02 Nov 2013 22:37:00 -0600
 
 lubuntu-default-settings (0.34) saucy; urgency=low
 

=== removed file 'usr/share/applications/lubuntu-browser.desktop'
--- usr/share/applications/lubuntu-browser.desktop	2012-11-23 18:21:39 +0000
+++ usr/share/applications/lubuntu-browser.desktop	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Internet
-Comment=Internet
-Icon=internet-web-browser
-Exec=x-www-browser
-NoDisplay=true

=== modified file 'usr/share/lxpanel/profile/Lubuntu/panels/panel'
--- usr/share/lxpanel/profile/Lubuntu/panels/panel	2013-07-25 21:56:07 +0000
+++ usr/share/lxpanel/profile/Lubuntu/panels/panel	2013-11-03 04:56:36 +0000
@@ -47,7 +47,7 @@
             id=pcmanfm.desktop
         }
         Button {
-            id=lubuntu-browser.desktop
+            id=lxde-x-www-browser.desktop
         }
     }
 }