[Gaim-commits] CVS: gaim COPYRIGHT,1.219,1.220 config.h.mingw,1.15,1.16 configure.ac,1.380,1.381

[Richard L. <rl...@us...>]

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6613

Modified Files:
	COPYRIGHT config.h.mingw configure.ac 
Log Message:
Long long ago, in a far-off land, a patch was sent to gaim-devel...

I modified this patch, but couldn't test it, so it sat. Today, I got to borrow an evaluation laptop from Apple (here at the University of Minnesota, Crookston). So, I bring you...

A patch from Michael Culbertson: On Mac OS X, obtain the system idle time via IOKit. Thus, our idle time calculations will reflect system usage rather than X11 application usage.


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/gaim/gaim/COPYRIGHT,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -p -r1.219 -r1.220
--- COPYRIGHT	14 Feb 2006 07:45:07 -0000	1.219
+++ COPYRIGHT	24 Feb 2006 03:38:09 -0000	1.220
@@ -64,6 +64,7 @@ Glauber de Oliveira Costa
 Adam Cowell
 Palmer Cox
 Jeramey Crawford
+Michael Culbertson
 Martijn Dekker
 Balwinder Singh Dheeman
 Andrew Dieffenbach

Index: config.h.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/config.h.mingw,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -p -r1.15 -r1.16
--- config.h.mingw	22 Feb 2006 03:21:20 -0000	1.15
+++ config.h.mingw	24 Feb 2006 03:38:09 -0000	1.16
@@ -183,6 +183,9 @@
    declares uintmax_t. */
 #define HAVE_INTTYPES_H_WITH_UINTMAX 1
 
+/* Define if we have IOKit */
+/* #undef HAVE_IOKIT */
+
 /* Define to 1 if you have the `krb_get_err_text' function. */
 /* #undef HAVE_KRB_GET_ERR_TEXT */
 
@@ -318,7 +321,7 @@
 /* Define to 1 if you have the <signal.h> header file. */
 /* #define HAVE_SIGNAL_H 1 */
 
-/* define if we have silcmime.h */
+/* Define if we have silcmime.h */
 /* #undef HAVE_SILCMIME_H */
 
 /* Define to 1 if you have the <smime.h> header file. */

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -d -p -r1.380 -r1.381
--- configure.ac	22 Feb 2006 03:21:20 -0000	1.380
+++ configure.ac	24 Feb 2006 03:38:09 -0000	1.381
@@ -25,6 +25,14 @@ AC_SUBST(GETTEXT_PACKAGE)
 case "$host_os" in
 darwin*)
 	AC_CHECK_LIB(resolv, res_query)
+
+	AC_CHECK_HEADER(CoreFoundation/CoreFoundation.h, [
+		AC_CHECK_HEADER(IOKit/IOKitLib.h, [
+			AC_DEFINE(HAVE_IOKIT, 1, [Define if we have IOKit])
+			LIBS="$LIBS -framework IOKit -framework CoreFoundation"
+		], [])
+	], [])
+
 	AC_MSG_CHECKING([for fink])
 	if test -d /sw; then
 		AC_MSG_RESULT([found, adding /sw to search paths])
@@ -264,7 +272,7 @@ if test "x$silcclient" = "xyes"; then
 #include <silcmime.h>
 		], [], [
 		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_SILCMIME_H, 1, [define if we have silcmime.h])
+		AC_DEFINE(HAVE_SILCMIME_H, 1, [Define if we have silcmime.h])
 		], [
 		AC_MSG_RESULT(no)
 		])