commit 70d8fff20eb68ad2febfaf72e81c3f22a2385774
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 12 20:03:52 2010 +0200
prepare 2.31.5 release
NEWS | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 4 ++--
2 files changed, 54 insertions(+), 2 deletions(-)
commit 2afbcc31503e9e17bebbfd964a8c984cd8f8c60f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 12 20:25:20 2010 +0200
add GTK+ flags when building tests
tests/Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit bf4b7622a7dc16d156902095a2769250c22255e9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 12 20:18:09 2010 +0200
preferences: coding style fix
src/empathy-preferences.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 1542510953ec87f4279165476c6f4f6cc71a5639
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 12 20:18:01 2010 +0200
main-window: coding style fix
src/empathy-main-window.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 557c7faedb00dddc519226dec258a33dfdd63d32
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 12 20:17:49 2010 +0200
empathy-log-window: coding style fixes
libempathy-gtk/empathy-log-window.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 0dc52c58e16a3438ae6de9f6cf80f973d856d0f7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 12 20:17:33 2010 +0200
empathy-contact-list-view: coding style fix
libempathy-gtk/empathy-contact-list-view.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit beeba464478b13169a2a2e7163d4de2088ca80b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 12 20:03:41 2010 +0200
add empathy-av.c to POTFILES.in
po/POTFILES.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit c46ed4f0469071f10eb3b363c790c0beb464d5b7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 14:25:55 2010 +0200
empathy-accounts.1: document --if-needed
src/empathy-accounts.1 | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit f6cf9ea3896123239e838825da0c14de670c5e95
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 14:22:48 2010 +0200
empathy-accounts.1: --import has been removed
src/empathy-accounts.1 | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
commit 35c2f2093089a86cdbed59c77debf0e84ce5bd47
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 14:19:54 2010 +0200
import empathy-accounts manpage from Debian
Thanks to Laurent Bigonville for this man page.
src/Makefile.am | 3 ++-
src/empathy-accounts.1 | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 1 deletions(-)
commit a36d0fe444e451f3bfc10c05510596901b1f72e1
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 14:16:18 2010 +0200
sync empathy manpage with Debian package
src/empathy.1 | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
commit c60dc144eb53bc084f5ac51f0ee3794ecaceb6ac
Author: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Sat Jul 10 17:19:32 2010 +0100
Fix a memory leak in EmpathyAvatar (#624054)
The avatar filename was being leaked.
libempathy/empathy-contact.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 505c8415b87f7b0ebfce502ec44a39b0c3bf7ff5
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: Fri Jul 9 18:39:48 2010 +0100
Fix activating [ ] Enabled with the keyboard.
The GtkToggleButton::released signal has been deprecated since
Gtk+ 2.8.
And, is also wrong, because there are other ways to change the
state of
this button besides using your mouse.
Fixes bug #623972.
Toggled-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
libempathy-gtk/empathy-account-widget.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
commit b17b7bcb810f293a2de4515bbc7239b786189293
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 9 14:39:54 2010 +0200
empathy_status_icon_new: always call status_icon_set_visibility
Seems calling gtk_widget_show() doesn't mark the window as active
right away.
This code used to work fine before but doesn't since we replace
empathy_main_window_show() by empathy_main_window_dup().
src/empathy-status-icon.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
commit 5f4f3e491530aac63d78c00c6b06bb8cb1e4d043
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 9 14:38:57 2010 +0200
empathy_status_icon_new: don't ignore hide_contact_list (#623937)
That's a regression introduced when we switch to GSettings.
src/empathy-status-icon.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
commit 47fe98399a18bd0a69b86656c7821addb7916885
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: Sun Jul 11 16:24:55 2010 +0200
Updated Norwegian bokmål translation
po/nb.po | 567
+++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 300 insertions(+), 267 deletions(-)
commit 15933b3643b147f29c4b34cef1f81502feaf0af7
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Sat Jul 10 10:20:31 2010 +0200
Updated Spanish translation
po/es.po | 101
+++++++++++++++++++++++++++++++------------------------------
1 files changed, 51 insertions(+), 50 deletions(-)
commit 32e442f47b3a901d0a02ed364b9052750d989900
Author: Ivar Smolin <okul@linux.ee>
Date: Sat Jul 10 09:56:18 2010 +0300
[l10n] Updated Estonian translation
po/et.po | 372
++++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 280 insertions(+), 92 deletions(-)
commit 85593df4f49b9ac3bd6d881446da7934aff77705
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 9 15:17:31 2010 +0200
Improve desktop's Comment (#617405)
Thanks to Danny Piccirillo for his suggestion.
data/empathy.desktop.in.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 36db8ebb6a9bcc9852c7218b020ef05f6105bb69
Merge: 03635af 1607492
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 9 14:18:32 2010 +0200
Merge branch 'backlog-623914'
commit 03635afd3d842f27d1e64d9e056b0a810b38f0e2
Merge: f5d81f3 5b580ca
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 9 13:52:05 2010 +0200
Merge branch 'auto-approve'
commit f5d81f3c9dd74a9c53fcbe53375acf99e9387f79
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 16:24:13 2010 +0200
debug_window_name_owner_changed_cb: update client services as well
Remove some deprecated comments in th proccess.
src/empathy-debug-window.c | 65
+++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 33 deletions(-)
commit ec08d8cafdf99f9ae3de2c92d3fcfbb94704bafd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 16:06:25 2010 +0200
Store the unique name in the model
This avoid to add one entry per Empathy head for example.
src/empathy-debug-window.c | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
commit 678527d4d55a1b93916187f08f038fdacdfaf8d2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 15:55:23 2010 +0200
FillCmChooserData: rename, add type field and helper functions
src/empathy-debug-window.c | 47
++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 12 deletions(-)
commit bbe77b37c47e4e40967863f985fc4eacbf71d1d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 15:25:33 2010 +0200
rename vars, functions and constants to make code less CM specific
Basically a renaming from 'cm' to 'services' to make code clearer.
src/empathy-debug-window.c | 164
++++++++++++++++++++++----------------------
1 files changed, 82 insertions(+), 82 deletions(-)
commit 63dc035915797386772ac3b9c2dfe968121565de
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 15:07:28 2010 +0200
coding style fix
src/empathy-debug-window.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 405a6c07d0579285dc4d35cb9cfee795fff0f744
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 14:56:19 2010 +0200
debug-window: add Telepathy clients
src/empathy-debug-window.c | 54
++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 54 insertions(+), 0 deletions(-)
commit f598e0acbf7c981d5adaf7bf52a30d2a61d04aba
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 14:38:38 2010 +0200
debug-window: remove hardcoded clients
src/empathy-debug-window.c | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
commit 5b580ca6e7e87b15f829a621cf60556f1ce4942e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 9 13:31:20 2010 +0200
Pass EMPATHY_DISPATCHER_NON_USER_ACTION as action time when
auto-approving mucs
src/empathy-event-manager.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 16074928eee79472c804687556c193f50409ce8c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 9 12:42:25 2010 +0200
tp-chat: mark scrollback messages as backlog
libempathy/empathy-tp-chat.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
commit fe9075a08d2ee01281397511752087e94ea3c3c2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 9 12:35:36 2010 +0200
Properly mark messages from TPL as backlog (#623914)
If the message is build from a TplEntry it *is* a backlog one.
libempathy/empathy-message.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit acc341d1178dc9806b32d7aadc4154259dadf63c
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Thu Jul 8 00:01:31 2010 +0100
tell the chatroom manager asap about chats
src/empathy-chat-manager.c | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
commit 6bb5c181852365a1bb14820528bd2b925069140d
Author: Xavier Claessens <xclaesse@gmail.com>
Date: Thu Jul 8 16:29:18 2010 +0200
Some coding style fixes in configure.ac
configure.ac | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
commit 62bd07ab4997bb1959c1095fcce91f97c2878a8d
Author: Xavier Claessens <xclaesse@gmail.com>
Date: Thu Jul 8 16:27:23 2010 +0200
Cleanup nm/conman pkg check
No need to check for libnm_glib twice
configure.ac | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
commit 00c7156baa528fff2ee491c8d3452d3e2effb627
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Thu Jul 8 23:12:20 2010 +0200
Updated Spanish translation
po/es.po | 329
+++++++++++++++++++++++++++++++++----------------------------
1 files changed, 178 insertions(+), 151 deletions(-)
commit 701e8ee3edfb7a2de17f1d3b82137d0dfdb3388f
Author: Xavier Claessens <xclaesse@gmail.com>
Date: Thu Jul 8 15:24:10 2010 +0200
Fail to build if --enable-gtk3 is passed but only gtk2 is available
configure.ac | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
commit 5033a8f7fae372bece2f8c49c7fd1e7f69e37fb9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 14:54:37 2010 +0200
add have_gtk3 var
configure.ac | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
commit 6f95b307dda6580150cff92b974166958c9af222
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 14:41:09 2010 +0200
don't check GTK3 deps if GTK3 is not present
configure.ac | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
commit 0664e133624ca7def05aa0f16b6e1a05669937a3
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 15:49:08 2010 +0200
tp-contact-list: add a comment
libempathy/empathy-tp-contact-list.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit d5269ccea8739cc0cd0c40f1673ecfbeee8eb667
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 15:48:49 2010 +0200
simplify empathy_presence_chooser_new
libempathy-gtk/empathy-presence-chooser.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
commit 1e7ad4e03e46b877974b7f73d28dbc737ec9a977
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 15:29:33 2010 +0200
dispatcher: explicitely keep a ref on accounts in
status_changed_handlers
It makes things much cleaner.
libempathy/empathy-dispatcher.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
commit 0637683a2f89087f49fa0d91e44b04ed26d72ba3
Merge: 526cac7 6b1d425
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 14:35:53 2010 +0200
Merge branch 'gtk3-621753'
commit 526cac765322aa7516d46d735fc9b5f1c4f2c228
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 14:07:17 2010 +0200
empathy_pixbuf_contact_status_icon_with_icon_name: don't use
icon_filename after freeing it
libempathy-gtk/empathy-ui-utils.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
commit 6b1d4251dc32cf7c75871002a1f8163af9775f65
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 11:32:20 2010 +0200
Build with latest NST when using GTK3 and port to new API (#623199)
configure.ac | 16 ++++++++++++----
nautilus-sendto-plugin/empathy-nautilus-sendto.c | 17 +++++++++++++++++
2 files changed, 29 insertions(+), 4 deletions(-)
commit 166785e324a397f3b1444820102a41413041d76d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 10:50:59 2010 +0200
disable champlain when using GTK3
configure.ac | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
commit 757c4d6c3e3a1872588387bfd49f473ce444b3cf
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 10:36:16 2010 +0200
Check for webkitgtk-3.0 when building with GTK3
configure.ac | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
commit 457808007540c9d7ab0f6b29f2d8e643d46eb8b4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 10:08:53 2010 +0200
no need to explicitely check for gdk-x11
configure.ac | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
commit ce007d41e6854b9434efe29621e98efe95ff0d3b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 10:01:01 2010 +0200
link on unique-3 when using GTK3
configure.ac | 3 ++-
src/Makefile.am | 4 ++++
2 files changed, 6 insertions(+), 1 deletions(-)
commit c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jul 8 09:46:44 2010 +0200
Update libnotify dep when using GTK3
Since 0.5.1 libnotify doesn't link on GTK+.
configure.ac | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
commit 9a1f7eef53c664ec9a81f51bfe9a7ec5659b8c6c
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jul 7 17:03:45 2010 +0200
notify-manager: include empathy-contact.h as we use it
libempathy-gtk/empathy-notify-manager.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit e56070fd87fe3429ee046550623c90d64c98eb83
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jul 7 16:20:54 2010 +0200
use libcanberra-gtk3 when building with GTK3
configure.ac | 7 ++++++-
libempathy-gtk/Makefile.am | 2 ++
2 files changed, 8 insertions(+), 1 deletions(-)
commit fc57cd132b0563feeec4dba0e5a7298c7d904a0a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jul 7 16:11:39 2010 +0200
Build with GTK+3 if available (#621753)
configure.ac | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
commit bc2b3bf0966076e8452a170a9741ded016051f44
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jul 7 15:49:08 2010 +0200
move GTK+ check to its own PKG_CHECK_MODULES
configure.ac | 3 ++-
libempathy-gtk/Makefile.am | 2 ++
nautilus-sendto-plugin/Makefile.am | 3 ++-
src/Makefile.am | 2 ++
tests/interactive/Makefile.am | 4 +++-
5 files changed, 11 insertions(+), 3 deletions(-)
commit 0abfccd4c28892dbf098ba15e2d7565caa97e87d
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Thu Jul 8 12:29:34 2010 +0300
Updated Hebrew translation.
po/he.po | 496
+++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 265 insertions(+), 231 deletions(-)
commit 71e2b896131187e81e4af8b485864f7a173d496b
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date: Wed Jul 7 17:45:05 2010 +0200
Updated Galician translations
po/gl.po | 507
+++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 273 insertions(+), 234 deletions(-)
commit 85063c344a4dada140b609c726118a889e4e09ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jul 7 15:41:05 2010 +0200
call-window: use gtk_widget_get_allocation()
src/empathy-call-window.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
commit 3dffe8d0ebce77eded0b7e9ed70ac03b09d0090e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jul 7 15:25:53 2010 +0200
sort dependencies
configure.ac | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
commit 9fd5a0d64710c248045f245317f8d9e4ddbf005b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jul 7 15:09:02 2010 +0200
Simplify checking of the deps
The empathy/libempathy/libempathy-gtk border is less clear than it
used to be
so there is not point continuing checking deps separately.
configure.ac | 60
+++++++------------------------------------
extensions/Makefile.am | 2 +-
libempathy-gtk/Makefile.am | 4 +-
libempathy/Makefile.am | 4 +-
4 files changed, 15 insertions(+), 55 deletions(-)
commit b9ae519cbeec01245b6f589a60d6fb63d730d19a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed Jul 7 11:57:53 2010 +0200
rephrase 'Important Room' menu entry
src/empathy-chat-window.ui | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 0ee5b6292c89521a3ca52780c3a230199f01ee85
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 12:37:45 2010 +0200
set a title to the room invitation dialog
src/empathy-event-manager.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
commit 32ea1c129259b67d020944b3092a410f8b84908a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 12:33:11 2010 +0200
Make incoming file chooser dialog's title more informative
This gives a bit more context when the dialog is displayed right away.
libempathy-gtk/empathy-ui-utils.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
commit 48d289288400d52adc40a78548ba0dbaf7dea3cd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 12:27:06 2010 +0200
Add a title to the incoming call dialog
This gives a bit more context when the dialog is displayed right away.
src/empathy-event-manager.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
commit cc77a379d1daa6130dad17486d52808c874c62a7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 12:23:05 2010 +0200
display incoming events right away if user asked to
src/empathy-event-manager.c | 41
++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
commit 5b029371a79ba91901cf88f7362f86632e94e223
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 5 16:48:41 2010 +0200
Add option to disable displaying events in the notif area (#585914)
data/org.gnome.Empathy.gschema.xml.in | 6 ++++++
libempathy/empathy-gsettings.h | 1 +
src/empathy-preferences.c | 8 ++++++++
src/empathy-preferences.ui | 17 ++++++++++++++++-
4 files changed, 31 insertions(+), 1 deletions(-)
commit dbf13d34105beedc112b8d6005c0b8ff0646aa0f
Author: Jorge González <jorgegonz@svn.gnome.org>
Date: Wed Jul 7 10:41:13 2010 +0200
Updated Spanish translation
po/es.po | 539
++++++++++++++++++++++++++++++++------------------------------
1 files changed, 275 insertions(+), 264 deletions(-)
commit 24bf0cac9c5f51ba172e1ec9c673c5c1781e6379
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 14:49:38 2010 +0200
add accept/decline buttons to invitation notifications
src/empathy-status-icon.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 4ac0eb75372d295c6ff7bd36fb7d708ad28132b2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 14:49:09 2010 +0200
use a specific event type for muc invitations
src/empathy-event-manager.c | 4 ++--
src/empathy-event-manager.h | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
commit dd3a1f3f2ce8b7b6f7c7ed02ff956ca26bc556e2
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 14:44:10 2010 +0200
add accept/decline buttons to FT notifications
src/empathy-status-icon.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
commit f589f32173b109b4bf8ade5710ff7a8a11f9b939
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 14:43:45 2010 +0200
event-manager: allow to reject FT channels
src/empathy-event-manager.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
commit c4240a8b706c62564179654af0f6e423fa27b1e0
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 14:20:55 2010 +0200
add answer/decline buttons in call notifications (#597124)
src/empathy-status-icon.c | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
commit cf452c7dd1d96a8d2f80b8cf8c64c03604a50c31
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 14:20:47 2010 +0200
add empathy_event_decline
src/empathy-event-manager.c | 10 ++++++++++
src/empathy-event-manager.h | 1 +
2 files changed, 11 insertions(+), 0 deletions(-)
commit 8963051c95e0c4511f264eff2e7bc1336e4b9735
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 14:07:17 2010 +0200
Add 'Respond' button only for text channels and approve it directly
src/empathy-status-icon.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
commit 8e794ecc865cd0cc031963fa8c271de1b2e68993
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 14:04:42 2010 +0200
add empathy_event_approve()
src/empathy-event-manager.c | 10 ++++++++++
src/empathy-event-manager.h | 1 +
2 files changed, 11 insertions(+), 0 deletions(-)
commit 3103575b755da0765275fb3b774e2e8f8a88bd46
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 13:56:55 2010 +0200
factor out add_notification_actions
src/empathy-status-icon.c | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
commit ac6f56a439647386c15fdd6045c00b914f4975f9
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 16:29:29 2010 +0200
chat: add FIXME explaining how we should ideally request channels
libempathy-gtk/empathy-chat.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
commit 26110eb9baef0ef58e8daebff9c3373485da3e50
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 16:18:39 2010 +0200
empathy_dispatcher_join_muc: remove callback arg
We always want to let the text handler handle the channel.
libempathy-gtk/empathy-chat.c | 6 ++----
libempathy/empathy-dispatcher.c | 6 ++----
libempathy/empathy-dispatcher.h | 4 +---
src/empathy-chat-manager.c | 2 +-
src/empathy-main-window.c | 2 +-
src/empathy-new-chatroom-dialog.c | 2 +-
src/empathy.c | 5 ++---
7 files changed, 10 insertions(+), 17 deletions(-)
commit 817f3db6bb903c509b55a194425a1ccb350192fa
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 5 16:08:48 2010 +0200
chat: no need to pass a callback to
empathy_dispatcher_chat_with_contact_id any more
The HandleChannels implementation will re-set the tp-chat once we
get it.
libempathy-gtk/empathy-chat.c | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 deletions(-)
commit a13ef5ed10746ecb68171f965fe62806189c4f27
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 16:11:28 2010 +0200
/join: don't pass a call when calling empathy_dispatcher_join_muc()
We want to let the text channel handler to handle it.
libempathy-gtk/empathy-chat.c | 17 +----------------
1 files changed, 1 insertions(+), 16 deletions(-)
commit e756c74ca8b2656a4975934fcc048cf5bf151a36
Author: Matej Urbančič <mateju@svn.gnome.org>
Date: Tue Jul 6 15:11:40 2010 +0200
Updated Slovenian translation
po/sl.po | 1720
++++++++++++++++++++++++--------------------------------------
1 files changed, 673 insertions(+), 1047 deletions(-)
commit b5e9f28beaa02f564016b30e173adb36e6279642
Author: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Tue Jul 6 12:32:21 2010 +0100
Revert "no need to specify each time of handle"
This reverts commit d88eaef098d3afc329266f25ce194c6dfebbc979.
data/Empathy.client | 9 +++++++++
src/empathy-chat-manager.c | 11 +++++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
commit c17ffb62ebc6e69071e0a0380b2402ba8201bb83
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jul 6 11:23:46 2010 +0200
dispatcher_channel_invalidated_cb: always remove invalidated chan
from the list
It doesn't hurt to always try to remove it and prevent us of
keeping an
invalidated or disposed object around if something weird happens.
libempathy/empathy-dispatcher.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 5be45ef12ac579cbbb914f4d056df51a787bf98f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 5 15:33:03 2010 +0200
Empathy.AudioVideo.client: properly define filters
data/Empathy.AudioVideo.client | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit b07f3a5c948066219cb57bb113a48d0981106f23
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 5 10:58:55 2010 +0200
Inform the chatroom mgr when we are handling a new room
It can't rely on the internal dispatcher any more.
libempathy/empathy-chatroom-manager.c | 45
++++++---------------------------
libempathy/empathy-chatroom-manager.h | 6 +++-
src/empathy-chat-manager.c | 10 +++++++
src/empathy.c | 1 -
4 files changed, 22 insertions(+), 40 deletions(-)
commit d88eaef098d3afc329266f25ce194c6dfebbc979
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jul 5 10:13:47 2010 +0200
no need to specify each time of handle
data/Empathy.client | 9 ---------
src/empathy-chat-manager.c | 11 -----------
2 files changed, 0 insertions(+), 20 deletions(-)
commit 49aabeaba61750883864e95dc5f1bb254dbdb20d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 13:41:56 2010 +0200
Update Empathy.client
data/Empathy.client | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
commit f178351cb959326996921f56c7a881a8a3e1e771
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 13:41:00 2010 +0200
Handle text channels using TpSimpleHandler (#623358)
Also move handling code from empathy.c to empathy-chat-manager.
src/empathy-chat-manager.c | 168
++++++++++++++++++++++++++++++++++++++++++++
src/empathy.c | 47 +------------
2 files changed, 169 insertions(+), 46 deletions(-)
commit 73845ad550f78190379cfa74a4b9e4ecefa6b241
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 13:37:42 2010 +0200
connect sigs using tp_g_signal_connect_object
libempathy/empathy-tp-chat.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
commit 23e70b8d3b88b893d3dd5ab818b5243d215bd48e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 12:07:51 2010 +0200
chat-manager: document the queue
src/empathy-chat-manager.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 9be71372f5579a2517231f1c5c2733610a550975
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 12:00:46 2010 +0200
stop handling text channels using EmpathyDispatcher
libempathy/empathy-dispatch-operation.c | 40
+------------------------------
src/empathy.c | 22 +----------------
2 files changed, 2 insertions(+), 60 deletions(-)
commit f965c339f09e993d4d02567b93e09646b3d6f627
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 11:57:28 2010 +0200
room list channels are not dispatched
src/empathy.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
commit f01a6553b2bf073fd200e9ee3f8f442a3999a02b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 15:56:41 2010 +0200
main: destroy the window when we're done (#623396)
src/empathy.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 5dc6e55d7bb8199aa54bba603eb5154ba41a49c7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 15:21:08 2010 +0200
status-icon: drop our ref on the window when disposing
src/empathy-status-icon.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 7f5324c4a8e1c2bec44a79558c3b02ab95d906ac
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 14:12:48 2010 +0200
empathy_geometry_save: fix string leak
libempathy-gtk/empathy-geometry.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit af6301ba7e46881feaf21f696a4721bbec946ca6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 14:12:32 2010 +0200
contact_widget_location_update: fix string leak
libempathy-gtk/empathy-contact-widget.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 34676cc2bbd026908720a6c0067eee58dbf20d5b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 13:50:39 2010 +0200
rename valgrind.supp to tp-glib.supp
tests/Makefile.am | 2 +-
tests/tp-glib.supp | 333
+++++++++++++++++++++++++++++++++++++++++++++++++++
tests/valgrind.supp | 333
---------------------------------------------------
3 files changed, 334 insertions(+), 334 deletions(-)
commit 172a473d7dfa3e28211758eebad57d4b65b77b2a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 13:46:49 2010 +0200
sync valgrind supp file with tp-glib's one
tests/valgrind.supp | 784
+++++++++++++--------------------------------------
1 files changed, 203 insertions(+), 581 deletions(-)
commit 268d7f421f60d1688134f6438fa2a2c4caf0a68f
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Fri Jul 2 10:15:03 2010 +0200
empathy-types: remove EmpathyContactMonitor
libempathy/empathy-types.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
commit 2cba9cbe1638c309e680778598ff66e319615b0a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 14:25:49 2010 +0200
chat: display pending messages once constructed if the channel is
a room (#623112)
Now that we wait that the TpChat has retrieved pending messages before
considering it as ready, the message-received signal is fired
*before* we
connect it in EmpathyChat and so it misses them.
We fix that by looking for pending messages once the EmpathyChat
has been
constructed.
libempathy-gtk/empathy-chat.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
commit 807c4cdfac49d1cf4d8eefbda394c2b53bd5598b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 12:20:07 2010 +0200
install empathy-av to libexec
data/Makefile.am | 2 +-
....Telepathy.Client.Empathy.AudioVideo.service.in | 2 +-
src/Makefile.am | 4 +++-
3 files changed, 5 insertions(+), 3 deletions(-)
commit 0d3a21856b23f8ba591e833f77ff3a5bcb465d24
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jun 24 15:54:44 2010 +0200
add AV client to the debug window
src/empathy-debug-window.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
commit 4834af14fe305ac39331b1619e3cc4c3121a6c16
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 11:08:54 2010 +0200
Disable timer if EMPATHY_PERSIST is set
src/empathy-av.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
commit bba82eedbef0a2e3ea30ef924d64c85a7a105ad4
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 11:05:19 2010 +0200
Add a timer stopping the proccess after a while if idling
There is no point to keep it around when not needed.
src/empathy-av.c | 61
++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
commit 8ad9151c1f7228436492e992158346e2bc808122
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 10:35:58 2010 +0200
Claim that we support H264
May not be actually true but needed to be callable using Google Video.
data/Empathy.AudioVideo.client | 1 +
libempathy/empathy-call-factory.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
commit 9694c8d334037461fc11537920d0a01520a032e5
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 10:23:42 2010 +0200
add empathy_call_factory_register
So we can connect signal before registering the Handler.
libempathy/empathy-call-factory.c | 15 +++++++++------
libempathy/empathy-call-factory.h | 3 +++
src/empathy-av.c | 8 ++++++++
3 files changed, 20 insertions(+), 6 deletions(-)
commit 70821f0c74f2d441bc889110e56bbfa602863559
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue Jun 29 09:56:58 2010 +0200
add service and client files
data/.gitignore | 1 +
data/Empathy.AudioVideo.client | 20
++++++++++++++++++++
data/Makefile.am | 12 ++++++++++--
....Telepathy.Client.Empathy.AudioVideo.service.in | 3 +++
4 files changed, 34 insertions(+), 2 deletions(-)
commit 53fa331b0f2ad50a8520c4adf6983b744d5cddbd
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jun 24 15:47:33 2010 +0200
Add empathy-av, a new process handling media channels (#599161)
src/.gitignore | 3 +-
src/Makefile.am | 14 +++++--
src/empathy-av.c | 111
++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 122 insertions(+), 6 deletions(-)
commit 01e72ff82e7516cf71bdab66e107b8a3df3f1749
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jun 24 15:34:20 2010 +0200
empathy_call_factory_new_call_with_streams: no need to pass a
EmpathyCallFactory
libempathy-gtk/empathy-contact-menu.c | 9 ++-------
libempathy/empathy-call-factory.c | 3 +--
libempathy/empathy-call-factory.h | 3 +--
libempathy/empathy-call-handler.c | 4 ++--
4 files changed, 6 insertions(+), 13 deletions(-)
commit 661b357c331dca16c4ff0a075dd7f3982e028dce
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu Jun 24 15:06:14 2010 +0200
empathy: stop handling media channels
src/empathy.c | 25 +------------------------
1 files changed, 1 insertions(+), 24 deletions(-)
commit 406dc93dff623caa69b1b416d526cfd2030aa09a
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue Jun 29 14:08:14 2010 +1000
Fix up distribution of GSettings schemas
data/Makefile.am | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
commit f563f6d7383c61c560d22a7e500dddb499cdea11
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue Jun 29 13:58:20 2010 +1000
Work around GCompletion deprecation for the time being
libempathy-gtk/empathy-chat.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 65b4cee8ab5be953fa62cf182134d0de7339686f
Author: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue Jun 29 12:07:05 2010 +1000
Revert "remove org.gnome.Empathy.gschema.xml.in from POTFILES.in"
This reverts commit 78031524a27be66bdf51f1132f8285fa859b0c7a.
po/POTFILES.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit 0dfb3ff44eebef82fd9f6a5772363b74356459c6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jun 28 18:46:06 2010 +0200
remove released flag
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 78031524a27be66bdf51f1132f8285fa859b0c7a
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon Jun 28 18:43:39 2010 +0200
remove org.gnome.Empathy.gschema.xml.in from POTFILES.in
It breaks "make distcheck" and I didn't have time to dig right now...
po/POTFILES.in | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)