Merge fixup

Sat, 20 Aug 2016 00:14:13 -0500

author
Gary Kramlich <grim@reaperworld.com>
date
Sat, 20 Aug 2016 00:14:13 -0500
changeset 37906
3058c5bf560f
parent 37905
848e16508276
child 37907
23bf046b0955

Merge fixup

pidgin/gtkblist.c file | annotate | diff | comparison | revisions
--- a/pidgin/gtkblist.c	Fri Aug 19 23:57:02 2016 -0500
+++ b/pidgin/gtkblist.c	Sat Aug 20 00:14:13 2016 -0500
@@ -4972,7 +4972,7 @@
 
 	priv = PIDGIN_BUDDY_LIST_GET_PRIVATE(gtkblist);
 
-	priv->select_page_timeout = 0;
+	priv->select_notebook_page_timeout = 0;
 
 	/* this is far too ugly thanks to me not wanting to fix #3989 properly right now */
 	if (priv->error_scrollbook != NULL) {

mercurial