Mercurial > pidgin

changeset 12263:8190a70d2c34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14565] removed GMP dependancy for sametime support. fixed some buddy status issues as noted in bug #1368136. sametime seems to be working just fine now, and I'm trying to use HEAD as my primary client for a while to get things going. committer: Tailor Script <tailor@pidgin.im>
author Christopher O'Brien <siege@pidgin.im>
date Tue, 29 Nov 2005 23:37:05 +0000
parents 6e55515e4b39
children 2be62353f708
files configure.ac src/protocols/sametime/sametime.c
diffstat 2 files changed, 17 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Nov 29 23:34:19 2005 +0000
+++ b/configure.ac	Tue Nov 29 23:37:05 2005 +0000
@@ -104,53 +104,6 @@
 dnl FreeBSD doesn't have libdl, dlopen is provided by libc
 AC_CHECK_FUNC(dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
 
-dnl # Check for GMP. If it's not there, Sametime won't build
-have_gmp=yes
-GMP_LIBS=
-GMP_CFLAGS=
-
-# either auto-detect or specify the libgmp.a file for static linking
-withval="auto"
-AC_ARG_WITH(gmp-prefix,
-        [  --with-gmp-prefix[=auto]  prefix gmp was installed to])
-
-if test "$withval" = "auto" ; then
-        found_prefix=no
-
-        if test $found_prefix = "no" ; then
-           try_prefix=/usr
-           AC_CHECK_HEADER([$try_prefix/include/gmp.h], found_prefix="yes")
-        fi
-
-        if test $found_prefix = "no" ; then
-           try_prefix=/usr/local
-           AC_CHECK_HEADER([$try_prefix/include/gmp.h], found_prefix="yes")
-        fi
-
-        if test $found_prefix = "no" ; then
-           dnl AC_MSG_ERROR([GNU MP headers not found])
-	   have_gmp=no
-        fi
-
-elif test -n "$withval" ; then
-        try_prefix=$withval
-
-        AC_CHECK_HEADER([$try_prefix/include/gmp.h],,
-                [AC_MSG_ERROR([GNU MP headers not found])])
-
-else
-        dnl AC_MSG_ERROR([GNU MP headers not found, $withval])
-	have_gmp=no
-fi
-if test "$have_gmp" = "yes" ; then
-	GMP_CFLAGS=-I$try_prefix/include
-	dnl XXX: shouldn't we be checking where the libs are and adding -L if necessary?
-	GMP_LIBS="-lgmp"
-fi
-
-AC_SUBST(GMP_CFLAGS)
-AC_SUBST(GMP_LIBS)
-
 
 
 dnl #######################################################################
@@ -302,7 +255,7 @@
 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
-AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_gmp" = "xyes")
+AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes")
 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes")
 AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
 AM_CONDITIONAL(STATIC_TOC, test "x$static_toc" = "xyes")
@@ -322,9 +275,6 @@
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc//'`
 fi
-if test "x$have_gmp" != "xyes"; then
-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
-fi
 AC_SUBST(DYNAMIC_PRPLS)
 for i in $DYNAMIC_PRPLS ; do
 	case $i in
@@ -351,7 +301,7 @@
 AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes")
 AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes")
 AM_CONDITIONAL(DYNAMIC_OSCAR, test "x$dynamic_oscar" = "xyes")
-AM_CONDITIONAL(DYNAMIC_SAMETIME, test "x$dynamic_sametime" = "xyes" -a "x$have_gmp" = "xyes")
+AM_CONDITIONAL(DYNAMIC_SAMETIME, test "x$dynamic_sametime" = "xyes")
 AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes")
 AM_CONDITIONAL(DYNAMIC_SIMPLE, test "x$dynamic_simple" = "xyes")
 AM_CONDITIONAL(DYNAMIC_TOC, test "x$dynamic_toc" = "xyes")
@@ -1597,6 +1547,7 @@
 		   src/protocols/oscar/Makefile
 		   src/protocols/sametime/Makefile
 		   src/protocols/sametime/meanwhile/Makefile
+		   src/protocols/sametime/meanwhile/mpi/Makefile
 		   src/protocols/silc/Makefile
 		   src/protocols/simple/Makefile
 		   src/protocols/toc/Makefile
--- a/src/protocols/sametime/sametime.c	Tue Nov 29 23:34:19 2005 +0000
+++ b/src/protocols/sametime/sametime.c	Tue Nov 29 23:37:05 2005 +0000
@@ -501,8 +501,13 @@
     gaim_blist_node_set_int(bnode, BUDDY_KEY_TYPE, mwSametimeUser_NORMAL);
   }
   
-  gaim_prpl_got_user_status(acct, id, status, NULL);
-  gaim_prpl_got_user_idle(acct, id, !!idle, idle);
+  if(aware->online) {
+    gaim_prpl_got_user_status(acct, id, status, NULL);
+    gaim_prpl_got_user_idle(acct, id, !!idle, idle);
+
+  } else {
+    gaim_prpl_got_user_status(acct, id, MW_STATE_OFFLINE, NULL);
+  }
 }
 
 
@@ -1682,8 +1687,8 @@
   GaimAccount *acct;
   GaimConversation *conv;
   GaimBuddy *buddy;
-  const char *who = from->user_id;
-  char *tmp, *msg;
+  char *who = from->user_id;
+  char *msg;
   
   pd = mwSession_getClientData(s);
   acct = gaim_connection_get_account(pd->gc);
@@ -1691,15 +1696,13 @@
   if(! conv) conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, acct, who);
 
   buddy = gaim_find_buddy(acct, who);
-  if(buddy) {
-    who = gaim_buddy_get_contact_alias(buddy);
-  }
-
-  tmp = g_strdup_printf(_("Announcement from %s"), who);
+  if(buddy) who = (char *) gaim_buddy_get_contact_alias(buddy);
+
+  who = g_strdup_printf(_("Announcement from %s"), who);
   msg = gaim_markup_linkify(text);
 
-  gaim_conversation_write(conv, tmp, msg, GAIM_MESSAGE_RECV, time(NULL));
-  g_free(tmp);
+  gaim_conversation_write(conv, who, msg, GAIM_MESSAGE_RECV, time(NULL));
+  g_free(who);
   g_free(msg);
 }