# HG changeset patch
# User Gabriel Schulhof <nix@go-nix.ca>
# Date 1190493106 0
# Node ID ec247a10b12b22eb27701f45204c5552385aa3ca
# Parent  5c2fdf2b066967553c0409d145c09d4a1c2b6bd3
Making pidgin_dialogs_about _with_parent

diff -r 5c2fdf2b0669 -r ec247a10b12b pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sat Sep 22 19:23:36 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Sep 22 20:31:46 2007 +0000
@@ -3106,9 +3106,9 @@
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
 	{ N_("/Help/_Debug Window"), NULL, toggle_debug, 0, "<Item>", NULL },
 #if GTK_CHECK_VERSION(2,6,0)
-	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about, "<StockItem>", GTK_STOCK_ABOUT },
+	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about_with_parent, "<StockItem>", GTK_STOCK_ABOUT },
 #else
-	{ N_("/Help/_About"), NULL, pidgin_dialogs_about, 0,  "<Item>", NULL },
+	{ N_("/Help/_About"), NULL, pidgin_blist_show_with_parent, (int)pidgin_dialogs_about_with_parent, "<Item>", NULL },
 #endif
 };
 
diff -r 5c2fdf2b0669 -r ec247a10b12b pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Sat Sep 22 19:23:36 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sat Sep 22 20:31:46 2007 +0000
@@ -326,7 +326,14 @@
 }
 #endif
 
-void pidgin_dialogs_about(GtkWindow *parent)
+void pidgin_dialogs_about(void)
+{
+	PidginBuddyList *blist = pidgin_blist_get_default_gtk_blist();
+
+	pidgin_dialogs_about_with_parent(blist ? GTK_WINDOW(blist->window) : NULL);
+}
+
+void pidgin_dialogs_about_with_parent(GtkWindow *parent)
 {
 	GtkWidget *hbox;
 	GtkWidget *vbox;
diff -r 5c2fdf2b0669 -r ec247a10b12b pidgin/gtkdialogs.h
--- a/pidgin/gtkdialogs.h	Sat Sep 22 19:23:36 2007 +0000
+++ b/pidgin/gtkdialogs.h	Sat Sep 22 20:31:46 2007 +0000
@@ -32,7 +32,8 @@
 
 /* Functions in gtkdialogs.c (these should actually stay in this file) */
 void pidgin_dialogs_destroy_all(void);
-void pidgin_dialogs_about(GtkWindow *parent);
+void pidgin_dialogs_about(void);
+void pidgin_dialogs_about_with_parent(GtkWindow *parent);
 void pidgin_dialogs_im(void);
 void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
 void pidgin_dialogs_info(void);
diff -r 5c2fdf2b0669 -r ec247a10b12b pidgin/plugins/perl/common/GtkDialogs.xs
--- a/pidgin/plugins/perl/common/GtkDialogs.xs	Sat Sep 22 19:23:36 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkDialogs.xs	Sat Sep 22 20:31:46 2007 +0000
@@ -9,7 +9,13 @@
 void
 pidgin_dialogs_about()
 CODE:
-	pidgin_dialogs_about(NULL);
+	pidgin_dialogs_about_with_parent(NULL);
+
+void
+pidgin_dialogs_about_with_parent(parent)
+	GtkWindow * parent
+CODE:
+	pidgin_dialogs_about(parent);
 
 void
 pidgin_dialogs_im()