]> git.0d.be Git - empathy.git/commitdiff
Do not present chat window from empathy_chat_window_get_default()
authorXavier Claessens <xclaesse@gmail.com>
Thu, 26 May 2011 09:57:24 +0000 (11:57 +0200)
committerXavier Claessens <xclaesse@gmail.com>
Thu, 26 May 2011 10:49:48 +0000 (12:49 +0200)
It is already handled in empathy_chat_window_present_chat()

src/empathy-chat-window.c

index 01736d75b306babe153581ab15f0011a64be0763..c0a08d4ddc9feb6b85518e5baf3d4c66ed51cfa4 100644 (file)
@@ -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;
        }