? meanwhile-gaim-nonstdprefix-fix.patch
Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/meanwhile/meanwhile-gaim/src/Makefile.am,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile.am
--- src/Makefile.am	18 Jul 2004 21:46:43 -0000	1.6
+++ src/Makefile.am	19 Jul 2004 13:09:50 -0000
@@ -11,7 +11,7 @@ libmwgaim_la_CFLAGS = \
 
 libmwgaim_la_LDFLAGS = -module -avoid-version
 
-libmwgaim_la_LIBADD = $(GAIM_LIBS) $(MEANWHILE_LIBS) -lmeanwhile
+libmwgaim_la_LIBADD = $(GAIM_LIBS) $(MEANWHILE_LIBS)
 
 INCLUDES = $(GLIB_CFLAGS) $(GAIM_CFLAGS) $(MEANWHILE_CFLAGS)
 
Index: src/mwgaim.c
===================================================================
RCS file: /cvsroot/meanwhile/meanwhile-gaim/src/mwgaim.c,v
retrieving revision 1.22
diff -u -p -r1.22 mwgaim.c
--- src/mwgaim.c	18 Jul 2004 21:46:43 -0000	1.22
+++ src/mwgaim.c	19 Jul 2004 13:09:50 -0000
@@ -21,27 +21,27 @@ USA. */
 
 
 #define GAIM_PLUGINS
-#include <gaim/gaim.h>
-#include <gaim/accountopt.h>
-#include <gaim/conversation.h>
-#include <gaim/debug.h>
-#include <gaim/internal.h>
-#include <gaim/multi.h>
-#include <gaim/notify.h>
-#include <gaim/plugin.h>
-#include <gaim/prpl.h>
+#include <gaim.h>
+#include <accountopt.h>
+#include <conversation.h>
+#include <debug.h>
+#include <internal.h>
+#include <multi.h>
+#include <notify.h>
+#include <plugin.h>
+#include <prpl.h>
 
 #include <glib.h>
 #include <glib/ghash.h>
 #include <glib/glist.h>
 
-#include <meanwhile/meanwhile.h>
-#include <meanwhile/st_list.h>
-#include <meanwhile/service.h>
-#include <meanwhile/srvc_aware.h>
-#include <meanwhile/srvc_conf.h>
-#include <meanwhile/srvc_im.h>
-#include <meanwhile/srvc_store.h>
+#include <meanwhile.h>
+#include <st_list.h>
+#include <service.h>
+#include <srvc_aware.h>
+#include <srvc_conf.h>
+#include <srvc_im.h>
+#include <srvc_store.h>
 
 
 /* considering that there's no display of this information for prpls,
@@ -777,7 +777,7 @@ static void got_welcome(struct mwConfere
 
   while(count--) {
     struct mwIdBlock *idb = members + count;
-    gaim_conv_chat_add_user(GAIM_CONV_CHAT(conv), idb->user, NULL);
+    gaim_conv_chat_add_user(GAIM_CONV_CHAT(conv), idb->user, NULL, GAIM_CBFLAGS_NONE);
   }
 
   /* add a mapping for easier lookup */
@@ -809,7 +809,7 @@ static void got_join(struct mwConference
   g_return_if_fail(conv);
 
   DEBUG_INFO(" got join");
-  gaim_conv_chat_add_user(GAIM_CONV_CHAT(conv), id->user, NULL);
+  gaim_conv_chat_add_user(GAIM_CONV_CHAT(conv), id->user, NULL, GAIM_CBFLAGS_NONE);
 }