Newer versions of butterfly use the conference interface, so their 1-1
chats don't implement the group interface. This patch changes nothing
there, but now when butterfly gives a channel with
TargetHandleType=NONE, it is actually a MUC, so act like that.
Thanks to the addition of the conference interface with this change,
we can check for its presence to decide whether this is old-school or
new-school butterfly.
This commit and 13a7c40c together fix bug #612461.
Jonny Lamb [Wed, 10 Mar 2010 18:41:08 +0000 (18:41 +0000)]
tp-chat: when seeing if a chat can be upgraded, don't worry about handle type
When you upgrade a gtalk 1-1 chat to a PMUC, it moves from
[ChannelType=TEXT, TargetHandleType=CONTACT] to [ChannelType=TEXT,
TargetHandleType=ROOM].
When you upgrade an MSN 1-1 chat to a multi-user chat in butterfly, it
moves from [ChannelType=TEXT, TargetHandleType=CONTACT] to
[ChannelType=TEXT, TargetHandleType=NONE].
Both of these cases have the 1-1 chat properties set as fixed
properties in a class in their connection's RCC. They both also have
the upgraded set of properties as above fixed, and
o.fd.Tp.Channel.Interface.Conference(.DRAFT) in the appropriate
Allowed_Properties array.
Empathy used to look for this said channel interface in the allowed
properties of a TargetHandleType=ROOM class. As butterfly uses
TargetHandleType=NONE, this isn't so useful, so let's not care about
the handle type to fit around both gtalk and MSN.
Jonas Bonn [Mon, 8 Mar 2010 09:30:02 +0000 (10:30 +0100)]
chatroom-manager: Save correct room name
When writing out the room name to the persistance file, the room name should
properly be gotten with the get_room function. This bug has probably not
bitten too many users as the remote room name and the favorite chatroom name
usually are usually the same; however, if the user were to change the
favorite chatroom name then this bug would become apparent.
Mike Ruprecht [Fri, 5 Mar 2010 02:53:53 +0000 (20:53 -0600)]
Prevent contact list tooltip from showing if context menu is shown.
Previously, if you opened a context menu in the contact list,
contact tooltips would still be capable of being shown and
obscuring the context menu options. This patch prevents tooltips
from being shown if a context menu is visible.
Sjoerd Simons [Thu, 4 Mar 2010 12:19:32 +0000 (12:19 +0000)]
Cancel creation in the accounts dialog if the wizard is running
If the account wizard is finished it should have created at least some
accounts. Cancel any account creation that was going on in the accounts dialog
so it nicely jumps showing the first real account :)
Sjoerd Simons [Thu, 4 Mar 2010 12:16:26 +0000 (12:16 +0000)]
Don't assume there is always a settings widget available
When we exit the assistant with just salut accounts there is no account widget
for it in the normal sense, so don't crash if there isn't one. Fixes: #611792
assistant: always uses empathy_account_widget_get_default_display_name to get a better display name
EmpathyAccountSettings is created with a default display name such as "New
Jabber account". But once the account has been created we want to update it to
a more relevant name. (#611675)
account-widget: change presence to online when creating a new account
account_widget_account_enabled_cb was forcing the presence by setting the
current most available presence to the newly created account.
But if user was starting Empathy for the first time, this presence was offline
so the account wasn't connected. (#611565)
Sjoerd Simons [Tue, 2 Mar 2010 11:17:54 +0000 (11:17 +0000)]
Remove code that will always fail and has no use
libunique will already register a unique name and we have no other dbus
services so we don't need to register a unique name ourselves. Also
trying to register one which is the same as what we suggest to libunique
will always fail and is thus pointless
Sjoerd Simons [Mon, 1 Mar 2010 18:59:38 +0000 (18:59 +0000)]
Make the empathy-account code be slightly more streamlined
On every run of the accounts UI we should try to import MC4 accounts (if they
weren't imported already). Also replace the --try-import option with
--if-needed to better document the fact that it will only display the UI if
needed.