# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1128273342 0
# Node ID e8585a3306369a48265fdd5a78efe5d231160542
# Parent  03cd74ca2562f835e695bf90dc51aa6c9002c256
[gaim-migrate @ 13857]
i'm good at breaking things

committer: Tailor Script <tailor@pidgin.im>

diff -r 03cd74ca2562 -r e8585a330636 plugins/perl/common/Conversation.xs
--- a/plugins/perl/common/Conversation.xs	Sun Oct 02 16:50:08 2005 +0000
+++ b/plugins/perl/common/Conversation.xs	Sun Oct 02 17:15:42 2005 +0000
@@ -118,11 +118,6 @@
 gaim_conversation_get_features(conv)
 	Gaim::Conversation conv
 
-void
-gaim_conversation_update_progress(conv, percent)
-	Gaim::Conversation conv
-	float percent
-
 gboolean
 gaim_conversation_has_focus(conv)
 	Gaim::Conversation conv
diff -r 03cd74ca2562 -r e8585a330636 src/protocols/sametime/meanwhile/srvc_store.c
--- a/src/protocols/sametime/meanwhile/srvc_store.c	Sun Oct 02 16:50:08 2005 +0000
+++ b/src/protocols/sametime/meanwhile/srvc_store.c	Sun Oct 02 17:15:42 2005 +0000
@@ -19,6 +19,7 @@
 */
 
 #include <glib/glist.h>
+#include <internal.h>
 
 #include "mw_channel.h"
 #include "mw_debug.h"