[empathy] chat_window_page_switched_cb: get the child from the GTK+ signal



commit 898327a20db060ddcedde2e85757c952c08dbef3
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Apr 27 12:04:06 2011 +0200

    chat_window_page_switched_cb: get the child from the GTK+ signal
    
    We don't care about GTK+2 compatibility any more.

 src/empathy-chat-window.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 6341267..94f93e2 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1511,24 +1511,15 @@ notebook_create_window_cb (GtkNotebook *source,
 
 static void
 chat_window_page_switched_cb (GtkNotebook      *notebook,
-			      gpointer          ignore, /* see note below */
+			      GtkWidget         *child,
 			      gint	        page_num,
 			      EmpathyChatWindow *window)
 {
-	EmpathyChatWindowPriv *priv;
-	EmpathyChat           *chat;
-	GtkWidget            *child;
+	EmpathyChatWindowPriv *priv = GET_PRIV (window);
+	EmpathyChat           *chat = EMPATHY_CHAT (child);
 
 	DEBUG ("Page switched");
 
-	priv = GET_PRIV (window);
-
-	/* N.B. in GTK+ 3 child is passed as the first argument to the signal,
-	 * but we can't use that while trying to retain GTK+ 2.x compatibility.
-	 */
-	child = gtk_notebook_get_nth_page (notebook, page_num);
-	chat = EMPATHY_CHAT (child);
-
 	if (priv->page_added) {
 		priv->page_added = FALSE;
 		empathy_chat_scroll_down (chat);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]