Move empathy-log to tests/interactive and don't install it anymore

diff --git a/src/.gitignore b/src/.gitignore
index a7f583649b571f1a0fc8ff752bc5d05f4da47622..17f66a507fa3d0b9157dd4bf3c545396092f1731 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,6 +1,5 @@
 empathy
 empathy-accounts
-empathy-logs
 empathy-chat-chandler
 empathy-call-chandler
 empathy-tubes-chandler

diff --git a/src/Makefile.am b/src/Makefile.am
index b61f9d34aa878ba0994c4689eb0cfea91aa2078b..ecec8923f4c446436f02e53163e01edfaf3b7815 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,8 +22,7 @@ LDADD =                                                               \
        $(WEBKIT_LIBS)
 
 bin_PROGRAMS =                 \
-       empathy                 \
-       empathy-logs
+       empathy
 
 BUILT_SOURCES= \
        empathy-tube-dispatch-enumtypes.h \
@@ -59,8 +58,6 @@ empathy_SOURCES =                                                     \
 
 nodist_empathy_SOURCES = $(BUILT_SOURCES)
 
-empathy_logs_SOURCES = empathy-logs.c
-
 check_c_sources = \
     $(empathy_handwritten_source) \
     $(empathy_logs_SOURCES)

diff --git a/src/empathy-logs.c b/src/empathy-logs.c
deleted file mode 100644 (file)
index b9f38e0..0000000
--- a/src/empathy-logs.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2008 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., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- */
-
-#include <config.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-debug.h>
-#include <libempathy-gtk/empathy-log-window.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-static void
-destroy_cb (GtkWidget *dialog,
-           gpointer   user_data)
-{
-       gtk_main_quit ();
-}
-
-int
-main (int argc, char *argv[])
-{
-       GtkWidget *window;
-
-       g_thread_init (NULL);
-       gtk_init (&argc, &argv);
-       empathy_gtk_init ();
-       g_set_application_name (PACKAGE_NAME);
-       gtk_window_set_default_icon_name ("empathy");
-
-       window = empathy_log_window_show (NULL, NULL, FALSE, NULL);
-
-       g_signal_connect (window, "destroy",
-                         G_CALLBACK (destroy_cb),
-                         NULL);
-
-       gtk_main ();
-
-       return EXIT_SUCCESS;
-}
-

diff --git a/tests/interactive/.gitignore b/tests/interactive/.gitignore
index f5c45764eea75440d6c814e21ae88f09307c8056..f6f87d8b47f1235d7d540ae07f26f5cbfd640540 100644 (file)
--- a/tests/interactive/.gitignore
+++ b/tests/interactive/.gitignore
@@ -1,4 +1,5 @@
 contact-manager
+empathy-logs
 contact-run-until-ready
 contact-run-until-ready-2
 empetit

diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index a66f518e9011a6772c19fca176ef3f16a11e71bc..7770e768f0fac7febb80d43e3f5f529095eef2ff 100644 (file)
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -13,6 +13,7 @@ LDADD =                                                               \
 
 noinst_PROGRAMS =                      \
        contact-manager                 \
+       empathy-logs                    \
        empetit                         \
        test-empathy-account-assistant \
        test-empathy-presence-chooser   \
@@ -20,6 +21,7 @@ noinst_PROGRAMS =                     \
        test-empathy-protocol-chooser
 
 contact_manager_SOURCES = contact-manager.c
+empathy_logs_SOURCES = empathy-logs.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

diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c
new file mode 100644 (file)
index 0000000..b9f38e0
--- /dev/null
+++ b/tests/interactive/empathy-logs.c
@@ -0,0 +1,60 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2008 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., 51 Franklin St, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
+ * Authors: Xavier Claessens <xclaesse@gmail.com>
+ */
+
+#include <config.h>
+#include <stdlib.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <libempathy/empathy-debug.h>
+#include <libempathy-gtk/empathy-log-window.h>
+#include <libempathy-gtk/empathy-ui-utils.h>
+
+static void
+destroy_cb (GtkWidget *dialog,
+           gpointer   user_data)
+{
+       gtk_main_quit ();
+}
+
+int
+main (int argc, char *argv[])
+{
+       GtkWidget *window;
+
+       g_thread_init (NULL);
+       gtk_init (&argc, &argv);
+       empathy_gtk_init ();
+       g_set_application_name (PACKAGE_NAME);
+       gtk_window_set_default_icon_name ("empathy");
+
+       window = empathy_log_window_show (NULL, NULL, FALSE, NULL);
+
+       g_signal_connect (window, "destroy",
+                         G_CALLBACK (destroy_cb),
+                         NULL);
+
+       gtk_main ();
+
+       return EXIT_SUCCESS;
+}
+