Merge branch 'presets-dialog'

diff --cc libempathy-gtk/empathy-presence-chooser.c
index 36e8376927a1a47cfb6eceb58618c668ccd7e65a,d97abea0cb503e98d1cbec29955b99432f5bb92e..f4a325b51f7cb9ef343dd6f60732d923dc1cf742
--- 1/libempathy-gtk/empathy-presence-chooser.c
--- 2/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 cf9bc6a26825191b0bc2897a79939ccd44ef19a0,9b1c2d4eb2514e92ff00828846020b0db9d129de..7740d1f8beeefd2b387e028f4464a980f9e44188
--- 1/tests/Makefile.am
--- 2/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