From: Colin Walters <walters@src.gnome.org>
Date: Thu, 14 Aug 2008 18:29:56 +0000 (+0000)
Subject: Don't need separate "Empathy accounts" in preferences;
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=f576f39ae95eac38e5862cb83f7e30f7446b7752

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 58b18521..b4cb549b 100644
--- 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
index f13819db..00000000
--- 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 7ec9719a..4b56f424 100644
--- 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