Don't need separate "Empathy accounts" in preferences;

for now Edit->accounts, hopefully in the long term we can
merge with evolution-data-server/gnome-about-me UI.

svn path=/trunk/; revision=1335

diff --git a/data/Makefile.am b/data/Makefile.am
index 58b18521883b29162885e6ca28c610e2963c097a..b4cb549bc56073b303654dd888299977d44c945c 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -20,7 +20,7 @@ profile_DATA =                                \
        qq.profile
 
 desktopdir = $(datadir)/applications
-desktop_in_files = empathy.desktop.in empathy-properties.desktop.in
+desktop_in_files = empathy.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 

diff --git a/data/empathy-properties.desktop.in.in b/data/empathy-properties.desktop.in.in
deleted file mode 100644 (file)
index f13819d..0000000
--- a/data/empathy-properties.desktop.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=Empathy accounts
-_Comment=Configure Telepathy account settings
-Exec=empathy --accounts
-Icon=empathy
-Terminal=false
-Type=Application
-Categories=Settings;
-OnlyShowIn=GNOME;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=empathy
-X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=@VERSION@

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7ec9719ae0236b48b94fb53e32c926eb4084094d..4b56f424365ea4694b4c9901d0a3b6e923a9ad2a 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@
 
 data/empathy.desktop.in.in
 data/empathy.schemas.in
-data/empathy-properties.desktop.in.in
 
 libempathy/empathy-tp-contact-list.c
 libempathy/empathy-utils.c