diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/ChangeLog empathy-2.30.1.1/ChangeLog --- empathy-2.30.1/ChangeLog 2010-04-26 16:39:57.000000000 +0200 +++ empathy-2.30.1.1/ChangeLog 2010-06-09 16:18:12.000000000 +0200 @@ -1,6 +1,484 @@ +commit 6856c0fc3ea3f865882ea522f2850c1a5ef07910 +Author: Guillaume Desmottes +Date: Wed Jun 9 15:53:32 2010 +0200 + + prepare 2.30.1.1 release + + NEWS | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + configure.ac | 4 ++-- + 2 files changed, 50 insertions(+), 2 deletions(-) + +commit 2842333f503ad762c2ff52ed33a1fd44463147d6 +Author: Guillaume Desmottes +Date: Wed Jun 9 10:06:26 2010 +0200 + + factor out set_requirements + + libempathy-gtk/empathy-location-manager.c | 36 + +++++++++++++++++----------- + 1 files changed, 22 insertions(+), 14 deletions(-) + +commit 43df723f82db92fd7d0e953245eb5d3577072fe7 +Author: Laurent Bigonville +Date: Tue Jun 8 23:38:26 2010 +0200 + + Call geoclue_master_client_set_requirements before asking for + position/address + + Be sure geoclue_master_client_set_requirements() is called in + setup_geoclue() + otherwise no provider will be selected (#621023) + + libempathy-gtk/empathy-location-manager.c | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +commit a412d641587734a4ee96a04b0cdc069948df0bb1 +Author: Guillaume Desmottes +Date: Tue Jun 8 17:14:22 2010 +0200 + + empathy_string_replace_escaped: remove '\r' (#620903) + + libempathy-gtk/empathy-string-parser.c | 16 +++++++++++++++- + tests/empathy-parser-test.c | 4 ++++ + 2 files changed, 19 insertions(+), 1 deletions(-) + +commit 6cd311cd08491e31aa03444a8679d4c5bc666dce +Author: Guillaume Desmottes +Date: Tue Jun 8 16:46:05 2010 +0200 + + empathy-parser-test: use empathy_string_replace_escaped + + tests/empathy-parser-test.c | 25 +++++++------------------ + 1 files changed, 7 insertions(+), 18 deletions(-) + +commit 1ee85fe8eeb8c44aa2769fcdee3d871f28b51c02 +Author: Guillaume Desmottes +Date: Tue Jun 8 16:50:09 2010 +0200 + + empathy-parser-test: stop as soon a test fails + + That's much easier to spot the test failing. + + tests/empathy-parser-test.c | 6 +----- + 1 files changed, 1 insertions(+), 5 deletions(-) + +commit 7b6e67db6f8de44b28d51e7010fd371958d7e069 +Author: Danielle Madeley +Date: Mon Jun 7 21:30:22 2010 +1000 + + Makefile.am fixes + + Makefile.am | 11 ++++++++--- + 1 files changed, 8 insertions(+), 3 deletions(-) + +commit aa41d97cba3b0f4356525df7d80f2748f156af01 +Author: Laurent Bigonville +Date: Sat Jun 5 14:26:41 2010 +0200 + + Do not require geoclue provider to support updates + + Requiring that provider supports updates reduce the choice to almost + zero (#620657). + + libempathy-gtk/empathy-location-manager.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 2ad941149dcca32730db7c1efc70ef3b188bebb6 +Author: Rob Bradford +Date: Thu Jun 3 14:24:21 2010 +0100 + + accounts-dialog: avoid leaking the account status message + + Originally this function mixed const and allocated strings using + the same + variable, resulting in leaks. This change refactors the code + slightly to + prevent such leaks. + + Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=620476 + + src/empathy-accounts-dialog.c | 53 + +++++++++++++++++++++++++++++++--------- + 1 files changed, 41 insertions(+), 12 deletions(-) + +commit 77e7d105ecc88a77bd7838d36512b4dd3d4d8877 +Author: Rob Bradford +Date: Wed Jun 2 12:47:34 2010 +0100 + + accounts-dialog: Ensure correct connectivity information + + Move the creation of the EmpathyConnectivity object to the dialog + construction so that there is time for the asynchronous calls that + the EmpathyConnectivity makes (in ConnMan mode) to return. + + Without this change the error is always reported as network connection + failure + rather than the real error when built with ConnMan. + + Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=620474 + + src/empathy-accounts-dialog.c | 14 ++++++++++---- + 1 files changed, 10 insertions(+), 4 deletions(-) + +commit 4b91df6fd314c16844ec39f854197dc6ecb2f11c +Merge: 086441e cb9b729 +Author: Guillaume Desmottes +Date: Thu Jun 3 14:52:58 2010 +0200 + + Merge branch 'fav-room-620439-2.30' into gnome-2-30 + +commit cb9b7292facee86736acfac5d1a110a944b45cbd +Author: Guillaume Desmottes +Date: Thu Jun 3 12:26:55 2010 +0200 + + change 'disconnect' label to 'finally' + + src/empathy-main-window.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 31516cb326bf0a21f913626ad945d8f36b68912c +Author: Guillaume Desmottes +Date: Thu Jun 3 11:27:16 2010 +0200 + + Don't wait longer than 5 seconds when trying to join chatrooms + + If the accounts takes ages to connect or was disabled, it would be + weird to + automatically join the room a long time after the user asked to join + favorite rooms. + + src/empathy-main-window.c | 25 +++++++++++++++++++++++-- + 1 files changed, 23 insertions(+), 2 deletions(-) + +commit 82a42a7fdd617397d3846675f336b409808747e6 +Author: Guillaume Desmottes +Date: Thu Jun 3 11:14:45 2010 +0200 + + Join chatroom favorites once the account is connected (#620439) + + src/empathy-main-window.c | 69 + ++++++++++++++++++++++++++++++++++++++++++++- + 1 files changed, 68 insertions(+), 1 deletions(-) + +commit 96da120918a480cb6137229e9a1b046d6ac960e1 +Author: Guillaume Desmottes +Date: Thu Jun 3 11:00:44 2010 +0200 + + factor out join_chatroom + + src/empathy-main-window.c | 20 ++++++++++++++++---- + 1 files changed, 16 insertions(+), 4 deletions(-) + +commit 086441ec802ae718a529d0dbdf6b93226d6627ef +Author: Danielle Madeley +Date: Thu Jun 3 17:59:44 2010 +1000 + + Only create the EmpathyAccountsDialog if required + + https://bugzilla.gnome.org/show_bug.cgi?id=616616 + + src/empathy-accounts-common.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +commit 8ff7679d53d148f75c403a59b7ab50d86387124f +Author: Danielle Madeley +Date: Thu Jun 3 16:20:58 2010 +1000 + + Update location for mx-gtk.h + + libempathy-gtk/empathy-account-widget.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 496cde28aa2ef2be253a09865b8a493892c3634b +Author: Guillaume Desmottes +Date: Fri May 28 09:24:18 2010 +0200 + + log-window: start the search when the entry is activated (#619863) + + libempathy-gtk/empathy-log-window.c | 20 ++++++++++++++++++-- + 1 files changed, 18 insertions(+), 2 deletions(-) + +commit 039a533b0df07962485d1f433cb100cfbe76de05 +Author: Xavier Claessens +Date: Thu May 20 16:12:57 2010 +0200 + + Make sure to not infinite loop when scaling avatar. + + 1) Add a limit of 10 retries, to be sure to never do more in the + worst case. + 2) Only keep converted data that respect the requirements, make sure + to not + accept bigger data than maximum_bytes, even if it is close to + the limit. + 3) Stop the loop if the new factor does not change the image + resolution. That + means we already found the optimal size. + + Fixes bug #619701 + + libempathy-gtk/empathy-avatar-chooser.c | 55 + +++++++++++++++++++++---------- + 1 files changed, 37 insertions(+), 18 deletions(-) + +commit 371e91b25039b8dc1ac2489f9ef5dd5aa21cab7a +Author: Hannie Dumoleyn +Date: Mon May 31 19:39:14 2010 +0200 + + Dutch translation updated by Hannie Dumoleyn + + po/nl.po | 5759 + +++++++++++++++++++++++++------------------------------------- + 1 files changed, 2267 insertions(+), 3492 deletions(-) + +commit ad57c03ab520ce83282b582c2a1d7dc7e537031f +Author: Guillaume Desmottes +Date: Tue May 25 14:45:05 2010 +0200 + + assistant: call empathy_import_widget_add_selected_accounts in + impl_signal_apply as well + + If the user already has a salut account configured, the import page + is the + last one of the assistant. So impl_signal_apply() is called instead of + impl_signal_prepare(). (#617971) + + src/empathy-account-assistant.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit b41b8478952bd912820cb496a3e01069b5acb91d +Author: Mattias Põldaru +Date: Thu May 27 13:18:53 2010 +0300 + + Estonian translation updated + + po/et.po | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +commit 5a94d355b1f9243170b3dc8b98d1d0333a6bd1ea +Author: Robert McQueen +Date: Thu May 27 10:21:26 2010 +0200 + + fix 0-byte logfile crash (#619736) + + libempathy/empathy-log-store-empathy.c | 18 ++++++++++++------ + 1 files changed, 12 insertions(+), 6 deletions(-) + +commit 439e23d0658d950c17d99b636724088223d5d64b +Author: Simon McVittie +Date: Wed May 26 11:08:34 2010 +0100 + + with-session-bus.sh: update from telepathy-glib, fixing bash-specific + &> redirection + + tools/with-session-bus.sh | 12 +++++++++++- + 1 files changed, 11 insertions(+), 1 deletions(-) + +commit 2de67b1620da339380e817ecaf5cdf0c4f459202 +Author: Simon McVittie +Date: Wed May 26 11:08:01 2010 +0100 + + configure.ac: improve portability of test(1) calls + + The "==" operator isn't POSIX (use "="), and the -a and -o connectors + aren't POSIX (use test foo && test bar, test foo || test bar). + + configure.ac | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 32b3df1df008c3cbf501a1e5af119ed0c719a54a +Author: Guillaume Desmottes +Date: Tue May 25 11:23:08 2010 +0200 + + hardcode facebook server to workaround SRV lookup issues + + src/empathy-account-assistant.c | 3 +++ + src/empathy-accounts-dialog.c | 3 +++ + 2 files changed, 6 insertions(+), 0 deletions(-) + +commit 156949f6b444cb4ef04d320fa4cef13c630f8573 +Author: Guillaume Desmottes +Date: Fri May 21 15:54:39 2010 +0200 + + main_window_favorite_chatroom_join: skip not connected accounts + (#606738) + + This fix a crash if the account is connecting. + + Conflicts: + + src/empathy-main-window.c + + src/empathy-main-window.c | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +commit b87a2f274a838e8636c64605506e6ba243c2671a +Author: Guillaume Desmottes +Date: Thu May 20 17:10:20 2010 +0200 + + use avatar-default instead of the deprecated stock_person icon + + libempathy-gtk/empathy-avatar-chooser.c | 4 +++- + libempathy-gtk/empathy-images.h | 1 + + libempathy-gtk/empathy-theme-adium.c | 3 ++- + src/empathy-call-window.c | 5 +++-- + src/empathy-call-window.ui | 2 +- + src/empathy-event-manager.c | 4 ++-- + 6 files changed, 12 insertions(+), 7 deletions(-) + +commit b1e074ece7658f3d3fac30c114c42360e4fe5602 +Author: Guillaume Desmottes +Date: Tue May 18 12:57:08 2010 +0200 + + account-widget-irc: call empathy_account_widget_changed when the + network dialog is destroyed + + This will allow user to save or discard changes he just done + (#618883). + + libempathy-gtk/empathy-account-widget-irc.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 45f4d328ed3a1f0108ca463677912c750221c8d8 +Author: Brian Curtis +Date: Mon May 17 15:49:01 2010 +0200 + + use port 8001 to connect to freenode irc (#618401) + + libempathy/irc-networks.xml | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 9468f149790dae7efbc8f06fcf4cb80c135fac9d +Author: Rob Bradford +Date: Tue May 18 11:09:45 2010 +0100 + + Use library i18n method for source files included in shared library + + Since these files are included in the g-c-c shared module we must + use the + version of the _ macro that includes the domain. + + Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=618969 + + src/empathy-account-assistant.c | 3 ++- + src/empathy-accounts-common.c | 2 +- + src/empathy-accounts-dialog.c | 2 +- + src/empathy-auto-salut-account-helper.c | 4 +++- + src/empathy-import-dialog.c | 2 +- + src/empathy-import-mc4-accounts.c | 4 +++- + src/empathy-import-widget.c | 4 +++- + 7 files changed, 14 insertions(+), 7 deletions(-) + +commit 3e84f4f327d98ba3f696efc893bb80c9e2af5e46 +Author: Sjoerd Simons +Date: Sat May 8 17:20:25 2010 +0100 + + Don't try to start change the camera when there is no input + + Fixes bug #618167 + + src/empathy-call-window.c | 14 ++++++++++---- + 1 files changed, 10 insertions(+), 4 deletions(-) + +commit e94931a82aa97d6a9980e1d9454662b510a22a5d +Author: Rob Bradford +Date: Thu May 6 15:17:57 2010 +0100 + + ui-utils: Set translation domain on GtkBuilder UIs + + This is necessary for when GtkBuilder UIs are used outside of the + main Empathy + process. + + Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=617909 + + libempathy-gtk/empathy-ui-utils.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 791022575040aa5aa08e1b0fa1953209cfefe1a6 +Author: Rob Bradford +Date: Fri Apr 30 10:29:22 2010 +0100 + + accounts-module: Remove call to textdomain () + + This shouldn't be called in shared module. + + Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=617262 + + src/empathy-accounts-module.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +commit 5be5f730f4ddc806d3cb1f4c74312d8de20e31a9 +Author: Frédéric Péters +Date: Sun May 2 17:54:11 2010 +0200 + + Do not display "missing image" for contacts without avatar (#608103) + + libempathy-gtk/empathy-avatar-image.c | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +commit 975aaba54306ff7f7ed53a1337b1a500dd19de98 +Author: Jorge González +Date: Sat May 1 09:54:02 2010 +0200 + + Updated Spanish translation + + help/es/es.po | 137 + ++++++++++++++++++++++++++++++++++---------------------- + 1 files changed, 83 insertions(+), 54 deletions(-) + +commit 004fb4fb7659e9c2697c10354f4fcc7c44877d6b +Author: Jorge González +Date: Sat May 1 09:49:14 2010 +0200 + + Updated Spanish translation + + help/es/es.po | 125 + +++++++++++++++++++++++++------------------------------- + 1 files changed, 56 insertions(+), 69 deletions(-) + +commit e3a2b8e6f1e5868939b21a22ddf43d414ac74db4 +Author: Mario Blättermann +Date: Thu Apr 29 12:08:02 2010 +0200 + + Updated German doc translation + + help/de/de.po | 1101 + +++++++++++++++++++++++++++++---------------------------- + 1 files changed, 563 insertions(+), 538 deletions(-) + +commit e6fe74920433afd0004139f182d3c3a402b26834 +Author: Jorge González +Date: Wed Apr 28 07:59:29 2010 +0200 + + Updated Spanish translation + + help/es/es.po | 294 + ++++++++++++++++++++++++++++++++------------------------- + 1 files changed, 165 insertions(+), 129 deletions(-) + +commit 0abebe1a4f75bc2919c4894a58cee2742cd423d9 +Author: Jasper Lievisse Adriaanse +Date: Tue Apr 27 09:38:45 2010 +0200 + + tp-file: include netinet/in.h + + The storage size of 'addr' isn't known without netinet/in.h (#616859). + + libempathy/empathy-tp-file.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 1b78c3263c7e8f19bb5407d683360c3430f0f7d6 +Author: Guillaume Desmottes +Date: Mon Apr 26 16:47:03 2010 +0200 + + remove released flag + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit 106bfb0043995ad179fa9f1277e83e4cec1c62cc Author: Guillaume Desmottes -Date: Mon Apr 26 16:39:49 2010 +0200 +Date: Mon Apr 26 16:39:49 2010 +0200 actually set the empathy_released flag @@ -9,38 +487,38 @@ commit ac829226a529d38b5964db2f5224512eed427271 Author: Guillaume Desmottes -Date: Mon Apr 26 16:21:02 2010 +0200 +Date: Mon Apr 26 16:21:02 2010 +0200 prepare 2.30.1 - NEWS | 25 +++++++++++++++++++++++++ + NEWS | 25 +++++++++++++++++++++++++ configure.ac | 6 +++--- 2 files changed, 28 insertions(+), 3 deletions(-) commit a25c8b705401f9d8dfd6037263780427824b4615 Author: Rob Bradford -Date: Fri Apr 23 16:23:52 2010 +0100 +Date: Fri Apr 23 16:23:52 2010 +0100 cc-empathy-accounts-panel: Enable gettext when the panel is created Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=616660 - src/Makefile.am | 1 + + src/Makefile.am | 1 + src/cc-empathy-accounts-panel.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) commit e4576d4e7f1770df597c55ff356d6f52cc0c101d Author: Guillaume Desmottes -Date: Mon Apr 26 09:42:14 2010 +0200 +Date: Mon Apr 26 09:42:14 2010 +0200 irc-networks.xml: properly spell 'freenode' (#616711) - libempathy/irc-networks.xml | 2 +- + libempathy/irc-networks.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit bc576bc85801f877db75f80481895f2a3c918c08 Author: Sjoerd Simons -Date: Sat Apr 24 16:13:50 2010 +0100 +Date: Sat Apr 24 16:13:50 2010 +0100 Fix X display connection leak @@ -54,7 +532,7 @@ commit 155c1ad42bed1b46d6d85b92005112e26d1e3df8 Author: Claude Paroz -Date: Mon Apr 26 08:40:41 2010 +0200 +Date: Mon Apr 26 08:40:41 2010 +0200 Fix French translation (fixes bug #615719) @@ -63,7 +541,7 @@ commit d0703a7a5be0235d2de9778b86aa75b5df5e0b0a Author: Ivar Smolin -Date: Mon Apr 26 08:15:45 2010 +0300 +Date: Mon Apr 26 08:15:45 2010 +0300 Estonian translation updated @@ -72,7 +550,7 @@ commit f7b433c4607c50e649e0e6902d1bd169efa6c532 Author: Milo Casagrande -Date: Sun Apr 25 15:30:21 2010 +0200 +Date: Sun Apr 25 15:30:21 2010 +0200 Updated Italian help translation @@ -82,19 +560,19 @@ commit ea8471b6b738989414c396ce39f4a53de26c6b75 Author: Cheng-Chia Tseng -Date: Sun Apr 25 19:29:53 2010 +0800 +Date: Sun Apr 25 19:29:53 2010 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 267 + po/zh_HK.po | 267 +++++++++++++++++++++++++++++----------------------------- - po/zh_TW.po | 270 + po/zh_TW.po | 270 +++++++++++++++++++++++++++++------------------------------ 2 files changed, 264 insertions(+), 273 deletions(-) commit fb3b51749db3e0eb4db0f74faed3c68a11743a6e Author: Ask H. Larsen -Date: Fri Apr 23 12:08:38 2010 +0200 +Date: Fri Apr 23 12:08:38 2010 +0200 Updated Danish translation @@ -104,7 +582,7 @@ commit 8f61c9e8f82f76c4663fbfef5d976ceae86ba378 Author: Xandru Armesto -Date: Fri Apr 23 07:12:32 2010 +0200 +Date: Fri Apr 23 07:12:32 2010 +0200 Updated asturian translation @@ -114,7 +592,7 @@ commit eb19e841e7db9dfb5ba65e3304759fc65601dd61 Author: Petr Kovar -Date: Fri Apr 23 00:15:47 2010 +0200 +Date: Fri Apr 23 00:15:47 2010 +0200 Fix Czech translation @@ -124,7 +602,7 @@ commit fb036185c13aba985df71e430590e89541c77de2 Author: Carles Ferrando -Date: Thu Apr 22 22:58:34 2010 +0200 +Date: Thu Apr 22 22:58:34 2010 +0200 Updated Catalan (Valencian) translation @@ -134,23 +612,23 @@ commit ab845071a85d6776cafa7e59b8ece198a2f9c0a6 Author: Milo Casagrande -Date: Thu Apr 22 21:50:23 2010 +0200 +Date: Thu Apr 22 21:50:23 2010 +0200 [help] Some updates to the help based on the new version - help/C/account-irc.page | 8 +++++--- - help/C/account-jabber.page | 2 +- - help/C/add-account.page | 3 ++- - help/C/audio-call.page | 4 +++- - help/C/create-account.page | 17 ++++++++++++++++- - help/C/irc-manage.page | 6 ++++++ - help/C/remove-account.page | 3 ++- - help/C/video-call.page | 4 +++- + help/C/account-irc.page | 8 +++++--- + help/C/account-jabber.page | 2 +- + help/C/add-account.page | 3 ++- + help/C/audio-call.page | 4 +++- + help/C/create-account.page | 17 ++++++++++++++++- + help/C/irc-manage.page | 6 ++++++ + help/C/remove-account.page | 3 ++- + help/C/video-call.page | 4 +++- 8 files changed, 38 insertions(+), 9 deletions(-) commit ab0e8f605cc781f8eda275babc47c1e3cc98545a Author: David Laban -Date: Tue Apr 20 15:51:30 2010 +0100 +Date: Tue Apr 20 15:51:30 2010 +0100 disconnect empathy_call_window_bus_message() in dispose (#616301) @@ -161,7 +639,7 @@ commit e7aebe14c38782867e67ad11949a5db1d53a21b8 Author: Guillaume Desmottes -Date: Tue Apr 20 12:10:08 2010 +0200 +Date: Tue Apr 20 12:10:08 2010 +0200 NEWS: fix typo @@ -170,17 +648,17 @@ commit 3d9c6a6232cae237645985ba747682ab51d9c60c Author: Guillaume Desmottes -Date: Tue Apr 20 12:06:28 2010 +0200 +Date: Tue Apr 20 12:06:28 2010 +0200 prepare 2.30.0.2 release - NEWS | 23 +++++++++++++++++++++++ + NEWS | 23 +++++++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) commit c540250dd9a84efcc84330ed82e7e1e87255bbeb Author: Guillaume Desmottes -Date: Tue Apr 20 11:47:26 2010 +0200 +Date: Tue Apr 20 11:47:26 2010 +0200 fix show_offline gconf key (#616267) @@ -192,7 +670,7 @@ commit badfcea7164e9b12916c77c21456d4b382b7cdc9 Author: Guillaume Desmottes -Date: Mon Apr 19 15:30:23 2010 +0200 +Date: Mon Apr 19 15:30:23 2010 +0200 call cb with an error if dispatcher_chat_with_contact* fails @@ -201,7 +679,7 @@ commit f2f939e82822df06bcf35914888d4cb6c1158d99 Author: Guillaume Desmottes -Date: Mon Apr 19 15:11:59 2010 +0200 +Date: Mon Apr 19 15:11:59 2010 +0200 dispatcher_connection_invalidated_cb: terminate pending requests @@ -210,7 +688,7 @@ commit 9b3759d6a7c7ce4ec9c49cce1f7424270f19999d Author: Guillaume Desmottes -Date: Mon Apr 19 11:13:17 2010 +0200 +Date: Mon Apr 19 11:13:17 2010 +0200 empathy_dispatcher_chat_with_contact: check if connection_data is NULL @@ -223,7 +701,7 @@ commit e095c83e79fed15c8bb42edf5fc8e872e6006bcf Author: Mike Ruprecht -Date: Sat Apr 17 03:31:04 2010 -0500 +Date: Sat Apr 17 03:31:04 2010 -0500 Update the Tabs menu when a tab is moved. @@ -237,7 +715,7 @@ commit 8f21b88eadef0136385386185ee0fd260a733dfe Author: Mirsal Ennaime -Date: Mon Apr 12 18:31:02 2010 +0200 +Date: Mon Apr 12 18:31:02 2010 +0200 src/empathy-chat-window.ui: Swap keyboard controls for moving tabs @@ -249,12 +727,12 @@ The mapping is now Ctrl + Shift + PageUp / PageDown for moving tabs left / right respectively, as it is in GNOME Terminal for instance. - src/empathy-chat-window.ui | 4 ++-- + src/empathy-chat-window.ui | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 328cdf4c7520b1526b1aac245791f1e97be2d3a5 Author: Guillaume Desmottes -Date: Thu Apr 15 17:19:56 2010 +0200 +Date: Thu Apr 15 17:19:56 2010 +0200 protocol-chooser: return NULL if for some reason we can't find the procol any more @@ -263,12 +741,12 @@ in its manager file but actually don't. Should fix #61582 - libempathy-gtk/empathy-protocol-chooser.c | 8 ++++++++ + libempathy-gtk/empathy-protocol-chooser.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit b1a7119082e71351bf2fce3a850206fb322f6096 Author: Guillaume Desmottes -Date: Thu Apr 15 14:00:51 2010 +0200 +Date: Thu Apr 15 14:00:51 2010 +0200 account-widget-generic: embed the advanced section in a GtkScrolledWindow (#615827) @@ -279,7 +757,7 @@ commit 8e97af466c5385b3fe0f8a16195fe9cdcca2af8c Author: David Laban -Date: Wed Apr 14 15:57:54 2010 +0100 +Date: Wed Apr 14 15:57:54 2010 +0100 account-assistant: make impl_signal_apply() behave more like impl_signal_prepare() @@ -304,7 +782,7 @@ commit 88ba99c8a14c666106c097a4dd8cd227f07b54cc Author: Žygimantas Beručka -Date: Sat Apr 10 21:36:18 2010 +0300 +Date: Sat Apr 10 21:36:18 2010 +0300 Updated Lithuanian translation @@ -314,7 +792,7 @@ commit 5cf97e936cf58b94b9a250421a79cc966da5d088 Author: Guillaume Desmottes -Date: Fri Apr 9 14:56:09 2010 +0200 +Date: Fri Apr 9 14:56:09 2010 +0200 remove released flag @@ -323,17 +801,17 @@ commit be278f11ad3cbf5b3ee4c36dad76f6be378cdf86 Author: Guillaume Desmottes -Date: Fri Apr 9 14:28:25 2010 +0200 +Date: Fri Apr 9 14:28:25 2010 +0200 prepare 2.30.0.1 release - NEWS | 32 ++++++++++++++++++++++++++++++++ + NEWS | 32 ++++++++++++++++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) commit 41e4c4ed38393a12669f641e264a18ecffd763bc Author: Guillaume Desmottes -Date: Fri Apr 9 10:01:45 2010 +0200 +Date: Fri Apr 9 10:01:45 2010 +0200 account_assistant_apply_account_and_finish: explicitely ask to set the display name @@ -357,7 +835,7 @@ commit e9ac4ddd0f527317ddec9a6efc000e0c74c6b35f Author: Guillaume Desmottes -Date: Fri Apr 9 12:50:23 2010 +0200 +Date: Fri Apr 9 12:50:23 2010 +0200 status-icon: don't approve event if notification bubble has been dismissed @@ -368,7 +846,7 @@ commit db7ff361a82a72d0bcef94c82877ffc1e783e8ee Author: Guillaume Desmottes -Date: Fri Apr 9 12:43:25 2010 +0200 +Date: Fri Apr 9 12:43:25 2010 +0200 remove NotificationData @@ -380,7 +858,7 @@ commit fd845a984220e1004ad93c56bec771c7a14a8c3f Author: Guillaume Desmottes -Date: Wed Apr 7 11:08:45 2010 +0200 +Date: Wed Apr 7 11:08:45 2010 +0200 chat-window: don't present chat if notification has been dismissed @@ -390,37 +868,37 @@ This code was broken anyway so we don't change the current behaviour. - src/empathy-chat-window.c | 8 -------- + src/empathy-chat-window.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) commit 95e197e782920fda4a91a5c154390bd5b6e0102c Author: Guillaume Desmottes -Date: Thu Apr 8 11:30:35 2010 +0200 +Date: Thu Apr 8 11:30:35 2010 +0200 rename im-xmpp icon to im-jabber Empathy uses 'im-jabber'. - data/icons/Makefile.am | 12 +- - data/icons/hicolor_apps_16x16_im-jabber.png | Bin 0 -> 663 bytes - data/icons/hicolor_apps_16x16_im-xmpp.png | Bin 663 -> 0 bytes - data/icons/hicolor_apps_22x22_im-jabber.png | Bin 0 -> 953 bytes - data/icons/hicolor_apps_22x22_im-xmpp.png | Bin 953 -> 0 bytes - data/icons/hicolor_apps_24x24_im-jabber.png | Bin 0 -> 1013 bytes - data/icons/hicolor_apps_24x24_im-xmpp.png | Bin 1013 -> 0 bytes - data/icons/hicolor_apps_32x32_im-jabber.png | Bin 0 -> 1492 bytes - data/icons/hicolor_apps_32x32_im-xmpp.png | Bin 1492 -> 0 bytes - data/icons/hicolor_apps_48x48_im-jabber.png | Bin 0 -> 2413 bytes - data/icons/hicolor_apps_48x48_im-xmpp.png | Bin 2413 -> 0 bytes + data/icons/Makefile.am | 12 +- + data/icons/hicolor_apps_16x16_im-jabber.png | Bin 0 -> 663 bytes + data/icons/hicolor_apps_16x16_im-xmpp.png | Bin 663 -> 0 bytes + data/icons/hicolor_apps_22x22_im-jabber.png | Bin 0 -> 953 bytes + data/icons/hicolor_apps_22x22_im-xmpp.png | Bin 953 -> 0 bytes + data/icons/hicolor_apps_24x24_im-jabber.png | Bin 0 -> 1013 bytes + data/icons/hicolor_apps_24x24_im-xmpp.png | Bin 1013 -> 0 bytes + data/icons/hicolor_apps_32x32_im-jabber.png | Bin 0 -> 1492 bytes + data/icons/hicolor_apps_32x32_im-xmpp.png | Bin 1492 -> 0 bytes + data/icons/hicolor_apps_48x48_im-jabber.png | Bin 0 -> 2413 bytes + data/icons/hicolor_apps_48x48_im-xmpp.png | Bin 2413 -> 0 bytes data/icons/hicolor_apps_scalable_im-jabber.svg | 632 ++++++++++++++++++++++++ - data/icons/hicolor_apps_scalable_im-xmpp.svg | 632 + data/icons/hicolor_apps_scalable_im-xmpp.svg | 632 ------------------------ 13 files changed, 638 insertions(+), 638 deletions(-) commit dc1a7834fa4749d090dd6b3ad4a3aac332941c50 Author: Simon McVittie -Date: Wed Apr 7 13:40:22 2010 +0100 +Date: Wed Apr 7 13:40:22 2010 +0100 location_manager_dispose: chain up to the parent's dispose, not the parent's finalize @@ -428,12 +906,12 @@ This leads to crashes when other code is relying on weak reference notifications happening in the right order. - libempathy-gtk/empathy-location-manager.c | 5 ++++- + libempathy-gtk/empathy-location-manager.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) commit 37aa027a859b69982d9569d7cb0d54ae21860cbc Author: Theppitak Karoonboonyanan -Date: Wed Apr 7 16:39:14 2010 +0700 +Date: Wed Apr 7 16:39:14 2010 +0700 Updated Thai translation. @@ -443,7 +921,7 @@ commit e026e709743efbdd10fc01c3c3fba675011551bd Author: Ask H. Larsen -Date: Mon Apr 5 23:02:42 2010 +0200 +Date: Mon Apr 5 23:02:42 2010 +0200 Updated Danish translation @@ -453,7 +931,7 @@ commit 5f3c96ab2bdf0fb5fa9e134393c2fae4db5e8f25 Author: Guillaume Desmottes -Date: Mon Apr 5 15:58:41 2010 +0200 +Date: Mon Apr 5 15:58:41 2010 +0200 account-chooser: check if account is NULL before trying to use it (#614874) @@ -463,16 +941,16 @@ commit eb3f7666328c6a0da2e7d17e9662ac1f4bfb4ce3 Author: Reşat SABIQ -Date: Sat Apr 3 14:19:49 2010 -0500 +Date: Sat Apr 3 14:19:49 2010 -0500 Minor update for Crimean Tatar/Turkish translation - po/crh.po | 8 ++++---- + po/crh.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) commit 71065bbc2aa726f106dd5c733538ef4c55fb2894 Author: Jordi Serratosa -Date: Thu Apr 1 21:44:11 2010 +0200 +Date: Thu Apr 1 21:44:11 2010 +0200 Fixes to Catalan translation @@ -482,7 +960,7 @@ commit 5e6677109e062d9f8c591eae4649dd0ab5f81621 Author: Milo Casagrande -Date: Wed Mar 31 21:11:08 2010 +0200 +Date: Wed Mar 31 21:11:08 2010 +0200 Updated Italian translation @@ -491,7 +969,7 @@ commit c821e81c68acc1daba78899c9c844f916ea2c99e Author: Guillaume Desmottes -Date: Wed Mar 24 11:49:18 2010 +0100 +Date: Wed Mar 24 11:49:18 2010 +0100 disconnect NewChannels signal once we got all the list channels we care about @@ -501,7 +979,7 @@ commit 7ba0f1046ada332737644ecbe1892911b81d6aef Author: Guillaume Desmottes -Date: Wed Mar 24 11:38:39 2010 +0100 +Date: Wed Mar 24 11:38:39 2010 +0100 tp-contact-list: watch for list channels announced in NewChannels signals @@ -518,7 +996,7 @@ commit 4893de0412531c4cb0eb846cffc9fec8031d5a1d Author: Guillaume Desmottes -Date: Wed Mar 24 11:32:00 2010 +0100 +Date: Wed Mar 24 11:32:00 2010 +0100 allow got_list_channel to be called more than once for the same channel @@ -530,7 +1008,7 @@ commit 944632a01dd934666170583b87e970f32211f810 Author: Guillaume Desmottes -Date: Wed Mar 24 11:22:53 2010 +0100 +Date: Wed Mar 24 11:22:53 2010 +0100 factor out got_list_channel @@ -540,7 +1018,7 @@ commit 6af5464b86a9e013ffc36b5243055c5c0d8495f9 Author: Guillaume Desmottes -Date: Tue Mar 30 10:18:10 2010 +0200 +Date: Tue Mar 30 10:18:10 2010 +0200 don't leak the classes list @@ -549,16 +1027,16 @@ commit c9c1f10a1684e62f9e628974206578bb2f79ace3 Author: Guillaume Desmottes -Date: Fri Mar 26 12:53:07 2010 +0100 +Date: Fri Mar 26 12:53:07 2010 +0100 Unsensitive roomlist expander if roomlist is not supported (#614002) - src/empathy-new-chatroom-dialog.c | 2 ++ + src/empathy-new-chatroom-dialog.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 5c93e102dc5ac20a01a805e1f8bfc5d1986fedb0 Author: Guillaume Desmottes -Date: Fri Mar 26 12:52:47 2010 +0100 +Date: Fri Mar 26 12:52:47 2010 +0100 Don't request roomlist channel if not supported (#614002) @@ -567,7 +1045,7 @@ commit 57cbda8c31761ad2cc577c6139199ef57a9e2976 Author: Guillaume Desmottes -Date: Fri Mar 26 12:40:54 2010 +0100 +Date: Fri Mar 26 12:40:54 2010 +0100 empathy_dispatcher_find_requestable_channel_classes: allow handle_type being 0 @@ -581,26 +1059,26 @@ commit d03f537aabceae14cd953bd45d5e13768e6aa2d6 Author: Guillaume Desmottes -Date: Tue Mar 30 11:01:02 2010 +0200 +Date: Tue Mar 30 11:01:02 2010 +0200 release.py: releases are now tagged EMPATHY_2_30* - release.py | 2 +- + release.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a7fc06448ff7adffc32be7ee3b4d8232cf3ef5e9 Author: Aaron Brown -Date: Tue Mar 30 15:33:15 2010 +1000 +Date: Tue Mar 30 15:33:15 2010 +1000 Sets sensitivity of Previous/Next Tab menu items based on gtk-keynav-wrap-around and tab position (#613382) - src/empathy-chat-window.c | 9 +++++++-- + src/empathy-chat-window.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) commit 9026fc61824658c231847e1f023be6fd1eb673e4 Author: Khaled Hosny -Date: Mon Mar 29 22:12:35 2010 +0200 +Date: Mon Mar 29 22:12:35 2010 +0200 Updated Arabic translation @@ -610,7 +1088,7 @@ commit eb7c5a3ae3ba35ee8e0c5952e2f4b17fc803f59c Author: Peteris Krisjanis -Date: Mon Mar 29 22:39:41 2010 +0300 +Date: Mon Mar 29 22:39:41 2010 +0300 Updated Latvian translation. @@ -620,7 +1098,7 @@ commit f5600abfa444ec8ccbca5ffb11c3e649e16f338e Author: Guillaume Desmottes -Date: Thu Mar 18 15:50:32 2010 +0100 +Date: Thu Mar 18 15:50:32 2010 +0100 chat: use empathy_signal_connect_weak to connect signal on the buffer @@ -635,7 +1113,7 @@ commit e3c822bf3b14a6a769353a35a137a0b0e183ac15 Author: Guillaume Desmottes -Date: Thu Mar 18 15:45:32 2010 +0100 +Date: Thu Mar 18 15:45:32 2010 +0100 chat_input_text_buffer_changed_cb: 'priv' is useless @@ -644,7 +1122,7 @@ commit b8cc8019e97c48c259c04e100443f2ce526a821c Author: Guillaume Desmottes -Date: Fri Mar 19 15:34:25 2010 +0100 +Date: Fri Mar 19 15:34:25 2010 +0100 coding style fixes @@ -653,7 +1131,7 @@ commit 66d8d07abade96645aca23d9c0dd526a9ed5481c Author: Olivier Crête -Date: Sat Mar 6 19:18:27 2010 -0500 +Date: Sat Mar 6 19:18:27 2010 -0500 Check for errors when linking the video source into a call (#612020) @@ -663,16 +1141,16 @@ commit 1711b4dffc6c39c948ac441aec2bd81a99c411ff Author: Olivier Crête -Date: Sat Mar 6 18:37:36 2010 -0500 +Date: Sat Mar 6 18:37:36 2010 -0500 Verify that the video source could be linked into the pipeline - src/empathy-call-window.c | 6 +++++- + src/empathy-call-window.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit ee584165872d730f364018915231e014fb0ca37f Author: Olivier Crête -Date: Sat Mar 6 18:36:30 2010 -0500 +Date: Sat Mar 6 18:36:30 2010 -0500 Return error when the audio source can not be started @@ -681,7 +1159,7 @@ commit bcbcb511ce03d1bfde0096830f28bfa21c703569 Author: Olivier Crête -Date: Sat Mar 6 18:31:16 2010 -0500 +Date: Sat Mar 6 18:31:16 2010 -0500 telepathy-glib sucks, need to send stream error from the main thread @@ -690,17 +1168,17 @@ commit b860ad599ff905a735ca00f4f256c43411c09a85 Author: Olivier Crête -Date: Sat Mar 6 18:27:56 2010 -0500 +Date: Sat Mar 6 18:27:56 2010 -0500 Return a telepathy error if the source can't be added libempathy/empathy-call-handler.c | 11 ++++++++--- - src/empathy-call-window.c | 3 ++- + src/empathy-call-window.c | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) commit fc5be44316c04af418f131f6be0d9e4d9dda2e39 Author: Olivier Crête -Date: Sat Mar 6 18:22:49 2010 -0500 +Date: Sat Mar 6 18:22:49 2010 -0500 Remove false comment @@ -709,12 +1187,12 @@ thread. It is the src-addec callback that comes from a streaming thread. - src/empathy-call-window.c | 1 - + src/empathy-call-window.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit 92be33483073c5475567d60b442c8c130dd1babb Author: Olivier Crête -Date: Sat Mar 6 18:21:24 2010 -0500 +Date: Sat Mar 6 18:21:24 2010 -0500 Add audio conversion filter to receive pipeline @@ -724,7 +1202,7 @@ commit 49542a8ff607d5b1b60d14d3d34ebef943362778 Author: Olivier Crête -Date: Sat Mar 6 18:11:13 2010 -0500 +Date: Sat Mar 6 18:11:13 2010 -0500 Add fakesink to srcpad if not real sink could be linked @@ -733,7 +1211,7 @@ commit 6f2876c2a265e4dbd968113795ec222dec86d008 Author: Olivier Crête -Date: Sat Mar 6 16:59:51 2010 -0500 +Date: Sat Mar 6 16:59:51 2010 -0500 Emit error when failing to link audio pad @@ -742,17 +1220,17 @@ commit 4a4a8f89579147d1e712d5da257c83786f86439f Author: Olivier Crête -Date: Sat Mar 6 17:02:32 2010 -0500 +Date: Sat Mar 6 17:02:32 2010 -0500 Send stream error when the src pad can't be linked libempathy/empathy-call-handler.c | 11 ++++++++--- - src/empathy-call-window.c | 4 +++- + src/empathy-call-window.c | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) commit c7662e15ba7412146c8d9d76c9c3b4c3cffb4089 Author: Olivier Crête -Date: Sat Mar 6 16:59:20 2010 -0500 +Date: Sat Mar 6 16:59:20 2010 -0500 Handle errors from audio sink @@ -762,7 +1240,7 @@ commit c3d5568a05b65ec18ff7ff6012be6420340bebab Author: Andrew Gorcester -Date: Mon Mar 29 17:33:32 2010 +0200 +Date: Mon Mar 29 17:33:32 2010 +0200 new-chatroom-dialog: filter CM not implementing groupchat @@ -772,7 +1250,7 @@ commit c3057afe0d6ffddc4b7223fab51751473dfb1a1f Author: Guillaume Desmottes -Date: Fri Mar 26 11:58:50 2010 +0100 +Date: Fri Mar 26 11:58:50 2010 +0100 tp-chat: update self user if it has been renamed (#613930) @@ -781,7 +1259,7 @@ commit 2fcfa45d056d18a8eec36b3da755d82e7dcf7484 Author: Guillaume Desmottes -Date: Mon Mar 29 17:03:14 2010 +0200 +Date: Mon Mar 29 17:03:14 2010 +0200 start dev of next release @@ -790,7 +1268,7 @@ commit 4717ca516f32e001c8888de619ea6624ef074dae Author: Felix Kaser -Date: Sun Mar 28 12:28:31 2010 +0200 +Date: Sun Mar 28 12:28:31 2010 +0200 fallback to JID if alias is empty @@ -802,19 +1280,19 @@ commit d0c2fc30cafbc9e1f2066bff136f0d19074268ee Author: Felix Kaser -Date: Mon Mar 29 09:48:48 2010 +0200 +Date: Mon Mar 29 09:48:48 2010 +0200 fix alignment of the label in error-infobar this left aligns the label which contains the error message in the infobar. fixes bug #609823 - src/empathy-main-window.c | 1 + + src/empathy-main-window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 0f13fb09fbc611dcf24df92a1e4a59b039abb094 Author: Simos Xenitellis -Date: Mon Mar 29 16:46:08 2010 +0300 +Date: Mon Mar 29 16:46:08 2010 +0300 Updated Greek translation for empathy documentation @@ -823,36 +1301,36 @@ commit 7de31d272fb3aa732befbe56aa277ca3532e4e08 Author: Guillaume Desmottes -Date: Mon Mar 29 14:43:12 2010 +0200 +Date: Mon Mar 29 14:43:12 2010 +0200 prepare 2.30 release - NEWS | 71 + NEWS | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 ++-- 2 files changed, 74 insertions(+), 3 deletions(-) commit 947c4ba4558c7cb156956ac63000b03bddbb0c9c Author: Guillaume Desmottes -Date: Mon Mar 29 14:28:01 2010 +0200 +Date: Mon Mar 29 14:28:01 2010 +0200 release.py: add release date in NEWS - release.py | 3 ++- + release.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) commit f468e66e0f35532de89ffd072828ea26d496090d Author: Guillaume Desmottes -Date: Mon Mar 29 14:16:25 2010 +0200 +Date: Mon Mar 29 14:16:25 2010 +0200 release.py: draw a 'line' of the length of the title - release.py | 4 +++- + release.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit 8a7843d2d137f6bd8ca336b79226b7e7a9d79bfa Author: Aron Xu -Date: Mon Mar 29 18:36:47 2010 +0800 +Date: Mon Mar 29 18:36:47 2010 +0800 Update Simplified Chinese translation. @@ -862,7 +1340,7 @@ commit 6bd3bfe6aa288d05f1aaf4cdbbf2f9ac574a3121 Author: Guillaume Desmottes -Date: Tue Mar 23 12:20:29 2010 +0100 +Date: Tue Mar 23 12:20:29 2010 +0100 remove empathy_log_store_empathy_get_dir @@ -872,7 +1350,7 @@ commit 025b934de806230bb79a51b0758cc8b87f9f4e67 Author: Guillaume Desmottes -Date: Tue Mar 23 12:16:01 2010 +0100 +Date: Tue Mar 23 12:16:01 2010 +0100 ship a copy of empathy_log_store_empathy_get_dir in migrate-butterfly-logs.c @@ -894,46 +1372,46 @@ commit cfc400ded9d7fa0ef6ab7649b0b34f7a048a93bb Author: Guillaume Desmottes -Date: Mon Mar 29 12:04:46 2010 +0200 +Date: Mon Mar 29 12:04:46 2010 +0200 coding style fixes - libempathy-gtk/empathy-ui-utils.c | 4 ++-- + libempathy-gtk/empathy-ui-utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit b1dbf73f50b304032c9caf49fee748b8eca81f72 Author: Guillaume Desmottes -Date: Mon Mar 29 11:02:12 2010 +0200 +Date: Mon Mar 29 11:02:12 2010 +0200 fix menu_tabs_right accelerator - src/empathy-chat-window.ui | 2 +- + src/empathy-chat-window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b0f4c4e1287dd2c2d4cc58b819cc467e46316600 Merge: fd2a444 4bbaced Author: Guillaume Desmottes -Date: Mon Mar 29 10:48:19 2010 +0200 +Date: Mon Mar 29 10:48:19 2010 +0200 Merge commit 'treitter/bug-613272' commit fd2a444d4a91e4e9f1863f0d476be4012fced75a Author: Aaron Brown -Date: Mon Mar 29 10:29:17 2010 +0200 +Date: Mon Mar 29 10:29:17 2010 +0200 Adds Ctrl+Shift+PgUp/PgDn accelerator key to move current tab left/right (#614155) - src/empathy-chat-window.ui | 2 ++ + src/empathy-chat-window.ui | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit 39d1d503097a0c4a0999629377f1dc7cf57eea7b Author: Branko Kokanović -Date: Sun Mar 28 23:58:16 2010 +0200 +Date: Sun Mar 28 23:58:16 2010 +0200 Updated Serbian translations - po/sr.po | 516 + po/sr.po | 516 ++++++++++++++++++++++++++++++-------------------------- po/sr@latin.po | 516 ++++++++++++++++++++++++++++++-------------------------- @@ -941,7 +1419,7 @@ commit 09198a0c8857f7143410911f82689964cc839149 Author: Petr Kovar -Date: Sun Mar 28 19:52:56 2010 +0200 +Date: Sun Mar 28 19:52:56 2010 +0200 Update Czech translation @@ -950,7 +1428,7 @@ commit ee3304194ccf4a241bddc79caf3666c16b9a5cbb Author: Jamil Ahmed -Date: Sun Mar 28 15:29:54 2010 +0600 +Date: Sun Mar 28 15:29:54 2010 +0600 Updated Bengali translation @@ -960,7 +1438,7 @@ commit a8e9eb71a1a35a04e9d5191c69615a07321ccc32 Author: Ask H. Larsen -Date: Sat Mar 27 23:52:19 2010 +0100 +Date: Sat Mar 27 23:52:19 2010 +0100 Updated Danish translation @@ -970,7 +1448,7 @@ commit e42a38b11705aed85f420bb2f780cdb0793327b0 Author: Simos Xenitellis -Date: Sat Mar 27 17:39:22 2010 +0200 +Date: Sat Mar 27 17:39:22 2010 +0200 Updated Greek translation @@ -979,7 +1457,7 @@ commit 051cc1c0efa6dde4fec6350f830a60df22f42a0d Author: Inaki Larranaga Murgoitio -Date: Sat Mar 27 15:30:50 2010 +0100 +Date: Sat Mar 27 15:30:50 2010 +0100 Updated Basque language @@ -988,7 +1466,7 @@ commit bfc1579d2720ed173d29c43f8ba5b626dfbf8944 Author: Jamil Ahmed -Date: Sat Mar 27 19:27:19 2010 +0600 +Date: Sat Mar 27 19:27:19 2010 +0600 Updated Bengali translation @@ -998,19 +1476,19 @@ commit b36357c57875a6e2da423a366d25c3990e1ac82c Author: Cheng-Chia Tseng -Date: Sat Mar 27 20:40:48 2010 +0800 +Date: Sat Mar 27 20:40:48 2010 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 74 + po/zh_HK.po | 74 ++++++++++++++++++++++++++++------------------------------- - po/zh_TW.po | 74 + po/zh_TW.po | 74 ++++++++++++++++++++++++++++------------------------------- 2 files changed, 70 insertions(+), 78 deletions(-) commit 2d0fb06ce2c802aa06b73b0f15b43e68acb7b15e Author: Kjartan Maraas -Date: Sat Mar 27 11:16:53 2010 +0100 +Date: Sat Mar 27 11:16:53 2010 +0100 Updated Norwegian bokmål translation @@ -1020,7 +1498,7 @@ commit d177a45c881341397702c92b28c72d1e5182684e Author: Jiri Eischmann -Date: Sat Mar 27 10:02:17 2010 +0100 +Date: Sat Mar 27 10:02:17 2010 +0100 Update Czech translation @@ -1030,7 +1508,7 @@ commit eb6de3a66f0c945999561a4e2ee989fc7763d985 Author: Žygimantas Beručka -Date: Fri Mar 26 23:33:15 2010 +0200 +Date: Fri Mar 26 23:33:15 2010 +0200 Updated Lithuanian translation @@ -1040,7 +1518,7 @@ commit 7dc6046d1986a74212b4d4789caa4a47d54ff722 Author: Marios Zindilis -Date: Fri Mar 26 23:17:04 2010 +0200 +Date: Fri Mar 26 23:17:04 2010 +0200 Updated Greek translation for empathy documentation @@ -1050,7 +1528,7 @@ commit 4bbaced7e7674a62c4c071d483e5d9f9058a6603 Author: Travis Reitter -Date: Fri Mar 26 10:57:43 2010 -0700 +Date: Fri Mar 26 10:57:43 2010 -0700 Set a default empathy-accounts window size such that any scrolled Advanced section will be somewhat-reasonably-sized. @@ -1060,7 +1538,7 @@ commit 782d06ab7f1f053bc3153315735838ea8d4c95e7 Author: Sîmurg56 -Date: Fri Mar 26 15:41:32 2010 +0100 +Date: Fri Mar 26 15:41:32 2010 +0100 Updated Kurdish translation @@ -1070,7 +1548,7 @@ commit c726208ae4c6b6e6c8eda8b56e05c7c089037141 Author: Sîmurg56 -Date: Fri Mar 26 15:39:18 2010 +0100 +Date: Fri Mar 26 15:39:18 2010 +0100 Updated Kurdish translation @@ -1080,7 +1558,7 @@ commit 38204039e3b2199d9837af3decc2992f78a20d1c Author: Maxim V. Dziumanenko -Date: Fri Mar 26 13:31:55 2010 +0200 +Date: Fri Mar 26 13:31:55 2010 +0200 Updated Ukrainian translation @@ -1090,7 +1568,7 @@ commit 863a1653f6c7d262e36ac6cf9c257df6161509ba Author: Mario Blättermann -Date: Fri Mar 26 11:13:35 2010 +0100 +Date: Fri Mar 26 11:13:35 2010 +0100 Updated German doc translation @@ -1100,7 +1578,7 @@ commit a450bc13ff9de2546bc450e41479a531e85ea647 Author: Guillaume Desmottes -Date: Thu Mar 25 11:36:55 2010 +0100 +Date: Thu Mar 25 11:36:55 2010 +0100 Add a comment explaining translator how to make the Facebook string look nice @@ -1110,7 +1588,7 @@ commit 600a7af1f885043ff82c3ea09ae5d3b44b1446a3 Author: Timo Jyrinki -Date: Fri Mar 26 11:45:50 2010 +0200 +Date: Fri Mar 26 11:45:50 2010 +0200 One more time... @@ -1119,7 +1597,7 @@ commit 7e69b277ef2ecb8de723a3a2d6d8e6f540127dfb Author: Bruno Brouard -Date: Fri Mar 26 10:36:57 2010 +0100 +Date: Fri Mar 26 10:36:57 2010 +0100 Updated French doc translation @@ -1128,7 +1606,7 @@ commit 8f27abc5614d08dd8c4eb916c9c71c35595e43a3 Author: Timo Jyrinki -Date: Fri Mar 26 10:47:44 2010 +0200 +Date: Fri Mar 26 10:47:44 2010 +0200 Updated translation from Launchpad. @@ -1138,7 +1616,7 @@ commit b83d40cbb92d2579d18a5847f7f49fbb09192f73 Author: Reşat SABIQ -Date: Thu Mar 25 21:07:32 2010 -0500 +Date: Thu Mar 25 21:07:32 2010 -0500 Updated Crimean Tatar (Crimean Turkish) translation @@ -1148,7 +1626,7 @@ commit 9229bb3761d7051c5bd6e3a8fe7f9115ccdcdca4 Author: Nicolò Chieffo <84yelo3@gmail.com> -Date: Wed Mar 24 13:18:27 2010 +0100 +Date: Wed Mar 24 13:18:27 2010 +0100 Removed the non standard notification capabilities from the list @@ -1158,13 +1636,13 @@ commit f43443d48a3982739a2872ee389cda4937c9bc82 Merge: 0988fd7 301e13e Author: Guillaume Desmottes -Date: Thu Mar 25 10:26:42 2010 +0100 +Date: Thu Mar 25 10:26:42 2010 +0100 Merge branch 'hidden-613892' commit 0988fd71bc0a32a3fa169a26867b6481c0e863e8 Author: Μάριος Ζηντίλης -Date: Thu Mar 25 11:11:00 2010 +0200 +Date: Thu Mar 25 11:11:00 2010 +0200 Updated Greek translation @@ -1174,16 +1652,16 @@ commit 301e13ea631e31f7dcb43750d6db9fb5cd4325c1 Author: Guillaume Desmottes -Date: Thu Mar 25 10:09:43 2010 +0100 +Date: Thu Mar 25 10:09:43 2010 +0100 Launch Empathy in hidden mode when invoked (#613892) - ...freedesktop.Telepathy.Client.Empathy.service.in | 2 +- + ...freedesktop.Telepathy.Client.Empathy.service.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 0d830578c9f264708ef32c96950df7386b0127bd Author: Kostas Papadimas -Date: Thu Mar 25 10:23:22 2010 +0200 +Date: Thu Mar 25 10:23:22 2010 +0200 Updated Greek translation @@ -1193,7 +1671,7 @@ commit 021db6b4be5579b06a00c3b1cddcdccae254f5c5 Author: Jorge González -Date: Wed Mar 24 20:52:39 2010 +0100 +Date: Wed Mar 24 20:52:39 2010 +0100 Updated Spanish translation @@ -1202,31 +1680,31 @@ commit 4eb6eb2634f170ac8dc8c44bf6293d05f5b80733 Author: Travis Reitter -Date: Wed Mar 24 10:29:16 2010 -0700 +Date: Wed Mar 24 10:29:16 2010 -0700 Another way to fix Gnome bug #613272. This puts the Advanced expander content for each of the problem protocols in a scrolled window, instead of the entire Details section. libempathy-gtk/empathy-account-widget-jabber.ui | 317 +++++----- - libempathy-gtk/empathy-account-widget-sip.ui | 734 + libempathy-gtk/empathy-account-widget-sip.ui | 734 ++++++++++++----------- - src/empathy-accounts-dialog.c | 4 +- - src/empathy-accounts-dialog.ui | 203 +++---- + src/empathy-accounts-dialog.c | 4 +- + src/empathy-accounts-dialog.ui | 203 +++---- 4 files changed, 630 insertions(+), 628 deletions(-) commit 69ba8084bf267c6b39e47f0b5e464c4097c87d86 Author: Paul Cutler -Date: Wed Mar 24 10:58:23 2010 -0500 +Date: Wed Mar 24 10:58:23 2010 -0500 fix enalbe typo - bgo 613772 - help/C/prob-conn-acctdisabled.page | 2 +- + help/C/prob-conn-acctdisabled.page | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 3c3e9cd0b59d3a3b835d76c894f40be776c2545f Author: Fran Diéguez -Date: Wed Mar 24 16:06:11 2010 +0100 +Date: Wed Mar 24 16:06:11 2010 +0100 Updated Galician translation @@ -1235,7 +1713,7 @@ commit a71fd64977dbe42f53c52c4a861d35f64b6f7714 Author: Bruno Brouard -Date: Wed Mar 24 13:41:32 2010 +0100 +Date: Wed Mar 24 13:41:32 2010 +0100 Updated French doc translation @@ -1248,16 +1726,16 @@ commit 2eea9e870d0f9a5de6bd1ac2bafccbe5f5337cd3 Author: Danielle Madeley -Date: Wed Mar 24 22:13:00 2010 +1100 +Date: Wed Mar 24 22:13:00 2010 +1100 Same reap-child fix for empathy-debugger - src/empathy-main-window.c | 2 +- + src/empathy-main-window.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit a79cbb8de56de5a163340d31524f0f77bc35ac2a Author: Danielle Madeley -Date: Wed Mar 24 22:05:09 2010 +1100 +Date: Wed Mar 24 22:05:09 2010 +1100 Automatically reap the empathy-accounts child process @@ -1266,12 +1744,12 @@ src/empathy-accounts-dialog.c | 17 ++++------------- src/empathy-accounts-dialog.h | 2 -- src/empathy-main-window.c | 6 +++--- - src/empathy.c | 14 +------------- + src/empathy.c | 14 +------------- 4 files changed, 8 insertions(+), 31 deletions(-) commit d47742d59d3635d1dc78cc298244baaeede9f67d Author: Danielle Madeley -Date: Wed Mar 24 17:00:21 2010 +1100 +Date: Wed Mar 24 17:00:21 2010 +1100 empathy-contact-manager: no need to pass object as user_data and weak_object @@ -1281,7 +1759,7 @@ commit 3ef2b98db024258db0161755b35bfc2a0a577bad Author: Danielle Madeley -Date: Wed Mar 24 16:58:24 2010 +1100 +Date: Wed Mar 24 16:58:24 2010 +1100 empathy-contact-manager: remove unrequired for loop when unpacking struct @@ -1291,7 +1769,7 @@ commit ae5f68d68c85b00d8b9dc337bb77fea393341f1c Author: Gil Forcada -Date: Wed Mar 24 00:00:46 2010 +0100 +Date: Wed Mar 24 00:00:46 2010 +0100 Updated Catalan translation @@ -1301,7 +1779,7 @@ commit 390d589fe52fce28aff5b09521ae38c5aa2ae7ed Author: Guillaume Desmottes -Date: Tue Mar 23 10:05:01 2010 +0100 +Date: Tue Mar 23 10:05:01 2010 +0100 empathy-debugger: set text domain @@ -1312,7 +1790,7 @@ commit c91768a1567df411b23f4068c799a5334f45612a Author: A S Alam -Date: Tue Mar 23 08:12:46 2010 +0530 +Date: Tue Mar 23 08:12:46 2010 +0530 updating for Punjabi by A S Alam @@ -1322,7 +1800,7 @@ commit 5d7e9cb53b5a5eab698da0f8535d23af9521fc37 Author: Inaki Larranaga Murgoitio -Date: Mon Mar 22 17:22:22 2010 +0100 +Date: Mon Mar 22 17:22:22 2010 +0100 Updated Basque language @@ -1331,7 +1809,7 @@ commit cc1cdbf44c5471f3fd54d4fc2a1fab342ef72f7c Author: Guillaume Desmottes -Date: Mon Mar 22 15:58:02 2010 +0100 +Date: Mon Mar 22 15:58:02 2010 +0100 empathy-accounts: set text domain @@ -1344,7 +1822,7 @@ commit 7270ae487433b9a0bc4381b7afe5c991bf074820 Author: Adi Roiban -Date: Mon Mar 22 14:32:39 2010 +0200 +Date: Mon Mar 22 14:32:39 2010 +0200 Update Romanian translation @@ -1354,7 +1832,7 @@ commit 4fad374b36f1b750397ce29ccd313464052f6f59 Author: Guillaume Desmottes -Date: Mon Mar 22 11:12:09 2010 +0100 +Date: Mon Mar 22 11:12:09 2010 +0100 chat-window: remove some DEBUG calls @@ -1365,7 +1843,7 @@ commit 3011ba3c2dd559c63c1ec659ccf494d7e85fe8f2 Author: Guillaume Desmottes -Date: Thu Mar 18 16:41:38 2010 +0100 +Date: Thu Mar 18 16:41:38 2010 +0100 empathy_window_present: use X server time if there is no event @@ -1375,7 +1853,7 @@ commit e8e8bfcd27704588c20755eb5528c08571c87406 Author: Ivar Smolin -Date: Sun Mar 21 19:27:13 2010 +0200 +Date: Sun Mar 21 19:27:13 2010 +0200 Estonian translation updated @@ -1384,7 +1862,7 @@ commit 42ee648e8fa97511f60caf6fdf5d2a4fdd276256 Author: Gabor Kelemen -Date: Sun Mar 21 15:28:11 2010 +0100 +Date: Sun Mar 21 15:28:11 2010 +0100 Updated Hungarian translation @@ -1394,7 +1872,7 @@ commit b6cd6faafcab427ba5d627d414a7fffb5f5e2a31 Author: Duarte Loreto -Date: Sun Mar 21 01:31:28 2010 +0000 +Date: Sun Mar 21 01:31:28 2010 +0000 Updated Portuguese translation @@ -1404,7 +1882,7 @@ commit b81b3b92534ce3a0594e03315e3cdfe3b67fe1e3 Author: Fran Diéguez -Date: Sat Mar 20 20:20:18 2010 +0100 +Date: Sat Mar 20 20:20:18 2010 +0100 Updated Galician translation @@ -1414,19 +1892,19 @@ commit ab919f20f4b0c9f72c3ea11ebb152176c9d65b92 Author: Cheng-Chia Tseng -Date: Sat Mar 20 20:26:51 2010 +0800 +Date: Sat Mar 20 20:26:51 2010 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) - po/zh_HK.po | 396 + po/zh_HK.po | 396 ++++++++++++++++++++++++++++++++--------------------------- - po/zh_TW.po | 396 + po/zh_TW.po | 396 ++++++++++++++++++++++++++++++++--------------------------- 2 files changed, 428 insertions(+), 364 deletions(-) commit f66a02a6fc21fa91bd8bb1d051ae891b41d41b09 Author: Christian Kirbach -Date: Sat Mar 20 11:38:23 2010 +0100 +Date: Sat Mar 20 11:38:23 2010 +0100 Updated German translation @@ -1435,7 +1913,7 @@ commit b3b0ed2f35dce09ba41adee1430005191e6e8f1c Author: Changwoo Ryu -Date: Sat Mar 20 15:39:50 2010 +0900 +Date: Sat Mar 20 15:39:50 2010 +0900 Updated Korean translation @@ -1445,21 +1923,21 @@ commit 8644b710942ce2358ee2345ceb6bf35326dab26b Author: Travis Reitter -Date: Fri Mar 19 11:14:51 2010 -0700 +Date: Fri Mar 19 11:14:51 2010 -0700 Make the account details pane scrollable, in case the Advanced section is too large to fit on the screen all at once. Fixes Gnome bug #613272. libempathy-gtk/empathy-account-widget-jabber.ui | 17 +- - src/empathy-accounts-dialog.c | 4 +- - src/empathy-accounts-dialog.ui | 203 + src/empathy-accounts-dialog.c | 4 +- + src/empathy-accounts-dialog.ui | 203 ++++++++++++----------- 3 files changed, 119 insertions(+), 105 deletions(-) commit aca0ef0b71041cd657486aad2ee65a6925cc226f Author: Khaled Hosny -Date: Fri Mar 19 07:12:34 2010 +0200 +Date: Fri Mar 19 07:12:34 2010 +0200 Updated Arabic translation @@ -1468,7 +1946,7 @@ commit a656c296e38c884682a6eb68fc03f911a7f2a48e Author: Daniel Nylander -Date: Fri Mar 19 00:10:31 2010 +0100 +Date: Fri Mar 19 00:10:31 2010 +0100 Updated Swedish translation @@ -1477,7 +1955,7 @@ commit 28002acf167557350bb3710e689f2d5167d6d567 Author: Milo Casagrande -Date: Thu Mar 18 18:53:30 2010 +0100 +Date: Thu Mar 18 18:53:30 2010 +0100 Updated Italian translation @@ -1486,7 +1964,7 @@ commit 79bf5e0855c5b4271b8872dcccde7abf1ee3b2f4 Author: Piotr Drąg -Date: Thu Mar 18 18:44:20 2010 +0100 +Date: Thu Mar 18 18:44:20 2010 +0100 Updated Polish translation @@ -1495,7 +1973,7 @@ commit 35a28a5b61996dea0afd29349bef0c32075b4378 Author: Mattias Põldaru -Date: Thu Mar 18 17:01:04 2010 +0200 +Date: Thu Mar 18 17:01:04 2010 +0200 Estonian translation updated @@ -1505,7 +1983,7 @@ commit 16d2a4a8852d0dca6bb225adb922b83ad623a627 Author: Timo Jyrinki -Date: Thu Mar 18 09:47:45 2010 +0200 +Date: Thu Mar 18 09:47:45 2010 +0200 Updated Finnish translation by Jiri Grönroos. Via Launchpad. @@ -1515,7 +1993,7 @@ commit 314a0a3b682031509ef72c1dbe0402829b510f01 Author: Leonid Kanter -Date: Thu Mar 18 07:51:07 2010 +0200 +Date: Thu Mar 18 07:51:07 2010 +0200 Updated Russian translation from Yury Kozlov @@ -1524,17 +2002,17 @@ commit 9919fd1de0bc1c8428bd3510ccbe38eb6b4be0c0 Author: Djavan Fagundes -Date: Wed Mar 17 22:55:12 2010 -0300 +Date: Wed Mar 17 22:55:12 2010 -0300 Updated Brazilian Portuguese translation - po/pt_BR.po | 384 + po/pt_BR.po | 384 ++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 207 insertions(+), 177 deletions(-) commit c87beda2353d636075e88797b516be79dfb825c8 Author: Bruno Brouard -Date: Wed Mar 17 23:40:44 2010 +0100 +Date: Wed Mar 17 23:40:44 2010 +0100 Updated French translation @@ -1544,17 +2022,17 @@ commit 5232733b0303a081c6050b538ca098771e3c7040 Author: Bruce Cowan -Date: Wed Mar 17 22:23:20 2010 +0000 +Date: Wed Mar 17 22:23:20 2010 +0000 Updated British English translation - po/en_GB.po | 386 + po/en_GB.po | 386 ++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 208 insertions(+), 178 deletions(-) commit 6686ef0069e2113446040abfa5c7a8204a41dc5e Author: Christian.Kirbach -Date: Wed Mar 17 17:57:50 2010 +0100 +Date: Wed Mar 17 17:57:50 2010 +0100 Updated German translation @@ -1564,7 +2042,7 @@ commit 5a3cce02732c0babacd63fdfa592ec7efcbbcf07 Author: Jorge González -Date: Wed Mar 17 17:31:22 2010 +0100 +Date: Wed Mar 17 17:31:22 2010 +0100 Updated Spanish translation @@ -1574,7 +2052,7 @@ commit 230b2989b0ea8fa2e64e04a92f713ed111dcf099 Author: Alexander Shopov -Date: Wed Mar 17 16:54:00 2010 +0200 +Date: Wed Mar 17 16:54:00 2010 +0200 Updated Bulgarian translation @@ -1583,7 +2061,7 @@ commit a48bc05ff7c4b56a875ff9942fc3ac168079bdb5 Author: Matej Urbančič -Date: Wed Mar 17 15:18:23 2010 +0100 +Date: Wed Mar 17 15:18:23 2010 +0100 Updated Slovenian translation @@ -1593,7 +2071,7 @@ commit e9f383cf554f9b2b8370345044a69d48d2397b81 Author: Inaki Larranaga Murgoitio -Date: Wed Mar 17 15:14:54 2010 +0100 +Date: Wed Mar 17 15:14:54 2010 +0100 Updated Basque language @@ -1603,7 +2081,7 @@ commit 131b0099496470abddae9abda7fb50fedf6b4910 Author: Guillaume Desmottes -Date: Wed Mar 17 14:48:12 2010 +0100 +Date: Wed Mar 17 14:48:12 2010 +0100 sidebar: fix assertion in empathy_sidebar_menu_position_under @@ -1616,17 +2094,17 @@ commit e7f1335e41ac72ac24684a8126151745a019c5a7 Author: Gabor Kelemen -Date: Wed Mar 17 11:37:29 2010 +0100 +Date: Wed Mar 17 11:37:29 2010 +0100 fix escaping of UTF-chars in ui file (#613117) libempathy-gtk/empathy-contact-widget.ui | 4 ++-- - src/empathy-accounts-dialog.ui | 4 ++-- + src/empathy-accounts-dialog.ui | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 7cd5db58862b57db5a1a67b6e2f5e61746e9fb07 Author: mrhappypants -Date: Wed Mar 17 08:30:16 2010 +1000 +Date: Wed Mar 17 08:30:16 2010 +1000 Added gtk-keynav-wrap-around check before cycling tabs @@ -1635,7 +2113,7 @@ commit 1d082229cc10c2fcf53f304b38780b125fd98c79 Author: A S Alam -Date: Wed Mar 17 07:40:48 2010 +0530 +Date: Wed Mar 17 07:40:48 2010 +0530 updating for Punjabi by A S Alam @@ -1645,7 +2123,7 @@ commit 3e1e37bfffbe0e81f036cc6cee11c5e720b71bb0 Author: simurg56 -Date: Wed Mar 17 00:27:44 2010 +0100 +Date: Wed Mar 17 00:27:44 2010 +0100 Updated Kurdish translation @@ -1655,7 +2133,7 @@ commit 13cde1ee20456977630af54aff986a432bf81cd4 Author: Inaki Larranaga Murgoitio -Date: Tue Mar 16 19:14:00 2010 +0100 +Date: Tue Mar 16 19:14:00 2010 +0100 Updated Basque language @@ -1665,7 +2143,7 @@ commit 354df7003597836171a1fa628b7924ba167f91f6 Author: Inaki Larranaga Murgoitio -Date: Tue Mar 16 19:11:45 2010 +0100 +Date: Tue Mar 16 19:11:45 2010 +0100 Updated Basque language @@ -1675,7 +2153,7 @@ commit 3c5a697f0941ac92fc8179bcdb17ec1a2b39efbc Author: Alexander Shopov -Date: Tue Mar 16 16:56:30 2010 +0200 +Date: Tue Mar 16 16:56:30 2010 +0200 Updated Bulgarian translation @@ -1685,7 +2163,7 @@ commit 4bf2c8998e866162af3fa8d4884025b0432acd57 Author: Leonid Kanter -Date: Tue Mar 16 15:00:59 2010 +0200 +Date: Tue Mar 16 15:00:59 2010 +0200 Update Russian translation from Alexander Saprykin @@ -1695,7 +2173,7 @@ commit 59cb12b8740ce412c6488a4c988b834ba81d2232 Author: Guillaume Desmottes -Date: Tue Mar 16 11:15:41 2010 +0100 +Date: Tue Mar 16 11:15:41 2010 +0100 start dev of next release @@ -1704,7 +2182,7 @@ commit cd62f0f8b13ec65077faa6dfc1552730ad0ceb7e Author: Milo Casagrande -Date: Mon Mar 15 22:19:27 2010 +0100 +Date: Mon Mar 15 22:19:27 2010 +0100 Revert "Updated Italian translation" @@ -1716,7 +2194,7 @@ commit dd8208c3597a234a62e3502f098d3c32fcedf70a Author: Francesco Marlatta -Date: Mon Mar 15 22:16:23 2010 +0100 +Date: Mon Mar 15 22:16:23 2010 +0100 Updated Italian translation @@ -1726,7 +2204,7 @@ commit 15474ed7e0781fbf7ca651592e2e9726e708ea2a Author: Claude Paroz -Date: Mon Mar 15 22:08:55 2010 +0100 +Date: Mon Mar 15 22:08:55 2010 +0100 Updated French translation @@ -1736,7 +2214,7 @@ commit a53c8d302baeb2256b6a3250bd375e383a6be8fb Author: Milo Casagrande -Date: Mon Mar 15 21:55:13 2010 +0100 +Date: Mon Mar 15 21:55:13 2010 +0100 Updated Italian translation @@ -1746,7 +2224,7 @@ commit a8760001a9a893f14f2b49f196dea0cf78be7114 Author: Khaled Hosny -Date: Mon Mar 15 20:07:14 2010 +0200 +Date: Mon Mar 15 20:07:14 2010 +0200 Updated Arabic translation @@ -1756,7 +2234,7 @@ commit df721bdb355c5c2d8549fcd9bd288137b9afd1dc Author: Daniel Nylander -Date: Mon Mar 15 18:40:05 2010 +0100 +Date: Mon Mar 15 18:40:05 2010 +0100 Updated Swedish translation @@ -1766,7 +2244,7 @@ commit 8916885875f64feb520d029634c0d386197df94b Author: Jorge González -Date: Mon Mar 15 18:23:03 2010 +0100 +Date: Mon Mar 15 18:23:03 2010 +0100 Updated Spanish translation @@ -1776,7 +2254,7 @@ commit d8407527e25ad3079cfd0da4cc6a5a86ec319c08 Author: Guillaume Desmottes -Date: Mon Mar 15 18:05:27 2010 +0100 +Date: Mon Mar 15 18:05:27 2010 +0100 fix typo in release name @@ -1785,33 +2263,33 @@ commit c88fa694db6c603fd01674591255ccfa830e30e5 Author: Guillaume Desmottes -Date: Mon Mar 15 17:18:57 2010 +0100 +Date: Mon Mar 15 17:18:57 2010 +0100 Prepare 2.29.93 release - NEWS | 44 ++++++++++++++++++++++++++++++++++++++++++++ + NEWS | 44 ++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++-- 2 files changed, 46 insertions(+), 2 deletions(-) commit 07d220cd50802d5d7e21f7f339984e0f3a8eb74a Merge: f3842fe b27315f Author: Guillaume Desmottes -Date: Mon Mar 15 18:03:25 2010 +0100 +Date: Mon Mar 15 18:03:25 2010 +0100 Merge commit 'staz/dnd' commit b27315f5de4084fff748ac12f54b6d23ee7260a7 Author: Olivier Le Thanh Duong -Date: Mon Mar 15 17:47:00 2010 +0100 +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 ++ + libempathy-gtk/empathy-contact-list-view.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) commit c7085dce8076c1e98049adc7dbcb593b16ac5df8 Author: Olivier Le Thanh Duong -Date: Fri Mar 5 00:45:01 2010 +0100 +Date: Fri Mar 5 00:45:01 2010 +0100 DnD: add a new text/path-list target in chat window @@ -1824,7 +2302,7 @@ commit f3842fe890a0819331c3a5901437c88b2e88d282 Author: Piotr Drąg -Date: Mon Mar 15 17:19:28 2010 +0100 +Date: Mon Mar 15 17:19:28 2010 +0100 Updated Polish translation @@ -1834,16 +2312,16 @@ commit 4d2d5a1622f93b69af195d7e3c4d4cb424dbec6e Author: Guillaume Desmottes -Date: Thu Mar 11 14:52:59 2010 +0100 +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 +++++- + libempathy-gtk/empathy-ui-utils.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit f22c92022672a78bead49aa44947bc9380ebf2b8 Author: Guillaume Desmottes -Date: Thu Mar 11 14:32:57 2010 +0100 +Date: Thu Mar 11 14:32:57 2010 +0100 empathy_window_present: use gdk_x11_display_get_user_time as timestamp @@ -1856,35 +2334,35 @@ Fixes bug #609001. - libempathy-gtk/empathy-ui-utils.c | 4 +++- + libempathy-gtk/empathy-ui-utils.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) commit c1d6af1cfbb1801d26a0a550dc7ae9a81e642bc0 Author: Guillaume Desmottes -Date: Thu Mar 11 10:35:25 2010 +0100 +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 +- + 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 -Date: Tue Mar 2 18:09:41 2010 +0100 +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 + + src/empathy-main-window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 170e1d8999a460bb3c293188b4dcc7ea492ab509 Author: Guillaume Desmottes -Date: Thu Mar 11 12:34:16 2010 +0100 +Date: Thu Mar 11 12:34:16 2010 +0100 call-window: display the 'audio input' page by default (#612450) @@ -1893,7 +2371,7 @@ commit 0d1cf12a9eae8334778e51934d5e6a3b0cb58b4a Author: Brian Curtis -Date: Mon Mar 15 13:47:51 2010 +0100 +Date: Mon Mar 15 13:47:51 2010 +0100 idle: Only restore state but not status message when getting back from idle (#566832) @@ -1903,7 +2381,7 @@ commit a7d443e78a3c58d6d188432ada7f7706b3c10cf2 Author: Matej Urbančič -Date: Mon Mar 15 12:41:54 2010 +0100 +Date: Mon Mar 15 12:41:54 2010 +0100 Updated Slovenian translation @@ -1913,19 +2391,19 @@ commit fd87c03fb0a0ae22d27e581bd46df84ac96a4c04 Author: Guillaume Desmottes -Date: Mon Mar 15 12:18:11 2010 +0100 +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 +++++++++----- + Makefile.am | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) commit b91ab973ed932fc95357a0531e8c548edacce215 Author: Guillaume Desmottes -Date: Mon Mar 15 10:29:08 2010 +0100 +Date: Mon Mar 15 10:29:08 2010 +0100 return correct value in g_return_val_if_fail @@ -1934,7 +2412,7 @@ commit c30bc2459bfdbd29f5607e48c9d94f1476defc80 Author: Guillaume Desmottes -Date: Mon Mar 15 10:25:42 2010 +0100 +Date: Mon Mar 15 10:25:42 2010 +0100 contact-selector-dialog: unref filter_account when disposing @@ -1943,7 +2421,7 @@ commit 00a119d8f895506897c86165c5b7592c3ff4f787 Author: Guillaume Desmottes -Date: Mon Mar 15 10:24:14 2010 +0100 +Date: Mon Mar 15 10:24:14 2010 +0100 contact_selector_dialog_account_changed_cb: cope with tp_account_get_connection being NULL @@ -1953,7 +2431,7 @@ commit f75ecac41ace8d80c9253e3f16fc5e068885a1f0 Author: Guillaume Desmottes -Date: Fri Mar 12 18:06:10 2010 +0100 +Date: Fri Mar 12 18:06:10 2010 +0100 invite-participant-dialog: filter contacts by account @@ -1961,14 +2439,14 @@ display them (#612718). - src/empathy-chat-window.c | 4 +++- + 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 -Date: Fri Mar 12 18:18:58 2010 +0100 +Date: Fri Mar 12 18:18:58 2010 +0100 contact-selector-dialog: Add a property to filter contacts by account @@ -1983,7 +2461,7 @@ commit 9f839398aa851f66bcd426f5a1754c7becb8c990 Author: Guillaume Desmottes -Date: Wed Mar 10 14:25:49 2010 +0100 +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 @@ -1993,57 +2471,57 @@ commit 8af9b4b15e86ed2d7307977ca1d2708d894baaf0 Author: Guillaume Desmottes -Date: Wed Mar 10 14:19:58 2010 +0100 +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 +++++++++++++-- + libempathy-gtk/empathy-contact-list-view.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) commit 91c1a372d9b58a42fd57cc4ce98888771b273f8d Author: Guillaume Desmottes -Date: Wed Mar 10 14:19:25 2010 +0100 +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 ++++++++--- + libempathy-gtk/empathy-contact-list-view.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) commit 71ad0f9d2f6a6c35719fbd4d5315ef1104299e7e Author: Guillaume Desmottes -Date: Wed Mar 10 13:49:42 2010 +0100 +Date: Wed Mar 10 13:49:42 2010 +0100 factor out group_can_be_modified - libempathy-gtk/empathy-contact-list-view.c | 25 + libempathy-gtk/empathy-contact-list-view.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) commit 3cab7c229b83bd9668c45a60d562a2e2574dfc49 Author: Guillaume Desmottes -Date: Wed Mar 10 13:26:50 2010 +0100 +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 +++++++++++-- + libempathy-gtk/empathy-contact-list-view.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) commit 8ae91c9509dde4dea0bc735dd24c7e3a690b4c9a Author: Guillaume Desmottes -Date: Wed Mar 10 10:21:32 2010 +0100 +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 +++++++-- + 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 -Date: Wed Mar 10 10:05:50 2010 +0100 +Date: Wed Mar 10 10:05:50 2010 +0100 add 'favorite' checkbox to the edit dialog @@ -2055,36 +2533,36 @@ commit d00ccf5d7f5da998dbcedcb6f420630e347cfe96 Author: Guillaume Desmottes -Date: Wed Mar 10 09:00:34 2010 +0100 +Date: Wed Mar 10 09:00:34 2010 +0100 remove double ; - libempathy-gtk/empathy-contact-list-view.c | 4 ++-- + libempathy-gtk/empathy-contact-list-view.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit d1c7199036cf8006fc1da210c77f7b0787f682fa Author: Guillaume Desmottes -Date: Wed Mar 10 08:59:29 2010 +0100 +Date: Wed Mar 10 08:59:29 2010 +0100 rephrase fake favorite group display name - libempathy-gtk/empathy-contact-list-store.h | 2 +- + libempathy-gtk/empathy-contact-list-store.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 2b8caddf10e90935b10748ea8c48e462bfc686ab Author: Guillaume Desmottes -Date: Wed Mar 10 08:59:08 2010 +0100 +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 -- + configure.ac | 2 -- + libempathy-gtk/Makefile.am | 2 -- + libempathy/Makefile.am | 2 -- 3 files changed, 0 insertions(+), 6 deletions(-) commit 639c68cc074ea525cb769213939383c9ee57fb57 Author: Guillaume Desmottes -Date: Tue Mar 9 18:10:51 2010 +0100 +Date: Tue Mar 9 18:10:51 2010 +0100 libtelepathy-logger has been renamed to telepathy-logger @@ -2093,134 +2571,134 @@ commit cd054461923a9c8c7d05fab2a5f7a88b9f2e6431 Author: Guillaume Desmottes -Date: Tue Mar 9 17:41:37 2010 +0100 +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.c | 35 --------------------------- - libempathy-gtk/empathy-contact-list-store.h | 1 - + libempathy-gtk/empathy-contact-list-store.h | 1 - 2 files changed, 0 insertions(+), 36 deletions(-) commit b92ad3740762d958364d4f9421095b088f0d845b Author: Guillaume Desmottes -Date: Tue Mar 9 17:25:14 2010 +0100 +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 ++- + 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 -Date: Tue Mar 9 17:20:39 2010 +0100 +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 + libempathy-gtk/empathy-contact-list-store.c | 28 ++++++++++++++------------ 1 files changed, 15 insertions(+), 13 deletions(-) commit 18c1a21f066f5077ff487ffb92554fd1539ff997 Author: Guillaume Desmottes -Date: Tue Mar 9 17:14:43 2010 +0100 +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 + + 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 -Date: Tue Mar 9 17:01:47 2010 +0100 +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 +++---------- + libempathy-gtk/empathy-contact-list-store.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) commit 28202c4333c27f360d9298427a9f196954cf8f9f Author: Guillaume Desmottes -Date: Tue Mar 9 16:31:59 2010 +0100 +Date: Tue Mar 9 16:31:59 2010 +0100 Display icon near the favorite fake group - libempathy-gtk/empathy-contact-list-view.c | 53 + libempathy-gtk/empathy-contact-list-view.c | 53 ++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) commit d8d32209c69c82ebec704126c461abb9e39e1b8f Author: Guillaume Desmottes -Date: Tue Mar 9 15:42:18 2010 +0100 +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 +++++- + libempathy-gtk/empathy-contact-list-store.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) commit 1accacab8c375482d6bd16de400529e333c8078f Author: Guillaume Desmottes -Date: Tue Mar 9 14:53:53 2010 +0100 +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 + + 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 -Date: Tue Mar 9 15:02:58 2010 +0100 +Date: Tue Mar 9 15:02:58 2010 +0100 factor out add_contact_to_store - libempathy-gtk/empathy-contact-list-store.c | 50 + libempathy-gtk/empathy-contact-list-store.c | 50 +++++++++++++-------------- 1 files changed, 24 insertions(+), 26 deletions(-) commit 4ac942f53ca44bcfc1e3b8aa9329dddf014b44b8 Author: Guillaume Desmottes -Date: Tue Mar 9 14:28:42 2010 +0100 +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 ++++++++-- + libempathy-gtk/empathy-contact-list-store.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) commit 3828abfc717a381003c81119dc96ef93b3d69d50 Author: Guillaume Desmottes -Date: Tue Mar 9 14:20:21 2010 +0100 +Date: Tue Mar 9 14:20:21 2010 +0100 factor out compare_separator_and_groups - libempathy-gtk/empathy-contact-list-store.c | 86 + libempathy-gtk/empathy-contact-list-store.c | 86 ++++++++++++++------------- 1 files changed, 45 insertions(+), 41 deletions(-) commit 256b001de17b36d197f21e202d82547510868a5b Author: Guillaume Desmottes -Date: Tue Mar 9 13:56:06 2010 +0100 +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 ++ + 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 -Date: Tue Mar 9 13:28:09 2010 +0100 +Date: Tue Mar 9 13:28:09 2010 +0100 Move the 'Favorite' menu item after 'Information' @@ -2229,7 +2707,7 @@ commit 9a912cfc5dfe0592d4e04c7da517383b49c99b95 Author: Guillaume Desmottes -Date: Tue Mar 9 11:59:07 2010 +0100 +Date: Tue Mar 9 11:59:07 2010 +0100 remove EMPATHY_IMAGE_(UN)FAVOURITE @@ -2238,19 +2716,19 @@ commit 40586f1a404d9e053ce4f282c50f3988e6976659 Author: Guillaume Desmottes -Date: Tue Mar 9 11:22:32 2010 +0100 +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 + libempathy-gtk/empathy-contact-list-view.c | 88 ---------------------------- 1 files changed, 0 insertions(+), 88 deletions(-) commit 8df2cf237283de1b049b4c24b0906384e45c4320 Author: Guillaume Desmottes -Date: Tue Mar 9 11:20:33 2010 +0100 +Date: Tue Mar 9 11:20:33 2010 +0100 Add 'favorite' checkbox to the contact menu @@ -2261,7 +2739,7 @@ commit 27591216de0bdbf8cfecd562414faa34138a1a52 Author: Guillaume Desmottes -Date: Mon Mar 8 16:39:29 2010 +0100 +Date: Mon Mar 8 16:39:29 2010 +0100 check that logger is not NULL before unrefing it @@ -2270,7 +2748,7 @@ commit 52d2d0aff0c3a8bbbdd433bb63434207c2e74001 Author: Guillaume Desmottes -Date: Mon Mar 8 16:32:54 2010 +0100 +Date: Mon Mar 8 16:32:54 2010 +0100 fix hash table leak @@ -2283,7 +2761,7 @@ commit 01e4fe629f1861723d004daba9d190abe1e3ec00 Author: Guillaume Desmottes -Date: Mon Mar 8 16:32:03 2010 +0100 +Date: Mon Mar 8 16:32:03 2010 +0100 factor out add_contacts_to_favourites @@ -2293,7 +2771,7 @@ commit 0117b6e07afbe6b05add3baba61aae8d36093051 Author: Guillaume Desmottes -Date: Mon Mar 8 16:14:27 2010 +0100 +Date: Mon Mar 8 16:14:27 2010 +0100 Unref contact returned by empathy_contact_list_get_members @@ -2304,7 +2782,7 @@ commit 6a74d80616929d756322a1cb61ab890d16c43e99 Author: Guillaume Desmottes -Date: Mon Mar 8 15:52:54 2010 +0100 +Date: Mon Mar 8 15:52:54 2010 +0100 log an error if {Add,Remove}FavouriteContact failed @@ -2313,7 +2791,7 @@ commit 1e8b4cff641adf7cd0a17a1fe429ada46f99907f Author: Guillaume Desmottes -Date: Mon Mar 8 15:52:41 2010 +0100 +Date: Mon Mar 8 15:52:41 2010 +0100 document the favorites hash table @@ -2322,22 +2800,22 @@ commit 2f6934c6f206596cfffe0497adad83a231cc24d7 Author: Guillaume Desmottes -Date: Mon Mar 8 14:30:57 2010 +0100 +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-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 + 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 -Date: Mon Mar 8 13:15:26 2010 +0100 +Date: Mon Mar 8 13:15:26 2010 +0100 Sync Unix_Timestamp64 definition with the spec @@ -2348,72 +2826,72 @@ commit c66e6c536d776414f6bfada650dc25d97dc95803 Author: Travis Reitter -Date: Fri Mar 5 18:58:17 2010 -0800 +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 + 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 -Date: Fri Mar 5 17:45:44 2010 -0800 +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-store.c | 60 +-------------------------- - libempathy-gtk/empathy-contact-list-view.c | 7 --- - libempathy/empathy-contact-list.c | 41 ++++++++++++++---- - libempathy/empathy-contact-list.h | 3 - + 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 -Date: Tue Feb 23 10:08:05 2010 -0800 +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 + 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 + + 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 -Date: Tue Feb 16 10:11:43 2010 -0800 +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-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 ++ + 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 -Date: Mon Mar 15 09:27:15 2010 +0100 +Date: Mon Mar 15 09:27:15 2010 +0100 Updated Spanish translation @@ -2422,7 +2900,7 @@ commit 1d6dbd3894044fb1d7240de3c8a36d6fe3591329 Author: Jorge González -Date: Mon Mar 15 09:25:06 2010 +0100 +Date: Mon Mar 15 09:25:06 2010 +0100 Updated Spanish translation @@ -2432,7 +2910,7 @@ commit 350d6eb6ab8dd109eb8250ebf8792ceb15eaa8b7 Author: Danielle Madeley -Date: Wed Mar 10 16:00:25 2010 +1100 +Date: Wed Mar 10 16:00:25 2010 +1100 empathy-accounts: set a title for the assistant @@ -2441,7 +2919,7 @@ commit 6b55164a3957ac07824d2598f36e397686c62533 Author: Guillaume Desmottes -Date: Wed Mar 3 10:07:24 2010 +0100 +Date: Wed Mar 3 10:07:24 2010 +0100 empathy-accounts: set "Empathy Accounts" as application name @@ -2452,7 +2930,7 @@ commit 221f5f70a908aec35711448c78fcea87fa894fa1 Author: Guillaume Desmottes -Date: Wed Mar 3 10:05:57 2010 +0100 +Date: Wed Mar 3 10:05:57 2010 +0100 empathy-debugger: set "Empathy Debugger" as application name @@ -2463,13 +2941,13 @@ commit 8e638ddd817039c0b6cdf342ce657b1b1e975b45 Author: Mike Ruprecht -Date: Wed Feb 24 14:52:38 2010 -0600 +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 +++++- + po/POTFILES.in | 1 + + src/.gitignore | 1 + + src/Makefile.am | 7 +++++- src/empathy-debugger.c | 50 +++++++++++++++++++++++++++++++++++++++++++++ src/empathy-main-window.c | 32 +++++++++++++++++++++++++++- @@ -2478,13 +2956,13 @@ commit df53944e1ba92732760d1cfe437b8b56edda526b Merge: ba8f9b6 c448b89 Author: Jonny Lamb -Date: Mon Mar 15 08:09:56 2010 +0000 +Date: Mon Mar 15 08:09:56 2010 +0000 Merge branch 'butterfly-networkid' commit ba8f9b6182a9f85c7d081e571fae128dc6261d1d Author: Jorge González -Date: Sun Mar 14 23:17:34 2010 +0100 +Date: Sun Mar 14 23:17:34 2010 +0100 Updated Spanish translation @@ -2494,7 +2972,7 @@ commit 4623d70bbcac3aae9ef3df096128e2cb8423dcf2 Author: Milo Casagrande -Date: Sun Mar 14 20:57:06 2010 +0100 +Date: Sun Mar 14 20:57:06 2010 +0100 Updated Italian help translation @@ -2504,7 +2982,7 @@ commit 1f8dfaf0c19c173385b305466cf2de15669a01d5 Author: Fran Diéguez -Date: Sat Mar 13 21:09:26 2010 +0100 +Date: Sat Mar 13 21:09:26 2010 +0100 Update Galician translation @@ -2514,7 +2992,7 @@ commit d81fef008bfdc3de122c80f001e7eed6c4f064d8 Author: Mario Blättermann -Date: Fri Mar 12 23:02:21 2010 +0100 +Date: Fri Mar 12 23:02:21 2010 +0100 Updated German doc translation @@ -2524,7 +3002,7 @@ commit e8f3e042b0792106ce288d26bd19949f834300a2 Author: Milo Casagrande -Date: Fri Mar 12 22:02:19 2010 +0100 +Date: Fri Mar 12 22:02:19 2010 +0100 [help] Updated the irc-join-pwd topic: password protected IRC room now works @@ -2534,7 +3012,7 @@ commit c448b89bb4f18377818b7802f4cb66ba47e3fe04 Author: Jonny Lamb -Date: Fri Mar 12 02:22:47 2010 +0000 +Date: Fri Mar 12 02:22:47 2010 +0000 Migrate butterfly logs to remove the network ID suffix. @@ -2542,39 +3020,39 @@ Signed-off-by: Jonny Lamb - data/empathy.schemas.in | 14 ++ - libempathy-gtk/empathy-conf.h | 1 + + 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/Makefile.am | 1 + + src/empathy-main-window.c | 18 +++ + src/empathy-migrate-butterfly-logs.c | 213 ++++++++++++++++++++++++++++++++ - src/empathy-migrate-butterfly-logs.h | 32 +++++ + src/empathy-migrate-butterfly-logs.h | 32 +++++ 8 files changed, 291 insertions(+), 0 deletions(-) commit cb3e4ee7e0d7d20c95b0067abbff640c005bccc8 Author: Guillaume Desmottes -Date: Fri Mar 12 13:50:08 2010 +0100 +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 +++ + libempathy-gtk/empathy-ui-utils.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit c57f6e063efe334033061088263d246868477c88 Author: Guillaume Desmottes -Date: Fri Mar 12 13:45:27 2010 +0100 +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 ++++++++ + libempathy-gtk/empathy-ui-utils.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) commit 2d9cbe355d22570bbc32d2cde0d7942adab355e0 Author: Mario Blättermann -Date: Thu Mar 11 23:48:11 2010 +0100 +Date: Thu Mar 11 23:48:11 2010 +0100 Updated German doc translation @@ -2584,7 +3062,7 @@ commit 37a671b0f78ddd621041bb529edc7662f317cc86 Author: deniarnuad -Date: Thu Mar 11 20:32:39 2010 +0100 +Date: Thu Mar 11 20:32:39 2010 +0100 updated breton translation @@ -2594,7 +3072,7 @@ commit d4843ddddb24f03451db3aed59a31d2158084171 Author: Jorge González -Date: Thu Mar 11 18:41:43 2010 +0100 +Date: Thu Mar 11 18:41:43 2010 +0100 Updated Spanish translation @@ -2604,7 +3082,7 @@ commit ac93e53085ee405164bc4f9f09ce2a39523727d5 Author: Milo Casagrande -Date: Thu Mar 11 18:23:23 2010 +0100 +Date: Thu Mar 11 18:23:23 2010 +0100 [help] Removed the offline-contacts topic (bug 612448): * Created hide-contacts based on removed-contacts @@ -2614,12 +3092,12 @@ help/C/hide-contacts.page | 42 ++++++++++++++++++++++++++++++++++ help/C/offline-contacts.page | 51 ------------------------------------------ - help/Makefile.am | 2 +- + help/Makefile.am | 2 +- 3 files changed, 43 insertions(+), 52 deletions(-) commit c9fa45d605497da2c0d79262b4d6d42d0fff7c63 Author: Luca Ferretti -Date: Thu Mar 11 15:16:47 2010 +0100 +Date: Thu Mar 11 15:16:47 2010 +0100 Fix a small typo @@ -2629,13 +3107,13 @@ commit 02141c6718553ad9bf05afee05e1ef834d3bdd62 Merge: c1dd662 2a98cb3 Author: Jonny Lamb -Date: Thu Mar 11 11:35:45 2010 +0000 +Date: Thu Mar 11 11:35:45 2010 +0000 Merge branch 'butterfly-conference-misc' commit 2a98cb3d4f7222097b4ec2f5343244d1b313eac1 Author: Jonny Lamb -Date: Wed Mar 10 18:44:14 2010 +0000 +Date: Wed Mar 10 18:44:14 2010 +0000 tp-chat: remove butterfly MSN HandleType=NONE workaround @@ -2657,17 +3135,17 @@ commit c1dd662a2d2c94b19e431750ddc9109b5509e3b6 Author: Guillaume Desmottes -Date: Thu Mar 11 11:12:52 2010 +0100 +Date: Thu Mar 11 11:12:52 2010 +0100 Add a copy of the Attribution-ShareAlike 3.0 Unported licence - COPYING.SHARE-ALIKE | 61 + COPYING.SHARE-ALIKE | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) commit c8516f4f6ea59ac596579dd55e16477d9f107f3e Author: Guillaume Desmottes -Date: Fri Mar 5 10:50:49 2010 +0100 +Date: Fri Mar 5 10:50:49 2010 +0100 add a copy of the GNU Free Documentation License @@ -2677,7 +3155,7 @@ commit 6a35cfc707c5b64aed0a3eecdc0001df6078fa06 Author: Guillaume Desmottes -Date: Fri Mar 5 10:49:14 2010 +0100 +Date: Fri Mar 5 10:49:14 2010 +0100 add a copy of the LGPLv2.1 @@ -2687,7 +3165,7 @@ commit b168624ab6f99b6f4fe1778e8309ee264e18b336 Author: Maxim V. Dziumanenko -Date: Thu Mar 11 11:45:00 2010 +0200 +Date: Thu Mar 11 11:45:00 2010 +0200 Updated Ukrainian translation @@ -2697,7 +3175,7 @@ commit 13a7c40c5aaf9b6ff9d75073775472f413959033 Author: Jonny Lamb -Date: Wed Mar 10 18:41:08 2010 +0000 +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 @@ -2728,7 +3206,7 @@ commit 7d8f163d8dcb540f611b3581389e2c15971e479f Author: Jonny Lamb -Date: Wed Mar 10 18:34:34 2010 +0000 +Date: Wed Mar 10 18:34:34 2010 +0000 dispatcher: allow not caring about handle type when looking up RCCs @@ -2739,7 +3217,7 @@ commit 70d4d71b08e3d8d5a0caaa051218180cd421187e Author: Guillaume Desmottes -Date: Wed Mar 10 16:48:12 2010 +0100 +Date: Wed Mar 10 16:48:12 2010 +0100 Show offline contacts by default (#612448) @@ -2748,7 +3226,7 @@ commit a814276b7d9222f2a3a8d556ffc2f86d4769d5fa Author: Guillaume Desmottes -Date: Wed Mar 10 16:47:44 2010 +0100 +Date: Wed Mar 10 16:47:44 2010 +0100 Sort contacts by state by default (#612448) @@ -2757,7 +3235,7 @@ commit 931c6e727885bdfab4f519ef7fcd7d90f30b3303 Author: Ken VanDine -Date: Wed Mar 10 15:42:21 2010 +0100 +Date: Wed Mar 10 15:42:21 2010 +0100 Window title for the accounts dialog should match the name in the launcher. @@ -2769,7 +3247,7 @@ commit 77192dd163342a513b88618bd8a4d213574d40c1 Author: Xavier Claessens -Date: Wed Mar 10 12:15:23 2010 +0100 +Date: Wed Mar 10 12:15:23 2010 +0100 gtk_check_version() is returning a string error or NULL, not a boolean @@ -2780,7 +3258,7 @@ commit 5601d115d7e74b78dc1a884902c08c23be7626a8 Author: Xavier Claessens -Date: Wed Mar 10 11:41:29 2010 +0100 +Date: Wed Mar 10 11:41:29 2010 +0100 Disable empathy_add_link_markup() if linked to an old GTK version @@ -2791,19 +3269,19 @@ commit 53a27a44ec3180efe29ed24f31091ecfd0bda3ad Author: Xavier Claessens -Date: Wed Mar 10 11:21:08 2010 +0100 +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-chat.c | 8 +++++++- libempathy-gtk/empathy-contact-widget.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) commit 77c57d35a578027d6f5ffea14483ba8762ad995a Author: Danielle Madeley -Date: Wed Mar 10 15:54:51 2010 +1100 +Date: Wed Mar 10 15:54:51 2010 +1100 empathy-accounts: make CcPage insensitive when assistant is being shown @@ -2819,7 +3297,7 @@ commit c2cd8fbabc39ee82f28e9617a33c2ae603f711b7 Author: Leonid Kanter -Date: Wed Mar 10 00:12:57 2010 +0200 +Date: Wed Mar 10 00:12:57 2010 +0200 Updated Russian translation from Yury Myasoedov @@ -2829,7 +3307,7 @@ commit 72ddf3a41e879b907b0e40f37e96468ce2d42f8e Author: Guillaume Desmottes -Date: Tue Mar 9 19:44:06 2010 +0100 +Date: Tue Mar 9 19:44:06 2010 +0100 start dev of next release @@ -2838,17 +3316,17 @@ commit ae87026eae01dd6dbb34a2ae9c1f3a6dcf4b0f2f Author: Guillaume Desmottes -Date: Tue Mar 9 19:31:30 2010 +0100 +Date: Tue Mar 9 19:31:30 2010 +0100 prepare 2.29.92 - NEWS | 28 ++++++++++++++++++++++++++++ + NEWS | 28 ++++++++++++++++++++++++++++ configure.ac | 6 +++--- 2 files changed, 31 insertions(+), 3 deletions(-) commit 383e6e321139a49a17be2bb3025e0568957e48fb Author: Jonas Bonn -Date: Mon Mar 8 10:30:02 2010 +0100 +Date: Mon Mar 8 10:30:02 2010 +0100 chatroom-manager: Save correct room name @@ -2866,7 +3344,7 @@ commit 656d02dd23d1b41cf1924ec3e5ae48c82b570851 Author: A S Alam -Date: Tue Mar 9 07:17:27 2010 +0530 +Date: Tue Mar 9 07:17:27 2010 +0530 updating Punjabi Translation @@ -2876,11 +3354,11 @@ commit d2bb178a1f1b97d7b82f1654898b8d08ac8bd5b9 Author: Branko Kokanović -Date: Mon Mar 8 22:13:37 2010 +0100 +Date: Mon Mar 8 22:13:37 2010 +0100 Updated Serbian translations - po/sr.po | 2271 + po/sr.po | 2271 +++++++++++++++++++++++++++++++++++--------------------- po/sr@latin.po | 2271 +++++++++++++++++++++++++++++++++++--------------------- @@ -2888,7 +3366,7 @@ commit dfb8d63e950c49a348c1d546b006a509df860e22 Author: Anita Reitere -Date: Mon Mar 8 22:09:13 2010 +0200 +Date: Mon Mar 8 22:09:13 2010 +0200 Updated Latvian translation. @@ -2898,7 +3376,7 @@ commit efb42513359f4db545e3312e3c583d07c6306418 Author: Xavier Claessens -Date: Mon Mar 8 13:17:57 2010 +0100 +Date: Mon Mar 8 13:17:57 2010 +0100 Revert "Make links clickable in presence message and topics" diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/configure empathy-2.30.1.1/configure --- empathy-2.30.1/configure 2010-04-26 16:38:58.000000000 +0200 +++ empathy-2.30.1.1/configure 2010-06-09 15:30:19.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for Empathy 2.30.1. +# Generated by GNU Autoconf 2.65 for Empathy 2.30.1.1. # # Report bugs to . # @@ -707,8 +707,8 @@ # Identity of this package. PACKAGE_NAME='Empathy' PACKAGE_TARNAME='empathy' -PACKAGE_VERSION='2.30.1' -PACKAGE_STRING='Empathy 2.30.1' +PACKAGE_VERSION='2.30.1.1' +PACKAGE_STRING='Empathy 2.30.1.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/browse.cgi?product=empathy' PACKAGE_URL='' @@ -1627,7 +1627,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Empathy 2.30.1 to adapt to many kinds of systems. +\`configure' configures Empathy 2.30.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1701,7 +1701,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Empathy 2.30.1:";; + short | recursive ) echo "Configuration of Empathy 2.30.1.1:";; esac cat <<\_ACEOF @@ -1911,7 +1911,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Empathy configure 2.30.1 +Empathy configure 2.30.1.1 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2287,7 +2287,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Empathy $as_me 2.30.1, which was +It was created by Empathy $as_me 2.30.1.1, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3184,7 +3184,7 @@ # Define the identity of the package. PACKAGE='empathy' - VERSION='2.30.1' + VERSION='2.30.1.1' # Some tools Automake needs. @@ -16917,7 +16917,7 @@ fi -if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" == "xyes"; then +if test "x$enable_favourite_contacts" != "xno" || test "x$chain_enable_favourite_contacts" = "xyes"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TELEPATHY_LOGGER" >&5 @@ -17016,7 +17016,7 @@ have_favourite_contacts="no" fi -if test "x$enable_favourite_contacts" = "xyes" -a "x$have_favourite_contacts" != "xyes"; then +if test "x$enable_favourite_contacts" = "xyes" && test "x$have_favourite_contacts" != "xyes"; then as_fn_error "Couldn't find favourite contacts dependencies." "$LINENO" 5 fi @@ -17878,7 +17878,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Empathy $as_me 2.30.1, which was +This file was extended by Empathy $as_me 2.30.1.1, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17944,7 +17944,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Empathy config.status 2.30.1 +Empathy config.status 2.30.1.1 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/configure.ac empathy-2.30.1.1/configure.ac --- empathy-2.30.1/configure.ac 2010-04-26 16:38:51.000000000 +0200 +++ empathy-2.30.1.1/configure.ac 2010-06-09 16:17:30.000000000 +0200 @@ -4,7 +4,7 @@ m4_define([empathy_major_version], [2]) m4_define([empathy_minor_version], [30]) m4_define([empathy_micro_version], [1]) -m4_define([empathy_nano_version], [0]) +m4_define([empathy_nano_version], [1]) dnl Display the nano_version only if it's not '0' m4_define([empathy_base_version], @@ -464,7 +464,7 @@ [Enable favourite contacts]), , enable_favourite_contacts=no) -if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" == "xyes"; then +if test "x$enable_favourite_contacts" != "xno" || test "x$chain_enable_favourite_contacts" = "xyes"; then PKG_CHECK_MODULES(TELEPATHY_LOGGER, [ telepathy-logger @@ -478,7 +478,7 @@ have_favourite_contacts="no" fi -if test "x$enable_favourite_contacts" = "xyes" -a "x$have_favourite_contacts" != "xyes"; then +if test "x$enable_favourite_contacts" = "xyes" && test "x$have_favourite_contacts" != "xyes"; then AC_MSG_ERROR([Couldn't find favourite contacts dependencies.]) fi diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/data/empathy-accounts.desktop empathy-2.30.1.1/data/empathy-accounts.desktop --- empathy-2.30.1/data/empathy-accounts.desktop 2010-04-26 16:39:57.000000000 +0200 +++ empathy-2.30.1.1/data/empathy-accounts.desktop 2010-06-09 15:30:31.000000000 +0200 @@ -25,6 +25,7 @@ Name[lt]=Pokalbių ir VoIP paskyros Name[lv]=Ziņojumapmaiņas un IP balss pārraides konti Name[nb]=Meldings- og VoIP-kontoer +Name[nl]=Messaging- en VoIP-accounts Name[pa]=ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ Name[pl]=Konta komunikatora i VoIP Name[pt]=Contas de Mensagens Instantâneas e VoIP @@ -66,6 +67,7 @@ GenericName[lt]=Pokalbių ir VoIP paskyros GenericName[lv]=Ziņojumapmaiņas un IP balss pārraides konti GenericName[nb]=Meldings- og VoIP-kontoer +GenericName[nl]=Messaging- en VoIP-accounts GenericName[pa]=ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ GenericName[pl]=Konta komunikatora i VoIP GenericName[pt]=Contas de Mensagens Instantâneas e VoIP @@ -107,6 +109,7 @@ Comment[lt]=Tvarkyti pokalbių ir VoIP paskyras Comment[lv]=Pārvaldīt ziņojumapmaiņas un IP balss pārraides kontus Comment[nb]=Håndter meldings- og VoIP-kontoer +Comment[nl]=Beheer Messaging- en VoIP-accounts Comment[pa]=ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਪਰਬੰਧ Comment[pl]=Zarządzanie kontami komunikatora i VoIP Comment[pt]=Gerir contas de Mensagens Instantâneas e VoIP @@ -132,4 +135,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=2.30.1 +X-GNOME-Bugzilla-Version=2.30.1.1 diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/data/empathy-accounts.desktop.in empathy-2.30.1.1/data/empathy-accounts.desktop.in --- empathy-2.30.1/data/empathy-accounts.desktop.in 2010-04-26 16:39:06.000000000 +0200 +++ empathy-2.30.1.1/data/empathy-accounts.desktop.in 2010-06-09 15:30:27.000000000 +0200 @@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=2.30.1 +X-GNOME-Bugzilla-Version=2.30.1.1 diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/data/empathy.desktop empathy-2.30.1.1/data/empathy.desktop --- empathy-2.30.1/data/empathy.desktop 2010-04-26 16:39:57.000000000 +0200 +++ empathy-2.30.1.1/data/empathy.desktop 2010-06-09 15:30:31.000000000 +0200 @@ -37,6 +37,7 @@ Name[mr]=Empathy Name[ms]=Empathy Name[nb]=Empathy +Name[nl]=Empathy Name[pa]=ਇੰਪੈਥੀ Name[pl]=Empathy Name[pt]=Empathy @@ -93,6 +94,7 @@ GenericName[lv]=TZ klients GenericName[mr]=IM क्लाएंट GenericName[nb]=Lynmeldingsklient +GenericName[nl]=Chatprogramma GenericName[pa]=IM ਕਲਾਇਟ GenericName[pl]=Komunikator GenericName[pt]=Cliente de MI @@ -149,6 +151,7 @@ X-GNOME-FullName[lv]=Empathy TZ klients X-GNOME-FullName[mr]=Empathy IM क्लाएंट X-GNOME-FullName[nb]=Empathy IM-klient +X-GNOME-FullName[nl]=Empathy chatprogramma X-GNOME-FullName[or]=Empathy IM କ୍ଲାଏଣ୍ଟ X-GNOME-FullName[pa]=ਇੰਪੈਥੀ IM ਕਲਾਇਟ X-GNOME-FullName[pl]=Komunikator Empathy @@ -206,6 +209,7 @@ Comment[lv]=Sūtīt un saņemt ziņojumus Comment[mr]=संदेश पाठवा व प्राप्त करा Comment[nb]=Send og motta meldinger +Comment[nl]=Chatberichten sturen en ontvangen Comment[or]=ସନ୍ଦେଶଗୁଡ଼ିକୁ ପଠାନ୍ତୁ ଏବଂ ଗ୍ରହଣ କରନ୍ତୁ Comment[pa]=ਸੁਨੇਹੇ ਭੇਜੋ ਅਤੇ ਲਵੋ Comment[pl]=Wysyłanie i odbieranie wiadomości @@ -236,4 +240,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=2.30.1 +X-GNOME-Bugzilla-Version=2.30.1.1 diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/data/empathy.desktop.in empathy-2.30.1.1/data/empathy.desktop.in --- empathy-2.30.1/data/empathy.desktop.in 2010-04-26 16:39:06.000000000 +0200 +++ empathy-2.30.1.1/data/empathy.desktop.in 2010-06-09 15:30:27.000000000 +0200 @@ -13,4 +13,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=2.30.1 +X-GNOME-Bugzilla-Version=2.30.1.1 diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/data/empathy.schemas empathy-2.30.1.1/data/empathy.schemas --- empathy-2.30.1/data/empathy.schemas 2010-04-26 16:22:46.000000000 +0200 +++ empathy-2.30.1.1/data/empathy.schemas 2010-06-09 15:30:31.000000000 +0200 @@ -240,8 +240,8 @@ - Offline contacten tonen - + Offline-contacten tonen + Of contactpersonen die offline zijn in de contactenlijst moeten worden getoond. @@ -500,6 +500,11 @@ + + Sorteercriterium contactenlijst + Te gebruiken criterium bij sorteren van contactenlijst. Standaard wordt gesorteerd op naam met de waarde ‘naam’. De waarde ‘status’ zal de lijst sorteren op status. + + ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਢੰਗ ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ ਡਿਫਾਲਟ ਸੰਪਰਕ ਦੇ ਨਾਂ ਨਾਲ "name (ਨਾਂ)" ਹੈ। "state (ਹਾਲਤ)" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮੁਤਾਬਕ ਲੜੀਬੱਧ ਕਰੋ @@ -812,7 +817,7 @@ Gebruikersafbeeldingen tonen - + Of gebruikersafbeeldingen van contactpersonen getoond moeten worden in de contactenlijst en chatvensters. @@ -1065,6 +1070,11 @@ + + Protocollen tonen + Of er protocollen moeten worden getoond voor contactpersonen in de contactenlijst. + + ਪਰੋਟੋਕਾਲ ਵੇਖੋ ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਪਰੋਟੋਕਾਲ ਵੇਖਾਏ ਜਾਣ। @@ -1376,7 +1386,7 @@ Compacte contactenlijst - + Of de contactenlijst in compacte modus moet worden getoond. @@ -1725,7 +1735,7 @@ Hoofdvenster verbergen - Het hoofdvenster niet tonen. + Het hoofdvenster verbergen. @@ -2413,7 +2423,7 @@ Waarschuwingsgeluiden gebruiken - + Of er geluid afgespeeld moet worden om gebeurtenissen te melden. @@ -2732,7 +2742,7 @@ Geluid uitschakelen indien afwezig - + Of er geluid afgespeeld moet worden indien afwezig of bezig. @@ -3046,7 +3056,7 @@ Geluid afspelen bij nieuwe berichten - + Of er geluid afgespeeld moet worden bij binnenkomende berichten. @@ -3359,8 +3369,8 @@ - Geluid afspelen voor uitgaande berichten - + Geluid afspelen bij uitgaande berichten + Of er geluid afgespeeld moet worden bij uitgaande berichten. @@ -3674,7 +3684,7 @@ Geluid afspelen bij nieuwe gesprekken - + Of er geluid afgespeeld moet worden om u op de hoogte te stellen van nieuwe gesprekken. @@ -3988,8 +3998,8 @@ - Geluid afspelen als contacten zich aanmelden - + Geluid afspelen wanneer contactpersonen zich aanmelden + Of er geluid afgespeeld moet worden als een contactpersoon zich aanmeldt. @@ -4303,8 +4313,8 @@ - Geluid afspelen als contacten zich afmeleden - + Geluid afspelen wanneer contactpersonen zich afmelden + Of er geluid afgespeeld moet worden als een contactpersoon zich afmeldt. @@ -4618,7 +4628,7 @@ Geluid afspelen bij aanmelden - + Of er geluid afgespeeld moet worden bij aanmelden bij een netwerk. @@ -4932,7 +4942,7 @@ Geluid afspelen bij afmelden - + Of er geluid afgespeeld moet worden bij afmelden bij een netwerk. @@ -5247,7 +5257,7 @@ Notificatieberichten tonen voor nieuwe berichten - + Of er een notificatiebericht getoond moet worden bij het ontvangen van een bericht. @@ -5555,8 +5565,8 @@ - Notificatieberichten verbergen indien afwezig - + Notificatieberichten uitschakelen indien afwezig + Of er een notificatiebericht getoond moet worden indien afwezig of bezig. @@ -5804,6 +5814,11 @@ + + Notificatieberichten tonen als het chatvenster geen focus heeft + Of er een notificatiebericht getoond moet worden bij het ontvangen van een bericht, ook als de chat geopend is, maar geen focus heeft. + + ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ ਪਹਿਲਾਂ ਖੁੱਲ੍ਹੀ ਹੋਵੇ, ਪਰ ਫੋਕਸ ਨਾ ਹੋਵੇ। @@ -6029,6 +6044,11 @@ + + Notificatiebericht tonen wanneer een contactpersoon zich aanmeldt + Of er een notificatiebericht getoond moet worden wanneer een contactpersoon zich aanmeldt. + + ਜੇ ਸੰਪਰਕ ਲਾਗ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ। @@ -6254,6 +6274,11 @@ + + Notificatiebericht tonen wanneer een contactpersoon zich afmeldt + Of er een notificatiebericht getoond moet worden wanneer een contactpersoon zich afmeldt. + + ਜੇ ਸੰਪਰਕ ਲਾਗ ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ। @@ -6905,7 +6930,7 @@ Smileys grafisch tonen - + Of smileys in gesprekken grafisch moeten worden getoond. @@ -7207,6 +7232,11 @@ Om kontaktlisten skal vises i praterom. + + Contactenlijst in chatruimtes tonen + Of de contactenlijst in chatruimtes getoond moet worden. + + ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ। @@ -7785,6 +7815,11 @@ Sti til Adium-tema skal brukes hvis tema for prat er Adium. + + Pad van het te gebruiken Adium-thema + Pad van het te gebruiken Adium-thema als het thema voor chatten Adium is. + + ਵਰਤਣ ਵਾਸਤੀ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚੁਣਿਆ ਹੋਵੇ। @@ -8054,6 +8089,11 @@ Om utviklerverktøy for WebKit, som Web Inspector, skal slås på. + + WebKit-ontwikkelhulpprogramma's inschakelen + Of WebKit-ontwikkelhulpprogramma's, zoals de Web Inspector, ingeschakeld moeten worden. + + WebKit ବିକାଶ ସାଧନଗୁଡ଼ିକୁ ସକ୍ରିୟ କରନ୍ତୁ @@ -8374,8 +8414,8 @@ - Thema voor chatruimte gebruiken - + Thema voor chatruimtes gebruiken + Of een thema gebruikt moet worden voor chatruimtes. @@ -8708,8 +8748,8 @@ - Talen voor de spellingchecker - + Talen voor de spellingcontrole + Door komma's gescheiden lijst van talen die door de spellingcontrole gebruikt kunnen worden (bijv. ‘en, fr, nl’). @@ -9048,8 +9088,8 @@ - Spellingchecker inschakelen - + Spellingcontrole inschakelen + Of ingetypte woorden gecontroleerd moeten worden met de talen die u op spelling wilt controleren. @@ -9419,7 +9459,7 @@ Achtervoegsel auto-afmaken - Te gebruiken achtervoegsel bij auto-afmaken (tab) in groepschat. + Te gebruiken achtervoegsel bij auto-afmaken (tab) van bijnaam in groepschat. @@ -9760,7 +9800,7 @@ De gebruikersafbeelding gebruiken als pictogram van het chatvenster - + Of Empathy gebruikersafbeeldingen moet gebruiken als pictogram voor de chatvensters. @@ -10089,8 +10129,8 @@ - Tip tonen bij het sluiten van het hoofdvenster. - + Tip tonen bij het sluiten van het hoofdvenster + Of het dialoogvenster over het sluiten van het hoofdvenster met de knop ‘x’ in de titelbalk getoond moet worden. @@ -10392,6 +10432,11 @@ MC 4-kontoer ble importert. + + MC 4-accounts zijn geïmporteerd + MC 4-accounts zijn geïmporteerd. + + MC 4 ଖାତାକୁ ଆମଦାନୀ କରାସରିଛି MC 4 ଖାତାଗୁଡ଼ିକୁ ଆମଦାନୀ କରାସରିଛି। @@ -10682,6 +10727,11 @@ Om tilkoblingshåndterere skal brukes til å koble til/fra automatisk. + + Verbindingsbeheer gebruiken + Of verbindingsbeheerders gebruikt moet worden om automatisch opnieuw verbinding te maken of de verbinding te verbreken. + + ସଂଯୋଗ ପରିଚାଳକଙ୍କୁ ବ୍ୟବହାର କରିବା ଉଚିତ @@ -10998,7 +11048,7 @@ Automatisch verbinden bij starten - + Of Empathy u automatisch moet aanmelden bij opstarten. @@ -11311,8 +11361,8 @@ - Empathy heeft gevraagd over het importeren van accounts - + Empathy heeft gevraagd of u accounts wilt importeren + Of Empathy gevraagd heeft accounts van andere programma's te importeren. @@ -11544,6 +11594,11 @@ Om Empathy har migrert logger for butterfly. + + Empathy heeft butterfly-logs gemigreerd + Of Empathy butterfly-logs gemigreerd heeft. + + ਇੰਪੈਥੀ ਨੇ ਬਟਰਫਲਾਈ ਲਾਗ ਮਾਈਗਰੇਟ ਕੀਤਾ ਕੀ ਇੰਪੈਥੀ ਬਟਰਫਲਾਈ ਲਾਗ ਕਰ ਚੁੱਕਿਆ ਹੈ। @@ -12122,6 +12177,11 @@ Om Empathy kan publisere brukers lokasjon til kontakter. + + Empathy kan de locatie van de gebruiker bekend maken + Of Empathy de locatie van de gebruiker aan de contacten mag bekend maken. + + Empathy ଚାଳକର ଅବସ୍ଥାନକୁ ପ୍ରକାଶନ କରିପାରିବ @@ -12416,6 +12476,11 @@ Om Empathy kan bruke nettverket for å gjette lokasjon. + + Empathy kan via het netwerk proberen om de locatie te bepalen + Of Empathy het netwerk kan gebruiken om de locatie te bepalen. + + Empathy ଅବସ୍ଥାନକୁ ଅନୁମାନ କରିବା ପାଇଁ ନେଟୱର୍କକୁ ବ୍ୟବହାର କରିପାରିବ @@ -12715,6 +12780,11 @@ Om Empathy kan bruke mobilnettverk for å gjette lokasjon. + + Empathy kan het gsm-netwerk gebruiken om de locatie te bepalen + Of Empathy het mobiele netwerk kan gebruiken om de locatie te bepalen. + + Empathy ଅବସ୍ଥାନକୁ ଅନୁମାନ କରିବା ପାଇଁ ସେଲ୍ୟୁଲାର ନେଟୱର୍କକୁ ବ୍ୟବହାର କରିପାରିବ @@ -13009,6 +13079,11 @@ Om Empathy kan bruke GPS for å gjette lokasjon. + + Empathy kan gps gebruiken om de locatie te bepalen + Of Empathy gps kan gebruiken om de locatie te bepalen. + + Empathy ଅବସ୍ଥାନକୁ ଅନୁମାନ କରିବା ପାଇଁ GPS କୁ ବ୍ୟବହାର କରିପାରିବ @@ -13303,6 +13378,11 @@ Om Empathy skal redusere nøyaktighet for lokasjon av personvernhensyn. + + Empathy moet de nauwkeurigheid van de locatie beperken + Of Empathy de nauwkeurigheid van de locatie moet beperken vanwege de privacy. + + Empathy ଅବସ୍ଥାନର ସଠିକତାକୁ କମ କରିବା ଉଚିତ diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/debian/changelog empathy-2.30.1.1/debian/changelog --- empathy-2.30.1/debian/changelog 2010-06-15 09:33:32.000000000 +0200 +++ empathy-2.30.1.1/debian/changelog 2010-06-15 09:33:33.000000000 +0200 @@ -1,3 +1,54 @@ +empathy (2.30.1.1-0ubuntu1) lucid-proposed; urgency=low + + * New upstream release: + - empathy_dispatcher_join_muc: assertion failed: (connection_data != NULL) + when joining favorites rooms while account is connecting + (Guillaume Desmottes) + - Possible to open multiple accounts dialog (Danielle Madeley) + - Fixed build failure due to missing header (Jasper Lievisse + Adriaanse) + - Empathy accounts CC module calls textdomain (Rob Bradford) + - Should call gtk_builder_set_translation_domain on GtkBuilder + UI components (Rob Bradford) + - Empathy silently fails importing contacts from Pidgin + (Guillaume Desmottes) (LP: #550569) + - Empathy should use port 8001 to connect to freenode irc (Brian Curtis) + (LP: #568901) + - IRC account: don't allow to save changes when editing network + details (Guillaume Desmottes) + - Incomplete localisation of g-c-c module (Rob Bradford) + - Avatar chooser can enter infinite loop (Xavier Claessens) + - configure script not compatible with dash as /bin/sh (Simon McVittie) + - crash on 0-byte file in log search (Robert McQueen) + - "Network error" on connecting to Facebook Chat (Guillaume Desmottes) + (LP: #542836) + - "Previous Conversations" Search entry is not activatable + (Guillaume Desmottes) + - empathy hangs with high cpu load when changing avatar (Xavier + Claessens) + - "Join favorites" should deal better with connecting accounts + (Guillaume Desmottes) + - Status reported by account dialog is wrong in connman mode + (Rob Bradford) + - accounts_dialog_update_status_infobar mixes const and + allocated strings for message (Rob Bradford) + - Empathy should not requires that geoclue providers support + updates (Laurent Bigonville) + - some messages get dropped when using adium themes (Guillaume + Desmottes) (LP: #546338) + - empathy does not set geoclue requirements before asking for + address/position (Laurent Bigonville) + - Missing image icon shows up when contact has no avatar + (Frédéric Péters) + - Crash when trying to start a camera preview without a camera + (Sjoerd Simons) + - updated translations + * added debian/patches/90_revert_removal_stock_person.patch: + remove upstream git commit b87a2f274a838e8636c64605506e6ba243c2671a + ad we don't have gnome-icon-theme 2.30 + + -- Didier Roche Tue, 15 Jun 2010 09:30:00 +0200 + empathy (2.30.1-0ubuntu1) lucid-proposed; urgency=low * New upstream release: (LP: #567277) diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/debian/patches/90_revert_removal_stock_person.patch empathy-2.30.1.1/debian/patches/90_revert_removal_stock_person.patch --- empathy-2.30.1/debian/patches/90_revert_removal_stock_person.patch 1970-01-01 01:00:00.000000000 +0100 +++ empathy-2.30.1.1/debian/patches/90_revert_removal_stock_person.patch 2010-06-15 09:33:33.000000000 +0200 @@ -0,0 +1,107 @@ +diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//libempathy-gtk/empathy-avatar-chooser.c empathy-2.30.1.1.new//libempathy-gtk/empathy-avatar-chooser.c +--- empathy-2.30.1.1//libempathy-gtk/empathy-avatar-chooser.c 2010-06-09 15:28:50.000000000 +0200 ++++ empathy-2.30.1.1.new//libempathy-gtk/empathy-avatar-chooser.c 2010-06-14 20:20:53.543660552 +0200 +@@ -34,7 +34,6 @@ + + #include "empathy-avatar-chooser.h" + #include "empathy-conf.h" +-#include "empathy-images.h" + #include "empathy-ui-utils.h" + + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER +@@ -591,8 +590,7 @@ + priv->avatar = NULL; + } + +- image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT, +- GTK_ICON_SIZE_DIALOG); ++ image = gtk_image_new_from_icon_name ("stock_person", GTK_ICON_SIZE_DIALOG); + gtk_button_set_image (GTK_BUTTON (chooser), image); + g_signal_emit (chooser, signals[CHANGED], 0); + } +diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//libempathy-gtk/empathy-images.h empathy-2.30.1.1.new//libempathy-gtk/empathy-images.h +--- empathy-2.30.1.1//libempathy-gtk/empathy-images.h 2010-06-14 20:19:40.403646653 +0200 ++++ empathy-2.30.1.1.new//libempathy-gtk/empathy-images.h 2010-06-14 20:20:56.003647490 +0200 +@@ -41,7 +41,6 @@ + #define EMPATHY_IMAGE_VIDEO_CALL "camera-web" + #define EMPATHY_IMAGE_LOG "document-open-recent" + #define EMPATHY_IMAGE_DOCUMENT_SEND "document-send" +-#define EMPATHY_IMAGE_AVATAR_DEFAULT "avatar-default" + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//libempathy-gtk/empathy-theme-adium.c empathy-2.30.1.1.new//libempathy-gtk/empathy-theme-adium.c +--- empathy-2.30.1.1//libempathy-gtk/empathy-theme-adium.c 2010-06-08 16:45:12.000000000 +0200 ++++ empathy-2.30.1.1.new//libempathy-gtk/empathy-theme-adium.c 2010-06-14 20:20:56.731647212 +0200 +@@ -41,7 +41,6 @@ + #include "empathy-ui-utils.h" + #include "empathy-plist.h" + #include "empathy-string-parser.h" +-#include "empathy-images.h" + + #define DEBUG_FLAG EMPATHY_DEBUG_CHAT + #include +@@ -492,7 +491,7 @@ + if (!avatar_filename) { + if (!priv->data->default_avatar_filename) { + priv->data->default_avatar_filename = +- empathy_filename_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT, ++ empathy_filename_from_icon_name ("stock_person", + GTK_ICON_SIZE_DIALOG); + } + avatar_filename = priv->data->default_avatar_filename; +diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//src/empathy-call-window.c empathy-2.30.1.1.new//src/empathy-call-window.c +--- empathy-2.30.1.1//src/empathy-call-window.c 2010-06-09 15:28:50.000000000 +0200 ++++ empathy-2.30.1.1.new//src/empathy-call-window.c 2010-06-14 20:20:57.223666557 +0200 +@@ -44,7 +44,6 @@ + #include + #include + #include +-#include + + #define DEBUG_FLAG EMPATHY_DEBUG_VOIP + #include +@@ -1107,8 +1106,8 @@ + + if (pixbuf_avatar == NULL) + { +- pixbuf_avatar = empathy_pixbuf_from_icon_name_sized ( +- EMPATHY_IMAGE_AVATAR_DEFAULT, size); ++ pixbuf_avatar = empathy_pixbuf_from_icon_name_sized ("stock_person", ++ size); + } + + gtk_image_set_from_pixbuf (GTK_IMAGE (image_widget), pixbuf_avatar); +diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//src/empathy-call-window.ui empathy-2.30.1.1.new//src/empathy-call-window.ui +--- empathy-2.30.1.1//src/empathy-call-window.ui 2010-06-07 14:12:53.000000000 +0200 ++++ empathy-2.30.1.1.new//src/empathy-call-window.ui 2010-06-14 20:20:57.680701459 +0200 +@@ -177,7 +177,7 @@ + + True + Preview +- avatar-default ++ stock_person + True + Enable camera but don't send video + +diff -Nur -x '*.orig' -x '*~' empathy-2.30.1.1//src/empathy-event-manager.c empathy-2.30.1.1.new//src/empathy-event-manager.c +--- empathy-2.30.1.1//src/empathy-event-manager.c 2010-06-14 20:19:40.499646234 +0200 ++++ empathy-2.30.1.1.new//src/empathy-event-manager.c 2010-06-14 20:20:58.119647420 +0200 +@@ -863,7 +863,7 @@ + empathy_contact_get_name (contact)); + + event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, +- EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL); ++ "stock_person", header, NULL, NULL, NULL, NULL); + } + } + else +@@ -879,7 +879,7 @@ + empathy_contact_get_name (contact)); + + event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, +- EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL); ++ "stock_person", header, NULL, NULL, NULL, NULL); + } + } + g_free (header); diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy/empathy-log-store-empathy.c empathy-2.30.1.1/libempathy/empathy-log-store-empathy.c --- empathy-2.30.1/libempathy/empathy-log-store-empathy.c 2010-04-15 09:50:39.000000000 +0200 +++ empathy-2.30.1.1/libempathy/empathy-log-store-empathy.c 2010-06-07 14:12:53.000000000 +0200 @@ -620,20 +620,22 @@ gchar *filename; GMappedFile *file; gsize length; - gchar *contents; - gchar *contents_casefold; + gchar *contents = NULL; + gchar *contents_casefold = NULL; filename = l->data; file = g_mapped_file_new (filename, FALSE, NULL); - if (!file) - continue; + if (file == NULL) + goto drinking_island; length = g_mapped_file_get_length (file); contents = g_mapped_file_get_contents (file); - contents_casefold = g_utf8_casefold (contents, length); - g_mapped_file_unref (file); + if (length == 0 || contents == NULL) + goto drinking_island; + + contents_casefold = g_utf8_casefold (contents, length); if (strstr (contents_casefold, text_casefold)) { @@ -649,6 +651,10 @@ } } +drinking_island: + if (file != NULL) + g_mapped_file_unref (file); + g_free (contents_casefold); g_free (filename); } diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy/empathy-tp-file.c empathy-2.30.1.1/libempathy/empathy-tp-file.c --- empathy-2.30.1/libempathy/empathy-tp-file.c 2010-04-15 09:50:39.000000000 +0200 +++ empathy-2.30.1.1/libempathy/empathy-tp-file.c 2010-05-27 16:32:35.000000000 +0200 @@ -30,6 +30,7 @@ #include #include #include +#include #include diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy/irc-networks.xml empathy-2.30.1.1/libempathy/irc-networks.xml --- empathy-2.30.1/libempathy/irc-networks.xml 2010-04-26 10:50:31.000000000 +0200 +++ empathy-2.30.1.1/libempathy/irc-networks.xml 2010-05-27 16:32:35.000000000 +0200 @@ -213,6 +213,7 @@ + diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-account-widget.c empathy-2.30.1.1/libempathy-gtk/empathy-account-widget.c --- empathy-2.30.1/libempathy-gtk/empathy-account-widget.c 2010-04-26 16:00:24.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-account-widget.c 2010-06-09 15:28:50.000000000 +0200 @@ -31,7 +31,7 @@ #include #ifdef HAVE_MEEGO -#include +#include #endif /* HAVE_MEEGO */ #include diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-account-widget-irc.c empathy-2.30.1.1/libempathy-gtk/empathy-account-widget-irc.c --- empathy-2.30.1/libempathy-gtk/empathy-account-widget-irc.c 2010-04-15 09:50:37.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-account-widget-irc.c 2010-06-09 15:28:50.000000000 +0200 @@ -159,6 +159,7 @@ COL_NETWORK_NAME, name, -1); update_server_params (settings); + empathy_account_widget_changed (settings->self); g_object_unref (network); g_free (name); diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-avatar-chooser.c empathy-2.30.1.1/libempathy-gtk/empathy-avatar-chooser.c --- empathy-2.30.1/libempathy-gtk/empathy-avatar-chooser.c 2010-04-26 16:00:24.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-avatar-chooser.c 2010-06-09 15:28:50.000000000 +0200 @@ -34,6 +34,7 @@ #include "empathy-avatar-chooser.h" #include "empathy-conf.h" +#include "empathy-images.h" #include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER @@ -416,8 +417,9 @@ gchar *new_mime_type = NULL; gdouble min_factor, max_factor; gdouble factor; - gchar *converted_image_data = NULL; - gsize converted_image_size = 0; + gchar *best_image_data = NULL; + gsize best_image_size = 0; + guint count = 0; g_object_get (priv->factory, "avatar-mime-types", &mime_types, /* Needs g_strfreev-ing */ @@ -491,10 +493,10 @@ GdkPixbuf *pixbuf_scaled = NULL; gboolean saved; gint new_width, new_height; + gchar *converted_image_data; + gsize converted_image_size; GError *error = NULL; - g_free (converted_image_data); - if (factor != 1) { new_width = width * factor; new_height = height * factor; @@ -531,8 +533,23 @@ DEBUG ("Produced an image data of %"G_GSIZE_FORMAT" bytes.", converted_image_size); - if (max_size == 0) - break; + /* If the new image satisfy the req, keep it as current best */ + if (max_size == 0 || + converted_image_size <= max_size) { + if (best_image_data) + g_free (best_image_data); + + best_image_data = converted_image_data; + best_image_size = converted_image_size; + + /* If this image is close enough to the optimal size, + * stop searching */ + if (max_size == 0 || + max_size - converted_image_size <= 1024) + break; + } else { + g_free (converted_image_data); + } /* Make a binary search for the bigest factor that produce * an image data size less than max_size */ @@ -542,20 +559,23 @@ min_factor = factor; factor = (min_factor + max_factor)/2; - /* We are done if either: - * - min_factor == max_factor. That happens if we resized to - * the max required dimension and the produced data size is - * less than max_size. - * - The data size is close enough to max_size. Here we accept - * a difference of 1k. - */ - } while (min_factor != max_factor && - abs (max_size - converted_image_size) > 1024); + if ((int) (width * factor) == new_width || + (int) (height * factor) == new_height) { + /* min_factor and max_factor are too close, so the new + * factor will produce the same image as previous + * iteration. No need to continue, we already found + * the optimal size. */ + break; + } + + /* Do 10 iterations in the worst case */ + } while (++count < 10); + g_free (new_format_name); - /* Takes ownership of new_mime_type and converted_image_data */ - avatar = empathy_avatar_new ((guchar *) converted_image_data, - converted_image_size, new_mime_type, NULL, NULL); + /* Takes ownership of new_mime_type and best_image_data */ + avatar = empathy_avatar_new ((guchar *) best_image_data, + best_image_size, new_mime_type, NULL, NULL); return avatar; } @@ -571,7 +591,8 @@ priv->avatar = NULL; } - image = gtk_image_new_from_icon_name ("stock_person", GTK_ICON_SIZE_DIALOG); + image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT, + GTK_ICON_SIZE_DIALOG); gtk_button_set_image (GTK_BUTTON (chooser), image); g_signal_emit (chooser, signals[CHANGED], 0); } diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-avatar-image.c empathy-2.30.1.1/libempathy-gtk/empathy-avatar-image.c --- empathy-2.30.1/libempathy-gtk/empathy-avatar-image.c 2010-04-15 09:50:38.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-avatar-image.c 2010-05-27 16:32:35.000000000 +0200 @@ -313,9 +313,7 @@ } if (!priv->pixbuf) { - gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), - "stock_person", - GTK_ICON_SIZE_DIALOG); + gtk_image_clear (GTK_IMAGE (priv->image)); return; } diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-images.h empathy-2.30.1.1/libempathy-gtk/empathy-images.h --- empathy-2.30.1/libempathy-gtk/empathy-images.h 2010-04-26 16:00:24.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-images.h 2010-06-09 15:28:50.000000000 +0200 @@ -41,6 +41,7 @@ #define EMPATHY_IMAGE_VIDEO_CALL "camera-web" #define EMPATHY_IMAGE_LOG "document-open-recent" #define EMPATHY_IMAGE_DOCUMENT_SEND "document-send" +#define EMPATHY_IMAGE_AVATAR_DEFAULT "avatar-default" G_END_DECLS diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-location-manager.c empathy-2.30.1.1/libempathy-gtk/empathy-location-manager.c --- empathy-2.30.1/libempathy-gtk/empathy-location-manager.c 2010-04-26 16:00:24.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-location-manager.c 2010-06-09 15:28:50.000000000 +0200 @@ -499,6 +499,24 @@ } } +static gboolean +set_requirements (EmpathyLocationManager *self) +{ + EmpathyLocationManagerPriv *priv = GET_PRIV (self); + GError *error = NULL; + + if (!geoclue_master_client_set_requirements (priv->gc_client, + GEOCLUE_ACCURACY_LEVEL_COUNTRY, 0, FALSE, priv->resources, + &error)) + { + DEBUG ("set_requirements failed: %s", error->message); + g_error_free (error); + return FALSE; + } + + return TRUE; +} + static void update_resources (EmpathyLocationManager *self) { @@ -512,13 +530,8 @@ /* As per Geoclue bug #15126, using NONE results in no address * being found as geoclue-manual report an empty address with * accuracy = NONE */ - if (!geoclue_master_client_set_requirements (priv->gc_client, - GEOCLUE_ACCURACY_LEVEL_COUNTRY, 0, TRUE, priv->resources, - NULL)) - { - DEBUG ("set_requirements failed"); - return; - } + if (!set_requirements (self)) + return; geoclue_address_get_address_async (priv->gc_address, initial_address_cb, self); @@ -546,7 +559,8 @@ return; } - update_resources (self); + if (!set_requirements (self)) + return; /* Get updated when the position is changes */ priv->gc_position = geoclue_master_client_create_position ( diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-log-window.c empathy-2.30.1.1/libempathy-gtk/empathy-log-window.c --- empathy-2.30.1/libempathy-gtk/empathy-log-window.c 2010-04-15 09:50:39.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-log-window.c 2010-06-07 16:46:08.000000000 +0200 @@ -99,6 +99,8 @@ static void log_window_find_setup (EmpathyLogWindow *window); static void log_window_button_find_clicked_cb (GtkWidget *widget, EmpathyLogWindow *window); +static void log_window_entry_find_activate_cb (GtkWidget *widget, + EmpathyLogWindow *window); static void log_window_button_next_clicked_cb (GtkWidget *widget, EmpathyLogWindow *window); static void log_window_button_previous_clicked_cb (GtkWidget *widget, @@ -241,6 +243,7 @@ empathy_builder_connect (gui, window, "log_window", "destroy", log_window_destroy_cb, "entry_find", "changed", log_window_entry_find_changed_cb, + "entry_find", "activate", log_window_entry_find_activate_cb, "button_previous", "clicked", log_window_button_previous_clicked_cb, "button_next", "clicked", log_window_button_next_clicked_cb, "button_find", "clicked", log_window_button_find_clicked_cb, @@ -738,8 +741,7 @@ } static void -log_window_button_find_clicked_cb (GtkWidget *widget, - EmpathyLogWindow *window) +start_find_search (EmpathyLogWindow *window) { const gchar *str; @@ -757,6 +759,20 @@ } static void +log_window_button_find_clicked_cb (GtkWidget *widget, + EmpathyLogWindow *window) +{ + start_find_search (window); +} + +static void +log_window_entry_find_activate_cb (GtkWidget *entry, + EmpathyLogWindow *self) +{ + start_find_search (self); +} + +static void log_window_button_next_clicked_cb (GtkWidget *widget, EmpathyLogWindow *window) { diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-string-parser.c empathy-2.30.1.1/libempathy-gtk/empathy-string-parser.c --- empathy-2.30.1/libempathy-gtk/empathy-string-parser.c 2010-04-26 16:00:24.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-string-parser.c 2010-06-09 15:28:50.000000000 +0200 @@ -185,9 +185,23 @@ { GString *string = user_data; gchar *escaped; + guint i; + gssize escaped_len, old_len; escaped = g_markup_escape_text (text, len); - g_string_append (string, escaped); + escaped_len = strlen (escaped); + + /* Allocate more space to string (we really need a g_string_extend...) */ + old_len = string->len; + g_string_set_size (string, old_len + escaped_len); + g_string_truncate (string, old_len); + + /* Remove '\r' */ + for (i = 0; i < escaped_len; i++) { + if (escaped[i] != '\r') + g_string_append_c (string, escaped[i]); + } + g_free (escaped); } diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-theme-adium.c empathy-2.30.1.1/libempathy-gtk/empathy-theme-adium.c --- empathy-2.30.1/libempathy-gtk/empathy-theme-adium.c 2010-04-15 09:50:39.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-theme-adium.c 2010-06-08 16:45:12.000000000 +0200 @@ -41,6 +41,7 @@ #include "empathy-ui-utils.h" #include "empathy-plist.h" #include "empathy-string-parser.h" +#include "empathy-images.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT #include @@ -491,7 +492,7 @@ if (!avatar_filename) { if (!priv->data->default_avatar_filename) { priv->data->default_avatar_filename = - empathy_filename_from_icon_name ("stock_person", + empathy_filename_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT, GTK_ICON_SIZE_DIALOG); } avatar_filename = priv->data->default_avatar_filename; diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/libempathy-gtk/empathy-ui-utils.c empathy-2.30.1.1/libempathy-gtk/empathy-ui-utils.c --- empathy-2.30.1/libempathy-gtk/empathy-ui-utils.c 2010-04-26 16:00:24.000000000 +0200 +++ empathy-2.30.1.1/libempathy-gtk/empathy-ui-utils.c 2010-06-09 15:28:50.000000000 +0200 @@ -78,6 +78,7 @@ DEBUG ("Loading file %s", filename); gui = gtk_builder_new (); + gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE); if (!gtk_builder_add_from_file (gui, filename, &error)) { g_critical ("GtkBuilder Error (%s): %s", filename, error->message); diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/Makefile.am empathy-2.30.1.1/Makefile.am --- empathy-2.30.1/Makefile.am 2010-04-15 09:50:36.000000000 +0200 +++ empathy-2.30.1.1/Makefile.am 2010-06-08 17:49:23.000000000 +0200 @@ -1,7 +1,12 @@ -SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests +MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests +NST_SUBDIRS = nautilus-sendto-plugin + +DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) + +SUBDIRS = $(MY_SUBDIRS) if HAVE_NST -SUBDIRS += nautilus-sendto-plugin +SUBDIRS += $(NST_SUBDIRS) endif ACLOCAL_AMFLAGS = -I m4 @@ -29,7 +34,7 @@ distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' distclean-local: - if test "x$(srdcir)" = "x."; then :; else \ + if test "x$(srcdir)" = "x."; then :; else \ rm -f ChangeLog; \ fi diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/NEWS empathy-2.30.1.1/NEWS --- empathy-2.30.1/NEWS 2010-04-26 16:27:08.000000000 +0200 +++ empathy-2.30.1.1/NEWS 2010-06-09 16:17:30.000000000 +0200 @@ -1,3 +1,51 @@ +NEW in 2.30.1.1 (09/06/2010) +=============== + +The "Faster, Better, Stronger" release. + +This stable release fixes some critical issues including crashes and a nasty bug +preventing multi-lines MSN messages to be displayed when using Adium themes. +We strongly advice distributions to upgrade to this version. + +IMPORTANT: We are now using the new icon replacing the deprecated +'stock_person' one and so rely on gnome-icon-theme 2.30. If your +distribution doens't ship this version you should consider to revert this +commit in your package: +http://git.gnome.org/browse/empathy/commit/?id=b87a2f274a838e8636c64605506e6ba243c2671a + +Bugs fixed: + - Fixed #606738, empathy_dispatcher_join_muc: assertion failed: (connection_data != NULL) when joining favorites rooms while account is connecting (Guillaume Desmottes) + - Fixed #616616, Possible to open multiple accounts dialog (Danielle Madeley) + - Fixed #616859, build failure due to missing header (Jasper Lievisse Adriaanse) + - Fixed #617262, Empathy accounts CC module calls textdomain (Rob Bradford) + - Fixed #617909, Should call gtk_builder_set_translation_domain on GtkBuilder UI components (Rob Bradford) + - Fixed #617971, Empathy silently fails importing contacts from Pidgin (Guillaume Desmottes) + - Fixed #618401, Empathy should use port 8001 to connect to freenode irc (Brian Curtis) + - Fixed #618883, IRC account: don't allow to save changes when editing network details (Guillaume Desmottes) + - Fixed #618969, Incomplete localisation of g-c-c module (Rob Bradford) + - Fixed #619701, Avatar chooser can enter infinite loop (Xavier Claessens) + - Fixed #619702, configure script not compatible with dash as /bin/sh (Simon McVittie) + - Fixed #619736, crash on 0-byte file in log search (Robert McQueen) + - Fixed #619862, "Network error" on connecting to Facebook Chat (Guillaume Desmottes) + - Fixed #619863, "Previous Conversations" Search entry is not activatable (Guillaume Desmottes) + - Fixed #619980, empathy hangs with high cpu load when changing avatar (Xavier Claessens) + - Fixed #620439, "Join favorites" should deal better with connecting accounts (Guillaume Desmottes) + - Fixed #620474, Status reported by account dialog is wrong in connman mode (Rob Bradford) + - Fixed #620476, accounts_dialog_update_status_infobar mixes const and allocated strings for message (Rob Bradford) + - Fixed #620657, Empathy should not requires that geoclue providers support updates (Laurent Bigonville) + - Fixed #620903, some messages get dropped when using adium themes (Guillaume Desmottes) + - Fixed #621023, empathy does not set geoclue requirements before asking for address/position (Laurent Bigonville) + - Fixed #608103, Missing image icon shows up when contact has no avatar (Frédéric Péters) + - Fixed #618167, Crash when trying to start a camera preview without a camera (Sjoerd Simons) + +Translations: + - Updated et Translation (Mattias Põldaru) + - Updated nl Translation (Hannie Dumoleyn) + +Documentation translations: + - Updated de Documentation translation (Mario Blättermann) + - Updated es Documentation translation (Jorge González) + NEW in 2.30.1 (26/04/2010) ============= diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-account-assistant.c empathy-2.30.1.1/src/empathy-account-assistant.c --- empathy-2.30.1/src/empathy-account-assistant.c 2010-04-20 15:31:06.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-account-assistant.c 2010-06-07 14:12:53.000000000 +0200 @@ -20,7 +20,8 @@ /* empathy-account-assistant.c */ -#include +#include +#include #include #include @@ -427,6 +428,9 @@ { empathy_account_settings_set_icon_name_async (settings, "im-facebook", NULL, NULL); + + empathy_account_settings_set_string (settings, "server", + "chat.facebook.com"); } if (priv->first_resp == RESPONSE_CREATE_ACCOUNT) @@ -909,6 +913,10 @@ g_object_unref (priv->settings); priv->settings = NULL; } + else if (current_page == PAGE_IMPORT) + { + empathy_import_widget_add_selected_accounts (priv->iw); + } } static void diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-accounts-common.c empathy-2.30.1.1/src/empathy-accounts-common.c --- empathy-2.30.1/src/empathy-accounts-common.c 2010-04-15 09:50:41.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-accounts-common.c 2010-06-07 16:46:08.000000000 +0200 @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include @@ -101,9 +101,10 @@ TpAccount *account, GCallback window_destroyed_cb) { - GtkWidget *accounts_window; + static GtkWidget *accounts_window = NULL; - accounts_window = empathy_accounts_dialog_show (NULL, account); + if (accounts_window == NULL) + accounts_window = empathy_accounts_dialog_show (NULL, account); if (window_destroyed_cb) g_signal_connect (accounts_window, "destroy", window_destroyed_cb, NULL); diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-accounts-dialog.c empathy-2.30.1.1/src/empathy-accounts-dialog.c --- empathy-2.30.1/src/empathy-accounts-dialog.c 2010-04-26 16:00:24.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-accounts-dialog.c 2010-06-09 15:28:50.000000000 +0200 @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include @@ -113,6 +113,7 @@ TpAccountManager *account_manager; EmpathyConnectionManagers *cms; + EmpathyConnectivity *connectivity; GtkWindow *parent_window; TpAccount *initial_selection; @@ -191,17 +192,26 @@ } static void +accounts_dialog_status_infobar_set_message (EmpathyAccountsDialog *dialog, + const gchar *message) +{ + EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); + gchar *message_markup; + + message_markup = g_markup_printf_escaped ("%s", message); + gtk_label_set_markup (GTK_LABEL (priv->label_status), message_markup); + g_free (message_markup); +} + +static void accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog, TpAccount *account) { EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog); - const gchar *message; - gchar *message_markup; gchar *status_message = NULL; guint status; guint reason; guint presence; - EmpathyConnectivity *connectivity; GtkTreeView *view; GtkTreeModel *model; GtkTreeSelection *selection; @@ -260,7 +270,8 @@ switch (status) { case TP_CONNECTION_STATUS_CONNECTING: - message = _("Connecting…"); + accounts_dialog_status_infobar_set_message (dialog, + _("Connecting…")); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_INFO); @@ -271,14 +282,24 @@ case TP_CONNECTION_STATUS_CONNECTED: if (g_strcmp0 (status_message, "") == 0) { + gchar *message; + message = g_strdup_printf ("%s", empathy_presence_get_default_message (presence)); + + accounts_dialog_status_infobar_set_message (dialog, message); + g_free (message); } else { + gchar *message; + message = g_strdup_printf ("%s — %s", empathy_presence_get_default_message (presence), status_message); + + accounts_dialog_status_infobar_set_message (dialog, message); + g_free (message); } gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_INFO); @@ -287,33 +308,41 @@ gtk_widget_hide (priv->throbber); break; case TP_CONNECTION_STATUS_DISCONNECTED: - message = g_strdup_printf (_("Disconnected — %s"), - empathy_status_reason_get_default_message (reason)); - if (reason == TP_CONNECTION_STATUS_REASON_REQUESTED) { + gchar *message; + message = g_strdup_printf (_("Offline — %s"), empathy_status_reason_get_default_message (reason)); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_WARNING); + + accounts_dialog_status_infobar_set_message (dialog, message); + g_free (message); } else { + gchar *message; + + message = g_strdup_printf (_("Disconnected — %s"), + empathy_status_reason_get_default_message (reason)); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_ERROR); + + accounts_dialog_status_infobar_set_message (dialog, message); + g_free (message); } - connectivity = empathy_connectivity_dup_singleton (); - if (!empathy_connectivity_is_online (connectivity)) - message = _("Offline — No Network Connection"); + if (!empathy_connectivity_is_online (priv->connectivity)) + accounts_dialog_status_infobar_set_message (dialog, + _("Offline — No Network Connection")); - g_object_unref (connectivity); ephy_spinner_stop (EPHY_SPINNER (priv->throbber)); gtk_widget_show (priv->image_status); gtk_widget_hide (priv->throbber); break; default: - message = _("Unknown Status"); + accounts_dialog_status_infobar_set_message (dialog, _("Unknown Status")); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_WARNING); @@ -324,7 +353,8 @@ } else { - message = _("Offline — Account Disabled"); + accounts_dialog_status_infobar_set_message (dialog, + _("Offline — Account Disabled")); gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar), GTK_MESSAGE_WARNING); @@ -333,8 +363,6 @@ gtk_widget_hide (priv->throbber); } - message_markup = g_markup_printf_escaped ("%s", message); - gtk_label_set_markup (GTK_LABEL (priv->label_status), message_markup); gtk_widget_show (priv->label_status); if (!creating_account) @@ -343,7 +371,6 @@ gtk_widget_hide (priv->infobar); g_free (status_message); - g_free (message_markup); } void @@ -595,6 +622,9 @@ { empathy_account_settings_set_icon_name_async (settings, "im-facebook", NULL, NULL); + + empathy_account_settings_set_string (settings, "server", + "chat.facebook.com"); } accounts_dialog_add (dialog, settings); @@ -2137,6 +2167,12 @@ priv->cms = NULL; } + if (priv->connectivity) + { + g_object_unref (priv->connectivity); + priv->connectivity = NULL; + } + if (priv->initial_selection != NULL) g_object_unref (priv->initial_selection); priv->initial_selection = NULL; @@ -2221,6 +2257,8 @@ gtk_widget_show (import_dialog); } } + + priv->connectivity = empathy_connectivity_dup_singleton (); } static void diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-accounts-module.c empathy-2.30.1.1/src/empathy-accounts-module.c --- empathy-2.30.1/src/empathy-accounts-module.c 2010-04-15 09:50:41.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-accounts-module.c 2010-05-27 16:32:35.000000000 +0200 @@ -30,8 +30,6 @@ void g_io_module_load (GIOModule *module) { - textdomain (GETTEXT_PACKAGE); - cc_empathy_accounts_panel_register (module); } diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-auto-salut-account-helper.c empathy-2.30.1.1/src/empathy-auto-salut-account-helper.c --- empathy-2.30.1/src/empathy-auto-salut-account-helper.c 2010-04-15 09:50:41.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-auto-salut-account-helper.c 2010-05-27 16:32:35.000000000 +0200 @@ -19,8 +19,10 @@ * Guillaume Desmottes */ +#include + #include -#include +#include #include #include diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-call-window.c empathy-2.30.1.1/src/empathy-call-window.c --- empathy-2.30.1/src/empathy-call-window.c 2010-04-26 16:00:24.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-call-window.c 2010-06-09 15:28:50.000000000 +0200 @@ -44,6 +44,7 @@ #include #include #include +#include #define DEBUG_FLAG EMPATHY_DEBUG_VOIP #include @@ -847,6 +848,13 @@ if (priv->camera_state == CAMERA_STATE_ON) return; + if (priv->video_input == NULL) + { + DEBUG ("Can't enable camera, no input"); + return; + } + + DEBUG ("Enable camera"); empathy_call_window_set_send_video (self, TRUE); @@ -1099,8 +1107,8 @@ if (pixbuf_avatar == NULL) { - pixbuf_avatar = empathy_pixbuf_from_icon_name_sized ("stock_person", - size); + pixbuf_avatar = empathy_pixbuf_from_icon_name_sized ( + EMPATHY_IMAGE_AVATAR_DEFAULT, size); } gtk_image_set_from_pixbuf (GTK_IMAGE (image_widget), pixbuf_avatar); @@ -2240,6 +2248,8 @@ EmpathyCallWindowPriv *priv = GET_PRIV (self); GstElement *preview; + disable_camera (self); + DEBUG ("remove video input"); preview = empathy_video_widget_get_element ( EMPATHY_VIDEO_WIDGET (priv->video_preview)); @@ -2258,11 +2268,8 @@ gtk_widget_destroy (priv->video_preview); priv->video_preview = NULL; - gtk_toggle_tool_button_set_active ( - GTK_TOGGLE_TOOL_BUTTON (priv->tool_button_camera_on), FALSE); gtk_widget_set_sensitive (priv->tool_button_camera_on, FALSE); - - gtk_widget_show (priv->self_user_avatar_widget); + gtk_widget_set_sensitive (priv->tool_button_camera_preview, FALSE); } static void diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-call-window.ui empathy-2.30.1.1/src/empathy-call-window.ui --- empathy-2.30.1/src/empathy-call-window.ui 2010-04-15 09:50:41.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-call-window.ui 2010-06-07 14:12:53.000000000 +0200 @@ -177,7 +177,7 @@ True Preview - stock_person + avatar-default True Enable camera but don't send video diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-event-manager.c empathy-2.30.1.1/src/empathy-event-manager.c --- empathy-2.30.1/src/empathy-event-manager.c 2010-04-20 15:31:06.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-event-manager.c 2010-06-09 15:28:50.000000000 +0200 @@ -863,7 +863,7 @@ empathy_contact_get_name (contact)); event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, - "stock_person", header, NULL, NULL, NULL, NULL); + EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL); } } else @@ -879,7 +879,7 @@ empathy_contact_get_name (contact)); event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, - "stock_person", header, NULL, NULL, NULL, NULL); + EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL); } } g_free (header); diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-import-dialog.c empathy-2.30.1.1/src/empathy-import-dialog.c --- empathy-2.30.1/src/empathy-import-dialog.c 2010-04-15 09:50:42.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-import-dialog.c 2010-05-27 16:32:35.000000000 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-import-mc4-accounts.c empathy-2.30.1.1/src/empathy-import-mc4-accounts.c --- empathy-2.30.1/src/empathy-import-mc4-accounts.c 2010-04-15 09:50:42.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-import-mc4-accounts.c 2010-05-27 16:32:35.000000000 +0200 @@ -19,10 +19,12 @@ * Authors: Arnaud Maillet */ +#include + #include #include #include -#include +#include #include #include #include diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-import-widget.c empathy-2.30.1.1/src/empathy-import-widget.c --- empathy-2.30.1/src/empathy-import-widget.c 2010-04-15 09:50:42.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-import-widget.c 2010-05-27 16:32:35.000000000 +0200 @@ -22,6 +22,8 @@ /* empathy-import-widget.c */ +#include + #include "empathy-import-dialog.h" #include "empathy-import-widget.h" #include "empathy-import-pidgin.h" @@ -36,7 +38,7 @@ #include #include -#include +#include G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT) diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/src/empathy-main-window.c empathy-2.30.1.1/src/empathy-main-window.c --- empathy-2.30.1/src/empathy-main-window.c 2010-04-26 16:00:24.000000000 +0200 +++ empathy-2.30.1.1/src/empathy-main-window.c 2010-06-09 15:28:50.000000000 +0200 @@ -875,7 +875,8 @@ } static void -main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) +join_chatroom (EmpathyChatroom *chatroom, + gint64 timestamp) { TpAccount *account; TpConnection *connection; @@ -883,12 +884,113 @@ account = empathy_chatroom_get_account (chatroom); connection = tp_account_get_connection (account); + g_assert (connection != NULL); room = empathy_chatroom_get_room (chatroom); - if (connection != NULL) { - DEBUG ("Requesting channel for '%s'", room); - empathy_dispatcher_join_muc (connection, room, NULL, NULL); + DEBUG ("Requesting channel for '%s'", room); + + empathy_dispatcher_join_muc (connection, room, NULL, NULL); +} + +typedef struct +{ + TpAccount *account; + EmpathyChatroom *chatroom; + gint64 timestamp; + glong sig_id; + guint timeout; +} join_fav_account_sig_ctx; + +static join_fav_account_sig_ctx * +join_fav_account_sig_ctx_new (TpAccount *account, + EmpathyChatroom *chatroom, + gint64 timestamp) +{ + join_fav_account_sig_ctx *ctx = g_slice_new0 ( + join_fav_account_sig_ctx); + + ctx->account = g_object_ref (account); + ctx->chatroom = g_object_ref (chatroom); + ctx->timestamp = timestamp; + return ctx; +} + +static void +join_fav_account_sig_ctx_free (join_fav_account_sig_ctx *ctx) +{ + g_object_unref (ctx->account); + g_object_unref (ctx->chatroom); + g_slice_free (join_fav_account_sig_ctx, ctx); +} + +static void +account_status_changed_cb (TpAccount *account, + TpConnectionStatus old_status, + TpConnectionStatus new_status, + guint reason, + gchar *dbus_error_name, + GHashTable *details, + gpointer user_data) +{ + join_fav_account_sig_ctx *ctx = user_data; + + switch (new_status) { + case TP_CONNECTION_STATUS_DISCONNECTED: + /* Don't wait any longer */ + goto finally; + break; + + case TP_CONNECTION_STATUS_CONNECTING: + /* Wait a bit */ + return; + + case TP_CONNECTION_STATUS_CONNECTED: + /* We can join the room */ + break; } + + join_chatroom (ctx->chatroom, ctx->timestamp); + +finally: + g_source_remove (ctx->timeout); + g_signal_handler_disconnect (account, ctx->sig_id); +} + +#define JOIN_FAVORITE_TIMEOUT 5 + +static gboolean +join_favorite_timeout_cb (gpointer data) +{ + join_fav_account_sig_ctx *ctx = data; + + /* stop waiting for joining the favorite room */ + g_signal_handler_disconnect (ctx->account, ctx->sig_id); + return FALSE; +} + +static void +main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) +{ + TpAccount *account; + + account = empathy_chatroom_get_account (chatroom); + if (tp_account_get_connection_status (account, NULL) != + TP_CONNECTION_STATUS_CONNECTED) { + join_fav_account_sig_ctx *ctx; + + ctx = join_fav_account_sig_ctx_new (account, chatroom, + gtk_get_current_event_time ()); + + ctx->sig_id = g_signal_connect_data (account, "status-changed", + G_CALLBACK (account_status_changed_cb), ctx, + (GClosureNotify) join_fav_account_sig_ctx_free, 0); + + ctx->timeout = g_timeout_add_seconds (JOIN_FAVORITE_TIMEOUT, + join_favorite_timeout_cb, ctx); + return; + } + + join_chatroom (chatroom, gtk_get_current_event_time ()); } static void diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/tests/empathy-parser-test.c empathy-2.30.1.1/tests/empathy-parser-test.c --- empathy-2.30.1/tests/empathy-parser-test.c 2010-04-15 09:50:42.000000000 +0200 +++ empathy-2.30.1.1/tests/empathy-parser-test.c 2010-06-08 17:55:56.000000000 +0200 @@ -25,17 +25,6 @@ } static void -test_replace_verbatim (const gchar *text, - gssize len, - gpointer match_data, - gpointer user_data) -{ - GString *string = user_data; - - g_string_append_len (string, text, len); -} - -static void test_parsers (void) { gchar *tests[] = @@ -70,25 +59,29 @@ "Foo (www.foo.com)", "Foo ([www.foo.com])", "Foo {www.foo.com}", "Foo {[www.foo.com]}", "Foo [www.foo.com]", "Foo [[www.foo.com]]", - "Foo ", "Foo <[www.foo.com]>", - "Foo \"www.foo.com\"", "Foo \"[www.foo.com]\"", + "Foo ", "Foo <[www.foo.com]>", + "Foo \"www.foo.com\"", "Foo "[www.foo.com]"", "Foo (www.foo.com/bar(123)baz)", "Foo ([www.foo.com/bar(123)baz])", - "bar", "bar", + "bar", "<a href="[http://foo.com]">bar</a>", "Foo (user@server.com)", "Foo ([user@server.com])", "Foo {user@server.com}", "Foo {[user@server.com]}", "Foo [user@server.com]", "Foo [[user@server.com]]", - "Foo ", "Foo <[user@server.com]>", - "Foo \"user@server.com\"", "Foo \"[user@server.com]\"", + "Foo ", "Foo <[user@server.com]>", + "Foo \"user@server.com\"", "Foo "[user@server.com]"", /* Basic smileys */ "a:)b", "a[:)]b", ">:)", "[>:)]", - ">:(", ">[:(]", + ">:(", ">[:(]", /* Smileys and links mixed */ ":)http://foo.com", "[:)][http://foo.com]", "a :) b http://foo.com c :( d www.test.com e", "a [:)] b [http://foo.com] c [:(] d [www.test.com] e", + /* '\r' should be stripped */ + "badger\n\rmushroom", "badger\nmushroom", + "badger\r\nmushroom", "badger\nmushroom", + /* FIXME: Known issue: Brackets should be counted by the parser */ //"Foo www.bar.com/test(123)", "Foo [www.bar.com/test(123)]", //"Foo (www.bar.com/test(123))", "Foo ([www.bar.com/test(123)])", @@ -102,11 +95,10 @@ { {empathy_string_match_link, test_replace_match}, {empathy_string_match_smiley, test_replace_match}, - {empathy_string_match_all, test_replace_verbatim}, + {empathy_string_match_all, empathy_string_replace_escaped}, {NULL, NULL} }; guint i; - gboolean failed = FALSE; DEBUG ("Started"); for (i = 0; tests[i] != NULL; i += 2) @@ -119,13 +111,10 @@ ok = !tp_strdiff (tests[i + 1], string->str); DEBUG ("'%s' => '%s': %s", tests[i], string->str, ok ? "OK" : "FAILED"); - if (!ok) - failed = TRUE; + g_assert (ok); g_string_free (string, TRUE); } - - g_assert (!failed); } int diff -Nru --exclude Makefile.in --exclude '*.po' --exclude help --exclude '*.m4' --exclude manuals --exclude docs --exclude '*auto*conf*' --exclude po --exclude '*autotools*' empathy-2.30.1/tools/with-session-bus.sh empathy-2.30.1.1/tools/with-session-bus.sh --- empathy-2.30.1/tools/with-session-bus.sh 2010-04-15 09:50:42.000000000 +0200 +++ empathy-2.30.1.1/tools/with-session-bus.sh 2010-06-07 14:12:53.000000000 +0200 @@ -15,6 +15,7 @@ me=with-session-bus dbus_daemon_args="--print-address=5 --print-pid=6 --fork" +sleep=0 usage () { @@ -29,6 +30,11 @@ while test "z$1" != "z--"; do case "$1" in + --sleep=*) + sleep="$1" + sleep="${sleep#--sleep=}" + shift + ;; --session) dbus_daemon_args="$dbus_daemon_args --session" shift @@ -73,11 +79,15 @@ if [ -n "$WITH_SESSION_BUS_FORK_DBUS_MONITOR" ] ; then echo -n "Forking dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT" >&2 dbus-monitor $WITH_SESSION_BUS_FORK_DBUS_MONITOR_OPT \ - &> $me-$$.dbus-monitor-logs & + > $me-$$.dbus-monitor-logs 2>&1 & fi "$@" || e=$? +if test $sleep != 0; then + sleep $sleep +fi + trap - INT HUP TERM cleanup