summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2016-08-20 00:14:13 -0500
committerGary Kramlich <grim@reaperworld.com>2016-08-20 00:14:13 -0500
commitbda7ecc1f8aee250279fb96694231c053fcbdd91 (patch)
tree96873261826e52e1f0faace572ffdbadbf2f824d
parent22e12fdb5b6701514a162c46b160aba86340cddb (diff)
downloadpidgin-bda7ecc1f8aee250279fb96694231c053fcbdd91.tar.gz
Merge fixup
-rw-r--r--pidgin/gtkblist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index eddebfdc6c..0761043847 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -4972,7 +4972,7 @@ static gboolean pidgin_blist_select_notebook_page_cb(gpointer user_data)
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) {