rpms/xfdesktop/devel xfdesktop-4.4.2-desktop-menu-fixes.patch, NONE, 1.1 xfdesktop-4.4.2-desktop-menu-icon.patch, NONE, 1.1 xfdesktop.spec, 1.22, 1.23
Christoph Wickert
cwickert at fedoraproject.org
Tue Aug 26 19:41:36 UTC 2008
Author: cwickert
Update of /cvs/pkgs/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28913
Modified Files:
xfdesktop.spec
Added Files:
xfdesktop-4.4.2-desktop-menu-fixes.patch
xfdesktop-4.4.2-desktop-menu-icon.patch
Log Message:
* Tue Aug 26 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.2-5
- Use Fedora icon for desktop menu plugin (#445986)
- Fix menu icons
xfdesktop-4.4.2-desktop-menu-fixes.patch:
--- NEW FILE xfdesktop-4.4.2-desktop-menu-fixes.patch ---
diff -dur xfdesktop-4.4.2.orig/menu.xml xfdesktop-4.4.2/menu.xml
--- xfdesktop-4.4.2.orig/menu.xml 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="File Manager" cmd="thunar" icon="file-manager"/>
- <app name="Web Browser" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Web Browser" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Help" cmd="xfhelp4" icon="gnome-help"/>
- <app name="About Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="About Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.be xfdesktop-4.4.2/menu.xml.be
--- xfdesktop-4.4.2.orig/menu.xml.be 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.be 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="ТÑÑмÑнал" cmd="xfterm4" icon="gnome-terminal"/>
<app name="ÐÑÑаÑнÑк ÑайлаÑ" cmd="thunar" icon="file-manager"/>
- <app name="ÐаÑÑÐ°Ñ ÑеÑÑва" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="ÐаÑÑÐ°Ñ ÑеÑÑва" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Ðаведка" cmd="xfhelp4" icon="gnome-help"/>
- <app name="ÐÑа Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="ÐÑа Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.ca xfdesktop-4.4.2/menu.xml.ca
--- xfdesktop-4.4.2.orig/menu.xml.ca 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.ca 2008-08-26 19:32:28.000000000 +0200
@@ -54,7 +54,7 @@
<xfdesktop-menu>
- <title name="Menú de l'escriptori" icon="xfce4-brackdrop" />
+ <title name="Menú de l'escriptori" icon="xfce4-backdrop"/>
<separator/>
@@ -64,7 +64,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal" />
<app name="Gestor de fitxers" cmd="thunar" icon="file-manager"/>
- <app name="Navegador" cmd="xfbrowser4" icon="gnome-globe" />
+ <app name="Navegador" cmd="xfbrowser4" icon="web-browser" />
<separator/>
@@ -89,7 +89,7 @@
<separator/>
<app name="Ajuda" cmd="xfhelp4" icon="gnome-help" />
- <app name="Quant a XFce" cmd="xfce4-about" icon="gnome-info" />
+ <app name="Quant a XFce" cmd="xfce4-about" icon="stock_about" />
<!--
Això farà que xfce4-session surti, després de mostrar la finestra de
sortida. Si xfce4-session no s'està executant farà que xfdesktop
diff -dur xfdesktop-4.4.2.orig/menu.xml.cs xfdesktop-4.4.2/menu.xml.cs
--- xfdesktop-4.4.2.orig/menu.xml.cs 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.cs 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminál" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Správce souborů" cmd="thunar" icon="file-manager"/>
- <app name="Webový prohlÞeÄ" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Webový prohlÞeÄ" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="NápovÄda" cmd="xfhelp4" icon="gnome-help"/>
- <app name="O prostÅedà Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="O prostÅedà Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.da xfdesktop-4.4.2/menu.xml.da
--- xfdesktop-4.4.2.orig/menu.xml.da 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.da 2008-08-26 19:32:28.000000000 +0200
@@ -53,7 +53,7 @@
<xfdesktop-menu>
- <title name="Desktop Menu" icon="backdrop"/>
+ <title name="Desktop Menu" icon="xfce4-backdrop"/>
<separator/>
@@ -63,7 +63,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="File Manager" cmd="thunar" icon="file-manager"/>
- <app name="Web Browser" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Web Browser" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Help" cmd="xfhelp4" icon="gnome-help"/>
- <app name="About Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="About Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.de xfdesktop-4.4.2/menu.xml.de
--- xfdesktop-4.4.2.orig/menu.xml.de 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.de 2008-08-26 19:32:28.000000000 +0200
@@ -23,15 +23,15 @@
<xfdesktop-menu></xfdesktop-menu> Tags.
+ Anwendungen:
- <app name="Name im Menü" cmd="Auszuführender Befehl" term="no" visible="yes" />
+ <app name="Name im Menü" cmd="Auszuführender Befehl" term="no" visible="true" />
'term' entscheidet ob das Programm ein Terminal benötigt, um zu laufen
Nur 'name' und 'cmd' werden benötigt.
+ Trennlinien:
- <separator/>
+ <separator visible="true" />
+ Untermenüs:
- <menu name="Name im Menü" visible="yes"></menu>
+ <menu name="Name im Menü" visible="true"></menu>
Nur 'name' wird benötigt.
Zwischen den menu-Tags können weitere Anwendungen, Trennlinien und Menüs definiert
werden.
@@ -53,17 +53,22 @@
-->
<xfdesktop-menu>
- <title name="Desktop-Menü" visible="yes" />
+ <title name="Desktop-Menü" icon="xfce4-backdrop"/>
+
<separator/>
- <app name="Programm ausführen ..." cmd="xfrun4"/>
+
+ <app name="Programm ausführen ..." cmd="xfrun4" icon="gnome-fs-executable"/>
+
<separator/>
- <app name="Terminal" cmd="xfterm4" />
+
+ <app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Dateimanager" cmd="thunar" icon="file-manager"/>
- <app name="Mozilla (Web-Browser)" cmd="xfbrowser4"/>
+ <app name="Web-Browser" cmd="xfbrowser4" icon="web-browser"/>
+
<separator/>
- <menu name="Einstellungen" visible="yes">
- <app name="Alle Einstellungen ..." cmd="xfce-setting-show" snotify="true"/>
- <app name="Hintergrund ..." cmd="xfce-setting-show backdrop"/>
+
+ <menu name="Einstellungen" icon="gnome-settings">
+ <app name="Alle Einstellungen ..." cmd="xfce-setting-show" snotify="true" icon="gnome-settings"/>
<!--
<app name="Hintergrund" cmd="xfce-setting-show backdrop"/>
<app name="Workspaces" cmd="xfce-setting-show workspaces"/>
@@ -80,6 +85,7 @@
</menu>
<separator/>
+
<!-- Verwenden Sie die folgende Zeile, um das automatisch generierte
Menü auf dieser Ebene einzuführen. Wenn Sie möchten, können Sie
dieses in ein eigenes Untermenü tun.
@@ -92,14 +98,17 @@
<!-- <include type="file" src="menu2.xml"/> -->
<separator/>
- <app name="Hilfe" cmd="xfhelp4"/>
+
+ <app name="Hilfe" cmd="xfhelp4" icon="gnome-help"/>
+ <app name="Ãber Xfce" cmd="xfce4-about" icon="stock_about"/>
+
<!-- <separator/> -->
<!-- Setzen Sie 'visible' auf 'yes', um diesen Eintrag zu verwenden.
Dies beendet den Desktopmanager. Wenn Sie auÃerdem 'exec xfdesktop'
an das Ende Ihrer ~/.xinitrc Datei schreiben kann dieser Menüeintrag
zum Beenden Ihrer X11-Sitzung verwendet werden.
-->
- <builtin name="Beenden" cmd="quit" visible="no"/>
+ <builtin name="Beenden" cmd="quit" icon="gnome-logout"/>
<!-- Beispiel, wie Dateien eingefügt werden können:
1) Deklarieren Sie eine ENTITY (Entität) im DOCTYPE tag (siehe oben)
2) Fügen Sie die Entität in die Datei ein:
diff -dur xfdesktop-4.4.2.orig/menu.xml.el xfdesktop-4.4.2/menu.xml.el
--- xfdesktop-4.4.2.orig/menu.xml.el 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.el 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="ΤεÏμαÏικÏ" cmd="xfterm4" icon="gnome-terminal"/>
<app name="ÎιαÏειÏιÏÏÎ®Ï ÎÏÏείÏν" cmd="thunar" icon="file-manager"/>
- <app name="ΠεÏιηγηÏÎ®Ï ÎÏÏοÏ" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="ΠεÏιηγηÏÎ®Ï ÎÏÏοÏ" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Îοήθεια" cmd="xfhelp4" icon="gnome-help"/>
- <app name="ΠεÏί ÏοÏ
Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="ΠεÏί ÏοÏ
Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.es xfdesktop-4.4.2/menu.xml.es
--- xfdesktop-4.4.2.orig/menu.xml.es 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.es 2008-08-26 19:32:28.000000000 +0200
@@ -60,23 +60,23 @@
<separator/>
- <app name="Terminal" cmd="xfterm4" icon="gnome-terminal" visible="true"/>
+ <app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Manejador de archivos" cmd="thunar" icon="file-manager"/>
- <app name="Navegador de Internet" cmd="xfbrowser4" icon="gnome-globe" visible="true"/>
+ <app name="Navegador de Internet" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
<menu name="Configuracion" icon="gnome-settings">
- <app name="Administrador de configuracion" cmd="xfce-setting-show" snotify="true" icon="gnome-settings" visible="true"/>
+ <app name="Administrador de configuracion" cmd="xfce-setting-show" snotify="true" icon="gnome-settings"/>
</menu>
- <separator visible="true"/>
+ <separator/>
<!--
The next line includes the autogenerated menu at the current level. If
you want, you can put this in its own submenu.
-->
- <include type="system" unique="true" visible="true"/>
+ <include type="system" unique="true"/>
<!--
Uncomment the following line (and comment the above) if you would rather
@@ -87,7 +87,7 @@
<separator/>
<app name="Ayuda" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Acerca de Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Acerca de Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.et xfdesktop-4.4.2/menu.xml.et
--- xfdesktop-4.4.2.orig/menu.xml.et 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.et 2008-08-26 19:32:28.000000000 +0200
@@ -53,7 +53,7 @@
<xfdesktop-menu>
- <title name="Töölaua Meüü" icon="backdrop"/>
+ <title name="Töölaua Meüü" icon="xfce4-backdrop"/>
<separator/>
@@ -63,7 +63,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Failihaldur" cmd="thunar" icon="file-manager"/>
- <app name="Veebilehitseja" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Veebilehitseja" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Abi" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Xfce4 info" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Xfce4 info" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.eu xfdesktop-4.4.2/menu.xml.eu
--- xfdesktop-4.4.2.orig/menu.xml.eu 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.eu 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminala" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Fitxategi Kudeatzailea" cmd="thunar" icon="file-manager"/>
- <app name="Web Nabigatzailea" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Web Nabigatzailea" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Laguntza" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Xfce-ri buruz" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Xfce-ri buruz" cmd="xfce4-about" icon="stock_about"/>
<!--
Honek xfce saioa irteera elkarrizketa kutxa bat erakutsi ostean ixtea egingo du.
xfce4-session abiarazirik ez badago, xfdesktop itxiko du.
diff -dur xfdesktop-4.4.2.orig/menu.xml.fi xfdesktop-4.4.2/menu.xml.fi
--- xfdesktop-4.4.2.orig/menu.xml.fi 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.fi 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Pääte" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Tiedostonhallinta" cmd="thunar" icon="file-manager"/>
- <app name="Web-selain" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Web-selain" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -89,7 +89,7 @@
<separator/>
<app name="Ohje" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Tietoja Xfce:stä" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Tietoja Xfce:stä" cmd="xfce4-about" icon="stock_about"/>
<!--
Tämä sulkee xfce4-sessionin, näyttäen ensin uloskirjautumisdialogin.
Jos xfce4-session ei ole käynnissä, tämä sulkee xfdesktopin.
diff -dur xfdesktop-4.4.2.orig/menu.xml.fr xfdesktop-4.4.2/menu.xml.fr
--- xfdesktop-4.4.2.orig/menu.xml.fr 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.fr 2008-08-26 19:32:28.000000000 +0200
@@ -53,7 +53,7 @@
<xfdesktop-menu>
- <title name="Menu du Bureau"/>
+ <title name="Menu du Bureau" icon="xfce4-backdrop"/>
<separator/>
@@ -63,7 +63,7 @@
<app name="Terminal" cmd="xfterm4" icon="terminal"/>
<app name="Gestionnaire de fichiers" cmd="thunar" icon="file-manager"/>
- <app name="Navigateur Web" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Navigateur Web" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Aide" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Ã propos de Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Ã propos de Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.he xfdesktop-4.4.2/menu.xml.he
--- xfdesktop-4.4.2.orig/menu.xml.he 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.he 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="×ס××£" cmd="xfterm4" icon="gnome-terminal"/>
<app name="ס××ר ק×צ××" cmd="thunar" icon="file-manager"/>
- <app name="×פ××¤× ××× ××¨× ×" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="×פ××¤× ××× ××¨× ×" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="×¢×ר×" cmd="xfhelp4" icon="gnome-help"/>
- <app name="××××ת Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="××××ת Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.hu xfdesktop-4.4.2/menu.xml.hu
--- xfdesktop-4.4.2.orig/menu.xml.hu 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.hu 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminál" cmd="xfterm4" icon="gnome-terminal"/>
<app name="FájlkezelÅ" cmd="thunar" icon="file-manager"/>
- <app name="WebböngészÅ" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="WebböngészÅ" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Súgó" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Xfce Névjegy" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Xfce Névjegy" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.it xfdesktop-4.4.2/menu.xml.it
--- xfdesktop-4.4.2.orig/menu.xml.it 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.it 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminale" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Gestione file" cmd="thunar" icon="file-manager"/>
- <app name="Naviga in rete" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Naviga in rete" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Aiuto" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Informazioni su Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Informazioni su Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.ja xfdesktop-4.4.2/menu.xml.ja
--- xfdesktop-4.4.2.orig/menu.xml.ja 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.ja 2008-08-26 19:32:28.000000000 +0200
@@ -106,7 +106,7 @@
<!--
訳è
注: å
ã®ãã¡ã¤ã«ã§ã¯ mozilla ã«ãªã£ã¦ãã¾ãã
-->
- <app name="ã¦ã§ããã©ã¦ã¶ã¼" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="ã¦ã§ããã©ã¦ã¶ã¼" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -132,7 +132,7 @@
<separator/>
<app name="ãã«ã" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Xfce ã«ã¤ãã¦" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Xfce ã«ã¤ãã¦" cmd="xfce4-about" icon="stock_about"/>
<!--
ãã°ã¢ã¦ãã®ãã¤ã¢ãã°ããã¯ã¹ãæåã«è¡¨ç¤ºããå¾ã§ xfce4-session
ãçµäºããã¾ããxfce4-session ãåä½ãã¦ããªããªããxfdesktop ã
diff -dur xfdesktop-4.4.2.orig/menu.xml.ko xfdesktop-4.4.2/menu.xml.ko
--- xfdesktop-4.4.2.orig/menu.xml.ko 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.ko 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="í°ë¯¸ë" cmd="xfterm4" icon="gnome-terminal"/>
<app name="íì¼ ê´ë¦¬ì" cmd="thunar" icon="file-manager"/>
- <app name="ì¹ ë¸ë¼ì°ì ¸" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="ì¹ ë¸ë¼ì°ì ¸" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="ëìë§" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Xfceë" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Xfceë" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.nb_NO xfdesktop-4.4.2/menu.xml.nb_NO
--- xfdesktop-4.4.2.orig/menu.xml.nb_NO 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.nb_NO 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Filbehandler" cmd="thunar" icon="file-manager"/>
- <app name="Nettleser" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Nettleser" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Hjelp" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Om Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Om Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.nl xfdesktop-4.4.2/menu.xml.nl
--- xfdesktop-4.4.2.orig/menu.xml.nl 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.nl 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Bestandsmanager" cmd="thunar" icon="file-manager"/>
- <app name="Web Browser" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Web Browser" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Help" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Xfce Info" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Xfce Info" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.pa xfdesktop-4.4.2/menu.xml.pa
--- xfdesktop-4.4.2.orig/menu.xml.pa 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.pa 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="à¨à¨°à¨®à©à¨¨à¨²" cmd="xfterm4" icon="gnome-terminal"/>
<app name="ਫਾà¨à¨² ਮà©à¨¨à©à¨à¨°" cmd="thunar" icon="file-manager"/>
- <app name="ਵà©à©±à¨¬ ਬਰਾà¨à¨à¨¼à¨°" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="ਵà©à©±à¨¬ ਬਰਾà¨à¨à¨¼à¨°" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="ਸਹਾà¨à¨¤à¨¾" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Xfce ਬਾਰà©" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Xfce ਬਾਰà©" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.pl xfdesktop-4.4.2/menu.xml.pl
--- xfdesktop-4.4.2.orig/menu.xml.pl 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.pl 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Menadżer Plików" cmd="thunar" icon="file-manager"/>
- <app name="PrzeglÄ
darka internetowa" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="PrzeglÄ
darka internetowa" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Pomoc" cmd="xfhelp4" icon="gnome-help"/>
- <app name="O Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="O Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.pt_BR xfdesktop-4.4.2/menu.xml.pt_BR
--- xfdesktop-4.4.2.orig/menu.xml.pt_BR 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.pt_BR 2008-08-26 19:32:28.000000000 +0200
@@ -65,7 +65,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Gerente de Arquivos" cmd="thunar" icon="file-manager"/>
- <app name="Navegador Web" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Navegador Web" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -90,7 +90,7 @@
<separator/>
<app name="Ajuda" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Sobre o Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Sobre o Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.ro xfdesktop-4.4.2/menu.xml.ro
--- xfdesktop-4.4.2.orig/menu.xml.ro 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.ro 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Administrator de fiÅiere" cmd="thunar" icon="file-manager"/>
- <app name="Navigator web" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Navigator web" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Ajutor" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Despre Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Despre Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.ru xfdesktop-4.4.2/menu.xml.ru
--- xfdesktop-4.4.2.orig/menu.xml.ru 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.ru 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="ТеÑминал" cmd="xfterm4" icon="gnome-terminal"/>
<app name="ФайловÑй менеджеÑ" cmd="thunar" icon="file-manager"/>
- <app name="ÐнÑеÑнеÑ-бÑаÑзеÑ" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="ÐнÑеÑнеÑ-бÑаÑзеÑ" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="ÐомоÑÑ" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Ðб Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Ðб Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.sk xfdesktop-4.4.2/menu.xml.sk
--- xfdesktop-4.4.2.orig/menu.xml.sk 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.sk 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminál" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Správca súborov" cmd="thunar" icon="file-manager"/>
- <app name="Webový prehliadaÄ" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Webový prehliadaÄ" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="PomocnÃk" cmd="xfhelp4" icon="gnome-help"/>
- <app name="O Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="O Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.sv xfdesktop-4.4.2/menu.xml.sv
--- xfdesktop-4.4.2.orig/menu.xml.sv 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.sv 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="Terminal" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Filhanterare" cmd="thunar" icon="file-manager"/>
- <app name="Webbläsare" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Webbläsare" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="Hjälp" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Om Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Om Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.tr xfdesktop-4.4.2/menu.xml.tr
--- xfdesktop-4.4.2.orig/menu.xml.tr 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.tr 2008-08-26 19:32:28.000000000 +0200
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<xfdesktop-menu>
- <title name="Menü"/>
+ <title name="Menü" icon="xfce4-backdrop"/>
<separator/>
<app name="ÃalıÅtır..." cmd="xfrun4" icon="gnome-fs-executable"/>
<separator/>
<app name="Kabuk" cmd="xfterm4" icon="terminal"/>
<app name="Dosya Yöneticisi (thunar)" cmd="thunar" icon="file-manager"/>
- <app name="Web Tarayıcı" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Web Tarayıcı" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
<menu name="Ayarlar" icon="gnome-settings">
<app name="Xfce4 ayarları" cmd="xfce-setting-show" icon="gnome-settings"/>
@@ -15,6 +15,6 @@
<include type="system" style="simple" unique="true" legacy="true"/>
<separator/>
<app name="Kılavuz" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Xfce Hakkında" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Xfce Hakkında" cmd="xfce4-about" icon="stock_about"/>
<builtin name="Ãık" cmd="quit" icon="gnome-logout"/>
</xfdesktop-menu>
diff -dur xfdesktop-4.4.2.orig/menu.xml.uk xfdesktop-4.4.2/menu.xml.uk
--- xfdesktop-4.4.2.orig/menu.xml.uk 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.uk 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="ТеÑмÑнал" cmd="xfterm4" icon="gnome-terminal"/>
<app name="ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ ÑайлÑв" cmd="thunar" icon="file-manager"/>
- <app name="Ðеб-пеÑеглÑдаÑ" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Ðеб-пеÑеглÑдаÑ" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="ÐовÑдка" cmd="xfhelp4" icon="gnome-help"/>
- <app name="ÐÑо Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="ÐÑо Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.vi xfdesktop-4.4.2/menu.xml.vi
--- xfdesktop-4.4.2.orig/menu.xml.vi 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.vi 2008-08-26 19:32:28.000000000 +0200
@@ -62,7 +62,7 @@
<app name="Trạm cuá»i" cmd="xfterm4" icon="gnome-terminal"/>
<app name="Trình quản là táºp tin" cmd="thunar" icon="file-manager"/>
- <app name="Trình duyá»t web" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="Trình duyá»t web" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -87,7 +87,7 @@
<separator/>
<app name="Giúp Äỡ" cmd="xfhelp4" icon="gnome-help"/>
- <app name="Giá»i thiá»u Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="Giá»i thiá»u Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
Lá»nh nà y sẽ khiếnt xfce4-session thoát, sau khi xuất hiá»n há»p thoại
ÄÄng xuất. Nếu xfce4-session không Äang chạy, nó sẽ thoát xfdesktop.
diff -dur xfdesktop-4.4.2.orig/menu.xml.zh_TW xfdesktop-4.4.2/menu.xml.zh_TW
--- xfdesktop-4.4.2.orig/menu.xml.zh_TW 2007-11-17 20:31:54.000000000 +0100
+++ xfdesktop-4.4.2/menu.xml.zh_TW 2008-08-26 19:32:28.000000000 +0200
@@ -63,7 +63,7 @@
<app name="çµç«¯æ©" cmd="xfterm4" icon="gnome-terminal"/>
<app name="æªæ¡ç®¡çç¨å¼" cmd="thunar" icon="file-manager"/>
- <app name="網é ç覽å¨" cmd="xfbrowser4" icon="gnome-globe"/>
+ <app name="網é ç覽å¨" cmd="xfbrowser4" icon="web-browser"/>
<separator/>
@@ -88,7 +88,7 @@
<separator/>
<app name="說æ" cmd="xfhelp4" icon="gnome-help"/>
- <app name="éæ¼ Xfce" cmd="xfce4-about" icon="gnome-info"/>
+ <app name="éæ¼ Xfce" cmd="xfce4-about" icon="stock_about"/>
<!--
This will cause xfce4-session to quit, after first displaying a log-out
dialog box. If xfce4-session isn't running, it will quit xfdesktop.
xfdesktop-4.4.2-desktop-menu-icon.patch:
--- NEW FILE xfdesktop-4.4.2-desktop-menu-icon.patch ---
diff -dur xfdesktop-4.4.2.orig/panel-plugin/desktop-menu-plugin.c xfdesktop-4.4.2/panel-plugin/desktop-menu-plugin.c
--- xfdesktop-4.4.2.orig/panel-plugin/desktop-menu-plugin.c 2007-11-17 20:31:41.000000000 +0100
+++ xfdesktop-4.4.2/panel-plugin/desktop-menu-plugin.c 2008-02-21 01:25:34.000000000 +0100
@@ -58,7 +58,7 @@
#include "xfce4-popup-menu.h"
#define BORDER 8
-#define DEFAULT_BUTTON_ICON DATADIR "/pixmaps/xfce4_xicon1.png"
+#define DEFAULT_BUTTON_ICON "xfce4_xicon1"
#define DEFAULT_BUTTON_TITLE "Xfce Menu"
#ifndef CHECK_RUNNING_PLUGIN
Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xfdesktop.spec 12 Aug 2008 04:00:49 -0000 1.22
+++ xfdesktop.spec 26 Aug 2008 19:41:06 -0000 1.23
@@ -1,7 +1,7 @@
Summary: Desktop manager for the XFce Desktop Environment
Name: xfdesktop
Version: 4.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
URL: http://www.xfce.org/
Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfdesktop-4.4.2.tar.bz2
@@ -14,6 +14,10 @@
Patch2: xfdesktop-4.4.2-gcc43.patch
# Fix memory leaks
Patch3: xfdesktop-4.4.2-memleak.patch
+# Fix desktop menu
+Patch4: xfdesktop-4.4.2-desktop-menu-fixes.patch
+# Enable distro specific logo in desktop menu
+Patch5: xfdesktop-4.4.2-desktop-menu-icon.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +49,8 @@
%patch1 -p1 -b .show-backdrop
%patch2 -p1 -b .gcc43
%patch3 -p1 -b .memleak
+%patch4 -p1 -b .fixed
+%patch5 -p1 -b .distro-logo
%build
%configure
@@ -90,6 +96,10 @@
%{_mandir}/man1/*
%changelog
+* Tue Aug 26 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.2-5
+- Use Fedora icon for desktop menu plugin (#445986)
+- Fix menu icons
+
* Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-4
- Add partial memory leak patch (partially fixes #428662)
More information about the fedora-extras-commits
mailing list