# HG changeset patch # User Mark Doliner # Date 1170654543 0 # Node ID fd5e7ac7f2fae0111f14cdfe3a13d021dc9e20ea # Parent 3b6ce2116f745cce9a0fbdbd4a13eef2b0024ee5# Parent bcdf8880564b68f112558abd45d9c48b5dde73d0 merge of '27c17e92071c391b099220ce5cac417ea8695587' and 'f5ec66d0e5f00c3c237d178403dcda3bc8b2496e' diff -r 3b6ce2116f74 -r fd5e7ac7f2fa COPYRIGHT --- a/COPYRIGHT Mon Feb 05 05:38:09 2007 +0000 +++ b/COPYRIGHT Mon Feb 05 05:49:03 2007 +0000 @@ -97,6 +97,7 @@ Andrew Echols John Eckerdal Sean Egan +Markus Elfring Nelson Elhage Ignacio J. Elia Brian Enigma diff -r 3b6ce2116f74 -r fd5e7ac7f2fa configure.ac --- a/configure.ac Mon Feb 05 05:38:09 2007 +0000 +++ b/configure.ac Mon Feb 05 05:49:03 2007 +0000 @@ -889,10 +889,11 @@ AC_PATH_PROG(gaimpath, gaim) dnl ####################################################################### -dnl # Check for DBUS libraries +dnl # Check for D-Bus libraries dnl ####################################################################### -AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable DBUS support])], , enable_dbus=yes) +AC_ARG_ENABLE(dbus, [AC_HELP_STRING([--enable-dbus], [enable D-Bus support])], , enable_dbus=yes) +AC_ARG_ENABLE(nm, [AC_HELP_STRING([--enable-nm], [enable NetworkManager support (buggy) (requires D-Bus)])], enable_libnm=yes, enable_libnm=no) if test "x$enable_dbus" = "xyes" ; then AC_CHECK_PROG(enable_dbus, dbus-binding-tool, yes, no) @@ -908,18 +909,24 @@ enable_dbus=no ]) -dnl Check for libnm_glib; if we don't have it, oh well - LIBNM_CFLAGS="" - LIBNM_LIBS="" - PKG_CHECK_MODULES(LIBNM, libnm_glib, - [ - AC_DEFINE(HAVE_LIBNM, 1, [Check to see if we have NetworkManager]) - ], - [ - AC_MSG_RESULT(no) - ]) - AC_SUBST(LIBNM_CFLAGS) - AC_SUBST(LIBNM_LIBS) +dnl Check for libnm_glib; if we don't have it, oh well + if test "x$enable_libnm" = "xyes" ; then + LIBNM_CFLAGS="" + LIBNM_LIBS="" + PKG_CHECK_MODULES(LIBNM, libnm_glib, + [ + AC_DEFINE(HAVE_LIBNM, 1, [Check to see if we have NetworkManager]) + enable_libnm=yes + ], + [ + AC_MSG_RESULT(no) + enable_libnm=no + ]) + AC_SUBST(LIBNM_CFLAGS) + AC_SUBST(LIBNM_LIBS) + fi +else + enable_libnm=no fi dnl ####################################################################### @@ -928,7 +935,7 @@ dnl Python scripts are used to auto-generate about 3000 lines of C dnl and XML code that wraps (part of) the existing Gaim API so that -dnl it is now accessible through DBUS. +dnl it is now accessible through D-Bus. dnl Python is only required if --enable-dbus is used, and only for dnl the build process to generate the code, not for running gaim. @@ -1011,14 +1018,14 @@ fi fi AC_MSG_RESULT([$DBUS_SERVICES_DIR]) - AC_DEFINE(HAVE_DBUS, 1, [Define if we are re using DBUS.]) + AC_DEFINE(HAVE_DBUS, 1, [Define if we are re using D-Bus.]) fi AC_SUBST(DBUS_SERVICES_DIR) if test "x$enable_dbus" = "xyes" ; then - echo "Building with DBUS support" + echo "Building with D-Bus support" else - echo "Building without DBUS support" + echo "Building without D-Bus support" fi AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes") @@ -1982,10 +1989,11 @@ echo Protocols to link statically.. : $STATIC_PRPLS echo echo Build with GStreamer support.. : $enable_gst -echo Build with DBUS support....... : $enable_dbus +echo Build with D-Bus support...... : $enable_dbus if test "x$enable_dbus" = "xyes" ; then - eval eval echo DBUS services directory....... : $DBUS_SERVICES_DIR + eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR fi +echo Build with NetworkManager..... : $enable_libnm echo SSL Library/Libraries......... : $msg_ssl echo Build with Cyrus SASL support. : $enable_cyrus_sasl echo Use kerberos 4 with zephyr.... : $kerberos diff -r 3b6ce2116f74 -r fd5e7ac7f2fa libpurple/circbuffer.c --- a/libpurple/circbuffer.c Mon Feb 05 05:38:09 2007 +0000 +++ b/libpurple/circbuffer.c Mon Feb 05 05:49:03 2007 +0000 @@ -122,8 +122,8 @@ buf->bufused += len; } -gsize gaim_circ_buffer_get_max_read(GaimCircBuffer *buf) { - int max_read; +gsize gaim_circ_buffer_get_max_read(const GaimCircBuffer *buf) { + gsize max_read; g_return_val_if_fail(buf != NULL, 0); diff -r 3b6ce2116f74 -r fd5e7ac7f2fa libpurple/circbuffer.h --- a/libpurple/circbuffer.h Mon Feb 05 05:38:09 2007 +0000 +++ b/libpurple/circbuffer.h Mon Feb 05 05:49:03 2007 +0000 @@ -97,7 +97,7 @@ * * @return the number of bytes that can be read from the GaimCircBuffer */ -gsize gaim_circ_buffer_get_max_read(GaimCircBuffer *buf); +gsize gaim_circ_buffer_get_max_read(const GaimCircBuffer *buf); /** * Mark the number of bytes that have been read from the buffer. diff -r 3b6ce2116f74 -r fd5e7ac7f2fa libpurple/whiteboard.c --- a/libpurple/whiteboard.c Mon Feb 05 05:38:09 2007 +0000 +++ b/libpurple/whiteboard.c Mon Feb 05 05:49:03 2007 +0000 @@ -101,9 +101,9 @@ * usernames 'me' and 'who'. Returns a pointer to a matching whiteboard * session; if none match, it returns NULL. */ -GaimWhiteboard *gaim_whiteboard_get_session(GaimAccount *account, const char *who) +GaimWhiteboard *gaim_whiteboard_get_session(const GaimAccount *account, const char *who) { - GaimWhiteboard *wb = NULL; + GaimWhiteboard *wb; GList *l = wbList; @@ -127,7 +127,7 @@ g_list_free(draw_list); } -gboolean gaim_whiteboard_get_dimensions(GaimWhiteboard *wb, int *width, int *height) +gboolean gaim_whiteboard_get_dimensions(const GaimWhiteboard *wb, int *width, int *height) { GaimWhiteboardPrplOps *prpl_ops = wb->prpl_ops; @@ -188,7 +188,7 @@ prpl_ops->set_brush(wb, size, color); } -gboolean gaim_whiteboard_get_brush(GaimWhiteboard *wb, int *size, int *color) +gboolean gaim_whiteboard_get_brush(const GaimWhiteboard *wb, int *size, int *color) { GaimWhiteboardPrplOps *prpl_ops = wb->prpl_ops; diff -r 3b6ce2116f74 -r fd5e7ac7f2fa libpurple/whiteboard.h --- a/libpurple/whiteboard.h Mon Feb 05 05:38:09 2007 +0000 +++ b/libpurple/whiteboard.h Mon Feb 05 05:49:03 2007 +0000 @@ -73,9 +73,9 @@ { void (*start)(GaimWhiteboard *wb); /**< start function */ void (*end)(GaimWhiteboard *wb); /**< end function */ - void (*get_dimensions)(GaimWhiteboard *wb, int *width, int *height); /**< get_dimensions function */ + void (*get_dimensions)(const GaimWhiteboard *wb, int *width, int *height); /**< get_dimensions function */ void (*set_dimensions)(GaimWhiteboard *wb, int width, int height); /**< set_dimensions function */ - void (*get_brush) (GaimWhiteboard *wb, int *size, int *color); /**< get the brush size and color */ + void (*get_brush) (const GaimWhiteboard *wb, int *size, int *color); /**< get the brush size and color */ void (*set_brush) (GaimWhiteboard *wb, int size, int color); /**< set the brush size and color */ void (*send_draw_list)(GaimWhiteboard *wb, GList *draw_list); /**< send_draw_list function */ void (*clear)(GaimWhiteboard *wb); /**< clear function */ @@ -138,7 +138,7 @@ * * @return The whiteboard if found, otherwise @c NULL. */ -GaimWhiteboard *gaim_whiteboard_get_session(GaimAccount *account, const char *who); +GaimWhiteboard *gaim_whiteboard_get_session(const GaimAccount *account, const char *who); /** * Destorys a drawing list for a whiteboard @@ -156,7 +156,7 @@ * * @return TRUE if the values of width and height were set. */ -gboolean gaim_whiteboard_get_dimensions(GaimWhiteboard *wb, int *width, int *height); +gboolean gaim_whiteboard_get_dimensions(const GaimWhiteboard *wb, int *width, int *height); /** * Sets the dimensions for a whiteboard. @@ -231,7 +231,7 @@ * * @return TRUE if the size and color were set. */ -gboolean gaim_whiteboard_get_brush(GaimWhiteboard *wb, int *size, int *color); +gboolean gaim_whiteboard_get_brush(const GaimWhiteboard *wb, int *size, int *color); /** * Sets the size and color of the brush. diff -r 3b6ce2116f74 -r fd5e7ac7f2fa libpurple/xmlnode.c --- a/libpurple/xmlnode.c Mon Feb 05 05:38:09 2007 +0000 +++ b/libpurple/xmlnode.c Mon Feb 05 05:49:03 2007 +0000 @@ -583,7 +583,7 @@ } xmlnode * -xmlnode_copy(xmlnode *src) +xmlnode_copy(const xmlnode *src) { xmlnode *ret; xmlnode *child; diff -r 3b6ce2116f74 -r fd5e7ac7f2fa libpurple/xmlnode.h --- a/libpurple/xmlnode.h Mon Feb 05 05:38:09 2007 +0000 +++ b/libpurple/xmlnode.h Mon Feb 05 05:49:03 2007 +0000 @@ -249,7 +249,7 @@ * * @return A new copy of the src node. */ -xmlnode *xmlnode_copy(xmlnode *src); +xmlnode *xmlnode_copy(const xmlnode *src); /** * Frees a node and all of it's children. diff -r 3b6ce2116f74 -r fd5e7ac7f2fa pidgin/gtkdialogs.c --- a/pidgin/gtkdialogs.c Mon Feb 05 05:38:09 2007 +0000 +++ b/pidgin/gtkdialogs.c Mon Feb 05 05:49:03 2007 +0000 @@ -518,9 +518,9 @@ #ifndef _WIN32 #ifdef HAVE_DBUS - g_string_append_printf(str, " D-BUS: Enabled
"); + g_string_append_printf(str, " D-Bus: Enabled
"); #else - g_string_append_printf(str, " D-BUS: Disabled
"); + g_string_append_printf(str, " D-Bus: Disabled
"); #endif #ifdef HAVE_EVOLUTION_ADDRESSBOOK