empathy r1335 - in trunk: data po

[walters svn gnome org]

Author: walters
Date: Thu Aug 14 18:29:56 2008
New Revision: 1335
URL: http://svn.gnome.org/viewvc/empathy?rev=1335&view=rev

Log:
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.



Removed:
   trunk/data/empathy-properties.desktop.in.in
Modified:
   trunk/data/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Aug 14 18:29:56 2008
@@ -20,7 +20,7 @@
 	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@
 

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Thu Aug 14 18:29:56 2008
@@ -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