From 97f89ca9e1c4556014633785a30ff871fae6460d Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Tue, 2 Oct 2007 18:01:06 +0000 Subject: [PATCH] Patch by: Stephane Loeuillet 2007-10-02 Jens Granseuer Patch by: Stephane Loeuillet * capplets/about-me/gnome-about-me.desktop.in.in: * capplets/accessibility/at-properties/at-properties.desktop.in.in: * capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in: * capplets/appearance/data/gnome-appearance-properties.desktop.in.in: * capplets/appearance/data/gnome-theme-installer.desktop.in.in: * capplets/appearance/theme-save.c: * capplets/default-applications/default-applications.desktop.in.in: * capplets/default-applications/gnome-at-session.desktop.in.in: * capplets/display/display-properties.desktop.in.in: * capplets/keybindings/keybinding.desktop.in.in: * capplets/keyboard/keyboard.desktop.in.in: * capplets/mouse/gnome-settings-mouse.desktop.in.in: * capplets/network/gnome-network-preferences.desktop.in.in: * capplets/sound/gnome-settings-sound.desktop.in.in: * capplets/windows/window-properties.desktop.in.in: * shell/gnomecc.desktop.in.in: * shell/gnomecc.directory.in: * vfs-methods/fontilus/font-method.directory.in: * vfs-methods/fontilus/gnome-font-viewer.desktop.in.in: * vfs-methods/themus/theme-method.directory.in: * vfs-methods/themus/themus-theme-applier.desktop.in.in: desktop file fixes: don't use the deprecated Encoding tag, change Terminal=0 to Terminal=false, remove empty Categories= (bug #481740) svn path=/trunk/; revision=8153 --- ChangeLog | 28 +++++++++++++++++++ .../about-me/gnome-about-me.desktop.in.in | 1 - .../at-properties/at-properties.desktop.in.in | 1 - .../accessibility-keyboard.desktop.in.in | 1 - .../gnome-appearance-properties.desktop.in.in | 1 - .../data/gnome-theme-installer.desktop.in.in | 1 - capplets/appearance/theme-save.c | 1 - .../default-applications.desktop.in.in | 1 - .../gnome-at-session.desktop.in.in | 2 -- .../display/display-properties.desktop.in.in | 1 - capplets/keybindings/keybinding.desktop.in.in | 1 - capplets/keyboard/keyboard.desktop.in.in | 1 - .../mouse/gnome-settings-mouse.desktop.in.in | 1 - .../gnome-network-preferences.desktop.in.in | 1 - .../sound/gnome-settings-sound.desktop.in.in | 1 - .../windows/window-properties.desktop.in.in | 1 - shell/gnomecc.desktop.in.in | 1 - shell/gnomecc.directory.in | 2 +- vfs-methods/fontilus/font-method.directory.in | 2 +- .../fontilus/gnome-font-viewer.desktop.in.in | 1 - vfs-methods/themus/theme-method.directory.in | 2 +- .../themus/themus-theme-applier.desktop.in.in | 2 +- 22 files changed, 32 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0b5817ed..1820fcb42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,31 @@ +2007-10-02 Jens Granseuer + + Patch by: Stephane Loeuillet + + * capplets/about-me/gnome-about-me.desktop.in.in: + * capplets/accessibility/at-properties/at-properties.desktop.in.in: + * capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in: + * capplets/appearance/data/gnome-appearance-properties.desktop.in.in: + * capplets/appearance/data/gnome-theme-installer.desktop.in.in: + * capplets/appearance/theme-save.c: + * capplets/default-applications/default-applications.desktop.in.in: + * capplets/default-applications/gnome-at-session.desktop.in.in: + * capplets/display/display-properties.desktop.in.in: + * capplets/keybindings/keybinding.desktop.in.in: + * capplets/keyboard/keyboard.desktop.in.in: + * capplets/mouse/gnome-settings-mouse.desktop.in.in: + * capplets/network/gnome-network-preferences.desktop.in.in: + * capplets/sound/gnome-settings-sound.desktop.in.in: + * capplets/windows/window-properties.desktop.in.in: + * shell/gnomecc.desktop.in.in: + * shell/gnomecc.directory.in: + * vfs-methods/fontilus/font-method.directory.in: + * vfs-methods/fontilus/gnome-font-viewer.desktop.in.in: + * vfs-methods/themus/theme-method.directory.in: + * vfs-methods/themus/themus-theme-applier.desktop.in.in: + desktop file fixes: don't use the deprecated Encoding tag, change + Terminal=0 to Terminal=false, remove empty Categories= (bug #481740) + 2007-09-28 Jens Granseuer * configure.in: fix typo in order to correctly substitute XCursor CFLAGS diff --git a/capplets/about-me/gnome-about-me.desktop.in.in b/capplets/about-me/gnome-about-me.desktop.in.in index 90d584d0d..95afabf24 100644 --- a/capplets/about-me/gnome-about-me.desktop.in.in +++ b/capplets/about-me/gnome-about-me.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=About Me _Comment=Set your personal information Exec=gnome-about-me diff --git a/capplets/accessibility/at-properties/at-properties.desktop.in.in b/capplets/accessibility/at-properties/at-properties.desktop.in.in index fe5c0d2f2..04b51f650 100644 --- a/capplets/accessibility/at-properties/at-properties.desktop.in.in +++ b/capplets/accessibility/at-properties/at-properties.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Assistive Technology Preferences _Comment=Enable support for GNOME assistive technologies at login Exec=gnome-at-properties diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in b/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in index a8d4b079b..aca757a1e 100644 --- a/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in +++ b/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Keyboard Accessibility _Comment=Set your keyboard accessibility preferences Exec=gnome-accessibility-keyboard-properties diff --git a/capplets/appearance/data/gnome-appearance-properties.desktop.in.in b/capplets/appearance/data/gnome-appearance-properties.desktop.in.in index 02a7719a0..4dd33915c 100644 --- a/capplets/appearance/data/gnome-appearance-properties.desktop.in.in +++ b/capplets/appearance/data/gnome-appearance-properties.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Appearance _Comment=Customize the look of the desktop Exec=gnome-appearance-properties %F diff --git a/capplets/appearance/data/gnome-theme-installer.desktop.in.in b/capplets/appearance/data/gnome-theme-installer.desktop.in.in index c3c7c4adf..292e4b857 100644 --- a/capplets/appearance/data/gnome-theme-installer.desktop.in.in +++ b/capplets/appearance/data/gnome-theme-installer.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Theme Installer _Comment=Installs themes packages for various parts of the desktop Exec=gnome-appearance-properties -i %u diff --git a/capplets/appearance/theme-save.c b/capplets/appearance/theme-save.c index 57f5e5374..cdb14fe14 100644 --- a/capplets/appearance/theme-save.c +++ b/capplets/appearance/theme-save.c @@ -191,7 +191,6 @@ write_theme_to_disk (GnomeThemeMetaInfo *theme_info, "Name=%s\n" "Type=X-GNOME-Metatheme\n" "Comment=%s\n" - "Encoding=UTF-8\n" "\n" "[X-GNOME-Metatheme]\n" "GtkTheme=%s\n" diff --git a/capplets/default-applications/default-applications.desktop.in.in b/capplets/default-applications/default-applications.desktop.in.in index bc84c446b..677eedcf3 100644 --- a/capplets/default-applications/default-applications.desktop.in.in +++ b/capplets/default-applications/default-applications.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Preferred Applications _Comment=Select your default applications Exec=gnome-default-applications-properties diff --git a/capplets/default-applications/gnome-at-session.desktop.in.in b/capplets/default-applications/gnome-at-session.desktop.in.in index 1169e2e08..274bd4827 100644 --- a/capplets/default-applications/gnome-at-session.desktop.in.in +++ b/capplets/default-applications/gnome-at-session.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Visual _Comment=Autostart the preferred AT Exec=gnome-at-visual -s @@ -7,7 +6,6 @@ Icon=gnome-searchtool Terminal=false Type=Application StartupNotify=true -Categories= OnlyShowIn=GNOME; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-control-center diff --git a/capplets/display/display-properties.desktop.in.in b/capplets/display/display-properties.desktop.in.in index 1fe978262..e2834ee6c 100644 --- a/capplets/display/display-properties.desktop.in.in +++ b/capplets/display/display-properties.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Screen Resolution _Comment=Change screen resolution Exec=gnome-display-properties diff --git a/capplets/keybindings/keybinding.desktop.in.in b/capplets/keybindings/keybinding.desktop.in.in index 74cfa4efc..a80266848 100644 --- a/capplets/keybindings/keybinding.desktop.in.in +++ b/capplets/keybindings/keybinding.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Keyboard Shortcuts _Comment=Assign shortcut keys to commands Exec=gnome-keybinding-properties diff --git a/capplets/keyboard/keyboard.desktop.in.in b/capplets/keyboard/keyboard.desktop.in.in index 1a1d6d666..9b4e2eb53 100644 --- a/capplets/keyboard/keyboard.desktop.in.in +++ b/capplets/keyboard/keyboard.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Keyboard _Comment=Set your keyboard preferences Exec=gnome-keyboard-properties diff --git a/capplets/mouse/gnome-settings-mouse.desktop.in.in b/capplets/mouse/gnome-settings-mouse.desktop.in.in index 01bd5d53e..6855463a5 100644 --- a/capplets/mouse/gnome-settings-mouse.desktop.in.in +++ b/capplets/mouse/gnome-settings-mouse.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Mouse _Comment=Set your mouse preferences Exec=gnome-mouse-properties diff --git a/capplets/network/gnome-network-preferences.desktop.in.in b/capplets/network/gnome-network-preferences.desktop.in.in index 2d0efea60..7ed598372 100644 --- a/capplets/network/gnome-network-preferences.desktop.in.in +++ b/capplets/network/gnome-network-preferences.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Network Proxy _Comment=Set your network proxy preferences Exec=gnome-network-preferences diff --git a/capplets/sound/gnome-settings-sound.desktop.in.in b/capplets/sound/gnome-settings-sound.desktop.in.in index 0b1020f65..f4ce59296 100644 --- a/capplets/sound/gnome-settings-sound.desktop.in.in +++ b/capplets/sound/gnome-settings-sound.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Sound _Comment=Enable sound and associate sounds with events Exec=gnome-sound-properties diff --git a/capplets/windows/window-properties.desktop.in.in b/capplets/windows/window-properties.desktop.in.in index 85e7f03b5..16367c114 100644 --- a/capplets/windows/window-properties.desktop.in.in +++ b/capplets/windows/window-properties.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Windows _Comment=Set your window properties Exec=gnome-window-properties diff --git a/shell/gnomecc.desktop.in.in b/shell/gnomecc.desktop.in.in index cedddd1f4..4b082e7f7 100644 --- a/shell/gnomecc.desktop.in.in +++ b/shell/gnomecc.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Control Center _GenericName=The GNOME configuration tool Icon=gnome-control-center diff --git a/shell/gnomecc.directory.in b/shell/gnomecc.directory.in index 8484af2a9..fef699447 100644 --- a/shell/gnomecc.directory.in +++ b/shell/gnomecc.directory.in @@ -2,4 +2,4 @@ _Name=Control Center Icon=gnome-settings Type=Directory -Encoding=UTF-8 + diff --git a/vfs-methods/fontilus/font-method.directory.in b/vfs-methods/fontilus/font-method.directory.in index e3237f41f..f2594f270 100644 --- a/vfs-methods/fontilus/font-method.directory.in +++ b/vfs-methods/fontilus/font-method.directory.in @@ -3,4 +3,4 @@ Name=Font Catalogue Comment=Font Catalogue Icon=font-capplet Type=Directory -Encoding=UTF-8 + diff --git a/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in b/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in index 051411e0e..42b414cf6 100644 --- a/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in +++ b/vfs-methods/fontilus/gnome-font-viewer.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Font Viewer _Comment=Preview fonts Icon=gnome-settings-font diff --git a/vfs-methods/themus/theme-method.directory.in b/vfs-methods/themus/theme-method.directory.in index 0f16f96a9..dde39c2db 100644 --- a/vfs-methods/themus/theme-method.directory.in +++ b/vfs-methods/themus/theme-method.directory.in @@ -3,4 +3,4 @@ Name=Theme Catalogue Comment=Theme Catalogue Icon=theme-capplet Type=Directory -Encoding=UTF-8 + diff --git a/vfs-methods/themus/themus-theme-applier.desktop.in.in b/vfs-methods/themus/themus-theme-applier.desktop.in.in index 826f57ea9..1a176cd02 100644 --- a/vfs-methods/themus/themus-theme-applier.desktop.in.in +++ b/vfs-methods/themus/themus-theme-applier.desktop.in.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 _Name=Apply theme _Comment=Sets the default theme Icon=gnome-settings-theme @@ -8,6 +7,7 @@ Terminal=false Type=Application StartupNotify=false NoDisplay=true +# we don't want to show this at all in the menus OnlyShowIn=; MimeType=application/x-gnome-theme-installed; X-GNOME-Bugzilla-Bugzilla=GNOME