]>
git.0d.be Git - empathy.git/log
Jonny Lamb [Wed, 10 Mar 2010 18:44:14 +0000 (18:44 +0000)]
tp-chat: remove butterfly MSN HandleType=NONE workaround
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.
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
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.
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Jonny Lamb [Wed, 10 Mar 2010 18:34:34 +0000 (18:34 +0000)]
dispatcher: allow not caring about handle type when looking up RCCs
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Philip Withnall [Thu, 4 Mar 2010 23:55:20 +0000 (23:55 +0000)]
Updated British English translation
Fran Diéguez [Thu, 4 Mar 2010 23:23:22 +0000 (00:23 +0100)]
Update Galician translation
Inaki Larranaga Murgoitio [Thu, 4 Mar 2010 22:03:39 +0000 (23:03 +0100)]
Updated Basque language
Jonh Wendell [Thu, 4 Mar 2010 19:04:52 +0000 (16:04 -0300)]
Updated Brazilian Portuguese translation
Xavier Claessens [Thu, 4 Mar 2010 18:53:27 +0000 (19:53 +0100)]
Revert "Disable empathy-parser-test for now as it doesn't build any more"
This reverts commit
400dc9cfed1e4ff95e10ecec47c51871332302a9 .
Xavier Claessens [Thu, 4 Mar 2010 18:41:47 +0000 (19:41 +0100)]
Parser API is moved from empathy-ui-utils to empathy-string-parser
Guillaume Desmottes [Thu, 4 Mar 2010 18:50:48 +0000 (19:50 +0100)]
start dev of next release
Guillaume Desmottes [Thu, 4 Mar 2010 18:38:54 +0000 (19:38 +0100)]
Disable empathy-parser-test for now as it doesn't build any more
Guillaume Desmottes [Thu, 4 Mar 2010 18:22:44 +0000 (19:22 +0100)]
prepare 2.29.91.2 release
Sjoerd Simons [Thu, 4 Mar 2010 18:02:21 +0000 (18:02 +0000)]
Force windows to jump to the foreground if we present them
Guillaume Desmottes [Thu, 4 Mar 2010 17:38:24 +0000 (18:38 +0100)]
set the server field of Google Talk account
This should solve connection issue with buggy router (#601089).
Sjoerd Simons [Thu, 4 Mar 2010 17:23:10 +0000 (17:23 +0000)]
Fix silly typo
Xavier Claessens [Thu, 4 Mar 2010 17:11:26 +0000 (18:11 +0100)]
empathy_add_link_markup() is not NULL-safe
Add a g_return_val_if_fail() to avoid crash, and avoid calling that func
with NULL text.
Guillaume Desmottes [Thu, 4 Mar 2010 16:57:05 +0000 (17:57 +0100)]
Popup the assistant when starting only if there is *no* account configured
Guillaume Desmottes [Thu, 4 Mar 2010 16:52:37 +0000 (17:52 +0100)]
add empathy_accounts_has_accounts
Guillaume Desmottes [Thu, 4 Mar 2010 16:31:40 +0000 (17:31 +0100)]
remove the salut_created gconf key (#611817)
Sjoerd Simons [Thu, 4 Mar 2010 16:56:36 +0000 (16:56 +0000)]
Merge branch 'tweaks'
Sjoerd Simons [Thu, 4 Mar 2010 13:35:48 +0000 (13:35 +0000)]
Cope with the favorite pixbuf not being available
Not all icon themes have the favorite icon, so don't rely on it existing (if
it's not there, just don't display a bookmark icon) Fixes: #611794
Sjoerd Simons [Thu, 4 Mar 2010 12:21:54 +0000 (12:21 +0000)]
Connect to the accounts signals in one central place
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
Guillaume Desmottes [Thu, 4 Mar 2010 14:19:12 +0000 (15:19 +0100)]
Stop mapping 'B)' with the face-cool icon
'B)' is a common pattern when explaining things or doing enumeration
(#611753).
Xavier Claessens [Thu, 4 Mar 2010 15:37:48 +0000 (16:37 +0100)]
Merge branch 'clickable-link'
Xavier Claessens [Thu, 4 Mar 2010 15:28:56 +0000 (16:28 +0100)]
Add a comment explaining what does empathy_add_link_markup, and don't make parser list static
Xavier Claessens [Thu, 4 Mar 2010 15:24:00 +0000 (16:24 +0100)]
Also make links clickable in tooltip
It is not clickable, but still nice looking
Xavier Claessens [Wed, 3 Mar 2010 15:51:48 +0000 (16:51 +0100)]
Remove unused function empathy_toggle_button_set_state_quietly
Mario Blättermann [Wed, 3 Mar 2010 21:15:52 +0000 (22:15 +0100)]
Updated German translation
Khaled Hosny [Wed, 3 Mar 2010 17:42:43 +0000 (19:42 +0200)]
Updated Arabic translation
Guillaume Desmottes [Wed, 3 Mar 2010 17:27:50 +0000 (18:27 +0100)]
start dev of next release
Guillaume Desmottes [Wed, 3 Mar 2010 13:00:08 +0000 (14:00 +0100)]
prepare 2.29.91.1 release
vasudeven [Wed, 3 Mar 2010 16:02:27 +0000 (21:32 +0530)]
updated Tamil translation
Xavier Claessens [Wed, 3 Mar 2010 15:17:37 +0000 (16:17 +0100)]
Make links clickable in presence message and topics
Fixes bug #525576
Xavier Claessens [Wed, 3 Mar 2010 14:48:07 +0000 (15:48 +0100)]
New function empathy_add_link_markup() to be used with gtk_label_set_markup()
Xavier Claessens [Wed, 3 Mar 2010 14:39:40 +0000 (15:39 +0100)]
Make empathy_string_replace_link and empathy_string_replace_escaped public
The code is moved from empathy-theme-adium.c
Xavier Claessens [Wed, 3 Mar 2010 14:33:35 +0000 (15:33 +0100)]
Reorganize code in empathy-ui-utils.ch to group related code
Xavier Claessens [Wed, 3 Mar 2010 14:52:35 +0000 (15:52 +0100)]
Move empathy_uri_regex_dup_singleton to be private inside empathy-string-parser.c
Now that our code is correctly factored, that regex can be made private
Xavier Claessens [Wed, 3 Mar 2010 14:31:45 +0000 (15:31 +0100)]
Move empathy_string_parser API to its own file
Sjoerd Simons [Wed, 3 Mar 2010 15:02:51 +0000 (15:02 +0000)]
Use the right marshaller for account-created
Don't try to marshal G_TYPE_OBJECT values with a _POINTER marshaller.
Fixes: #611224
Kjartan Maraas [Wed, 3 Mar 2010 13:44:29 +0000 (14:44 +0100)]
Updated Norwegian bokmål translation
Iswandi Basri [Wed, 3 Mar 2010 12:31:01 +0000 (13:31 +0100)]
Update Malaj translation. Fixes bug 605878.
Piotr Drąg [Wed, 3 Mar 2010 12:18:10 +0000 (13:18 +0100)]
Updated Polish translation
Guillaume Desmottes [Wed, 3 Mar 2010 10:54:57 +0000 (11:54 +0100)]
Merge branch 'update-display-name-603463'
Guillaume Desmottes [Wed, 3 Mar 2010 10:46:30 +0000 (11:46 +0100)]
update display name after editing if it hasn't been overridden (#603463)
Guillaume Desmottes [Wed, 3 Mar 2010 10:45:39 +0000 (11:45 +0100)]
account-widget: try to guess if the display name has been manually changed by the user
Guillaume Desmottes [Wed, 3 Mar 2010 10:44:24 +0000 (11:44 +0100)]
empathy_account_settings_set_display_name_async: don't do anything if not needed
Guillaume Desmottes [Wed, 3 Mar 2010 10:43:46 +0000 (11:43 +0100)]
no need to call empathy_account_settings_is_ready in account-widget's dispose function
Alexander Shopov [Wed, 3 Mar 2010 09:46:45 +0000 (11:46 +0200)]
Updated Bulgarian translation
Guillaume Desmottes [Wed, 3 Mar 2010 09:23:01 +0000 (10:23 +0100)]
accounts-dialog: set display-name before creating the account
This saves us a D-Bus call.
Guillaume Desmottes [Wed, 3 Mar 2010 09:15:37 +0000 (10:15 +0100)]
assistant: call empathy_account_widget_get_default_display_name before actually creating the account
This saves us a D-Bus call.
Guillaume Desmottes [Wed, 3 Mar 2010 08:48:23 +0000 (09:48 +0100)]
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)
Jorge González [Wed, 3 Mar 2010 06:48:12 +0000 (07:48 +0100)]
Updated Spanish translation
Travis Reitter [Tue, 2 Mar 2010 18:57:36 +0000 (10:57 -0800)]
Merge branch 'more-accounts-fixes'
Milo Casagrande [Tue, 2 Mar 2010 18:08:29 +0000 (19:08 +0100)]
Updated Italian translation
Travis Reitter [Tue, 2 Mar 2010 17:06:12 +0000 (09:06 -0800)]
Remove EmpathyAccountsPlugin's requirement that it be a singleton, so we can reset the embedded control panel to a sane state every time we open it.
Guillaume Desmottes [Tue, 2 Mar 2010 15:52:09 +0000 (16:52 +0100)]
empathy-accounts: the TpDBusDaemon is not used any more
Guillaume Desmottes [Tue, 2 Mar 2010 09:25:52 +0000 (10:25 +0100)]
account-assistant: ensure that new accounts are connected (#611565)
Guillaume Desmottes [Tue, 2 Mar 2010 09:25:46 +0000 (10:25 +0100)]
factor out empathy_connect_new_account
Guillaume Desmottes [Tue, 2 Mar 2010 09:03:40 +0000 (10:03 +0100)]
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)
Matej Urbančič [Tue, 2 Mar 2010 14:29:53 +0000 (15:29 +0100)]
Updated Slovenian translation
Sjoerd Simons [Tue, 2 Mar 2010 11:39:14 +0000 (11:39 +0000)]
Merge branch 'accounts-wizard'
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 [Tue, 2 Mar 2010 11:17:35 +0000 (11:17 +0000)]
Improve debugging and don't use g_debug
Travis Reitter [Mon, 1 Mar 2010 23:54:13 +0000 (15:54 -0800)]
Disable the Cancel button in the accounts dialog if there are no existing accounts to display (ie, we're creating our first account).
Sjoerd Simons [Mon, 1 Mar 2010 19:01:54 +0000 (19:01 +0000)]
Simplify empathy_accounts_import
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.
Sjoerd Simons [Mon, 1 Mar 2010 18:32:28 +0000 (18:32 +0000)]
Always popup the accounts wizard if we don't have salut accounts
Sjoerd Simons [Mon, 1 Mar 2010 18:28:24 +0000 (18:28 +0000)]
Only launch empathy-accounts if needed
Sjoerd Simons [Mon, 1 Mar 2010 18:25:19 +0000 (18:25 +0000)]
Also potentially popup the account dialog when activate by libunique
Jennie Petoumenou [Mon, 1 Mar 2010 16:40:05 +0000 (08:40 -0800)]
Updated Greek translation
Guillaume Desmottes [Mon, 1 Mar 2010 12:41:46 +0000 (13:41 +0100)]
Merge commit 'ka/tpl-0.1.1'
blueomega [Mon, 1 Mar 2010 05:59:32 +0000 (07:59 +0200)]
Updated Hebrew translation
Daniel Nylander [Sun, 28 Feb 2010 20:04:03 +0000 (21:04 +0100)]
Updated Swedish translation
Guillaume Desmottes [Fri, 26 Feb 2010 14:20:04 +0000 (14:20 +0000)]
remove empathy-starred and empathy-unstarred icons
We don't need those any more.
Guillaume Desmottes [Fri, 26 Feb 2010 14:19:06 +0000 (14:19 +0000)]
update the not-favorite icon when the theme is changed
Guillaume Desmottes [Fri, 26 Feb 2010 14:04:00 +0000 (14:04 +0000)]
presence-chooser: Grey the 'favorite' icon when the status is not a favorite
This is more coherent as the favorite icon is now theme dependent and fix the
problem that the old unstarred icon was not really visible (#584629).
Guillaume Desmottes [Fri, 26 Feb 2010 13:42:43 +0000 (13:42 +0000)]
presence-chooser: use 'emblem-favorite' instead of our own icon
gnome-icon-theme has an icon for favorites; we should use it instead of
re-inventing our own.
Guillaume Desmottes [Fri, 26 Feb 2010 13:35:53 +0000 (13:35 +0000)]
accounts-dialog: update the status info when account when account is enabled
If we are offline and we enable a disabled account, the info bar message
should be updated from "Acconut Disabled" to "Status is set to Offline"
(#610847).
Travis Reitter [Fri, 26 Feb 2010 23:13:36 +0000 (15:13 -0800)]
When we're creating our first account, don't let the remove button become sensitive when we change the account protocol
Travis Reitter [Fri, 26 Feb 2010 20:08:27 +0000 (12:08 -0800)]
Don't create some extra "ghost" account if we're creating our first account and we change protocols in the protocol combo box.
Danielle Madeley [Fri, 26 Feb 2010 22:19:13 +0000 (09:19 +1100)]
Merge branch 'show-assistant-611131'
Milo Casagrande [Fri, 26 Feb 2010 20:19:58 +0000 (21:19 +0100)]
Updated Italian translation
Mario Blättermann [Fri, 26 Feb 2010 20:18:26 +0000 (21:18 +0100)]
Updated German translation
Matej Urbančič [Fri, 26 Feb 2010 14:24:30 +0000 (15:24 +0100)]
Updated Slovenian translation
Jorge González [Fri, 26 Feb 2010 13:56:57 +0000 (14:56 +0100)]
Updated Spanish translation
Cosimo Alfarano [Fri, 26 Feb 2010 13:52:36 +0000 (13:52 +0000)]
Update to TPL 0.1.1
Updated the the pkg-config version to 0.1.1
Updated the the pkg-config dep name fom libtelepathy-logger to telepathy-logger
Updated TPL's _finish() methods using one for each async API.
Mattias Põldaru [Fri, 26 Feb 2010 11:30:51 +0000 (13:30 +0200)]
Estonian translation updated
Mattias Põldaru [Fri, 26 Feb 2010 11:10:10 +0000 (13:10 +0200)]
Estonian translation updated
Guillaume Desmottes [Fri, 26 Feb 2010 08:49:16 +0000 (08:49 +0000)]
Merge commit 'ka/empathy-tpl-
20100225 -ifdef'
Rob Bradford [Thu, 25 Feb 2010 22:16:09 +0000 (22:16 +0000)]
Remove the SKIP_TASKBAR hint when the main window is activated
Mike Ruprecht [Tue, 23 Feb 2010 03:23:43 +0000 (21:23 -0600)]
Add the capability to search debug messages in the debug window.
Danielle Madeley [Fri, 26 Feb 2010 00:56:24 +0000 (11:56 +1100)]
empathy-accounts: Check to see if there are no accounts thus show the assistant
Fixes: #611131
Cosimo Alfarano [Thu, 25 Feb 2010 19:15:15 +0000 (19:15 +0000)]
moving retrieving_backlog = FALSE right before empathy_chat_messages_read()
or it will allow race conditions
Will Thompson [Thu, 25 Feb 2010 12:30:56 +0000 (12:30 +0000)]
Don't try to close channels thrice.
Fixes: #611071
Cosimo Alfarano [Tue, 23 Feb 2010 19:32:57 +0000 (19:32 +0000)]
TPL Enabling patch, all-in-one.
By default TPL is disabled, use --enable-tpl configure option to enable it.
Guillaume Desmottes [Thu, 25 Feb 2010 17:24:48 +0000 (17:24 +0000)]
set empathy_released to 0
I forgot to set it after latest release...
Guillaume Desmottes [Thu, 25 Feb 2010 15:46:00 +0000 (15:46 +0000)]
show map license
Guillaume Desmottes [Thu, 25 Feb 2010 09:51:23 +0000 (09:51 +0000)]
contact-widget: increase zoom on map