commit d8407527e25ad3079cfd0da4cc6a5a86ec319c08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 15 18:05:27 2010 +0100
fix typo in release name
NEWS | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit c88fa694db6c603fd01674591255ccfa830e30e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 15 17:18:57 2010 +0100
Prepare 2.29.93 release
NEWS | 44 ++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 4 ++--
2 files changed, 46 insertions(+), 2 deletions(-)
commit 07d220cd50802d5d7e21f7f339984e0f3a8eb74a
Merge: f3842fe b27315f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 15 18:03:25 2010 +0100
Merge commit 'staz/dnd'
commit b27315f5de4084fff748ac12f54b6d23ee7260a7
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
Date: Mon Mar 15 17:47:00 2010 +0100
DnD: add a text/path-list target to contact list windows too
libempathy-gtk/empathy-contact-list-view.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit c7085dce8076c1e98049adc7dbcb593b16ac5df8
Author: Olivier Le Thanh Duong <olivier@lethanh.be>
Date: Fri Mar 5 00:45:01 2010 +0100
DnD: add a new text/path-list target in chat window
add a new text/path-list drop target to the chat window, it act like
the text/uri-list target but is prioritized over it. This is mainly to
circumvent Tomboy returning note:// uri in its uri-list.
src/empathy-chat-window.c | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
commit f3842fe890a0819331c3a5901437c88b2e88d282
Author: Piotr DrÄ…g <piotrdrag@gmail.com>
Date: Mon Mar 15 17:19:28 2010 +0100
Updated Polish translation
po/pl.po | 438
+++++++++++++++++++++++++++++++-------------------------------
1 files changed, 222 insertions(+), 216 deletions(-)
commit 4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Mar 11 14:52:59 2010 +0100
empathy_window_present: use _NET_WM_USER_TIME only has a fallback
libempathy-gtk/empathy-ui-utils.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
commit f22c92022672a78bead49aa44947bc9380ebf2b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Mar 11 14:32:57 2010 +0100
empathy_window_present: use gdk_x11_display_get_user_time as timestamp
Using G_MAXINT32 is wrong because X clock wraps every few weeks
so G_MAXINT32
is not garanteed to be in the past or future.
Using gdk_x11_display_get_user_time should give us a good
approximation of the
actual time.
Fixes bug #609001.
libempathy-gtk/empathy-ui-utils.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
commit c1d6af1cfbb1801d26a0a550dc7ae9a81e642bc0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Mar 11 10:35:25 2010 +0100
empathy_window_present: remove useless 'steal_focus' arg
libempathy-gtk/empathy-ui-utils.c | 3 +--
libempathy-gtk/empathy-ui-utils.h | 3 +--
src/empathy-chat-window.c | 2 +-
src/empathy-main-window.c | 2 +-
src/empathy-map-view.c | 4 ++--
src/empathy-status-icon.c | 2 +-
6 files changed, 7 insertions(+), 9 deletions(-)
commit cb0b0ee29fc08109b5180e7a0e468e6947ae0758
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 2 18:09:41 2010 +0100
main_window_chat_quit_cb: release the reference on the chatroom mgr
src/empathy-main-window.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 170e1d8999a460bb3c293188b4dcc7ea492ab509
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Mar 11 12:34:16 2010 +0100
call-window: display the 'audio input' page by default (#612450)
src/empathy-call-window.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
commit 0d1cf12a9eae8334778e51934d5e6a3b0cb58b4a
Author: Brian Curtis <briancurtis.wx@gmail.com>
Date: Mon Mar 15 13:47:51 2010 +0100
idle: Only restore state but not status message when getting back
from idle (#566832)
libempathy/empathy-idle.c | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
commit a7d443e78a3c58d6d188432ada7f7706b3c10cf2
Author: Matej UrbanÄiÄ <mateju@svn.gnome.org>
Date: Mon Mar 15 12:41:54 2010 +0100
Updated Slovenian translation
po/sl.po | 454
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 236 insertions(+), 218 deletions(-)
commit fd87c03fb0a0ae22d27e581bd46df84ac96a4c04
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 15 12:18:11 2010 +0100
add COPYING-DOCS, COPYING.LGPL and COPYING.SHARE-ALIKE to EXTRA_DIST
so they are shipped in tarballs
Also sort EXTRA_DIST.
Makefile.am | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
commit b91ab973ed932fc95357a0531e8c548edacce215
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 15 10:29:08 2010 +0100
return correct value in g_return_val_if_fail
libempathy-gtk/empathy-contact-selector-dialog.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit c30bc2459bfdbd29f5607e48c9d94f1476defc80
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 15 10:25:42 2010 +0100
contact-selector-dialog: unref filter_account when disposing
libempathy-gtk/empathy-contact-selector-dialog.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
commit 00a119d8f895506897c86165c5b7592c3ff4f787
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 15 10:24:14 2010 +0100
contact_selector_dialog_account_changed_cb: cope with
tp_account_get_connection being NULL
libempathy-gtk/empathy-contact-selector-dialog.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit f75ecac41ace8d80c9253e3f16fc5e068885a1f0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Mar 12 18:06:10 2010 +0100
invite-participant-dialog: filter contacts by account
We can't invite contacts from other accounts so we shouldn't
display them
(#612718).
src/empathy-chat-window.c | 4 +++-
src/empathy-invite-participant-dialog.c | 7 +++++--
src/empathy-invite-participant-dialog.h | 3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
commit e1e6e92bae0eac67637b06eca8860a88d29bd8b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Mar 12 18:18:58 2010 +0100
contact-selector-dialog: Add a property to filter contacts by account
This is useful when the account chooser is not displayed to filter
contacts
from one specific account.
libempathy-gtk/empathy-contact-selector-dialog.c | 68
+++++++++++++++++++++-
libempathy-gtk/empathy-contact-selector-dialog.h | 7 ++
2 files changed, 72 insertions(+), 3 deletions(-)
commit 9f839398aa851f66bcd426f5a1754c7becb8c990
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 14:25:49 2010 +0100
contact_widget_contact_update: don't call
contact_widget_favourites_changed_cb if favorite support is disabled
libempathy-gtk/empathy-contact-widget.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 8af9b4b15e86ed2d7307977ca1d2708d894baaf0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 14:19:58 2010 +0100
Allow to unmark contacts as favorite using DnD
libempathy-gtk/empathy-contact-list-view.c | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
commit 91c1a372d9b58a42fd57cc4ce98888771b273f8d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 14:19:25 2010 +0100
Allow to remove contact from the 'Ungrouped' group using DnD
libempathy-gtk/empathy-contact-list-view.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
commit 71ad0f9d2f6a6c35719fbd4d5315ef1104299e7e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 13:49:42 2010 +0100
factor out group_can_be_modified
libempathy-gtk/empathy-contact-list-view.c | 25
+++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
commit 3cab7c229b83bd9668c45a60d562a2e2574dfc49
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 13:26:50 2010 +0100
Support to tag contact as favorite using DnD
libempathy-gtk/empathy-contact-list-view.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
commit 8ae91c9509dde4dea0bc735dd24c7e3a690b4c9a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 10:21:32 2010 +0100
Don't allow moving contacts to fake groups using DnD
Fake groups can't be modified.
libempathy-gtk/empathy-contact-list-store.c | 8 +++++++-
libempathy-gtk/empathy-contact-list-store.h | 3 ++-
libempathy-gtk/empathy-contact-list-view.c | 9 +++++++--
3 files changed, 16 insertions(+), 4 deletions(-)
commit 10de86b4bf55d1b624adbb867854bb61df04fb19
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 10:05:50 2010 +0100
add 'favorite' checkbox to the edit dialog
libempathy-gtk/empathy-contact-dialogs.c | 3 +-
libempathy-gtk/empathy-contact-widget.c | 84
++++++++++++++++++++++++++++--
libempathy-gtk/empathy-contact-widget.h | 1 +
3 files changed, 82 insertions(+), 6 deletions(-)
commit d00ccf5d7f5da998dbcedcb6f420630e347cfe96
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 09:00:34 2010 +0100
remove double ;
libempathy-gtk/empathy-contact-list-view.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit d1c7199036cf8006fc1da210c77f7b0787f682fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 08:59:29 2010 +0100
rephrase fake favorite group display name
libempathy-gtk/empathy-contact-list-store.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 2b8caddf10e90935b10748ea8c48e462bfc686ab
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 08:59:08 2010 +0100
stop exporting FAVOURITE_CONTACTS_CFLAGS and FAVOURITE_CONTACTS_LIBS
configure.ac | 2 --
libempathy-gtk/Makefile.am | 2 --
libempathy/Makefile.am | 2 --
3 files changed, 0 insertions(+), 6 deletions(-)
commit 639c68cc074ea525cb769213939383c9ee57fb57
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 18:10:51 2010 +0100
libtelepathy-logger has been renamed to telepathy-logger
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit cd054461923a9c8c7d05fab2a5f7a88b9f2e6431
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 17:41:37 2010 +0100
contact-list-store: remove EMPATHY_CONTACT_LIST_STORE_COL_IS_FAVOURITE
We don't need it any more.
libempathy-gtk/empathy-contact-list-store.c | 35
---------------------------
libempathy-gtk/empathy-contact-list-store.h | 1 -
2 files changed, 0 insertions(+), 36 deletions(-)
commit b92ad3740762d958364d4f9421095b088f0d845b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 17:25:14 2010 +0100
Don't display context menu when right clicking on a fake group
Those can't be renamed.
libempathy-gtk/empathy-contact-list-view.c | 16 ++++++++++++----
libempathy-gtk/empathy-contact-list-view.h | 3 ++-
2 files changed, 14 insertions(+), 5 deletions(-)
commit 39aeb13d19382b86d3b322a7cca13a72c5fac1b5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 17:20:39 2010 +0100
compare_separator_and_groups: check that the group is actually a
fake one
libempathy-gtk/empathy-contact-list-store.c | 28
++++++++++++++------------
1 files changed, 15 insertions(+), 13 deletions(-)
commit 18c1a21f066f5077ff487ffb92554fd1539ff997
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 17:14:43 2010 +0100
contact-list-store: add a column saying if a group is a fake one
or not
libempathy-gtk/empathy-contact-list-store.c | 14 +++++++++-----
libempathy-gtk/empathy-contact-list-store.h | 1 +
2 files changed, 10 insertions(+), 5 deletions(-)
commit a1aabfa9396be10ba988a84d3e7aac0ec6f10ffa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 17:01:47 2010 +0100
stop displaying favorite contacts on top of groups
They are already displayed in a separated group on top of the
contact list
libempathy-gtk/empathy-contact-list-store.c | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
commit 28202c4333c27f360d9298427a9f196954cf8f9f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 16:31:59 2010 +0100
Display icon near the favorite fake group
libempathy-gtk/empathy-contact-list-view.c | 53
++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
commit d8d32209c69c82ebec704126c461abb9e39e1b8f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 15:42:18 2010 +0100
Display the fake 'Favorites' group at the top of the contact list
libempathy-gtk/empathy-contact-list-store.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
commit 1accacab8c375482d6bd16de400529e333c8078f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 14:53:53 2010 +0100
Create a fake 'Favorites People' group
libempathy-gtk/empathy-contact-list-store.c | 19 ++++++++++++++++++-
libempathy-gtk/empathy-contact-list-store.h | 1 +
2 files changed, 19 insertions(+), 1 deletions(-)
commit a15866686e0851f4951144f0d7a6118e963b605d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 15:02:58 2010 +0100
factor out add_contact_to_store
libempathy-gtk/empathy-contact-list-store.c | 50
+++++++++++++--------------
1 files changed, 24 insertions(+), 26 deletions(-)
commit 4ac942f53ca44bcfc1e3b8aa9329dddf014b44b8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 14:28:42 2010 +0100
Move the 'Ungrouped' fake contact to the bottom of the contact list
libempathy-gtk/empathy-contact-list-store.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
commit 3828abfc717a381003c81119dc96ef93b3d69d50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 14:20:21 2010 +0100
factor out compare_separator_and_groups
libempathy-gtk/empathy-contact-list-store.c | 86
++++++++++++++-------------
1 files changed, 45 insertions(+), 41 deletions(-)
commit 256b001de17b36d197f21e202d82547510868a5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 13:56:06 2010 +0100
add 'Ungrouped' fake contact
libempathy-gtk/empathy-contact-list-store.c | 15 ++++++++++++++-
libempathy-gtk/empathy-contact-list-store.h | 2 ++
2 files changed, 16 insertions(+), 1 deletions(-)
commit 3e47aa6e9b32793d878488d0344afb0ba9c09f2e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 13:28:09 2010 +0100
Move the 'Favorite' menu item after 'Information'
libempathy-gtk/empathy-contact-menu.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
commit 9a912cfc5dfe0592d4e04c7da517383b49c99b95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 11:59:07 2010 +0100
remove EMPATHY_IMAGE_(UN)FAVOURITE
libempathy-gtk/empathy-images.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
commit 40586f1a404d9e053ce4f282c50f3988e6976659
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 11:22:32 2010 +0100
remove 'favorite' column in the contact list
We can use the contact menu now.
libempathy-gtk/empathy-contact-list-view.c | 88
----------------------------
1 files changed, 0 insertions(+), 88 deletions(-)
commit 8df2cf237283de1b049b4c24b0906384e45c4320
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 11:20:33 2010 +0100
Add 'favorite' checkbox to the contact menu
libempathy-gtk/empathy-contact-menu.c | 49
+++++++++++++++++++++++++++++++++
libempathy-gtk/empathy-contact-menu.h | 1 +
2 files changed, 50 insertions(+), 0 deletions(-)
commit 27591216de0bdbf8cfecd562414faa34138a1a52
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 8 16:39:29 2010 +0100
check that logger is not NULL before unrefing it
libempathy/empathy-contact-manager.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 52d2d0aff0c3a8bbbdd433bb63434207c2e74001
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 8 16:32:54 2010 +0100
fix hash table leak
priv->favourites takes the reference of the newly created hash table
so we
don't have to ref it.
libempathy/empathy-contact-manager.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 01e4fe629f1861723d004daba9d190abe1e3ec00
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 8 16:32:03 2010 +0100
factor out add_contacts_to_favourites
libempathy/empathy-contact-manager.c | 61
++++++++++++++++-----------------
1 files changed, 30 insertions(+), 31 deletions(-)
commit 0117b6e07afbe6b05add3baba61aae8d36093051
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 8 16:14:27 2010 +0100
Unref contact returned by empathy_contact_list_get_members
empathy_contact_list_get_members return a list of reffed contacts.
libempathy/empathy-contact-manager.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 6a74d80616929d756322a1cb61ab890d16c43e99
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 8 15:52:54 2010 +0100
log an error if {Add,Remove}FavouriteContact failed
libempathy/empathy-contact-manager.c | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
commit 1e8b4cff641adf7cd0a17a1fe429ada46f99907f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 8 15:52:41 2010 +0100
document the favorites hash table
libempathy/empathy-contact-manager.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 2f6934c6f206596cfffe0497adad83a231cc24d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 8 14:30:57 2010 +0100
coding style fixes
libempathy-gtk/empathy-contact-list-store.c | 33
++++++++++++++-------------
libempathy-gtk/empathy-contact-list-view.c | 20 ++++++++--------
libempathy/empathy-contact-list.c | 12 +++++-----
libempathy/empathy-contact-list.h | 8 +++---
libempathy/empathy-contact-manager.c | 32
++++++++++++++------------
5 files changed, 54 insertions(+), 51 deletions(-)
commit 5056bda77944ccee7a6bc4040a462590c16982b3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Mar 8 13:15:26 2010 +0100
Sync Unix_Timestamp64 definition with the spec
It now has the 'x' type.
extensions/generic-types.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
commit c66e6c536d776414f6bfada650dc25d97dc95803
Author: Travis Reitter <treitter@gmail.com>
Date: Fri Mar 5 18:58:17 2010 -0800
Rebase the favourites support upon the telepathy-logger instead of
a specially-named favourites group.
extensions/Logger.xml | 179 ++++++++++++++++
extensions/Makefile.am | 6 +-
extensions/all.xml | 2 +
extensions/misc.xml | 1 +
libempathy-gtk/empathy-contact-list-store.c | 66 ++++++-
libempathy-gtk/empathy-contact-list-view.c | 10 +-
libempathy/empathy-contact-list.c | 11 +-
libempathy/empathy-contact-list.h | 19 ++-
libempathy/empathy-contact-manager.c | 291
+++++++++++++++++++++++++++
9 files changed, 564 insertions(+), 21 deletions(-)
commit 79ef79c4d92cc4978dd12528d5bb6c3673a6b0f9
Author: Travis Reitter <treitter@gmail.com>
Date: Fri Mar 5 17:45:44 2010 -0800
Cut out the concept of a special Favourites group
libempathy-gtk/empathy-contact-list-store.c | 60
+--------------------------
libempathy-gtk/empathy-contact-list-view.c | 7 ---
libempathy/empathy-contact-list.c | 41 ++++++++++++++----
libempathy/empathy-contact-list.h | 3 -
4 files changed, 33 insertions(+), 78 deletions(-)
commit 50a0138f16ceabeecd1ee92f127684a9d50b3e70
Author: Travis Reitter <treitter@gmail.com>
Date: Tue Feb 23 10:08:05 2010 -0800
Add a favorite contacts build option and make Moblin support
automatically turn it on.
configure.ac | 32
+++++++++++++++++++++++++++
libempathy-gtk/Makefile.am | 2 +
libempathy-gtk/empathy-contact-list-store.c | 22 ++++++++++++++++++
libempathy-gtk/empathy-contact-list-view.c | 8 ++++++
libempathy/Makefile.am | 2 +
libempathy/empathy-contact-list.c | 2 +
6 files changed, 68 insertions(+), 0 deletions(-)
commit b8657a61fe72be0da2d91325b0851dd4d7fd533c
Author: Travis Reitter <treitter@gmail.com>
Date: Tue Feb 16 10:11:43 2010 -0800
Add support for marking contacts as favorites (which gives them
a highlighted
star next to their name and adds them to the top of the contact list)
libempathy-gtk/empathy-contact-list-store.c | 69 +++++++++++++++++++--
libempathy-gtk/empathy-contact-list-store.h | 3 +-
libempathy-gtk/empathy-contact-list-view.c | 89
+++++++++++++++++++++++++++
libempathy-gtk/empathy-images.h | 2 +
libempathy/empathy-contact-list.c | 17 +++++
libempathy/empathy-contact-list.h | 7 ++
6 files changed, 181 insertions(+), 6 deletions(-)
commit 870983d8050e267e1894f36c7ab6fe7fe0295441
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Mon Mar 15 09:27:15 2010 +0100
Updated Spanish translation
po/es.po | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
commit 1d6dbd3894044fb1d7240de3c8a36d6fe3591329
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Mon Mar 15 09:25:06 2010 +0100
Updated Spanish translation
po/es.po | 425
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 221 insertions(+), 204 deletions(-)
commit 350d6eb6ab8dd109eb8250ebf8792ceb15eaa8b7
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Wed Mar 10 16:00:25 2010 +1100
empathy-accounts: set a title for the assistant
src/empathy-account-assistant.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit 6b55164a3957ac07824d2598f36e397686c62533
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 3 10:07:24 2010 +0100
empathy-accounts: set "Empathy Accounts" as application name
It's more friendly to translators.
src/empathy-accounts.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 221f5f70a908aec35711448c78fcea87fa894fa1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 3 10:05:57 2010 +0100
empathy-debugger: set "Empathy Debugger" as application name
It's more friendly to translators.
src/empathy-debugger.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 8e638ddd817039c0b6cdf342ce657b1b1e975b45
Author: Mike Ruprecht <mike.ruprecht@collabora.co.uk>
Date: Wed Feb 24 14:52:38 2010 -0600
Separate the debug window into its own process.
po/POTFILES.in | 1 +
src/.gitignore | 1 +
src/Makefile.am | 7 +++++-
src/empathy-debugger.c | 50
+++++++++++++++++++++++++++++++++++++++++++++
src/empathy-main-window.c | 32 +++++++++++++++++++++++++++-
5 files changed, 88 insertions(+), 3 deletions(-)
commit df53944e1ba92732760d1cfe437b8b56edda526b
Merge: ba8f9b6 c448b89
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Mon Mar 15 08:09:56 2010 +0000
Merge branch 'butterfly-networkid'
commit ba8f9b6182a9f85c7d081e571fae128dc6261d1d
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Sun Mar 14 23:17:34 2010 +0100
Updated Spanish translation
help/es/es.po | 64
++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 21 deletions(-)
commit 4623d70bbcac3aae9ef3df096128e2cb8423dcf2
Author: Milo Casagrande <milo@ubuntu.com>
Date: Sun Mar 14 20:57:06 2010 +0100
Updated Italian help translation
help/it/it.po | 158
+++++++++++++++++++++++++++++++++------------------------
1 files changed, 91 insertions(+), 67 deletions(-)
commit 1f8dfaf0c19c173385b305466cf2de15669a01d5
Author: Fran Diéguez <frandieguez@ubuntu.com>
Date: Sat Mar 13 21:09:26 2010 +0100
Update Galician translation
po/gl.po | 65
++++++++++++++++++++++++-------------------------------------
1 files changed, 26 insertions(+), 39 deletions(-)
commit d81fef008bfdc3de122c80f001e7eed6c4f064d8
Author: Mario Blättermann <mariobl@gnome.org>
Date: Fri Mar 12 23:02:21 2010 +0100
Updated German doc translation
help/de/de.po | 65
++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 21 deletions(-)
commit e8f3e042b0792106ce288d26bd19949f834300a2
Author: Milo Casagrande <milo@ubuntu.com>
Date: Fri Mar 12 22:02:19 2010 +0100
[help] Updated the irc-join-pwd topic: password protected IRC room
now works
help/C/irc-join-pwd.page | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
commit c448b89bb4f18377818b7802f4cb66ba47e3fe04
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Fri Mar 12 02:22:47 2010 +0000
Migrate butterfly logs to remove the network ID suffix.
Bug #612519 contains much more information about this change.
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
data/empathy.schemas.in | 14 ++
libempathy-gtk/empathy-conf.h | 1 +
libempathy/empathy-log-store-empathy.c | 7 +
libempathy/empathy-log-store-empathy.h | 5 +
src/Makefile.am | 1 +
src/empathy-main-window.c | 18 +++
src/empathy-migrate-butterfly-logs.c | 213
++++++++++++++++++++++++++++++++
src/empathy-migrate-butterfly-logs.h | 32 +++++
8 files changed, 291 insertions(+), 0 deletions(-)
commit cb3e4ee7e0d7d20c95b0067abbff640c005bccc8
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Mar 12 13:50:08 2010 +0100
set $HOME as default directory when sending a file
libempathy-gtk/empathy-ui-utils.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit c57f6e063efe334033061088263d246868477c88
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Mar 12 13:45:27 2010 +0100
Set XDG_DOWNLOAD_DIR as default directory when receiving a file
(#612672)
libempathy-gtk/empathy-ui-utils.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
commit 2d9cbe355d22570bbc32d2cde0d7942adab355e0
Author: Mario Blättermann <mariobl@gnome.org>
Date: Thu Mar 11 23:48:11 2010 +0100
Updated German doc translation
help/de/de.po | 918
++++++++++++++++++++++++++++-----------------------------
1 files changed, 455 insertions(+), 463 deletions(-)
commit 37a671b0f78ddd621041bb529edc7662f317cc86
Author: deniarnuad <denisarnuad@yahoo.fr>
Date: Thu Mar 11 20:32:39 2010 +0100
updated breton translation
po/br.po | 3021
++++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 1972 insertions(+), 1049 deletions(-)
commit d4843ddddb24f03451db3aed59a31d2158084171
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Thu Mar 11 18:41:43 2010 +0100
Updated Spanish translation
help/es/es.po | 151
+++++++++++++++++++++++++++------------------------------
1 files changed, 72 insertions(+), 79 deletions(-)
commit ac93e53085ee405164bc4f9f09ce2a39523727d5
Author: Milo Casagrande <milo@ubuntu.com>
Date: Thu Mar 11 18:23:23 2010 +0100
[help] Removed the offline-contacts topic (bug 612448):
* Created hide-contacts based on removed-contacts
* Fixed the topic
* Removed the old page from Makefile and added the new one
help/C/hide-contacts.page | 42 ++++++++++++++++++++++++++++++++++
help/C/offline-contacts.page | 51
------------------------------------------
help/Makefile.am | 2 +-
3 files changed, 43 insertions(+), 52 deletions(-)
commit c9fa45d605497da2c0d79262b4d6d42d0fff7c63
Author: Luca Ferretti <lferrett@gnome.org>
Date: Thu Mar 11 15:16:47 2010 +0100
Fix a small typo
po/it.po | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 02141c6718553ad9bf05afee05e1ef834d3bdd62
Merge: c1dd662 2a98cb3
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Thu Mar 11 11:35:45 2010 +0000
Merge branch 'butterfly-conference-misc'
commit 2a98cb3d4f7222097b4ec2f5343244d1b313eac1
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Wed Mar 10 18:44:14 2010 +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>
libempathy/empathy-tp-chat.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
commit c1dd662a2d2c94b19e431750ddc9109b5509e3b6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Mar 11 11:12:52 2010 +0100
Add a copy of the Attribution-ShareAlike 3.0 Unported licence
COPYING.SHARE-ALIKE | 61
+++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
commit c8516f4f6ea59ac596579dd55e16477d9f107f3e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Mar 5 10:50:49 2010 +0100
add a copy of the GNU Free Documentation License
COPYING-DOCS | 451
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 451 insertions(+), 0 deletions(-)
commit 6a35cfc707c5b64aed0a3eecdc0001df6078fa06
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Mar 5 10:49:14 2010 +0100
add a copy of the LGPLv2.1
COPYING.LGPL | 504
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 504 insertions(+), 0 deletions(-)
commit b168624ab6f99b6f4fe1778e8309ee264e18b336
Author: Maxim V. Dziumanenko <dziumanenko@gmail.com>
Date: Thu Mar 11 11:45:00 2010 +0200
Updated Ukrainian translation
po/uk.po | 2280
++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 1260 insertions(+), 1020 deletions(-)
commit 13a7c40c5aaf9b6ff9d75073775472f413959033
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Wed Mar 10 18:41:08 2010 +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>
libempathy/empathy-tp-chat.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 7d8f163d8dcb540f611b3581389e2c15971e479f
Author: Jonny Lamb <jonnylamb@gnome.org>
Date: Wed Mar 10 18:34:34 2010 +0000
dispatcher: allow not caring about handle type when looking up RCCs
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
libempathy/empathy-dispatcher.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
commit 70d4d71b08e3d8d5a0caaa051218180cd421187e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 16:48:12 2010 +0100
Show offline contacts by default (#612448)
data/empathy.schemas.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit a814276b7d9222f2a3a8d556ffc2f86d4769d5fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Mar 10 16:47:44 2010 +0100
Sort contacts by state by default (#612448)
data/empathy.schemas.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 931c6e727885bdfab4f519ef7fcd7d90f30b3303
Author: Ken VanDine <ken.vandine@canonical.com>
Date: Wed Mar 10 15:42:21 2010 +0100
Window title for the accounts dialog should match the name in the
launcher.
Fixes bug #612433
src/empathy-accounts-dialog.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 77192dd163342a513b88618bd8a4d213574d40c1
Author: Xavier Claessens <xclaesse@gmail.com>
Date: Wed Mar 10 12:15:23 2010 +0100
gtk_check_version() is returning a string error or NULL, not a boolean
This actually invert the logic
libempathy-gtk/empathy-string-parser.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 5601d115d7e74b78dc1a884902c08c23be7626a8
Author: Xavier Claessens <xclaesse@gmail.com>
Date: Wed Mar 10 11:41:29 2010 +0100
Disable empathy_add_link_markup() if linked to an old GTK version
Using links in labels could make a freeze, see GNOME #612066
libempathy-gtk/empathy-string-parser.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
commit 53a27a44ec3180efe29ed24f31091ecfd0bda3ad
Author: Xavier Claessens <xclaesse@gmail.com>
Date: Wed Mar 10 11:21:08 2010 +0100
Revert "Revert "Make links clickable in presence message and topics""
This reverts commit efb42513359f4db545e3312e3c583d07c6306418.
libempathy-gtk/empathy-chat.c | 8 +++++++-
libempathy-gtk/empathy-contact-widget.c | 12 ++++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
commit 77c57d35a578027d6f5ffea14483ba8762ad995a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Wed Mar 10 15:54:51 2010 +1100
empathy-accounts: make CcPage insensitive when assistant is being
shown
Also destroy assistant when CcPanel becomes inactive.
src/cc-empathy-accounts-page.c | 35
++++++++++++++++++++++++++++++++---
src/cc-empathy-accounts-page.h | 1 +
src/cc-empathy-accounts-panel.c | 26 +++++++++++++++++++++++++-
src/empathy-account-assistant.c | 2 +-
4 files changed, 59 insertions(+), 5 deletions(-)
commit c2cd8fbabc39ee82f28e9617a33c2ae603f711b7
Author: Leonid Kanter <leon@asplinux.ru>
Date: Wed Mar 10 00:12:57 2010 +0200
Updated Russian translation from Yury Myasoedov
po/ru.po | 2431
++++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 1428 insertions(+), 1003 deletions(-)
commit 72ddf3a41e879b907b0e40f37e96468ce2d42f8e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Mar 9 19:44:06 2010 +0100
start dev of next release
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)