diff --git a/net-im/meanwhile-gaim/files/patch-src_mwgaim.c b/net-im/meanwhile-gaim/files/patch-src_mwgaim.c
new file mode 100644
index 000000000000..e6aa8438cc82
--- /dev/null
+++ b/net-im/meanwhile-gaim/files/patch-src_mwgaim.c
@@ -0,0 +1,20 @@
+--- src/mwgaim.c.orig	Thu Jun 24 20:55:29 2004
++++ src/mwgaim.c	Thu Jun 24 20:56:30 2004
+@@ -723,11 +723,14 @@
+ 
+ 
+ static char *mw_list_status_text(GaimBuddy *b) {
++  struct mw_plugin_data *pd;
++  struct mwIdBlock i = { b->name, NULL };
++  const char *t;
++
+   g_return_val_if_fail(b, NULL);
+ 
+-  struct mw_plugin_data *pd = PLUGIN_DATA(b->account->gc);
+-  struct mwIdBlock i = { b->name, NULL };
+-  const char *t = mwServiceAware_getText(pd->srvc_aware, &i);
++  pd = PLUGIN_DATA(b->account->gc);
++  t = mwServiceAware_getText(pd->srvc_aware, &i);
+   return t? g_strdup(t): NULL;
+ }
+ 
diff --git a/net-im/meanwhile/files/patch-src_srvc_im.c b/net-im/meanwhile/files/patch-src_srvc_im.c
new file mode 100644
index 000000000000..47d70264e8b6
--- /dev/null
+++ b/net-im/meanwhile/files/patch-src_srvc_im.c
@@ -0,0 +1,19 @@
+--- src/srvc_im.c.orig	Thu Jun 24 20:53:09 2004
++++ src/srvc_im.c	Thu Jun 24 20:53:33 2004
+@@ -160,12 +160,14 @@
+   struct mwSession *s;
+   struct mwChannelSet *cs;
+   unsigned int a, b;
++  char *buf;
++  gsize n;
+   
+   s = chan->session;
+   cs = s->channels;
+ 
+-  char *buf = msg->addtl.data;
+-  gsize n = msg->addtl.len;
++  buf = msg->addtl.data;
++  n = msg->addtl.len;
+ 
+   if( (msg->service != Service_IM) ||
+       (msg->proto_type != Protocol_IM) ||
diff --git a/net/meanwhile-gaim/files/patch-src_mwgaim.c b/net/meanwhile-gaim/files/patch-src_mwgaim.c
new file mode 100644
index 000000000000..e6aa8438cc82
--- /dev/null
+++ b/net/meanwhile-gaim/files/patch-src_mwgaim.c
@@ -0,0 +1,20 @@
+--- src/mwgaim.c.orig	Thu Jun 24 20:55:29 2004
++++ src/mwgaim.c	Thu Jun 24 20:56:30 2004
+@@ -723,11 +723,14 @@
+ 
+ 
+ static char *mw_list_status_text(GaimBuddy *b) {
++  struct mw_plugin_data *pd;
++  struct mwIdBlock i = { b->name, NULL };
++  const char *t;
++
+   g_return_val_if_fail(b, NULL);
+ 
+-  struct mw_plugin_data *pd = PLUGIN_DATA(b->account->gc);
+-  struct mwIdBlock i = { b->name, NULL };
+-  const char *t = mwServiceAware_getText(pd->srvc_aware, &i);
++  pd = PLUGIN_DATA(b->account->gc);
++  t = mwServiceAware_getText(pd->srvc_aware, &i);
+   return t? g_strdup(t): NULL;
+ }
+ 
diff --git a/net/meanwhile/files/patch-src_srvc_im.c b/net/meanwhile/files/patch-src_srvc_im.c
new file mode 100644
index 000000000000..47d70264e8b6
--- /dev/null
+++ b/net/meanwhile/files/patch-src_srvc_im.c
@@ -0,0 +1,19 @@
+--- src/srvc_im.c.orig	Thu Jun 24 20:53:09 2004
++++ src/srvc_im.c	Thu Jun 24 20:53:33 2004
+@@ -160,12 +160,14 @@
+   struct mwSession *s;
+   struct mwChannelSet *cs;
+   unsigned int a, b;
++  char *buf;
++  gsize n;
+   
+   s = chan->session;
+   cs = s->channels;
+ 
+-  char *buf = msg->addtl.data;
+-  gsize n = msg->addtl.len;
++  buf = msg->addtl.data;
++  n = msg->addtl.len;
+ 
+   if( (msg->service != Service_IM) ||
+       (msg->proto_type != Protocol_IM) ||