[empathy] Do not present chat window from empathy_chat_window_get_default()
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Do not present chat window from empathy_chat_window_get_default()
- Date: Thu, 26 May 2011 10:50:04 +0000 (UTC)
commit 943d659bf3c2c966c5944faa4d05a576f9630906
Author: Xavier Claessens <xclaesse gmail com>
Date: Thu May 26 11:57:24 2011 +0200
Do not present chat window from empathy_chat_window_get_default()
It is already handled in empathy_chat_window_present_chat()
src/empathy-chat-window.c | 18 ------------------
1 files changed, 0 insertions(+), 18 deletions(-)
---
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 01736d7..c0a08d4 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -2181,18 +2181,6 @@ empathy_chat_window_init (EmpathyChatWindow *window)
window);
}
-static GtkWidget *
-empathy_chat_window_get_dialog (EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
-
- g_return_val_if_fail (window != NULL, NULL);
-
- priv = GET_PRIV (window);
-
- return priv->dialog;
-}
-
/* Returns the window to open a new tab in if there is a suitable window,
* otherwise, returns NULL indicating that a new window should be added.
*/
@@ -2215,13 +2203,10 @@ empathy_chat_window_get_default (gboolean room)
for (l = chat_windows; l; l = l->next) {
EmpathyChatWindow *chat_window;
- GtkWidget *dialog;
guint nb_rooms, nb_private;
chat_window = l->data;
- dialog = empathy_chat_window_get_dialog (chat_window);
-
empathy_chat_window_get_nb_chats (chat_window, &nb_rooms, &nb_private);
/* Skip the window if there aren't any rooms in it */
@@ -2232,9 +2217,6 @@ empathy_chat_window_get_default (gboolean room)
if (!room && nb_private == 0)
continue;
- /* Found a window on this desktop, make it visible if necessary */
- if (!empathy_window_get_is_visible (GTK_WINDOW (dialog)))
- empathy_window_present (GTK_WINDOW (dialog));
return chat_window;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]