aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-05-05 14:13:19 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-05-05 14:13:19 +0800
commitde1d1ad186ec7bcabd83aa653f8c766d8fa05fbe (patch)
tree380750823a934dc26838fbb2e5b7650532404588
parentb06bf5de42fca789a03b3d9666a1f9cd3b56b71d (diff)
downloadgsoc2013-empathy-de1d1ad186ec7bcabd83aa653f8c766d8fa05fbe.tar
gsoc2013-empathy-de1d1ad186ec7bcabd83aa653f8c766d8fa05fbe.tar.gz
gsoc2013-empathy-de1d1ad186ec7bcabd83aa653f8c766d8fa05fbe.tar.bz2
gsoc2013-empathy-de1d1ad186ec7bcabd83aa653f8c766d8fa05fbe.tar.lz
gsoc2013-empathy-de1d1ad186ec7bcabd83aa653f8c766d8fa05fbe.tar.xz
gsoc2013-empathy-de1d1ad186ec7bcabd83aa653f8c766d8fa05fbe.tar.zst
gsoc2013-empathy-de1d1ad186ec7bcabd83aa653f8c766d8fa05fbe.zip
Revert "Make empathy_chat_window_find_chat() static"
This reverts commit e84d41efe4b2febb9f3276e54f603550c929a69d.
-rw-r--r--src/empathy-chat-window.c4
-rw-r--r--src/empathy-chat-window.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 4bf43cd70..f30578512 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -146,8 +146,6 @@ static const GtkTargetEntry drag_types_dest_file[] = {
static void chat_window_update (EmpathyChatWindow *window,
gboolean update_contact_menu);
-static EmpathyChat *empathy_chat_window_find_chat (TpAccount *account,
- const gchar *id);
G_DEFINE_TYPE (EmpathyChatWindow, empathy_chat_window, G_TYPE_OBJECT);
@@ -2395,7 +2393,7 @@ empathy_chat_window_has_focus (EmpathyChatWindow *window)
return has_focus;
}
-static EmpathyChat *
+EmpathyChat *
empathy_chat_window_find_chat (TpAccount *account,
const gchar *id)
{
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 33caec70c..963abd725 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -70,6 +70,8 @@ void empathy_chat_window_move_chat (EmpathyChatWindow *old_wi
void empathy_chat_window_switch_to_chat (EmpathyChatWindow *window,
EmpathyChat *chat);
gboolean empathy_chat_window_has_focus (EmpathyChatWindow *window);
+EmpathyChat * empathy_chat_window_find_chat (TpAccount *account,
+ const gchar *id);
EmpathyChat * empathy_chat_window_find_chat_by_channel (const char *path);
void empathy_chat_window_present_chat (EmpathyChat *chat,
gint64 timestamp);