aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-log-window.c6
-rw-r--r--libempathy-gtk/empathy-log-window.h8
-rw-r--r--src/.gitignore1
-rw-r--r--src/Makefile.am4
-rw-r--r--src/empathy-logs.c59
5 files changed, 71 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index da553075f..c32ed76e0 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -136,7 +136,7 @@ enum {
COL_CHAT_COUNT
};
-void
+GtkWidget *
empathy_log_window_show (McAccount *account,
const gchar *chat_id,
gboolean is_chatroom,
@@ -157,7 +157,7 @@ empathy_log_window_show (McAccount *account,
chat_id, is_chatroom);
}
- return;
+ return window->window;
}
window = g_new0 (EmpathyLogWindow, 1);
@@ -261,6 +261,8 @@ empathy_log_window_show (McAccount *account,
}
gtk_widget_show (window->window);
+
+ return window->window;
}
static void
diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h
index 09a986399..a45cbbb84 100644
--- a/libempathy-gtk/empathy-log-window.h
+++ b/libempathy-gtk/empathy-log-window.h
@@ -29,10 +29,10 @@
G_BEGIN_DECLS
-void empathy_log_window_show (McAccount *account,
- const gchar *chat_id,
- gboolean chatroom,
- GtkWindow *parent);
+GtkWidget * empathy_log_window_show (McAccount *account,
+ const gchar *chat_id,
+ gboolean chatroom,
+ GtkWindow *parent);
G_END_DECLS
diff --git a/src/.gitignore b/src/.gitignore
index 54397d04f..78d6c8df4 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,5 +1,6 @@
empathy
empathy-accounts
+empathy-logs
empathy-chat-chandler
org.gnome.Empathy.Chat.service
empathy-call-chandler
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ed5cd52d..59d6c5c1f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,13 +16,15 @@ LDADD = \
bin_PROGRAMS = \
empathy \
- empathy-accounts
+ empathy-accounts \
+ empathy-logs
libexec_PROGRAMS = \
empathy-chat-chandler
empathy_SOURCES = empathy.c
empathy_accounts_SOURCES = empathy-accounts.c
+empathy_logs_SOURCES = empathy-logs.c
empathy_chat_chandler_SOURCES = empathy-chat-chandler.c
# Dbus service files
diff --git a/src/empathy-logs.c b/src/empathy-logs.c
new file mode 100644
index 000000000..3763ab279
--- /dev/null
+++ b/src/empathy-logs.c
@@ -0,0 +1,59 @@
+/* -*- 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., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Xavier Claessens <xclaesse@gmail.com>
+ */
+
+#include <config.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include <libempathy-gtk/empathy-log-window.h>
+
+static void
+destroy_cb (GtkWidget *dialog,
+ gpointer user_data)
+{
+ gtk_main_quit ();
+}
+
+int
+main (int argc, char *argv[])
+{
+ GtkWidget *window;
+
+ gtk_init (&argc, &argv);
+
+ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+ PKGDATADIR G_DIR_SEPARATOR_S "icons");
+ window = empathy_log_window_show (NULL, NULL, FALSE, NULL);
+
+ g_signal_connect (window, "destroy",
+ G_CALLBACK (destroy_cb),
+ NULL);
+
+ gtk_main ();
+
+ return EXIT_SUCCESS;
+}
+