Merge lp:~bwilliam/elementaryos/pantheon-xsession-settings into lp:~elementary-os/elementaryos/pantheon-xsession-settings-luna

[Brendan William]

added telepathy-indicator-pantheon

[Sergey "Shnatsel" Davidoff (shnatsel)]

Telepathy indicator? Wait, don't we have a messaging menu already?

review: Needs Information

[Brendan William (bwilliam)]

Empathy is in the messaging menu, but Empathy doesn't become fully functional with LibUnity and chat waitings in the messaging menu unless telepaty-indicator is started.

[Brendan William (bwilliam)]

Telepathy and the messaging menu are totally different things

[Sergey "Shnatsel" Davidoff (shnatsel)]

So telepathy indicator is not an ayatana indicator, but a service to export telepathy status elsewhere? Okay, merging.

=== added file 'autostart/telepathy-indicator-pantheon.desktop'
--- autostart/telepathy-indicator-pantheon.desktop	1970-01-01 00:00:00 +0000
+++ autostart/telepathy-indicator-pantheon.desktop	2012-06-12 01:51:18 +0000
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Version=1.0
+Name=Chat
+Comment=Telepathy Indicator Service
+Exec=telepathy-indicator
+Icon=applications-chat-panel
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=GNOME;GTK;Network;InstantMessaging;
+NoDisplay=true
+OnlyShowIn=Pantheon;
+X-GNOME-Autostart-Delay=15
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
+X-Ubuntu-Gettext-Domain=telepathy-indicator