# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1244180684 0
# Node ID f3b0232ef1eabab6619514efa81f57f55febb4b2
# Parent  c3fcdd59ab763d01d6149eb64c32adae3e26036d# Parent  9c36a340fcaf158599c23ed2a39f96c6d41ee42d
merge of '58446e074cca7b8a7348254c03cfce2c5534fd63'
     and '80305ffb91d9fc37e61e28c36fdc60fa02826699'

diff -r c3fcdd59ab76 -r f3b0232ef1ea pidgin/gtknotify.c
--- a/pidgin/gtknotify.c	Fri Jun 05 05:42:05 2009 +0000
+++ b/pidgin/gtknotify.c	Fri Jun 05 05:44:44 2009 +0000
@@ -120,7 +120,7 @@
 {
 	PIDGIN_NOTIFY_MAIL,
 	PIDGIN_NOTIFY_POUNCE,
-        PIDGIN_NOTIFY_TYPES
+	PIDGIN_NOTIFY_TYPES
 } PidginNotifyType;
 
 static PidginNotifyDialog *mail_dialog = NULL;
@@ -1379,7 +1379,6 @@
 
 	spec_dialog = g_new0(PidginNotifyDialog, 1);
 	spec_dialog->dialog = dialog;
-	spec_dialog->open_button = button;
 
 	spec_dialog->treemodel = treemodel;
 	spec_dialog->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(spec_dialog->treemodel));
@@ -1399,6 +1398,7 @@
 
 		button = gtk_dialog_add_button(GTK_DIALOG(dialog),
 						 PIDGIN_STOCK_OPEN_MAIL, GTK_RESPONSE_YES);
+		spec_dialog->open_button = button;
 
 		gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(spec_dialog->treeview), FALSE);
 
@@ -1496,7 +1496,7 @@
 		mail_dialog = spec_dialog;
 	else if (type == PIDGIN_NOTIFY_POUNCE) {
 		pounce_dialog = spec_dialog;
-        }
+	}
 
 	return spec_dialog->dialog;