commit fd0c17ddf662f5de04d33acaea778d7ffebbdfaf Author: Guillaume Desmottes Date: Mon Nov 7 17:45:28 2011 +0100 sync gsettings.m4 Latest version of glib-compile-schemas removed the --uninstall option; trying to use it break "make distcheck". m4/gsettings.m4 | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) commit 2945131b0e6c56085a5b635afe715c7960c19a97 Author: Guillaume Desmottes Date: Mon Nov 7 17:26:04 2011 +0100 prepare 3.2.1.2 NEWS | 14 ++++++++++++++ configure.ac | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) commit 59008336234ac35de562e6595c6ec7c7d5f9e3b9 Author: Michael Monreal Date: Mon Oct 31 17:59:11 2011 +0100 Fix for misaligned 16x16 app icon The 16x16 app icon that ships with empathy 3.x is missing the upper border because it is shifted one pixel up. I have rearranged the vector image to the baseplate and created a fixed 16x16. https://bugzilla.gnome.org/show_bug.cgi?id=662995 data/icons/empathy.svg | 5759 +---------------------------- data/icons/hicolor_apps_16x16_empathy.png | Bin 890 -> 905 bytes 2 files changed, 202 insertions(+), 5557 deletions(-) commit 69e0d9daec0f2d0cb8489ed996081cde9b119f89 Author: Danielle Madeley Date: Thu Oct 27 15:48:31 2011 +1100 accounts-dialog: fix infobar packing issues by porting to GtkGrid src/empathy-accounts-dialog.c | 51 +++++++++++++--------------------------- 1 files changed, 17 insertions(+), 34 deletions(-) commit d87949ee841cb1be630ae1d048a1e007f2a4965f Author: Danielle Madeley Date: Wed Oct 26 14:26:11 2011 +1100 contact-chooser: refilter when the tmp contacts change capabilities Making a call to GetContactAttributes only gets the attributes currently known to the CM. If a contact is unknown, lookups for the attributes are then queued and signalled when retrieved. When we receive this signal, we should refilter the contact list. Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=662727 libempathy-gtk/empathy-contact-chooser.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) commit 807171fd01b81462be2f7ee96a9ddd213580597a Author: Guillaume Desmottes Date: Tue Oct 25 17:03:28 2011 +0200 empathy-debugger: rely on gtk_application_add_window() to manage the main loop We have to old the application while doing async preparation as the app window is not created right away. https://bugzilla.gnome.org/show_bug.cgi?id=662504 src/empathy-accounts-common.c | 30 +++++++++++++++++----------- src/empathy-accounts-common.h | 2 +- src/empathy-accounts.c | 43 +++++++++++++++++++++-------------------- 3 files changed, 41 insertions(+), 34 deletions(-) commit 3cb7d4dcb966dfa5ed391cc0b5aee1cc6f05f5b6 Author: Guillaume Desmottes Date: Wed Oct 26 10:02:01 2011 +0200 empathy-accounts: prepare the AM in app_command_line_cb We just need to prepare it in the main instance; there is no point doing it the other ones as they will just re-invoke the main one and exit. https://bugzilla.gnome.org/show_bug.cgi?id=662504 src/empathy-accounts.c | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) commit 35c8dca4f051944b011ef8c0843548a10be9117b Author: Guillaume Desmottes Date: Wed Oct 26 11:12:44 2011 +0200 empathy-accounts: re-use existing TpAccount rather than creating a new one This allows us to detect right away if the account is a valid one and we don't have to prepare it any more as the AM already did it for us. https://bugzilla.gnome.org/show_bug.cgi?id=662504 Conflicts: src/empathy-accounts.c src/empathy-accounts.c | 60 ++++++++++++++++++++++++------------------------ 1 files changed, 30 insertions(+), 30 deletions(-) commit f3e2b667893b4abc3b39aa338716dace9e9723ac Author: Guillaume Desmottes Date: Tue Oct 25 17:03:28 2011 +0200 empathy-debugger: rely on gtk_application_add_window() to manage the main loop https://bugzilla.gnome.org/show_bug.cgi?id=662504 src/empathy-debugger.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) commit bec05425315c6ab2581300b9f0f98f8fe2e2273d Author: Guillaume Desmottes Date: Tue Oct 25 17:03:28 2011 +0200 empathy: rely on gtk_application_add_window() to manage the main loop We are not supposed to call gtk_main_quit() as we don't use gtk_main() any more. Instead we add the windows to the GtkApplication which will take care of exiting when they have been all destroyed. https://bugzilla.gnome.org/show_bug.cgi?id=662504 src/empathy-main-window.c | 2 +- src/empathy-status-icon.c | 4 +++- src/empathy.c | 7 +++---- 3 files changed, 7 insertions(+), 6 deletions(-) commit 886d9c9f70c77c1bb1d595595f8b7cf75ea4ebc4 Author: Guillaume Desmottes Date: Tue Oct 25 11:48:21 2011 +0200 Disable GLib deprecation warnings in stable branch configure.ac | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) commit e13f9d39a868176022b9fba9e1c17a560937e7a5 Author: Guillaume Desmottes Date: Tue Oct 25 11:44:19 2011 +0200 Include config.h in a bunch of files They use deprecated API (g_mutex_new) but we still want to use it for now so they need to have GLIB_DISABLE_DEPRECATION_WARNINGS defined. src/empathy-audio-src.c | 1 + src/empathy-call-window.c | 1 + src/empathy-streamed-media-window.c | 1 + src/empathy-video-widget.c | 1 + 4 files changed, 4 insertions(+), 0 deletions(-) commit 4d4547dd8d04c8f0a3bd2b7a267bf063e73bdc52 Author: Christian Kirbach Date: Mon Oct 24 23:35:33 2011 +0200 Updated German translation po/de.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit f04a15f4560cf75ae47389fc1a2018ee434050d8 Author: Guillaume Desmottes Date: Mon Oct 24 17:46:49 2011 +0200 remove released flag configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)