pidgin: 80305ffb: Setting `dialog->open_button = button` w...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 80305ffb91d9fc37e61e28c36fdc60fa02826699
Ancestor: d99389c7a3c660aa7a54362dd26e7b3e103a05c8
Author: qulogic at pidgin.im
Date: 2009-06-05T05:15:09
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/80305ffb91d9fc37e61e28c36fdc60fa02826699

Modified files:
        pidgin/gtknotify.c

ChangeLog: 

Setting `dialog->open_button = button` when `button` is not yet assigned
anything seems a bit silly. Anyway, this should fix some GTK+ errors from
showing up because of widget==NULL.

-------------- next part --------------
============================================================
--- pidgin/gtknotify.c	662e33170d4f2209b3bed6fcbafb00d283c9b4bd
+++ pidgin/gtknotify.c	1696f5540d327085b88821d2508c368b74f60f67
@@ -120,7 +120,7 @@ typedef enum
 {
 	PIDGIN_NOTIFY_MAIL,
 	PIDGIN_NOTIFY_POUNCE,
-        PIDGIN_NOTIFY_TYPES
+	PIDGIN_NOTIFY_TYPES
 } PidginNotifyType;
 
 static PidginNotifyDialog *mail_dialog = NULL;
@@ -1379,7 +1379,6 @@ pidgin_get_dialog(PidginNotifyType type,
 
 	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 @@ pidgin_get_dialog(PidginNotifyType type,
 
 		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 @@ pidgin_get_dialog(PidginNotifyType type,
 		mail_dialog = spec_dialog;
 	else if (type == PIDGIN_NOTIFY_POUNCE) {
 		pounce_dialog = spec_dialog;
-        }
+	}
 
 	return spec_dialog->dialog;