[Xfce4-commits] <orage:master> 4.8.1.2 fixed Bug 7350: Problems with menu entries / desktop files

[Juha Kautto]

Updating branch refs/heads/master
         to 6c8258c3907d8d05fc0dcc9e14d5bf76f97560bb (commit)
       from 93d17d6fd19487796719d70fc04a843c81819d06 (commit)

commit 6c8258c3907d8d05fc0dcc9e14d5bf76f97560bb
Author: Juha Kautto <juha at xfce.org>
Date:   Fri Jul 1 16:19:34 2011 +0300

    4.8.1.2 fixed Bug 7350: Problems with menu entries / desktop files
    
    Removed references to depricated "encoding" and "application" and
    changed globaltime icon to be clock.

 configure.in.in                                    |    2 +-
 globaltime/globaltime.desktop.in                   |    5 ++---
 panel-plugin/xfce4-orageclock-plugin.desktop.in.in |    1 -
 plugin/xfce-xfcalendar-settings.desktop.in         |    1 -
 xfcalendar.desktop.in                              |    1 -
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index e28047e..b4c997b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.8.1.1-git])
+m4_define([orage_version], [4.8.1.2-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
diff --git a/globaltime/globaltime.desktop.in b/globaltime/globaltime.desktop.in
index a42d480..385d506 100644
--- a/globaltime/globaltime.desktop.in
+++ b/globaltime/globaltime.desktop.in
@@ -1,12 +1,11 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 _Name=Orage Globaltime
 _Comment=Show clocks from different countries
 Exec=globaltime
-Icon=xfce4-clock
+Icon=clock
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=X-XFCE;Office;Clock;GTK;Application;Utility;
+Categories=X-XFCE;Office;Clock;GTK;Utility;
 _GenericName=Globaltime
diff --git a/panel-plugin/xfce4-orageclock-plugin.desktop.in.in b/panel-plugin/xfce4-orageclock-plugin.desktop.in.in
index c4c2534..7220138 100644
--- a/panel-plugin/xfce4-orageclock-plugin.desktop.in.in
+++ b/panel-plugin/xfce4-orageclock-plugin.desktop.in.in
@@ -1,6 +1,5 @@
 [Xfce Panel]
 Type=X-XFCE-PanelPlugin
-Encoding=UTF-8
 _Name=Orage Panel Clock
 _Comment=Show time and date?
 Icon=xfce-schedule
diff --git a/plugin/xfce-xfcalendar-settings.desktop.in b/plugin/xfce-xfcalendar-settings.desktop.in
index 211985e..736fdef 100644
--- a/plugin/xfce-xfcalendar-settings.desktop.in
+++ b/plugin/xfce-xfcalendar-settings.desktop.in
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 _Name=Orage preferences
 _Comment=Settings for the Xfce 4 Calendar Application (Orage)
 Exec=orage -p
diff --git a/xfcalendar.desktop.in b/xfcalendar.desktop.in
index 023920a..a79b956 100644
--- a/xfcalendar.desktop.in
+++ b/xfcalendar.desktop.in
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 _Name=Orage Calendar
 _Comment=Desktop calendar
 Exec=orage