diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-08-07 18:09:29 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-08-07 18:10:25 +0800 |
| commit | e50bbed1c0ea00a62e22bd2ace2427fef4d65ada (patch) | |
| tree | 7923968142464b36a3fd86d2d0ea4a73a85e6654 | |
| parent | 3bf2022584d5c52b5959387fb519ffc50b44ff0e (diff) | |
| download | gsoc2013-empathy-e50bbed1c0ea00a62e22bd2ace2427fef4d65ada.tar gsoc2013-empathy-e50bbed1c0ea00a62e22bd2ace2427fef4d65ada.tar.gz gsoc2013-empathy-e50bbed1c0ea00a62e22bd2ace2427fef4d65ada.tar.bz2 gsoc2013-empathy-e50bbed1c0ea00a62e22bd2ace2427fef4d65ada.tar.lz gsoc2013-empathy-e50bbed1c0ea00a62e22bd2ace2427fef4d65ada.tar.xz gsoc2013-empathy-e50bbed1c0ea00a62e22bd2ace2427fef4d65ada.tar.zst gsoc2013-empathy-e50bbed1c0ea00a62e22bd2ace2427fef4d65ada.zip | |
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
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/.gitignore | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | data/empathy-accounts.desktop.in.in | 14 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/POTFILES.skip | 1 |
6 files changed, 0 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index 8a0df1943..1aeac74b7 100644 --- 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 1b5fab599..1a3c9d800 100644 --- 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 65c724251..e6627ae15 100644 --- 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 index 0dc38c83a..000000000 --- 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 ed463aa8b..6793767b4 100644 --- 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 91d77da96..bfcb0d54f 100644 --- 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 |