# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1234928872 0
# Node ID ba717632d0dae24625b6bf785db6465fb704b728
# Parent  62de664662b142adad55800d7d6986c9a6c0b1b5# Parent  a439f24713c829651638b3a11c88e6aeedf32b15
merge of '2f4f593dae7afcbb03bfccfe5db4d44697ec87ef'
     and 'fb7ee3052dd0938f8dd913a37b2a01557d72c329'

diff -r 62de664662b1 -r ba717632d0da pidgin/plugins/pidgininc.c
--- a/pidgin/plugins/pidgininc.c	Wed Feb 18 03:33:37 2009 +0000
+++ b/pidgin/plugins/pidgininc.c	Wed Feb 18 03:47:52 2009 +0000
@@ -6,7 +6,7 @@
 #include "conversation.h"
 #include "version.h"
 
-/* include UI for pidgindialogs_about() */
+/* include UI for pidgin_dialogs_about() */
 #include "gtkplugin.h"
 #include "gtkdialogs.h"
 
@@ -16,7 +16,7 @@
 echo_hi(PurpleConnection *gc)
 {
 	/* this doesn't do much, just lets you know who we are :) */
-	pidgindialogs_about();
+	pidgin_dialogs_about();
 }
 
 static gboolean
@@ -108,7 +108,12 @@
 	NULL,                                             /**< ui_info        */
 	NULL,                                             /**< extra_info     */
 	NULL,                                             /**< prefs_info     */
-	NULL                                              /**< actions        */
+	NULL,                                             /**< actions        */
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static void