[Gaim-commits] CVS: gaim/src/protocols/sametime Makefile.am,1.5,1.6 Makefile.mingw,1.3,1.4 sametime.c,1.35,1.36

[Christopher (s. O'B. <tal...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/sametime
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2011/src/protocols/sametime

Modified Files:
	Makefile.am Makefile.mingw sametime.c 
Log Message:
removing meanwhile library code from gaim tree, use libmeanwhile-1.0.0 instead if available to enable the sametime plugin. also fixing a status message bug due to unescaped markup

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/sametime/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- Makefile.am	27 Oct 2005 20:43:43 -0000	1.5
+++ Makefile.am	16 Dec 2005 04:08:04 -0000	1.6
@@ -1,4 +1,3 @@
-SUBDIRS = meanwhile
 
 EXTRA_DIST = Makefile.mingw
 
@@ -29,17 +28,16 @@ endif
 
 
 libsametime_la_LDFLAGS = -module -avoid-version -no-undefined
-libsametime_la_LIBADD = $(GLIB_LIBS) meanwhile/libmeanwhile.la
+libsametime_la_LIBADD = $(GLIB_LIBS) $(MEANWHILE_LIBS)
 
 
 AM_CFLAGS = \
-	$(GLIB_CFLAGS) \
+	$(GLIB_CFLAGS) $(MEANWHILE_CFLAGS) \
 	$(DEBUG_CFLAGS) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/protocols/sametime/meanwhile
+	-I$(top_srcdir)/src
 
 
 AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"meanwhile\" \
+	-DG_LOG_DOMAIN=\"sametime\" \
 	$(st)
 

Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/sametime/Makefile.mingw,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- Makefile.mingw	30 Nov 2005 02:49:43 -0000	1.3
+++ Makefile.mingw	16 Dec 2005 04:08:04 -0000	1.4
@@ -47,14 +47,13 @@ include $(GAIM_TOP)/src/win32/global.mak
 ##
 
 INCLUDE_PATHS +=	-I$(SAMETIME_ROOT) \
-			-I$(SAMETIME_ROOT)/meanwhile \
-			-I$(SAMETIME_ROOT)/meanwhile/mpi \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(GAIM_TOP)/src \
 			-I$(GAIM_TOP)/src/win32 \
-			-I$(GAIM_TOP)
+			-I$(GAIM_TOP) \
+			$(MEANWHILE_CFLAGS)
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(GAIM_TOP)/src
@@ -64,25 +63,7 @@ LIB_PATHS =		-L$(GTK_TOP)/lib \
 ##  SOURCES, OBJECTS
 ##
 
-C_SRC =		meanwhile/mpi/mpi.c \
-		meanwhile/channel.c \
-		meanwhile/cipher.c \
-		meanwhile/common.c \
-		meanwhile/error.c \
-		meanwhile/message.c \
-		meanwhile/mw_debug.c \
-		meanwhile/mw_util.c \
-		meanwhile/service.c \
-		meanwhile/session.c \
-		meanwhile/srvc_aware.c \
-		meanwhile/srvc_conf.c \
-		meanwhile/srvc_ft.c \
-		meanwhile/srvc_im.c \
-		meanwhile/srvc_place.c \
-		meanwhile/srvc_resolve.c \
-		meanwhile/srvc_store.c \
-		meanwhile/st_list.c \
-		sametime.c
+C_SRC =		sametime.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
 
@@ -96,8 +77,8 @@ LIBS =		\
 		-lgobject-2.0 \
 		-lintl \
 		-lws2_32 \
-		-lgaim
-
+		-lgaim \
+		$(MEANWHILE_LIBS)
 
 ##
 ## RULES

Index: sametime.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/sametime/sametime.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -p -r1.35 -r1.36
--- sametime.c	15 Dec 2005 22:59:06 -0000	1.35
+++ sametime.c	16 Dec 2005 04:08:04 -0000	1.36
@@ -3229,7 +3229,7 @@ static char *mw_prpl_status_text(GaimBud
   pd = gc->proto_data;
 
   ret = mwServiceAware_getText(pd->srvc_aware, &t);
-  return g_strdup(ret);
+  return ret? g_markup_escape_text(ret, -1): NULL;
 }
 
 
@@ -4187,7 +4187,11 @@ static void mw_prpl_get_info(GaimConnect
     g_string_append(str, "<hr>");
     
     tmp = mwServiceAware_getText(pd->srvc_aware, &idb);
-    if(tmp) g_string_append(str, tmp);
+    if(tmp) {
+      tmp = g_markup_escape_text(tmp, -1);
+      g_string_append(str, tmp);
+      g_free((char *) tmp);
+    }
   }
 
   /* @todo emit a signal to allow a plugin to override the display of