remove empathy-accounts.desktop

Now that we have desktop wide UI to configure accounts (GNOME/Ubuntu Online
Accounts) it doesn't make much sense to expose empathy-accounts as a separated
application.

https://bugzilla.gnome.org/show_bug.cgi?id=662986

diff --git a/configure.ac b/configure.ac
index 8a0df1943c61ba0519af4e7a595f5b8198d291c1..1aeac74b7a51b845f1e5e1c02225dcd08afeddc3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -591,7 +591,6 @@ AC_CONFIG_FILES([
    Makefile
    data/Makefile
    data/empathy.desktop.in
-   data/empathy-accounts.desktop.in
    data/icons/Makefile
    data/themes/Makefile
    extensions/Makefile

diff --git a/data/.gitignore b/data/.gitignore
index 1b5fab599a2bdd4fd66628b374cf51f00eb088d5..1a3c9d8003cb7bd7a434bf23be3cb4febc7cc5cd 100644 (file)
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -5,8 +5,6 @@ gschemas.compiled
 org.freedesktop.Telepathy.Client.Empathy.Chat.service
 org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service
 org.freedesktop.Telepathy.Client.Empathy.Call.service
-empathy-accounts.desktop
-empathy-accounts.desktop.in
 org.freedesktop.Telepathy.Client.Empathy.Auth.service
 org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service
 icons/local-copy/*

diff --git a/data/Makefile.am b/data/Makefile.am
index 65c7242515b99612ed8ef6e600eb8355f71b2ef0..e6627ae15e8366ed7ebc52b755612c1034731508 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = icons themes
 desktopdir = $(datadir)/applications
 desktop_in_files = \
        empathy.desktop.in \
-       empathy-accounts.desktop.in \
        $(NULL)
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@

diff --git a/data/empathy-accounts.desktop.in.in b/data/empathy-accounts.desktop.in.in
deleted file mode 100644 (file)
index 0dc38c8..0000000
--- a/data/empathy-accounts.desktop.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-_Name=Messaging and VoIP Accounts
-_Comment=Manage Messaging and VoIP accounts
-Exec=empathy-accounts
-Icon=empathy
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-PersonalSettings;
-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 ed463aa8b0c8e9171cac6a68bbf32a525807a522..6793767b4cd6129040509712ac6e5ea3a6e99b68 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
 # Please keep this file sorted alphabetically.
 
 data/empathy.desktop.in.in
-data/empathy-accounts.desktop.in.in
 [type: gettext/gsettings]data/org.gnome.Empathy.gschema.xml
 
 libempathy/empathy-ft-handler.c

diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 91d77da96bed2771a4a81dcbf56d10152b887fb2..bfcb0d54f93d09847696f624f38a2659dc485ae8 100644 (file)
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,4 +1,3 @@
 # Please keep this file sorted alphabetically.
 
 data/empathy.desktop.in
-data/empathy-accounts.desktop.in