commit 19e09cf12c8683ce09729aa673be4cc72d853c92 Author: Guillaume Desmottes Date: Thu Feb 24 17:18:06 2011 +0100 prepare 2.33.2 NEWS | 37 +++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 39 insertions(+), 2 deletions(-) commit 76ddb67353d09f2f5a8a59a5e9c1faa1289d9c55 Author: Emilio Pozuelo Monfort Date: Thu Feb 24 16:22:15 2011 +0000 Add missing files to POTFILES.in po/POTFILES.in | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) commit ffab36ebb3e1dd7a19466e699c22bfb9f991bb00 Author: Emilio Pozuelo Monfort Date: Thu Feb 24 13:51:08 2011 +0000 Add a button to delete logs libempathy-gtk/empathy-log-window.c | 105 ++++++++++++++++++++++++++++++--- libempathy-gtk/empathy-log-window.ui | 2 +- 2 files changed, 96 insertions(+), 11 deletions(-) commit 1310cf061af956a53983ec0a48257cca3c922d9b Author: Emilio Pozuelo Monfort Date: Thu Feb 24 13:46:11 2011 +0000 Update the Logger dbus API for the new version extensions/Logger.xml | 114 ++++++++++++++++++++----------------------------- 1 files changed, 47 insertions(+), 67 deletions(-) commit 93d07624b205676bb0cc3f42e7834945856b8ca5 Author: Emilio Pozuelo Monfort Date: Thu Feb 24 10:46:38 2011 +0000 Indentation fix libempathy-gtk/empathy-log-window.c | 42 +++++++++++++++++----------------- 1 files changed, 21 insertions(+), 21 deletions(-) commit 6153b748bc55d0735e7294a0dcfe87905b579f11 Author: Emilio Pozuelo Monfort Date: Thu Feb 24 10:46:00 2011 +0000 Log window: free the entities together with the list libempathy-gtk/empathy-log-window.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) commit 7d2172c7227af850e6fa48b31d711b6dd0d14dba Author: Emilio Pozuelo Monfort Date: Thu Feb 24 10:37:58 2011 +0000 Check for the right telepathy-logger pc file configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d8c60da9cf53e2c08eb59f899062b08224c9fb7f Author: Emilio Pozuelo Monfort Date: Thu Feb 24 10:31:25 2011 +0000 Log window: don't leak the account libempathy-gtk/empathy-log-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit c8a06b2f3d3e090c9a86212ab0e1cd5b4a89eb65 Author: Emilio Pozuelo Monfort Date: Thu Feb 24 10:14:53 2011 +0000 Unref the entity when we're done libempathy-gtk/empathy-chat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 32eccf2454ea8abb4f1742d0c70f79a3dc8c8dd6 Author: Nicolas Dufresne Date: Wed Feb 23 17:04:18 2011 -0500 Port empathy to Telepathy logger 0.2.0 configure.ac | 2 +- libempathy-gtk/empathy-chat.c | 37 ++++--- libempathy-gtk/empathy-contact-menu.c | 11 ++- libempathy-gtk/empathy-log-window.c | 197 +++++++++++++++----------------- libempathy/empathy-contact.c | 9 +- libempathy/empathy-message.c | 30 +++--- libempathy/empathy-message.h | 4 +- 7 files changed, 144 insertions(+), 146 deletions(-) commit 1c6869ecc8569524ec2cd874b800bf4d153d31aa Author: Sjoerd Simons Date: Thu Feb 24 15:25:54 2011 +0000 Keep a ref to our handler instance src/empathy-event-manager.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2112a44c81e80882d4569f8115071d742c483efc Author: Guillaume Desmottes Date: Thu Feb 24 14:29:22 2011 +0100 tls-dialog: destroy the dialog if the certificate is invalidated (#643186) There is no point to keep it around. libempathy-gtk/empathy-tls-dialog.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) commit 38ec957d24df497e86ae94ee81e79fec5a7757b4 Author: Sjoerd Simons Date: Wed Feb 23 19:05:56 2011 +0000 More consistent naming of the call handler option configure.ac | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit 4643b155118652f3a50695431d359c5dc3a7f91b Author: Sjoerd Simons Date: Wed Feb 23 18:30:14 2011 +0000 make the dots consistent configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 718a788ac2d4120fa007cd329afb5b29f8fd087b Author: Sjoerd Simons Date: Wed Feb 23 18:30:03 2011 +0000 escape USE_MAINTAINER_MODE to prevent errors from make configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 857b27e6161b5a010d61a88d0a7ebce6904db49f Author: Sjoerd Simons Date: Wed Feb 23 18:29:30 2011 +0000 auto-detect the presence of farsight configure.ac | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) commit 0b12f2094066c4697b5eb151f30a186772b8447a Author: Emilio Pozuelo Monfort Date: Wed Feb 23 16:24:53 2011 +0000 empathy_call_new_with_streams: prefer StreamedMedia over Call libempathy-gtk/empathy-call-utils.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) commit efb08036e134b31339e0e422ef68e6ddef2bf467 Author: Emilio Pozuelo Monfort Date: Wed Feb 23 16:19:48 2011 +0000 Always build telepathy-yell and handle Call channels Just keep empathy-call optional. configure.ac | 4 ++-- libempathy-gtk/empathy-call-utils.c | 26 +------------------------- libempathy-gtk/empathy-new-call-dialog.c | 7 +------ libempathy/empathy-channel-factory.c | 6 +----- src/empathy.c | 4 +--- 5 files changed, 6 insertions(+), 41 deletions(-) commit 2c751f8089462c379401b930242b0ee244eeaf14 Author: Emilio Pozuelo Monfort Date: Tue Feb 22 18:15:07 2011 +0000 Show an error dialog if starting a call fails libempathy-gtk/empathy-call-utils.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) commit 43351bae1eb2f338922577ffa6dcc7321e35a37b Author: Emilio Pozuelo Monfort Date: Tue Feb 22 18:14:07 2011 +0000 Don't require EmpathyContacts to start a call libempathy-gtk/empathy-call-utils.c | 18 +++++------- libempathy-gtk/empathy-call-utils.h | 11 +++----- libempathy-gtk/empathy-contact-menu.c | 8 ++++- libempathy-gtk/empathy-individual-menu.c | 8 ++++- libempathy-gtk/empathy-new-call-dialog.c | 43 +---------------------------- src/empathy-call-factory.c | 3 +- src/empathy-streamed-media-handler.c | 3 +- 7 files changed, 30 insertions(+), 64 deletions(-) commit 10edf350020350475ece049d9c8fd969f70cf5c5 Author: Emilio Pozuelo Monfort Date: Tue Feb 22 17:15:11 2011 +0000 Move empathy_call_* util functions to libempathy-gtk Since we want to pop up a dialog when starting a call fails. libempathy-gtk/Makefile.am | 2 + libempathy-gtk/empathy-call-utils.c | 169 ++++++++++++++++++++++++++++++ libempathy-gtk/empathy-call-utils.h | 46 ++++++++ libempathy-gtk/empathy-contact-menu.c | 1 + libempathy-gtk/empathy-individual-menu.c | 1 + libempathy-gtk/empathy-new-call-dialog.c | 1 + libempathy/empathy-utils.c | 133 ----------------------- libempathy/empathy-utils.h | 12 -- src/empathy-call-factory.c | 2 + src/empathy-streamed-media-handler.c | 2 + 10 files changed, 224 insertions(+), 145 deletions(-) commit b768818115dbc3a0b570500a74bc9c8ded62eea5 Author: Sjoerd Simons Date: Wed Feb 23 16:50:20 2011 +0000 No need to borrow the connection, it gets passed to us src/empathy-event-manager.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit e9e2c4e84abfecccd0256bfd5045a508d3c71c94 Author: Sjoerd Simons Date: Wed Feb 23 16:50:06 2011 +0000 Trivial coding style fix (>80 chars) src/empathy-event-manager.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit cecc20a75406a29bd439d068ba56bd26a86c496b Author: Sjoerd Simons Date: Wed Feb 23 16:49:26 2011 +0000 Retrieve the contact for incoming calls so we can display it src/empathy-event-manager.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) commit 50c9020cfe7924fcb9bb69599ecede1f396e9bbd Author: Sjoerd Simons Date: Wed Feb 23 16:45:16 2011 +0000 Stop ringing after approving a Channel.Type.Call channel src/empathy-event-manager.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit 8b0718b8a650ff1f5d9e4a77011646366e592126 Author: Sjoerd Simons Date: Wed Feb 23 16:44:55 2011 +0000 event-manager Remove HAVE_CALL ifdefs, even if we didn't build the handler we can still approve src/empathy-event-manager.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) commit c10d6f51c74185475f1203c2de936d7030c7e10e Author: Sjoerd Simons Date: Wed Feb 23 16:44:05 2011 +0000 Close call channels after hanging up src/empathy-event-manager.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit e463f78478dc8de3514baca17d1c8ffc679134ee Author: Sjoerd Simons Date: Wed Feb 23 14:49:11 2011 +0000 Update telepathy-yell submodule telepathy-yell | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit e56440d55856fb0c3d3f88a6a31e362f563a3030 Author: Sjoerd Simons Date: Wed Feb 23 14:45:19 2011 +0000 In gtk2 GtkProgressBar doesn't implement GTK_ORIENTABLE src/empathy-call-window.c | 5 +++-- src/empathy-streamed-media-window.c | 8 -------- 2 files changed, 3 insertions(+), 10 deletions(-) commit 4e100e3643f5fd5c7a1e37aabd2e2d481b27e35d Author: Sjoerd Simons Date: Wed Feb 23 14:26:15 2011 +0000 Explicitely use the libtelepathy-yell .la file for dependency tracking libempathy/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit be1470f3a71db72890326fd534fb18fe9328fef0 Author: Sjoerd Simons Date: Wed Feb 23 11:20:34 2011 +0000 Remove stray debug src/empathy-call-handler.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) commit 89a7b20c0c51ccaa2ad28a185672f4f472cd2e20 Author: Sjoerd Simons Date: Wed Feb 23 11:39:35 2011 +0000 Only change the UI in the main thread src/empathy-call-window.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) commit ac766b706727ba8efdcb6132cd426d4882a82581 Author: Sjoerd Simons Date: Wed Feb 23 11:38:54 2011 +0000 Use target-contact instead of members src/empathy-call-window.c | 74 +++++++++++---------------------------------- 1 files changed, 18 insertions(+), 56 deletions(-) commit 2bf850dac794b120ff77b295dc3535dbab9a38fa Author: Sjoerd Simons Date: Wed Feb 23 11:28:23 2011 +0000 Move to using ->priv pointer in the object instance src/empathy-call-window.c | 12 +++++------- src/empathy-call-window.h | 2 ++ 2 files changed, 7 insertions(+), 7 deletions(-) commit 1825a527b99eb977f8399ff60355b5ef08e5b9f3 Author: Sjoerd Simons Date: Wed Feb 23 11:14:32 2011 +0000 coding style trivia src/empathy-call-factory.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) commit 87c608d6bb63b59625331e764333ca49d464559a Author: Sjoerd Simons Date: Wed Feb 23 11:14:06 2011 +0000 Add TargetContact property that's guaranteed to exist on CallHandler src/empathy-call-factory.c | 34 ++++++++++++++++++++++++++++------ src/empathy-call-handler.c | 22 +++++++++++++++++++++- src/empathy-call-handler.h | 3 ++- 3 files changed, 51 insertions(+), 8 deletions(-) commit 2f18a9a0364fa63dc21ec68fda25406303f58483 Author: Sjoerd Simons Date: Wed Feb 23 11:12:07 2011 +0000 Recognize Call channel capabilities libempathy/empathy-contact.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) commit 80e857fd3e975b1bd679dd9fc18ad7215ea322bc Author: Sjoerd Simons Date: Wed Feb 23 10:42:23 2011 +0000 Don't use wildcards for just one marshal file When a build is triggered from a location that isn't the top build dir, the generated files break as the wrong prefix gets passed for some reason. Given we only create one -marshal file, being smart doesn't actually save us anything, so do things the simple way libempathy/Makefile.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 5e556267aa25dd5eb4b82f0163cd5d5660d5473e Author: Emilio Pozuelo Monfort Date: Tue Feb 22 11:24:26 2011 +0000 Initialize GObject src/empathy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit fc6b10ba6d31118f090cdeaaa0aae7bd8fb223a2 Author: Emilio Pozuelo Monfort Date: Tue Feb 22 11:24:20 2011 +0000 Build fix src/Makefile.am | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 75c06b2beeaf16ffaf9984f1e04f21782754d568 Author: Emilio Pozuelo Monfort Date: Mon Feb 21 14:32:22 2011 +0000 Temporarily disable some code src/empathy-call-handler.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit e37519e9d15b5d68e92a6baa10ab5b9347151590 Author: Emilio Pozuelo Monfort Date: Mon Feb 21 15:41:16 2011 +0000 Don't use tpy_call_channel_is_sending_video Check if we have initial video instead. src/empathy-call-window.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit cb99d4e808c46476203fe7518436c58fa1684166 Author: Emilio Pozuelo Monfort Date: Mon Feb 21 15:27:33 2011 +0000 Don't use tpy_call_channel_is_receiving_video Rely on src-pad-added to show the remote user's video. src/empathy-call-window.c | 36 ++---------------------------------- 1 files changed, 2 insertions(+), 34 deletions(-) commit 9236be6f1b94ed5cf849b24f2dd92e670f4f2263 Author: Emilio Pozuelo Monfort Date: Mon Feb 21 14:31:50 2011 +0000 Call: check for priv->members to enable the video button src/empathy-call-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f738d401385f8bb99424fe354b1c63b97f9e6625 Author: Emilio Pozuelo Monfort Date: Tue Feb 22 11:11:30 2011 +0000 Build fix libempathy/empathy-utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 297222bf73efbed4a787695becf4c5c616834e73 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 17:06:56 2011 +0000 Add empathy-call src/empathy-call.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 195 insertions(+), 0 deletions(-) commit 2507d4632deeadc3f52500549d40634ba6e113f6 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 17:05:33 2011 +0000 Use the new empathy_call_create_call_request thoroughly src/empathy-call-factory.c | 20 +------------------- src/empathy-call-factory.h | 5 ----- src/empathy-call-handler.c | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) commit c777e8e659a70fc418fdd99caa7f4771dad93163 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 17:00:32 2011 +0000 empathy_call_new_with_streams: start Calls when we support them libempathy/empathy-utils.c | 89 ++++++++++++++++++++++++++++++++++++++++---- libempathy/empathy-utils.h | 17 +++++--- 2 files changed, 91 insertions(+), 15 deletions(-) commit 4038d6d672468a3a353139c5650c6906c60dce7f Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:45:21 2011 +0000 Initialize telepathy-yell src/empathy.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit e53d64d0d2e73ae757ffb379460f1e4a58e8dad3 Author: Emilio Pozuelo Monfort Date: Tue Feb 22 10:22:53 2011 +0000 Show notifications for Calls src/empathy-status-icon.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 37dc8d1981d655f72f5abffebc063492037b3da6 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:42:08 2011 +0000 EmpathyEventManager: handle Call channels src/empathy-event-manager.c | 98 +++++++++++++++++++++++++++++++++++++++++-- src/empathy-event-manager.h | 1 + 2 files changed, 95 insertions(+), 4 deletions(-) commit f44380b57b8f1bdfe4b2de41445d21fe99f85c92 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:31:35 2011 +0000 Teach EmpathyChannelFactory how to create Call channels libempathy/Makefile.am | 2 ++ libempathy/empathy-channel-factory.c | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) commit 93bb7636ec40f000d7de9ae97fe888a9427b0868 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:26:28 2011 +0000 NewCallDialog: support Calls libempathy-gtk/Makefile.am | 2 + libempathy-gtk/empathy-new-call-dialog.c | 77 ++++++++++++++++-------------- 2 files changed, 43 insertions(+), 36 deletions(-) commit c605f0006a5a08743fbbf4279e7df9d858381d01 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 16:16:33 2011 +0000 Build an empathy-call binary when we have Call support Makefile.am | 2 +- configure.ac | 6 ++++++ src/Makefile.am | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletions(-) commit 49f3dfb8bde4c1181025fe31326bc9e72f2bdf3f Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:51:12 2011 +0000 Add an EmpathyCallWindowFullscreen class src/empathy-call-window-fullscreen.c | 309 ++++++++++++++++++++++++++++++++++ src/empathy-call-window-fullscreen.h | 77 +++++++++ 2 files changed, 386 insertions(+), 0 deletions(-) commit b254540effb741b233c327792d853e05118e49de Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:50:55 2011 +0000 Add an EmpathyCallWindow class src/empathy-call-window.c | 3304 +++++++++++++++++++++++++++++++++++++++++++++ src/empathy-call-window.h | 65 + 2 files changed, 3369 insertions(+), 0 deletions(-) commit b50a2589bec0ad258d337b0d5c3e055b26fad991 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:50:20 2011 +0000 Add an EmpathyCallHandler class src/empathy-call-handler.c | 1012 ++++++++++++++++++++++++++++++++++++++++++++ src/empathy-call-handler.h | 107 +++++ 2 files changed, 1119 insertions(+), 0 deletions(-) commit 43c0cd4fbc2e2c5cdbf838cbfcde2204149a85ef Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:49:57 2011 +0000 Add an EmpathyCallFactory class src/empathy-call-factory.c | 332 ++++++++++++++++++++++++++++++++++++++++++++ src/empathy-call-factory.h | 82 +++++++++++ 2 files changed, 414 insertions(+), 0 deletions(-) commit f128fa86842918dc69b4d716b1f2ba36d1244639 Author: Emilio Pozuelo Monfort Date: Fri Feb 18 15:49:24 2011 +0000 Check for telepathy-yell if requested autogen.sh | 14 +++++++++++++- configure.ac | 17 +++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletions(-) commit 4c523367f4701db73fadc923f159511f6c07ac8c Author: Emilio Pozuelo Monfort Date: Fri Feb 18 14:51:47 2011 +0000 Add telepathy-yell as a submodule .gitmodules | 3 +++ telepathy-yell | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) commit 384469b0839388846c39bcab307783299035fc01 Author: Emilio Pozuelo Monfort Date: Thu Feb 17 12:06:50 2011 +0000 Add ax_config_dir from audacity m4/ax_config_dir.m4 | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) commit 27a18ac693371a804f9e5b9b5263024d90d1d07e Author: Guillaume Desmottes Date: Tue Feb 22 09:58:31 2011 +0100 Ship a 256x256 version of the Empathy icon data/icons/Makefile.am | 1 + data/icons/hicolor_apps_256x256_empathy.png | Bin 0 -> 24824 bytes 2 files changed, 1 insertions(+), 0 deletions(-) commit 1c9453749700b6d2c93da33ce9603b11af0389dc Author: Emilio Pozuelo Monfort Date: Mon Feb 21 15:59:52 2011 +0000 Fix make distcheck src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ad321c79756677c09b3fee13274c59dbaa27c483 Author: Danielle Madeley Date: Mon Feb 21 13:59:37 2011 +0100 Prevent segv attempting to free uninitialised value. libempathy/empathy-account-settings.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit fe148502a5dd08fc62825cac6272cb5e980984a6 Author: Emilio Pozuelo Monfort Date: Mon Feb 21 10:59:56 2011 +0000 Move farsight-using sources to src And only build them for empathy-av, since they use farsight. libempathy-gtk/Makefile.am | 12 +- libempathy-gtk/empathy-audio-sink.c | 235 ---------------- libempathy-gtk/empathy-audio-sink.h | 67 ----- libempathy-gtk/empathy-audio-src.c | 387 -------------------------- libempathy-gtk/empathy-audio-src.h | 66 ----- libempathy-gtk/empathy-video-src.c | 360 ------------------------ libempathy-gtk/empathy-video-src.h | 86 ------ libempathy-gtk/empathy-video-widget.c | 485 --------------------------------- libempathy-gtk/empathy-video-widget.h | 72 ----- src/Makefile.am | 9 +- src/empathy-audio-sink.c | 235 ++++++++++++++++ src/empathy-audio-sink.h | 67 +++++ src/empathy-audio-src.c | 387 ++++++++++++++++++++++++++ src/empathy-audio-src.h | 66 +++++ src/empathy-streamed-media-window.c | 8 +- src/empathy-video-src.c | 360 ++++++++++++++++++++++++ src/empathy-video-src.h | 86 ++++++ src/empathy-video-widget.c | 485 +++++++++++++++++++++++++++++++++ src/empathy-video-widget.h | 72 +++++ 19 files changed, 1772 insertions(+), 1773 deletions(-) commit 03de06a7d06a37b362ed7d5d85559000a3bb411c Author: Guillaume Desmottes Date: Fri Feb 18 11:16:39 2011 +0100 ensure that the theme manager stay alive src/empathy.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) commit ee4e14effcb1cb2b109d533c88933239c25a12c8 Author: Guillaume Desmottes Date: Fri Feb 18 10:57:11 2011 +0100 empathy_theme_manager_dup_singleton: act as a proper dup singleton function libempathy-gtk/empathy-theme-manager.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) commit 7365b5426c1e281f49bd67506c09ce76ffb67e2c Author: Philip Withnall Date: Sat Jan 29 16:16:29 2011 +0000 Bug 637151 — Hide the user Individual from the contact list Generalise the mechanism used to determine whether a persona is to be displayed by Empathy to also take into account whether the persona is the user and, if so, whether they're in the contact list. This bumps the libfolks dependency to 0.3.5. Closes: bgo#637151 configure.ac | 2 +- libempathy-gtk/empathy-individual-dialogs.c | 2 +- .../empathy-individual-information-dialog.c | 2 +- libempathy-gtk/empathy-individual-menu.c | 8 +++--- libempathy-gtk/empathy-individual-store.c | 4 +- libempathy-gtk/empathy-individual-view.c | 19 ++++++++++++++-- libempathy-gtk/empathy-individual-widget.c | 20 +++++++++--------- libempathy-gtk/empathy-linking-dialog.c | 2 +- libempathy/empathy-contact.c | 4 +- libempathy/empathy-utils.c | 22 ++++++++++++++++++- libempathy/empathy-utils.h | 1 + 11 files changed, 59 insertions(+), 27 deletions(-) commit 6103b13b462a07a8b508ee2223ef1e5acfc8dd47 Author: Philip Withnall Date: Sun Feb 6 12:14:28 2011 +0000 Bug 641662 — Update for libfolks API changes to IndividualAggregator Update EmpathyIndividualManager re. changes to IndividualAggregator.add_persona_from_details, BackendStore.enabled_backends and BackendStore.get_backend_by_name in libfolks. Closes: bgo#641662 libempathy/empathy-individual-manager.c | 33 +++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 2 deletions(-) commit 0289a301599c10bdf5a1946276ed62bd3bfe93bc Author: Guillaume Desmottes Date: Thu Feb 17 12:55:00 2011 +0100 accounts: release our ref on the TpDBusDaemon src/empathy-accounts.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 6cf142d1a902e1799abe66a5813f2f3978025f6c Author: Guillaume Desmottes Date: Thu Feb 17 12:54:10 2011 +0100 empathy_account_settings_check_readyness: don't leak a ref on manager libempathy/empathy-account-settings.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 4ee8d2a57e3165f036edf53e336282c1cab88b89 Author: Guillaume Desmottes Date: Thu Feb 17 11:15:48 2011 +0100 rename empathy_theme_manager_get() to empathy_theme_manager_dup_singleton() We also don't leak it any more. libempathy-gtk/empathy-chat.c | 5 ++++- libempathy-gtk/empathy-log-window.c | 7 +++++-- libempathy-gtk/empathy-theme-manager.c | 2 +- libempathy-gtk/empathy-theme-manager.h | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) commit e42a54e9e1bfe9a16ad319dc182b3e55caf69f90 Author: Guillaume Desmottes Date: Thu Feb 17 14:47:05 2011 +0100 folks favorite API has changed libempathy-gtk/empathy-individual-view.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 46d6989afcf9964e80d1e6a7b5e0f623da1b2f77 Author: Guillaume Desmottes Date: Thu Nov 11 12:28:41 2010 +0100 Always display favorite contacts (#592595) libempathy-gtk/empathy-individual-view.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit f8f7ac21055e4f5f6ebe90c0e9c0605739cefe73 Author: Guillaume Desmottes Date: Fri Feb 4 16:40:15 2011 +0100 accounts-dialog: only update the row which have actually been changed; may fix #636189 src/empathy-accounts-dialog.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) commit 4363d4c0d778b924b12f294636ca108a15d93aec Author: Guillaume Desmottes Date: Thu Dec 16 10:48:52 2010 +0100 ft-factory: don't leak the handler libempathy/empathy-ft-factory.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) commit 5f504abee583ca0e8ec6721a5d2e305b59003d04 Author: Guillaume Desmottes Date: Thu Dec 16 10:43:06 2010 +0100 fix coding style libempathy/empathy-ft-factory.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) commit b94a66a9ebc4ae1465b65ee4c2dbb76a78745e28 Author: Debarshi Ray Date: Tue Feb 15 17:28:09 2011 +0200 Add some more servers and port numbers for Freenode The list of servers and port numbers for Freenode are given at: http://freenode.net/irc_servers.shtml Fixes: https://bugzilla.gnome.org/642385 libempathy/irc-networks.xml | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) commit a98b91f97661f7a94ef44f957f1edbfebf680fc2 Author: Guillaume Desmottes Date: Tue Feb 15 11:20:59 2011 +0100 only try reconnecting accounts if needed (#642358) libempathy-gtk/empathy-account-widget.c | 17 ++++++++++++++--- libempathy/empathy-account-settings.c | 16 +++++++++++++++- libempathy/empathy-account-settings.h | 1 + src/empathy-account-assistant.c | 2 +- 4 files changed, 31 insertions(+), 5 deletions(-) commit 2d295e9cc7b2ce7a173144624e7226765a125c65 Author: Chandni Verma Date: Mon Feb 14 07:41:30 2011 +0530 Reset network list button Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=642264 .../empathy-irc-network-chooser-dialog.c | 33 ++++++++++ libempathy/empathy-irc-network-manager.c | 63 ++++++++++++++++---- libempathy/empathy-irc-network-manager.h | 3 + libempathy/empathy-irc-network.c | 21 ++++++- libempathy/empathy-irc-network.h | 2 + 5 files changed, 110 insertions(+), 12 deletions(-) commit b3399c7cdfc007245179797e44f5edae1fc27dd3 Merge: 9060de5 2a2ff64 Author: Danielle Madeley Date: Tue Feb 15 08:22:33 2011 +1100 Merge branch 'report-abuse' into gnome-2-34 commit 2a2ff64bde87c68a256f2c6ddacc559668ddd265 Author: Danielle Madeley Date: Tue Feb 15 08:19:46 2011 +1100 Use tp_g_signal_connect_object for Tp proxies that outlive the CB dialog libempathy-gtk/empathy-contact-blocking-dialog.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) commit 9060de5a495ec7afc49c08299c9b060c0abaae56 Author: Guillaume Desmottes Date: Mon Feb 14 16:33:10 2011 +0100 password-dialog: activate the dialog when the entry is activated (#642296) libempathy-gtk/empathy-password-dialog.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) commit 7a649b8764d0db04a57e0c1b004fb691a08113ab Author: Guillaume Desmottes Date: Fri Feb 11 11:29:15 2011 +0100 irc-network-chooser: recreate the default IRC network if needed (#641861) libempathy-gtk/empathy-irc-network-chooser.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) commit 33d5de140c27ee3c9caa8182426829a944a5b64c Author: Danielle Madeley Date: Mon Feb 14 12:44:34 2011 +1100 Use Conn.I.CB to report contacts as abusive when blocking them libempathy/empathy-tp-contact-list.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) commit a848bc5256e4c80371a11f5eae20679df11d0fc1 Author: Danielle Madeley Date: Mon Feb 14 12:36:22 2011 +1100 Only destroy block confirmation dialogs after we've read out the abusive state libempathy-gtk/empathy-contact-dialogs.c | 3 +-- libempathy-gtk/empathy-individual-dialogs.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) commit d48aea8bdaed274dfec7a46e092550067d7bd2ac Author: Danielle Madeley Date: Mon Feb 14 12:24:58 2011 +1100 Determine whether a connection supports reporting abuse, set the connection flag libempathy/empathy-tp-contact-list.c | 36 ++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) commit 8997acba567ca85e20c57c289f26caacaaef7d68 Author: Danielle Madeley Date: Mon Feb 14 12:10:35 2011 +1100 Add draft Conn.I.ContactBlocking (danni's version) to extensions .../Connection_Interface_Contact_Blocking.xml | 172 ++++++++++++++++++++ extensions/Makefile.am | 1 + extensions/misc.xml | 1 + 3 files changed, 174 insertions(+), 0 deletions(-) commit 89546bb514ec002bfddf7a13998398efa89a5cb5 Author: Danielle Madeley Date: Mon Feb 14 12:00:56 2011 +1100 Hook up abusive argument into TpContactList backend libempathy-gtk/empathy-contact-dialogs.c | 6 ++++-- libempathy-gtk/empathy-contact-menu.c | 6 +++--- libempathy-gtk/empathy-individual-view.c | 7 +++++-- libempathy/empathy-contact-list.c | 5 +++-- libempathy/empathy-contact-list.h | 6 ++++-- libempathy/empathy-contact-manager.c | 6 ++++-- libempathy/empathy-individual-manager.c | 5 +++-- libempathy/empathy-individual-manager.h | 3 ++- libempathy/empathy-tp-contact-list.c | 3 ++- 9 files changed, 30 insertions(+), 17 deletions(-) commit 20700ef6d7f72e7211195016335cac43ea2195e2 Author: Guillaume Desmottes Date: Wed Sep 29 14:09:26 2010 +0200 use TP_PROP_* libempathy/empathy-tp-chat.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) commit 57f786d197c61bf5bc914cadb33d9f1bfd50f264 Author: Guillaume Desmottes Date: Wed Sep 29 14:02:07 2010 +0200 Stop generating Conference API extensions/Channel_Interface_Conference.xml | 635 --------------------------- extensions/Makefile.am | 1 - extensions/misc.xml | 1 - 3 files changed, 0 insertions(+), 637 deletions(-) commit 461d2796da725e10c02dfd7767ac3ebd38261dfc Author: Guillaume Desmottes Date: Wed Sep 29 14:04:15 2010 +0200 use tp-glib API for Conference (#630709) libempathy/empathy-tp-chat.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 17e69195176edfa854e1d62cc3e6bd322128ce37 Merge: d23ec3d 49a44a4 Author: Danielle Madeley Date: Fri Feb 11 20:31:32 2011 +1100 Merge branch 'contact-blocking-3' into gnome-2-34 commit 49a44a405f845bdb1cb76c6d0b073c257342bf53 Author: Danielle Madeley Date: Fri Feb 11 20:30:56 2011 +1100 Style fixes from review libempathy-gtk/empathy-individual-dialogs.c | 4 +++- libempathy-gtk/empathy-individual-dialogs.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) commit 068551e68046f42a8278c01186e10fb1142493f9 Author: Danielle Madeley Date: Fri Feb 11 16:17:48 2011 +1100 Add confirmation dialog to Remove Also includes the future Report Abusive check box, so that all the strings are in place now. libempathy-gtk/empathy-individual-dialogs.c | 94 +++++++++++++++++++++++++++ libempathy-gtk/empathy-individual-dialogs.h | 2 + libempathy-gtk/empathy-individual-view.c | 16 ++++- libempathy/empathy-individual-manager.c | 2 + libempathy/empathy-individual-manager.h | 1 + 5 files changed, 112 insertions(+), 3 deletions(-) commit ca4aa4562c34e3f5c95a2bc39c7279c6ee3ae724 Author: Danielle Madeley Date: Fri Feb 11 15:27:05 2011 +1100 Add block confirmation to the authorise publication dialog libempathy-gtk/empathy-contact-dialogs.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) commit 56100a85fb2986ed04436a5988791f235215d402 Author: Danielle Madeley Date: Fri Feb 11 13:46:07 2011 +1100 Add UI to blocking confirmation dialog for future "report as abusive" function libempathy-gtk/empathy-contact-dialogs.c | 33 +++++++++++++++++++++++++++-- libempathy/empathy-contact-list.h | 1 + 2 files changed, 31 insertions(+), 3 deletions(-) commit 7311c2623170a0271d14da46d5b2ee0163ed46e5 Author: Danielle Madeley Date: Fri Feb 11 13:31:26 2011 +1100 Factor out common blocking confirmation dialog libempathy-gtk/empathy-contact-dialogs.c | 43 ++++++++++++++++++++++++++++++ libempathy-gtk/empathy-contact-dialogs.h | 3 ++ libempathy-gtk/empathy-contact-menu.c | 33 +++++------------------ 3 files changed, 53 insertions(+), 26 deletions(-) commit d23ec3dc8820592c390adec4de712a570a3c06c7 Author: Guillaume Desmottes Date: Thu Feb 10 13:18:12 2011 +0100 string-parser: properly handle if g_regex_new() fails libempathy-gtk/empathy-string-parser.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) commit 7c9f3c83e7abdf4c3a5dfc6b7dc91e671e79b662 Author: Guillaume Desmottes Date: Fri Nov 12 13:52:30 2010 +0100 add EmpathyChannelFactory (#634679) It just delegates everything to TpAutomaticProxyFactory for now. libempathy/Makefile.am | 2 + libempathy/empathy-channel-factory.c | 126 ++++++++++++++++++++++++++++++++++ libempathy/empathy-channel-factory.h | 58 ++++++++++++++++ 3 files changed, 186 insertions(+), 0 deletions(-) commit 39ff96975fe694db89e96574a256db64f6fa365b Author: Rob Bradford Date: Thu Feb 10 00:00:33 2011 +0000 connectivity: Update to use new Connman D-BUS service names / interfaces The Connman service name and interface name has changed to a different namespace: http://lists.connman.net/pipermail/connman/2010-November/002548.html Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=641985 libempathy/empathy-connectivity.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 79be987eee4d7e2156c0b4e765923831038815b1 Author: Guillaume Desmottes Date: Thu Feb 10 11:57:34 2011 +0100 improve phrasing of the subscription request message src/empathy-event-manager.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit a64acd193522eb034dc650fccfbe0b1d8f66c57e Author: Alex Launi Date: Tue Nov 2 21:11:56 2010 -0400 Reword subscription request dialog to be less technical src/empathy-event-manager.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit b144dca066162f1ece8de8c9762be8f5c19bcfa3 Author: Emilio Pozuelo Monfort Date: Wed Feb 9 17:06:31 2011 +0000 Only link empathy-av against farsight configure.ac | 8 ++++++-- src/Makefile.am | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) commit 8838f0c8bc0d835b4b76f8d28d5846e835b12496 Author: Emilio Pozuelo Monfort Date: Wed Feb 9 17:01:32 2011 +0000 Only build the EmpathyStreamedMedia* classes for empathy-av So the other binaries don't need to link against farsight. libempathy/Makefile.am | 4 - libempathy/empathy-streamed-media-factory.c | 275 -------- libempathy/empathy-streamed-media-factory.h | 72 --- libempathy/empathy-streamed-media-handler.c | 923 -------------------------- libempathy/empathy-streamed-media-handler.h | 106 --- src/Makefile.am | 21 +- src/empathy-av.c | 2 +- src/empathy-streamed-media-factory.c | 276 ++++++++ src/empathy-streamed-media-factory.h | 69 ++ src/empathy-streamed-media-handler.c | 924 +++++++++++++++++++++++++++ src/empathy-streamed-media-handler.h | 106 +++ src/empathy-streamed-media-window.h | 3 +- 12 files changed, 1393 insertions(+), 1388 deletions(-) commit 4d42a0eb3600ef6577ab96c7251cc45da4dfb989 Author: Emilio Pozuelo Monfort Date: Wed Feb 9 16:48:34 2011 +0000 Move a couple of call-related functions to empathy-utils.h Since the rest of the call stuff will only be compiled for empathy-av so we don't link every binary against farsight. libempathy-gtk/empathy-contact-menu.c | 9 ++-- libempathy-gtk/empathy-individual-menu.c | 9 ++-- libempathy/empathy-streamed-media-factory.c | 67 --------------------------- libempathy/empathy-streamed-media-factory.h | 10 ---- libempathy/empathy-streamed-media-handler.c | 3 +- libempathy/empathy-utils.c | 62 ++++++++++++++++++++++++- libempathy/empathy-utils.h | 11 ++++- 7 files changed, 80 insertions(+), 91 deletions(-) commit fd52278cc48cc8fb0a69d61d35eb59e96077e13a Author: Emilio Pozuelo Monfort Date: Wed Feb 9 16:29:24 2011 +0000 EmpathyCallFactory -> EmpathyStreamedMediaFactory libempathy-gtk/empathy-contact-list-view.c | 1 - libempathy-gtk/empathy-contact-menu.c | 6 +- libempathy-gtk/empathy-individual-menu.c | 6 +- libempathy-gtk/empathy-individual-view.c | 1 - libempathy-gtk/empathy-new-call-dialog.c | 1 - libempathy/Makefile.am | 4 +- libempathy/empathy-call-factory.c | 342 --------------------------- libempathy/empathy-call-factory.h | 82 ------- libempathy/empathy-streamed-media-factory.c | 342 +++++++++++++++++++++++++++ libempathy/empathy-streamed-media-factory.h | 82 +++++++ libempathy/empathy-streamed-media-handler.c | 8 +- libempathy/empathy-streamed-media-handler.h | 2 +- src/empathy-av.c | 10 +- src/empathy-event-manager.c | 1 - src/empathy-streamed-media-window.c | 1 - 15 files changed, 442 insertions(+), 447 deletions(-) commit 42a6c594b066bb28ee7ccfe66837562caf72254d Author: Emilio Pozuelo Monfort Date: Wed Feb 9 16:12:32 2011 +0000 Generate closures for src/ src/Makefile.am | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) commit 51f8d1fb607505c8ae9390fe081e72945130290b Author: Emilio Pozuelo Monfort Date: Thu Feb 3 15:30:39 2011 +0000 ::new-call-handler -> ::new-streamed-media-handler libempathy/empathy-call-factory.c | 2 +- src/empathy-av.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 5e6f399b45abc712ff5379ae7dbb53675ad12165 Author: Emilio Pozuelo Monfort Date: Thu Feb 3 14:03:26 2011 +0000 EmpathyCallWindowFullscreen -> EmpathyStreamedMediaFullscreen src/Makefile.am | 2 +- src/empathy-call-window-fullscreen.c | 309 ------------------------ src/empathy-call-window-fullscreen.h | 77 ------ src/empathy-streamed-media-window-fullscreen.c | 309 ++++++++++++++++++++++++ src/empathy-streamed-media-window-fullscreen.h | 77 ++++++ src/empathy-streamed-media-window.c | 28 +- 6 files changed, 401 insertions(+), 401 deletions(-) commit bcbd239c96127d53f3617cef3f3b423c692c4558 Author: Emilio Pozuelo Monfort Date: Thu Feb 3 13:57:28 2011 +0000 EmpathyCallWindow -> EmpathyStreamedMediaWindow po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/empathy-av.c | 8 +- src/empathy-call-window-fullscreen.c | 4 +- src/empathy-call-window-fullscreen.h | 4 +- src/empathy-call-window.c | 3324 ---------------------------------- src/empathy-call-window.h | 64 - src/empathy-streamed-media-window.c | 3324 ++++++++++++++++++++++++++++++++++ src/empathy-streamed-media-window.h | 64 + 9 files changed, 3398 insertions(+), 3398 deletions(-) commit cc91c3f32b15f6a8f1a0d38b8878f27fca412647 Author: Emilio Pozuelo Monfort Date: Thu Feb 3 13:45:45 2011 +0000 EmpathyCallHandler -> EmpathyStreamedMediaHandler libempathy/Makefile.am | 4 +- libempathy/empathy-call-factory.c | 12 +- libempathy/empathy-call-factory.h | 2 +- libempathy/empathy-call-handler.c | 924 --------------------------- libempathy/empathy-call-handler.h | 106 --- libempathy/empathy-streamed-media-handler.c | 924 +++++++++++++++++++++++++++ libempathy/empathy-streamed-media-handler.h | 106 +++ src/empathy-av.c | 2 +- src/empathy-call-window.c | 60 +- src/empathy-call-window.h | 4 +- 10 files changed, 1072 insertions(+), 1072 deletions(-) commit 2766ed3e19cc8032eedef5cf5cb6ab302a57f63a Author: Emilio Pozuelo Monfort Date: Thu Feb 3 12:15:12 2011 +0000 EmpathyTpCall -> EmpathyTpStreamedMedia libempathy/Makefile.am | 4 +- libempathy/empathy-call-factory.c | 14 +- libempathy/empathy-call-handler.c | 30 +- libempathy/empathy-call-handler.h | 4 +- libempathy/empathy-tp-call.c | 855 -------------------------------- libempathy/empathy-tp-call.h | 101 ---- libempathy/empathy-tp-streamed-media.c | 855 ++++++++++++++++++++++++++++++++ libempathy/empathy-tp-streamed-media.h | 113 +++++ libempathy/empathy-utils.c | 1 - src/empathy-call-window.c | 50 +- src/empathy-event-manager.c | 22 +- 11 files changed, 1030 insertions(+), 1019 deletions(-) commit 2327d4810445c2e3975cc69fae61bddf471abda2 Author: Danielle Madeley Date: Thu Feb 10 16:23:58 2011 +1100 contact-blocking-dialog: report errors to the user libempathy-gtk/empathy-contact-blocking-dialog.c | 55 ++++++++++++++++++++- 1 files changed, 52 insertions(+), 3 deletions(-) commit a9f69666a58de8145e3236485cff83b9d0e246ec Author: Danielle Madeley Date: Thu Feb 10 15:56:02 2011 +1100 Don't leak EmpathyContact libempathy/empathy-individual-manager.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit bbd1ebc8ae5c785b6a4c5458155c90a05981000e Author: Danielle Madeley Date: Thu Feb 10 15:45:17 2011 +1100 Add Block button to the subscription authorization dialog libempathy-gtk/empathy-contact-dialogs.c | 21 +++++++++++- libempathy-gtk/empathy-contact-dialogs.ui | 54 ++++++++++++++++++++++------- 2 files changed, 61 insertions(+), 14 deletions(-) commit 9b421ab4f0806be9bfb841286fa991204aaa4780 Author: Danielle Madeley Date: Thu Feb 10 13:19:35 2011 +1100 Add a confirmation dialog when you block a contact from the Contact menu libempathy-gtk/empathy-contact-menu.c | 43 ++++++++++++++++++++++++++++++++- src/empathy-chat-window.c | 4 +++ 2 files changed, 46 insertions(+), 1 deletions(-) commit be7fff958c4327450dcc170e6387cdc2a284f065 Author: Danielle Madeley Date: Wed Feb 9 17:29:18 2011 +1100 Add 'Delete and Block' as an option to the Remove Contact dialog libempathy-gtk/empathy-individual-view.c | 38 ++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 12 deletions(-) commit e0bc8ed3281f53e526823affb01396546c5e36b1 Author: Danielle Madeley Date: Wed Feb 9 17:24:27 2011 +1100 Add contact blocking support to EmpathyIndividualManager libempathy/empathy-individual-manager.c | 74 +++++++++++++++++++++++++++++++ libempathy/empathy-individual-manager.h | 9 ++++ 2 files changed, 83 insertions(+), 0 deletions(-) commit 317493d0a14718d5f1df6fb8738743146b69388e Author: Danielle Madeley Date: Wed Feb 9 13:05:20 2011 +1100 Add 'Block Contact' to empathy-contact-menu libempathy-gtk/empathy-chat.c | 3 +- libempathy-gtk/empathy-contact-menu.c | 71 +++++++++++++++++++++++++++++++++ libempathy-gtk/empathy-contact-menu.h | 3 +- 3 files changed, 75 insertions(+), 2 deletions(-) commit 61572ce5a33a31ec2d36ac676384a7a6d246d7b4 Author: Danielle Madeley Date: Mon Feb 7 13:41:40 2011 +1100 Add contact blocking to EmpathyContactList and friends libempathy/empathy-contact-list.c | 23 ++++++++++++ libempathy/empathy-contact-list.h | 12 ++++++ libempathy/empathy-contact-manager.c | 41 +++++++++++++++++++++ libempathy/empathy-tp-contact-list.c | 64 ++++++++++++++++++++++++++++++--- libempathy/empathy-tp-contact-list.h | 1 + 5 files changed, 135 insertions(+), 6 deletions(-) commit e86fa5ff0136af2458971a4e8e309b862b35b11a Author: Danielle Madeley Date: Tue Feb 8 13:53:11 2011 +1100 Handle the case where there are no accounts with deny channels libempathy-gtk/empathy-contact-blocking-dialog.c | 88 +++++++++++++++------- 1 files changed, 62 insertions(+), 26 deletions(-) commit 3b38e04da561f15963156302cac923e22a895936 Author: Danielle Madeley Date: Tue Feb 8 12:16:15 2011 +1100 Don't need to prepare accounts separately libempathy-gtk/empathy-contact-blocking-dialog.c | 41 ++++++---------------- 1 files changed, 11 insertions(+), 30 deletions(-) commit 155c260f5a7ef39c5f1403e024363844cc67a0f2 Author: Guillaume Desmottes Date: Mon Feb 7 13:13:20 2011 +0100 use tp_clear_object() libempathy/empathy-tp-file.c | 21 ++++----------------- 1 files changed, 4 insertions(+), 17 deletions(-) commit b2e3fe2be77ea14d5354bfd9eec9b62f007daa1b Author: Guillaume Desmottes Date: Mon Feb 7 13:11:20 2011 +0100 tp-file: use the self->priv pattern libempathy/empathy-tp-file.c | 399 +++++++++++++++++++----------------------- libempathy/empathy-tp-file.h | 3 +- 2 files changed, 182 insertions(+), 220 deletions(-) commit bc19e0f15b2aaba0a5a95ffa20ef70ea63b6fd2a Author: Guillaume Desmottes Date: Mon Feb 7 12:48:49 2011 +0100 depends on telepathy-glib 0.13.12 We need it for FileTransfer.URI API. configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f4b9ea4f2748b0c9e69133d10ded0c0a8d594667 Author: Guillaume Desmottes Date: Mon Feb 7 11:33:39 2011 +0100 Set FileTransfer.URI when accepting a file (#641707) libempathy/empathy-tp-file.c | 49 +++++++++++++++++++++++++++++++++-------- 1 files changed, 39 insertions(+), 10 deletions(-) commit 8ca89fda5872c87e2c4264748d722b8edda957be Author: Guillaume Desmottes Date: Mon Jan 31 14:11:57 2011 +0100 set FileTransfer.URI on outgoing FT libempathy/empathy-ft-handler.c | 59 ++++++++++++++------------------------ 1 files changed, 22 insertions(+), 37 deletions(-) commit 02cc922c2b3b8c0a511c95c0da5f4536ed94142c Author: Danielle Madeley Date: Mon Feb 7 10:59:33 2011 +1100 Add blocked contacts dialog to Empathy main window menu src/empathy-main-window.c | 17 ++++++++++++++++- src/empathy-main-window.ui | 7 +++++++ 2 files changed, 23 insertions(+), 1 deletions(-) commit 71d24b1424c861483f92a0e2d6412fc5633ec322 Author: Danielle Madeley Date: Mon Feb 7 10:59:14 2011 +1100 Prepare EmpathyContactManager in test .../test-empathy-contact-blocking-dialog.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) commit aa2cc94253279160b3ddc7db612068f0755c50e5 Author: Danielle Madeley Date: Mon Feb 7 10:58:32 2011 +1100 Provide autocompletion of known contacts in the entry box libempathy-gtk/empathy-contact-blocking-dialog.c | 52 +++++++++++++++++++-- 1 files changed, 47 insertions(+), 5 deletions(-) commit 09deedd52880ab343d8a95e1c6ff058c55bbc8c4 Author: Danielle Madeley Date: Sun Feb 6 12:13:43 2011 +1100 Add and remove contacts from deny list libempathy-gtk/empathy-contact-blocking-dialog.c | 171 ++++++++++++++++++++- libempathy-gtk/empathy-contact-blocking-dialog.ui | 24 ++-- 2 files changed, 183 insertions(+), 12 deletions(-) commit f9a27436cb73c57ac0fce1fdcae5d50fb5a6c111 Author: Danielle Madeley Date: Sun Feb 6 11:04:11 2011 +1100 Connect ::response in test .../test-empathy-contact-blocking-dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit 8d92d06bdbf9f7b60dba39ff77480ad30f56a1c7 Author: Danielle Madeley Date: Fri Feb 4 17:55:24 2011 +1100 Test for contact blocking dialog tests/interactive/.gitignore | 1 + tests/interactive/Makefile.am | 2 + .../test-empathy-contact-blocking-dialog.c | 45 ++++++++++++++++++++ 3 files changed, 48 insertions(+), 0 deletions(-) commit c485dc5d389f80edd6e425333228dc306da186c6 Author: Danielle Madeley Date: Fri Feb 4 17:47:31 2011 +1100 Beginning of contact blocking dialog Can currently select an account and view the contact blocking 'deny' list. List reponds to changes in the group membership. Add/Remove buttons do not yet do anything. libempathy-gtk/Makefile.am | 3 + libempathy-gtk/empathy-contact-blocking-dialog.c | 514 +++++++++++++++++++++ libempathy-gtk/empathy-contact-blocking-dialog.h | 60 +++ libempathy-gtk/empathy-contact-blocking-dialog.ui | 145 ++++++ 4 files changed, 722 insertions(+), 0 deletions(-) commit c1aff983fed1a1fab92585fb7a4ccf5f643e048d Author: Guillaume Desmottes Date: Thu Feb 3 14:44:44 2011 +0100 individual-view: properly unref the tooltip_widget when disposing (#641157) libempathy-gtk/empathy-individual-view.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) commit eabb53baaadb3d1cab2f4e1a08a275c0b47df70b Author: Guillaume Desmottes Date: Thu Feb 3 11:44:34 2011 +0100 contact_list_view_popup_menu_idle_cb: remove useless sink/unref libempathy-gtk/empathy-contact-list-view.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 175dcba889d04e5322047611c33eefbeab153017 Author: Guillaume Desmottes Date: Thu Feb 3 11:02:35 2011 +0100 individual-menu: ensure that the contact stays alive while the activate signal is connected (#641119) libempathy-gtk/empathy-individual-menu.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) commit 087abca96d4dcf3a00eeab826678060090656cb4 Author: Guillaume Desmottes Date: Thu Feb 3 10:53:43 2011 +0100 individual_view_popup_menu_idle_cb: remove useless sink/unref gtk_menu_attach_to_widget() takes the floating ref so this code is useless. libempathy-gtk/empathy-individual-view.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) commit 3b7f89ff3839d3da9b44736ded081e8f84ae4e0b Author: Guillaume Desmottes Date: Wed Feb 2 12:47:14 2011 +0100 update last_tag_pattern release.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 08e072c1a83419c2c1ff0e905ffc82a6329b41e5 Author: Guillaume Desmottes Date: Wed Feb 2 12:46:33 2011 +0100 remove released flag configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)