# HG changeset patch # User Eric Warmenhoven # Date 991082278 0 # Node ID 42aa9434800a22246c1fda222cc122e91d816eb1 # Parent 17ae421bb21492e855747bc9046387dac5b9bff6 [gaim-migrate @ 1916] gah. committer: Tailor Script diff -r 17ae421bb214 -r 42aa9434800a ChangeLog --- a/ChangeLog Mon May 28 19:18:06 2001 +0000 +++ b/ChangeLog Mon May 28 20:37:58 2001 +0000 @@ -20,7 +20,7 @@ * Can force messages through the server for ICQ (use this if you have problems sending) * Can receive buddy icons in Oscar (requires gdk_pixbuf, - which GNOME depends on. If you --disable-gnome, it will + which GNOME depends on. If you --disable-pixbuf, it will disable this.) version 0.11.0-pre11 (04/30/2001): diff -r 17ae421bb214 -r 42aa9434800a acconfig.h --- a/acconfig.h Mon May 28 19:18:06 2001 +0000 +++ b/acconfig.h Mon May 28 20:37:58 2001 +0000 @@ -6,6 +6,7 @@ #undef HAVE_LIBSM #undef USE_APPLET #undef USE_GNOME +#undef USE_PIXBUF #undef USE_SCREENSAVER #undef NO_MULTI #undef DEBUG diff -r 17ae421bb214 -r 42aa9434800a configure.in --- a/configure.in Mon May 28 19:18:06 2001 +0000 +++ b/configure.in Mon May 28 20:37:58 2001 +0000 @@ -21,7 +21,6 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h locale.h signal.h) -AC_CHECK_HEADERS(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not found ***])) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -45,6 +44,7 @@ AC_ARG_ENABLE(multi, [ --disable-multi disable multiple connections],,enable_multi=yes) AC_ARG_ENABLE(prpls, [ --disable-prpls don't build protocol plugins],,enable_prpls=yes) AC_ARG_ENABLE(gnome, [ --disable-gnome compile without Gnome bits],,enable_gnome=yes) +AC_ARG_ENABLE(pixbuf, [ --disable-pixbuf compile without GdkPixbuf (needed for Buddy Icons)],,enable_pixbuf=yes) AC_ARG_ENABLE(panel, [ --enable-panel compile as a GNOME applet],,enable_panel=$enable_distrib) AM_CONDITIONAL(GNOMEAPPLET, test "x$enable_panel" = "xyes") AC_ARG_ENABLE(esd, [ --disable-esd Turn off ESD (default=auto)],,enable_esd=yes) @@ -54,7 +54,6 @@ AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no) AC_ARG_ENABLE(screensaver, [ --disable-screensaver compile without X screensaver extension],,enable_xss=yes) AC_ARG_WITH(krb4, [ --with-krb4=PREFIX Compile Zephyr plugin with Kerberos 4 support],kerberos="$withval",kerberos="no") -AC_ARG_ENABLE(,,,) if test "$enable_debug" = yes ; then CFLAGS="$CFLAGS -Wall -g" @@ -68,13 +67,12 @@ CFLAGS="$CFLAGS $GNOME_INCLUDEDIR" AC_DEFINE(USE_APPLET) AC_DEFINE(USE_GNOME) - GDK_PIXBUF_LIBS=`$GNOME_CONFIG --libs gdk_pixbuf` - LIBS="$LIBS $GTK_LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS $GNOMEUI_LIBS $GDK_PIXBUF_LIBS" + LIBS="$LIBS $GTK_LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS $GNOMEUI_LIBS" AC_PATH_PROG(gaimpath, gaim_applet) else AC_PATH_PROG(gnomepath, gnome-config) AC_MSG_CHECKING(for Gnome compile flags) - GNOME_CFLAGS=`$gnomepath gnomeui gdk_pixbuf --cflags 2>/dev/null` + GNOME_CFLAGS=`$gnomepath gnomeui --cflags 2>/dev/null` if test "x$GNOME_CFLAGS" = "x" ; then enable_gnome=no AC_MSG_RESULT([Gnome not found, building without it.]) @@ -87,7 +85,7 @@ else AC_MSG_RESULT(ok) CFLAGS="$CFLAGS $GNOME_CFLAGS" - LIBS="$LIBS `$gnomepath gnomeui gdk_pixbuf --libs 2>/dev/null`" + LIBS="$LIBS `$gnomepath gnomeui --libs 2>/dev/null`" AC_DEFINE(USE_GNOME) GNOME_CONFIG="$gnomepath" AC_SUBST(GNOME_CONFIG) @@ -111,6 +109,24 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" +use_pixbuf=no +if test "x$enable_pixbuf" = "xyes" ; then + AC_PATH_PROG(pixbufcfg, gdk-pixbuf-config) + if test "x$pixbufcfg" != "x" ; then + GDK_PIXBUF_CFLAGS=`$pixbufcfg --cflags` + GDK_PIXBUF_LIBS=`$pixbufcfg --libs` + GDK_PIXBUF_CONFIG="$pixbufcfg" + AC_SUBST(GDK_PIXBUF_CONFIG) + AC_SUBST(GDK_PIXBUF_CFLAGS) + AC_SUBST(GDK_PIXBUF_LIBS) + CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS" + LIBS="$LIBS $GDK_PIXBUF_LIBS" + dnl We should be doing checks to see that the header files and functions exist. eh. + AC_DEFINE(USE_PIXBUF) + use_pixbuf=yes + fi +fi + dnl Check for XScreenSaver if test "x$enable_xss" = "xyes" ; then XSS_LIBS="no" @@ -285,6 +301,7 @@ echo Build Protocol Plugins..... : $enable_prpls echo echo Build with GNOME bits...... : $enable_gnome +echo Use GdkPixbuf for Icons.... : $use_pixbuf echo Build as GNOME applet...... : $enable_panel echo echo Build with Plugin support.. : $enable_plugins diff -r 17ae421bb214 -r 42aa9434800a src/oscar.c --- a/src/oscar.c Mon May 28 19:18:06 2001 +0000 +++ b/src/oscar.c Mon May 28 20:37:58 2001 +0000 @@ -43,7 +43,7 @@ #include "aim.h" #include "proxy.h" -#if USE_GNOME +#if USE_PIXBUF #include #include #endif @@ -62,7 +62,7 @@ #define AIMHASHDATA "http://gaim.sourceforge.net/aim_data.php3" static int gaim_caps = AIM_CAPS_CHAT | -#if USE_GNOME +#if USE_PIXBUF AIM_CAPS_BUDDYICON | #endif AIM_CAPS_GETFILE | @@ -143,7 +143,7 @@ long size; }; -#if USE_GNOME +#if USE_PIXBUF struct icon_req { char *user; time_t timestamp; @@ -522,7 +522,7 @@ odata->direct_ims = g_slist_remove(odata->direct_ims, n); g_free(n); } -#if USE_GNOME +#if USE_PIXBUF while (odata->hasicons) { struct icon_req *n = odata->hasicons->data; gdk_pixbuf_animation_unref(n->anim); @@ -1593,7 +1593,7 @@ } */ -#if USE_GNOME +#if USE_PIXBUF static gboolean redraw_anim(gpointer data) { int delay; @@ -1663,7 +1663,7 @@ args = va_arg(ap, struct aim_incomingim_ch1_args *); va_end(ap); -#if USE_GNOME +#if USE_PIXBUF if (args->icbmflags & AIM_IMFLAGS_HASICON) { struct oscar_data *od = gc->proto_data; struct icon_req *ir; @@ -1725,7 +1725,7 @@ */ } else if (args->reqclass & AIM_CAPS_VOICE) { } else if (args->reqclass & AIM_CAPS_BUDDYICON) { -#if USE_GNOME +#if USE_PIXBUF struct oscar_data *od = gc->proto_data; GSList *h = od->hasicons; struct icon_req *ir = NULL; @@ -2439,7 +2439,7 @@ aim_send_im(odata->sess, odata->conn, name, AIM_IMFLAGS_AWAY, message); else { int flags = AIM_IMFLAGS_ACK; -#if USE_GNOME +#if USE_PIXBUF GSList *h = odata->hasicons; struct icon_req *ir; char *who = normalize(name); @@ -3127,7 +3127,7 @@ static void oscar_insert_convo(struct gaim_connection *gc, struct conversation *c) { -#if USE_GNOME +#if USE_PIXBUF struct oscar_data *od = gc->proto_data; GSList *h = od->hasicons; struct icon_req *ir = NULL; @@ -3173,7 +3173,7 @@ static void oscar_remove_convo(struct gaim_connection *gc, struct conversation *c) { -#if USE_GNOME +#if USE_PIXBUF struct oscar_data *od = gc->proto_data; GSList *h = od->hasicons; struct icon_req *ir = NULL;