aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2011-05-26 17:57:24 +0800
committerXavier Claessens <xclaesse@gmail.com>2011-05-26 18:49:48 +0800
commit943d659bf3c2c966c5944faa4d05a576f9630906 (patch)
tree0d141d4986497728de6fa71a4b9ba0e798b3c5fd
parentbaeea6e11b647b788693ce6e16cccc18cd0b8402 (diff)
downloadgsoc2013-empathy-943d659bf3c2c966c5944faa4d05a576f9630906.tar
gsoc2013-empathy-943d659bf3c2c966c5944faa4d05a576f9630906.tar.gz
gsoc2013-empathy-943d659bf3c2c966c5944faa4d05a576f9630906.tar.bz2
gsoc2013-empathy-943d659bf3c2c966c5944faa4d05a576f9630906.tar.lz
gsoc2013-empathy-943d659bf3c2c966c5944faa4d05a576f9630906.tar.xz
gsoc2013-empathy-943d659bf3c2c966c5944faa4d05a576f9630906.tar.zst
gsoc2013-empathy-943d659bf3c2c966c5944faa4d05a576f9630906.zip
Do not present chat window from empathy_chat_window_get_default()
It is already handled in empathy_chat_window_present_chat()
-rw-r--r--src/empathy-chat-window.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 01736d75b..c0a08d4dd 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;
}