[empathy: 7/7] Merge branch 'notifications-635500'

From: Guillaume Desmottes <gdesmott src gnome org>
To: commits-list gnome org
Cc:
Subject: [empathy: 7/7] Merge branch 'notifications-635500'
Date: Thu, 25 Nov 2010 09:26:29 +0000 (UTC)

commit 5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79
Merge: c487a45 212a4ec
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Nov 25 10:25:44 2010 +0100

    Merge branch 'notifications-635500'

 src/Makefile.am                      |    1 +
 src/empathy-notifications-approver.c |  370 ++++++++++++++++++++++++++++++++++
 src/empathy-notifications-approver.h |   58 ++++++
 src/empathy-status-icon.c            |  259 ------------------------
 src/empathy.c                        |    6 +
 5 files changed, 435 insertions(+), 259 deletions(-)
---

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]