[Galago-commits] r1969 - in trunk/gaim-galago: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-06-21 00:37:16 -0700 (Tue, 21 Jun 2005)
New Revision: 1969

Modified:
   trunk/gaim-galago/ChangeLog
   trunk/gaim-galago/configure.ac
   trunk/gaim-galago/src/gaim-galago.c
Log:
Patch by Gary Kramlich to make gaim-galago compile and hopefully work on Gaim 2.0. This has not been tested yet.


Modified: trunk/gaim-galago/ChangeLog
===================================================================
--- trunk/gaim-galago/ChangeLog	2005-06-21 07:19:34 UTC (rev 1968)
+++ trunk/gaim-galago/ChangeLog	2005-06-21 07:37:16 UTC (rev 1969)
@@ -1,3 +1,10 @@
+Tue Jun 21 00:35:22 PDT 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/gaim-galago.c:
+	* configure.ac:
+	  - Patch by Gary Kramlich to make gaim-galago compile and hopefully
+	    work on Gaim 2.0. This has not been tested yet.
+
 Thu May 26 21:48:34 PDT 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* debian/changelog:

Modified: trunk/gaim-galago/configure.ac
===================================================================
--- trunk/gaim-galago/configure.ac	2005-06-21 07:19:34 UTC (rev 1968)
+++ trunk/gaim-galago/configure.ac	2005-06-21 07:37:16 UTC (rev 1969)
@@ -3,7 +3,7 @@
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
-AC_INIT(gaim-galago, 0.3.2, chipx86 at gnupdate.org)
+AC_INIT(gaim-galago, 0.3.2.90, chipx86 at gnupdate.org)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
 AC_COPYRIGHT([Copyright 2004-2005 Christian Hammond])
@@ -15,7 +15,7 @@
 GAIM_GALAGO_MAJOR_VERSION=0
 GAIM_GALAGO_MINOR_VERSION=3
 GAIM_GALAGO_MICRO_VERSION=2
-GAIM_GALAGO_DEVEL_VERSION=0
+GAIM_GALAGO_DEVEL_VERSION=90
 
 GAIM_GALAGO_VERSION=$GAIM_GALAGO_MAJOR_VERSION.$GAIM_GALAGO_MINOR_VERSION.$GAIM_GALAGO_MICRO_VERSION
 
@@ -72,15 +72,6 @@
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
 
-AC_MSG_CHECKING([gaim version])
-GAIM_VERSION=`$PKG_CONFIG --modversion gaim`
-GAIM_MAJOR_VER=`echo $GAIM_VERSION | cut -d. -f 1`
-if test "x$GAIM_MAJOR_VER" = "x1"; then
-	AC_MSG_RESULT($GAIM_VERSION)
-else
-	AC_MSG_ERROR([This version of gaim is not supported! Please use Gaim v1.x.x, and read the gaim-galago README.])
-fi
-
 dnl # Use wall if we have GCC
 if test "x$GCC" = "xyes"; then
 	CFLAGS="$CFLAGS -Wall"

Modified: trunk/gaim-galago/src/gaim-galago.c
===================================================================
--- trunk/gaim-galago/src/gaim-galago.c	2005-06-21 07:19:34 UTC (rev 1968)
+++ trunk/gaim-galago/src/gaim-galago.c	2005-06-21 07:37:16 UTC (rev 1969)
@@ -31,6 +31,10 @@
 #include "server.h"
 #include "version.h"
 
+#if GAIM_VERSION_CHECK(2,0,0)
+#  include "status.h"
+#endif
+
 #include <libgalago/galago.h>
 #include <dbus/dbus-glib.h>
 #include <ctype.h>
@@ -178,10 +182,21 @@
 	if (presence == NULL)
 		return;
 
+#if GAIM_VERSION_CHECK(2,0,0)
+	{
+		GaimPresence *bpresence;
+
+		bpresence = gaim_buddy_get_presence(buddy);
+
+		if((idle = gaim_presence_is_idle(bpresence)))
+			idle_time = gaim_presence_get_idle_time(bpresence);
+	}
+#else
 	idle = (buddy->idle > 0);
 
 	if (idle)
 		idle_time = time(NULL) - buddy->idle;
+#endif
 
 	galago_presence_set_idle(presence, idle, idle_time);
 }
@@ -252,7 +267,15 @@
 					buddy->name, gaim_account_get_username(buddy->account),
 					galago_service_get_id(service));
 
-	/* This will all change when gaim's new status API goes in. */
+#if GAIM_VERSION_CHECK(2,0,0)
+	if(!gaim_presence_is_available(gaim_buddy_get_presence(buddy))) {
+		status_type = GALAGO_STATUS_AWAY;
+		status_id = GALAGO_STATUS_ID_AWAY;
+	} else {
+		status_type = GALAGO_STATUS_AVAILABLE;
+		status_id = GALAGO_STATUS_ID_AVAILABLE;
+	}
+#else
 	if (buddy->uc & UC_UNAVAILABLE)
 	{
 		status_type = GALAGO_STATUS_AWAY;
@@ -263,6 +286,7 @@
 		status_type = GALAGO_STATUS_AVAILABLE;
 		status_id   = GALAGO_STATUS_ID_AVAILABLE;
 	}
+#endif
 
 	prpl = gaim_find_prpl(gaim_account_get_protocol_id(buddy->account));