changeset 25123:ba717632d0da

merge of '2f4f593dae7afcbb03bfccfe5db4d44697ec87ef' and 'fb7ee3052dd0938f8dd913a37b2a01557d72c329'
author Paul Aurich <paul@darkrain42.org>
date Wed, 18 Feb 2009 03:47:52 +0000
parents 62de664662b1 (current diff) a439f24713c8 (diff)
children ea62e934c80b
files
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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