Merge branch 'presets-dialog'

4 files changed, 57 insertions, 1 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 442cafd51..a37f3e5a0 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -5,3 +5,4 @@ contact-run-until-ready-2
 *.log
 empetit
 test-empathy-presence-chooser
+test-empathy-status-preset-dialog
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cf9bc6a26..7740d1f8b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,11 +25,13 @@ LDADD =								\
 noinst_PROGRAMS =			\
 	contact-manager			\
 	empetit				\
-	test-empathy-presence-chooser
+	test-empathy-presence-chooser	\
+	test-empathy-status-preset-dialog
 
 contact_manager_SOURCES = contact-manager.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
diff --git a/tests/test-empathy-presence-chooser.c b/tests/test-empathy-presence-chooser.c
index 02991e859..12d35b4c6 100644
--- a/tests/test-empathy-presence-chooser.c
+++ b/tests/test-empathy-presence-chooser.c
@@ -24,6 +24,8 @@
 
 #include <gtk/gtk.h>
 
+#include <libempathy/empathy-status-presets.h>
+
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-presence-chooser.h>
 
@@ -36,6 +38,8 @@ main (int argc, char **argv)
 	gtk_init (&argc, &argv);
 	empathy_gtk_init ();
 
+	empathy_status_presets_get_all ();
+
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	chooser = empathy_presence_chooser_new ();
 	gtk_container_add (GTK_CONTAINER (window), chooser);
diff --git a/tests/test-empathy-status-preset-dialog.c b/tests/test-empathy-status-preset-dialog.c
new file mode 100644
index 000000000..6602e4f28
--- /dev/null
+++ b/tests/test-empathy-status-preset-dialog.c
@@ -0,0 +1,49 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Collabora Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk>
+ */
+
+#include <config.h>
+
+#include <gtk/gtk.h>
+
+#include <libempathy/empathy-status-presets.h>
+
+#include <libempathy-gtk/empathy-ui-utils.h>
+#include <libempathy-gtk/empathy-status-preset-dialog.h>
+
+int
+main (int argc, char **argv)
+{
+	GtkWidget *dialog;
+
+	gtk_init (&argc, &argv);
+	empathy_gtk_init ();
+
+	empathy_status_presets_get_all ();
+
+	dialog = empathy_status_preset_dialog_new (NULL);
+
+	gtk_widget_show (dialog);
+
+	gtk_main ();
+
+	return 0;
+}