[empathy: 19/19] Merge branch 'presets-dialog'

[Davyd Madeley <davyd src gnome org>]

commit b4861a62cb323d686973e7527f02bd738053c04c
Merge: 338d287... 2315303...
Author: Davyd Madeley <davyd madeley id au>
Date:   Thu Apr 23 20:01:37 2009 +0800

    Merge branch 'presets-dialog'

 libempathy-gtk/Makefile.am                     |    4 +-
 libempathy-gtk/empathy-presence-chooser.c      |  240 +----------
 libempathy-gtk/empathy-presence-chooser.ui     |  140 ------
 libempathy-gtk/empathy-status-preset-dialog.c  |  549 ++++++++++++++++++++++++
 libempathy-gtk/empathy-status-preset-dialog.h  |   63 +++
 libempathy-gtk/empathy-status-preset-dialog.ui |  116 +++++
 po/POTFILES.in                                 |    3 +-
 tests/.gitignore                               |    1 +
 tests/Makefile.am                              |    4 +-
 tests/test-empathy-presence-chooser.c          |    4 +
 tests/test-empathy-status-preset-dialog.c      |   49 +++
 11 files changed, 801 insertions(+), 372 deletions(-)

diff --cc libempathy-gtk/empathy-presence-chooser.c
index 36e8376,d97abea..f4a325b
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@@ -46,24 -46,8 +46,25 @@@
  #include "empathy-ui-utils.h"
  #include "empathy-images.h"
  #include "empathy-presence-chooser.h"
+ #include "empathy-status-preset-dialog.h"
  
 +/**
 + * SECTION:empathy-presence-chooser
 + * @title:EmpathyPresenceChooser
 + * @short_description: A widget used to change presence
 + * @include: libempathy-gtk/empathy-presence-chooser.h
 + *
 + * #EmpathyPresenceChooser is a widget which extends #GtkComboBoxEntry
 + * to change presence.
 + */
 +
 +/**
 + * EmpathyAccountChooser:
 + * @parent: parent object
 + *
 + * Widget which extends #GtkComboBoxEntry to change presence.
 + */
 +
  /* Flashing delay for icons (milliseconds). */
  #define FLASH_TIMEOUT 500
  
diff --cc tests/Makefile.am
index cf9bc6a,9b1c2d4..7740d1f
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -24,12 -24,18 +24,14 @@@ LDADD =								
  
  noinst_PROGRAMS =			\
  	contact-manager			\
 -	contact-run-until-ready		\
 -	contact-run-until-ready-2	\
  	empetit				\
- 	test-empathy-presence-chooser
+ 	test-empathy-presence-chooser	\
+ 	test-empathy-status-preset-dialog
  
  contact_manager_SOURCES = contact-manager.c
 -contact_run_until_ready_SOURCES = contact-run-until-ready.c
 -contact_run_until_ready_2_SOURCES = contact-run-until-ready-2.c
  empetit_SOURCES = empetit.c
  test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c
+ test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c
  
  check_PROGRAMS = check-main
  TESTS = check-main