aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-05-24 07:01:46 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-05-24 07:01:46 +0800
commit726dec7bfdafeae5d1cbaf00149aa0659ce589a4 (patch)
treec69bb33a1a7c50dddc37cf1be09b26ba128bcf06 /data
parenta7b98a1b882d17da63c9165042282db78aff508b (diff)
downloadgsoc2013-empathy-726dec7bfdafeae5d1cbaf00149aa0659ce589a4.tar
gsoc2013-empathy-726dec7bfdafeae5d1cbaf00149aa0659ce589a4.tar.gz
gsoc2013-empathy-726dec7bfdafeae5d1cbaf00149aa0659ce589a4.tar.bz2
gsoc2013-empathy-726dec7bfdafeae5d1cbaf00149aa0659ce589a4.tar.lz
gsoc2013-empathy-726dec7bfdafeae5d1cbaf00149aa0659ce589a4.tar.xz
gsoc2013-empathy-726dec7bfdafeae5d1cbaf00149aa0659ce589a4.tar.zst
gsoc2013-empathy-726dec7bfdafeae5d1cbaf00149aa0659ce589a4.zip
New objects: GossipAccountChooser and GossipNewChatroom, we can now join
2007-05-24 Xavier Claessens <xclaesse@gmail.com> * libempathy-gtk/gossip-account-chooser.c: * libempathy-gtk/gossip-new-chatroom-dialog.c: * libempathy-gtk/gossip-account-widget-jabber.c: * libempathy-gtk/gossip-account-chooser.h: * libempathy-gtk/gossip-new-chatroom-dialog.h: * libempathy-gtk/gossip-group-chat.c: * libempathy-gtk/empathy-main-window.c: * libempathy-gtk/gossip-new-chatroom-dialog.glade: * libempathy-gtk/gossip-account-widget-jabber.glade: * libempathy-gtk/Makefile.am: * libempathy/empathy-tp-chatroom.c: * data/gtalk.profile: * data/jabber.profile: * data/salut.profile: * data/Makefile.am: * data/empathy.desktop.in.in: * data/msn.profile: * data/irc.profile: New objects: GossipAccountChooser and GossipNewChatroom, we can now join any chatroom. Adding IRC profile. svn path=/trunk/; revision=89
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am1
-rw-r--r--data/empathy.desktop.in.in2
-rw-r--r--data/gtalk.profile1
-rw-r--r--data/irc.profile7
-rw-r--r--data/jabber.profile1
-rw-r--r--data/msn.profile1
-rw-r--r--data/salut.profile1
7 files changed, 13 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index eca5bf4a2..128f8aa64 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,6 +5,7 @@ profile_DATA = \
jabber.profile \
gtalk.profile \
salut.profile \
+ irc.profile \
msn.profile
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
index eca31045b..abf48ce11 100644
--- a/data/empathy.desktop.in.in
+++ b/data/empathy.desktop.in.in
@@ -3,7 +3,7 @@ Version=1.0
Encoding=UTF-8
_Name=Empathy Instant Messenger
_Comment=Instant Messenger
-Exec=empathy
+Exec=empathy --no-connect
Icon=empathy
StartupNotify=false
Terminal=false
diff --git a/data/gtalk.profile b/data/gtalk.profile
index c8d5de9a1..f81dc27c3 100644
--- a/data/gtalk.profile
+++ b/data/gtalk.profile
@@ -4,6 +4,7 @@ Protocol=jabber
DisplayName=Google Talk
IconName = empathy-proto-google-talk
ConfigurationUI = jabber
+Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, supports-avatars, supports-alias
DefaultAccountDomain = gmail.com, googlemail.com
Default-server = talk.google.com
Default-port = 5223
diff --git a/data/irc.profile b/data/irc.profile
new file mode 100644
index 000000000..90915c16d
--- /dev/null
+++ b/data/irc.profile
@@ -0,0 +1,7 @@
+[Profile]
+Manager=idle
+Protocol=irc
+DisplayName=IRC
+ConfigurationUI = irc
+Capabilities = chat-p2p, chat-room, chat-room-list, supports-alias
+SupportsInvisible = 0
diff --git a/data/jabber.profile b/data/jabber.profile
index 1d2ad2561..7da8254f4 100644
--- a/data/jabber.profile
+++ b/data/jabber.profile
@@ -4,5 +4,6 @@ Protocol=jabber
DisplayName=Jabber
IconName = empathy-proto-jabber
ConfigurationUI = jabber
+Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, registration-ui, supports-avatars, supports-alias
DefaultAccountDomain = jabber.org
SupportsInvisible = 0
diff --git a/data/msn.profile b/data/msn.profile
index b344a4e6d..44058fc15 100644
--- a/data/msn.profile
+++ b/data/msn.profile
@@ -5,3 +5,4 @@ DisplayName=MSN
IconName = empathy-proto-msn
ConfigurationUI = msn
SupportsInvisible = 1
+Capabilities = chat-p2p, split-account, supports-avatars, supports-alias
diff --git a/data/salut.profile b/data/salut.profile
index 2082881ee..e9b346b39 100644
--- a/data/salut.profile
+++ b/data/salut.profile
@@ -4,4 +4,5 @@ Protocol=salut
DisplayName=Salut
IconName = empathy-proto-jabber
ConfigurationUI = salut
+Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, supports-avatars, supports-alias