commit a60d42b746ec9e85a38fab03c61e8a477e8dc3ee
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 18:27:42 2009 +0100

    upgrade NEWS for 2.28.0.1

 NEWS |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

commit ccd38a70e03526594bb240a6561a8aa24cffd28d
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 18:19:08 2009 +0100

    next stable release is going to be 2.28.0.1

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit e2608a8d9baf93ca56e8e8f66e97099e0a256446
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 18:45:41 2009 +0100

    empathy-status-icon: disable notification_action_cb if built without
    moblin

 src/empathy-status-icon.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit b3145a87c4749819586a8e3e3c5c6d2f9ff38a43
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 18:35:35 2009 +0100

    display 'Respond' button in notifications only if built for Moblin

    We don't want to have this feature on the desktop until it's properly
    integrated
    (#597124) which will be for 2.30.

 src/empathy-status-icon.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 6433791a724cd0370b3a065188e4e605b09a29d6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 17:23:52 2009 +0100

    empathy-accounts-dialog: 'Create' button should be 'Next' on Moblin

 src/empathy-accounts-dialog.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

commit 21526c22b8183e2306132087eae2df4ff7078ddf
Author: Rob Bradford <rob@linux.intel.com>
Date:   Fri Oct 2 16:04:10 2009 +0100

    Bring up notifications until the conversation is accepted (#597125)

    Rather than filter out message received signals for new conversations
    that have already been tried to be initiated let them pass
    through. This
    results in you getting notifications repeatedly until you open
    accept the
    conversation and open the conversation window with the user.

 src/empathy-event-manager.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

commit af28ad4fad5b0298d61d1b4c5eec31b2e8e00409
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 14:12:34 2009 +0100

    fix coding styles

 src/empathy-status-icon.c |   32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

commit 7e117916ca6ca5eba9108638885885ef4d19ab1e
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 13:02:25 2009 +0100

    empathy-status-icon: check if notification daemon supports actions

 src/empathy-status-icon.c |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

commit ce267d2301d36626dc4de3be5ce3b4b28c9eb0a6
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 12:50:48 2009 +0100

    initialize libnotify earlier in main()

    The status icon will have to query the notify daemon during its
    construction so libnotify has to be already initialized.

 src/empathy.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

commit e2e96275266ab5c3435d5a68750ac358b6ec3580
Author: Rob Bradford <rob@linux.intel.com>
Date:   Fri Oct 2 12:27:23 2009 +0100

    Add a "Respond" button to notifications to provide a positive action
    (#589408)

    The positive action is the same positive action that would be
    accomplished by clicking on the status icon.

 src/empathy-status-icon.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

commit d6e770d1b8d59919ff7563824843847e9fcddf9a
Merge: 72ee329 b8e7413
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Oct 2 17:36:13 2009 +0100

    Merge commit 'cosimo/moblin' into gnome-2-28

    Conflicts:
	libempathy-gtk/empathy-account-widget.c

commit b8e7413ad4741fea8da9e4eaf75ad29dd5491689
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 12:30:01 2009 +0200

    Remove the logic that re-applies the original enabled value.

    Now that we instant-apply the setting, this is not needed anymore.
    Also, this fixes a crasher.

 libempathy-gtk/empathy-account-widget.c |   21 ++++-----------------
 1 files changed, 4 insertions(+), 17 deletions(-)

commit 324cf197dad2b5125ee2433f4773307cfe3388d7
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:	Fri Oct 2 17:01:51 2009 +0100

    empathy-account-widget: document that the 'Account:' string is
    moblin specific

 libempathy-gtk/empathy-account-widget.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit d95be533cc77f9355c4dae8956f2eebd308bed97
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 18:04:41 2009 +0200

    Fix a typo in a string.

 src/empathy-accounts-dialog.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 9db9e7c08f04949fe14829a3eeea2fd562afa96e
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 15:08:49 2009 +0200

    Change strings for the remove dialog on the moblin build.

 src/empathy-accounts-dialog.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

commit 90b929ff33ebc0c0d28f3fbf402be7a06c7615e6
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Fri Oct 2 14:51:15 2009 +0200

    Rename the Connect button to "Log in" on Moblin.

 libempathy-gtk/empathy-account-widget.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 72ee329e9a99d5890bd0001edadc2df7d57c4dfb
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 28 12:18:40 2009 +0200

    Instant-apply the "enabled" setting.

 libempathy-gtk/empathy-account-widget.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

commit 28f0a856a08ab8e0319e8874963e83bc69bc8a68
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Oct 1 13:05:12 2009 +0200

    Chain up to the parent class render, instead of copying it.

 libempathy-gtk/empathy-cell-renderer-activatable.c |  148
 +-------------------
 1 files changed, 3 insertions(+), 145 deletions(-)

commit 3cecc493d3793bee23d73dbda75a30a4955290b7
Author: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
Date:	Thu Oct 1 12:14:53 2009 +0200

    Return if the renderer has no pixbuf.

 libempathy-gtk/empathy-cell-renderer-activatable.c |	 3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit b5053cb50edbb10a454524dffc9eb25a0a825ca8
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 12:24:30 2009 +0200

    Rename the Create button to Add on moblin.

 src/empathy-accounts-dialog.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit a111e7d0dbc0799eebcbc39533a32c5c049cea73
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 12:24:18 2009 +0200

    Disable account creation on moblin.

 src/empathy-accounts-dialog.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

commit 08b9757d2f2a4b21744a7fae4b6260d023dc0e9a
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 11:07:46 2009 +0200

    Hide the action area if we're on moblin.

 src/empathy-accounts-dialog.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

commit f0cd0bcd902f9091f26e13029c288877008f992e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 10:55:16 2009 +0200

    Add a vertical padding to the rows.

 src/empathy-accounts-dialog.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 20e23ccd473d62c319b23f1bd89ed2b5d45dcd12
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 29 17:31:14 2009 +0200

    Use the property in the accounts dialog.

 src/empathy-accounts-dialog.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit 1dd41a76187e118d29be310e9f715e8baa4eeeec
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Tue Sep 29 17:30:23 2009 +0200

    Add a "show-on-select" property.

    This implies copying the render function from gtkcellrendererpixbuf.c
    and modifying it slightly.

 libempathy-gtk/empathy-cell-renderer-activatable.c |  342
 ++++++++++++++++----
 libempathy-gtk/empathy-cell-renderer-activatable.h |	 1 +
 2 files changed, 283 insertions(+), 60 deletions(-)

commit fbf9d25b09b88cff6e6f36c1bfa83c0d37ca5312
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Thu Oct 1 17:52:50 2009 +0200

    Instant-apply the "enabled" setting.

    Conflicts:

	libempathy-gtk/empathy-account-widget.c

 libempathy-gtk/empathy-account-widget.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit ee7554e574161eaeda14be53ce70abe7be23bb77
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sun Sep 27 20:17:50 2009 +0200

    Add configure switches for nbtk (off by default).

 configure.ac		    |	28 ++++++++++++++++++++++++++++
 libempathy-gtk/Makefile.am |	 2 ++
 2 files changed, 30 insertions(+), 0 deletions(-)

commit 0d52a331321036c6d368b65db4eaad94d226ee19
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Sun Sep 27 20:16:50 2009 +0200

    Add an optional NbtkGtkLightSwitch.

    Use an optional NbtkGtkLightSwitch instead of a GtkToggleButton to set
    an account enabled/disabled.

 libempathy-gtk/empathy-account-widget.c |   75
 ++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 5 deletions(-)

commit 3d5d198ffc802f888fa7d77b9a4b2ff585779e5b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Mon Sep 28 12:18:40 2009 +0200

    Instant-apply the "enabled" setting.

 libempathy-gtk/empathy-account-widget.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

commit 38fb111427ddbe8cf8b35fa5e5cfd0f95ebcb66e
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 30 15:06:13 2009 +0200

    Don't rely on EmpathyAccountManager to be ready.

    This fixes a crash when Empathy is launched with the '--accounts'
    option.

 src/empathy-accounts-dialog.c |   99
 +++++++++++++++++++++++++---------------
 1 files changed, 62 insertions(+), 37 deletions(-)

commit 7af0ccbcb0e074193b018d9e52921179aca5b329
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 30 09:40:16 2009 +0200

    Even if Next*.html are missing, we have to use the appendNextMessage
    js function for consecutive message.

 libempathy-gtk/empathy-theme-adium.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

commit fc27fecb52fe108782e9835bad6c7256d38d6d72
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 28 09:52:41 2009 +0200

    Respect "DisableCombineConsecutive" adium theme setting. Fixes
    bug #596317

 libempathy-gtk/empathy-theme-adium.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

commit 0151759ddfe6a3d659b4b218e0a788c45d561a11
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 28 09:44:30 2009 +0200

    Make the correct fallbacks in case of missing html files in an Adium
    theme. Fixes bug #596303

 libempathy-gtk/empathy-theme-adium.c |  101
 +++++++++++++++++-----------------
 1 files changed, 51 insertions(+), 50 deletions(-)

commit 63c5120cb7999c68fcaeec5fc247c1b59d38c607
Author: Mario Blättermann <mariobl@gnome.org>
Date:	Tue Sep 29 21:24:37 2009 +0200

    Updated German doc translation

 help/de/de.po | 3041
 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 1573 insertions(+), 1468 deletions(-)

commit 72a226c81a8940e776e6f707f6816b4a56e6b65b
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 18:10:43 2009 +0200

    Don't show the "missing" image (#595921).

    If the icon theme doesn't have the protocol icon for the account we
    currently selected, show a default icon.

 src/empathy-accounts-dialog.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

commit 2003059d23824f5a6e71004d262c7f592dc8b6dd
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 17:51:22 2009 +0200

    Don't always show the main window (#596044).

 src/empathy-main-window.c |	2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

commit 7cf2fa411cce4666f32facbb42cdc7de6e222e15
Author: Kentaro Kazuhama <kazken3@gmail.com>
Date:	Sun Sep 27 12:44:12 2009 +0900

    Updated Japanese translation

 po/ja.po | 2453
 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 1672 insertions(+), 781 deletions(-)

commit 05710e8a814beedb93a79bab120036aff4069bab
Author: Milo Casagrande <milo@ubuntu.com>
Date:	Sat Sep 26 16:21:39 2009 +0200

    Updated Italian translation

 po/it.po |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 0b622ab2ac01f9c5aadde1256439df0abe71193b
Author: Yaron Shahrabani <sh.yaron@gmail.com>
Date:	Fri Sep 25 13:18:14 2009 +0300

    Updated Hebrew translation

 po/he.po |  718
 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 456 insertions(+), 262 deletions(-)

commit 5171fdbe77a57be06433674ff1a15289819ce6d4
Author: Tomasz Dominikowski <dominikowski@gmail.com>
Date:	Fri Sep 25 01:06:50 2009 +0200

    Updated Polish translation

 po/pl.po |  363
 ++++++++++++++++++++------------------------------------------
 1 files changed, 117 insertions(+), 246 deletions(-)

commit 84978ae1b087a3a0d13c5c91c83ddcc0bc13ac5d
Author: Cosimo Cecchi <cosimoc@gnome.org>
Date:	Wed Sep 23 18:43:43 2009 +0200

    Don't rely on the widget allocation to be != 0.

    This should fix bug #595945.

 src/empathy-call-window.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

commit 3c8557efe1b3bb97ba359b1d41165611e568f034
Author: Jorge González <jorgegonz@svn.gnome.org>
Date:	Thu Sep 24 10:29:14 2009 +0200

    Updated Spanish translation

 po/es.po |  108
 +++++++++++++++++++++++++++----------------------------------
 1 files changed, 48 insertions(+), 60 deletions(-)

commit c09aebc30dda23e1d6f2d9ae48be09ce10509f4b
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Wed Sep 23 15:29:15 2009 +0200

    Init contact_id to NULL to silent some stupid compilators. It can't
    really be used not initialized anyway.

 libempathy-gtk/empathy-contact-list-view.c |	 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 6e64203a5b4cf4e080c767fe733f6da96606ab05
Author: Will Thompson <will.thompson@collabora.co.uk>
Date:	Tue Sep 22 15:24:04 2009 +0100

    Cancel existing group animation before starting another

    Fixes Gnome bug #595962.

 libempathy-gtk/empathy-cell-renderer-expander.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit fecc657c0c64133dcf27477ee13e2da24a7f83ed
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Tue Sep 22 10:14:55 2009 +0200

    Do not use math.h for trunc(). It is useless and it does not build
    because we don't link with -lm.

 libempathy-gtk/empathy-location-manager.c |	8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

commit 797cf36440241fd7ee358297efc5dda534069580
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 21 19:54:25 2009 +0200

    Generate changelog only since 2.28.0

 Makefile.am |	  2 +-
 release.py  |	  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 1acb6efda6c938203338f6c184a7e3a8803e579f
Author: Xavier Claessens <xclaesse@gmail.com>
Date:	Mon Sep 21 19:33:58 2009 +0200

    Bump version to 2.28.1

 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
