diff options
| author | Colin Walters <walters@src.gnome.org> | 2008-08-15 02:29:56 +0800 |
|---|---|---|
| committer | Colin Walters <walters@src.gnome.org> | 2008-08-15 02:29:56 +0800 |
| commit | f576f39ae95eac38e5862cb83f7e30f7446b7752 (patch) | |
| tree | 45c3869430bdb9f98db19a52ed497dfcb69a12c4 | |
| parent | 079165754fe2711dc937f1615fff3d4900a2c1ed (diff) | |
| download | gsoc2013-empathy-f576f39ae95eac38e5862cb83f7e30f7446b7752.tar gsoc2013-empathy-f576f39ae95eac38e5862cb83f7e30f7446b7752.tar.gz gsoc2013-empathy-f576f39ae95eac38e5862cb83f7e30f7446b7752.tar.bz2 gsoc2013-empathy-f576f39ae95eac38e5862cb83f7e30f7446b7752.tar.lz gsoc2013-empathy-f576f39ae95eac38e5862cb83f7e30f7446b7752.tar.xz gsoc2013-empathy-f576f39ae95eac38e5862cb83f7e30f7446b7752.tar.zst gsoc2013-empathy-f576f39ae95eac38e5862cb83f7e30f7446b7752.zip | |
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
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/empathy-properties.desktop.in.in | 14 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
3 files changed, 1 insertions, 16 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 58b185218..b4cb549bc 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 f13819db3..000000000 --- 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 7ec9719ae..4b56f4243 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 |