Revision 94ea7876f0c62e34dd50c5a0b5abd4e99a2f78b9

markdoliner at pidgin.im markdoliner at pidgin.im
Sat Mar 24 18:55:41 EDT 2007


o     -----------------------------------------------------------------
|\    Revision: 94ea7876f0c62e34dd50c5a0b5abd4e99a2f78b9
| |   Ancestor: a023355644afe1706072f39dcd9311b6bbef8156
| |   Ancestor: bc6e8deb70e39cb5478ca121eb205ba723dffd15
| |   Author: markdoliner at pidgin.im
| |   Date: 2007-03-24T22:55:24
| |   Branch: im.pidgin.pidgin
| |   
| |   Renamed entries:
| |           gaim.spec.in to pidgin.spec.in
| |           libpurple/gaim-client-example.c to libpurple/purple-client-example.c
| |           libpurple/gaim-client.c to libpurple/purple-client.c
| |           libpurple/gaim-notifications-example to libpurple/purple-notifications-example
| |           libpurple/gaim-remote to libpurple/purple-remote
| |           libpurple/gaim-send to libpurple/purple-send
| |           libpurple/gaim-send-async to libpurple/purple-send-async
| |           libpurple/gaim-url-handler to libpurple/purple-url-handler
| |           libpurple/plugins/mono/api/GaimPlugin.cs to libpurple/plugins/mono/api/PurplePlugin.cs
| |           libpurple/plugins/perl/libgaimperl.c to libpurple/plugins/perl/libpurpleperl.c
| |   Added files:
| |           libpurple/purple-uninstalled.pc.in
| |           pidgin/pidgin-uninstalled.pc.in
| |   Modified files:
| |           Makefile.am configure.ac finch/Makefile.am
| |           finch/libgnt/wms/Makefile.am finch/plugins/Makefile.am
| |           finch/plugins/gntclipboard.c gaim.pc.in
| |           libpurple/Makefile.am libpurple/example/Makefile.am
| |           libpurple/gconf/gaim.schemas.in libpurple/network.c
| |           libpurple/plugin.c libpurple/plugins/Makefile.am
| |           libpurple/plugins/mono/BooPlugin.boo
| |           libpurple/plugins/mono/GetBuddyBack.cs
| |           libpurple/plugins/mono/MPlugin.cs
| |           libpurple/plugins/mono/Makefile.am
| |           libpurple/plugins/mono/api/BlistNode.cs
| |           libpurple/plugins/mono/api/Buddy.cs
| |           libpurple/plugins/mono/api/BuddyList.cs
| |           libpurple/plugins/mono/api/Contact.cs
| |           libpurple/plugins/mono/api/Debug.cs
| |           libpurple/plugins/mono/api/Event.cs
| |           libpurple/plugins/mono/api/Group.cs
| |           libpurple/plugins/mono/api/Makefile.am
| |           libpurple/plugins/mono/api/PurplePlugin.cs
| |           libpurple/plugins/mono/api/Signal.cs
| |           libpurple/plugins/mono/api/Status.cs
| |           libpurple/plugins/mono/loader/Makefile.am
| |           libpurple/plugins/mono/loader/mono-helper.c
| |           libpurple/plugins/mono/loader/mono-helper.h
| |           libpurple/plugins/mono/loader/mono.c
| |           libpurple/plugins/perl/Makefile.am
| |           libpurple/plugins/ssl/Makefile.am
| |           libpurple/protocols/bonjour/Makefile.am
| |           libpurple/protocols/gg/Makefile.am
| |           libpurple/protocols/irc/Makefile.am
| |           libpurple/protocols/jabber/Makefile.am
| |           libpurple/protocols/jabber/auth.c
| |           libpurple/protocols/jabber/jabber.c
| |           libpurple/protocols/jabber/jutil.c
| |           libpurple/protocols/jabber/jutil.h
| |           libpurple/protocols/jabber/presence.c
| |           libpurple/protocols/msn/Makefile.am
| |           libpurple/protocols/novell/Makefile.am
| |           libpurple/protocols/oscar/Makefile.am
| |           libpurple/protocols/qq/Makefile.am
| |           libpurple/protocols/sametime/Makefile.am
| |           libpurple/protocols/silc/Makefile.am
| |           libpurple/protocols/simple/Makefile.am
| |           libpurple/protocols/toc/Makefile.am
| |           libpurple/protocols/yahoo/Makefile.am
| |           libpurple/protocols/zephyr/Makefile.am
| |           libpurple/tests/Makefile.am
| |           libpurple/tests/check_libpurple.c
| |           libpurple/tests/test_cipher.c
| |           libpurple/tests/test_jabber_jutil.c
| |           libpurple/tests/test_util.c libpurple/tests/tests.h
| |           pidgin/Makefile.am pidgin/gtkconv.c pidgin/gtkdialogs.c
| |           pidgin/gtkdnd-hints.c pidgin/gtkstatusbox.c
| |           pidgin/pidgin.pc.in pidgin/pixmaps/Makefile.am
| |           pidgin/pixmaps/buddy_icons/qq/Makefile.am
| |           pidgin/pixmaps/emblems/16/scalable/Makefile.am
| |           pidgin/pixmaps/emotes/none/Makefile.am
| |           pidgin/pixmaps/status/default/Makefile.am
| |           pidgin/pixmaps/tray/16/Makefile.am
| |           pidgin/pixmaps/tray/22/Makefile.am
| |           pidgin/plugins/gevolution/Makefile.am
| |           pidgin/plugins/timestamp_format.c pidgin.spec.in
| |           po/POTFILES.in
| |   
| |   ChangeLog: 
| |   
| |   merge of 'a023355644afe1706072f39dcd9311b6bbef8156'
| |        and 'bc6e8deb70e39cb5478ca121eb205ba723dffd15'
| |   
| |   ============================================================
| |   --- libpurple/purple-uninstalled.pc.in	595f2cbfdaa745f8b7b1e9cde59496fc78a52854
| |   +++ libpurple/purple-uninstalled.pc.in	595f2cbfdaa745f8b7b1e9cde59496fc78a52854
| |   @@ -0,0 +1,13 @@
| |   +prefix=@prefix@
| |   +exec_prefix=@exec_prefix@
| |   +libdir=@libdir@
| |   +includedir=@includedir@
| |   +datadir=@datadir@
| |   +sysconfdir=@sysconfdir@
| |   +
| |   +Name: libpurple
| |   +Description: libpurple is a GLib-based instant messenger library.
| |   +Version: @VERSION@
| |   +Requires: glib-2.0
| |   +Cflags: -I${pc_top_builddir}/${pcfiledir}
| |   +Libs: ${pc_top_builddir}/${pcfiledir}/libpurple.la
| |   ============================================================
| |   --- pidgin/pidgin-uninstalled.pc.in	ffad534ae7866abe2ff0c949a9dc5a641e1e9302
| |   +++ pidgin/pidgin-uninstalled.pc.in	ffad534ae7866abe2ff0c949a9dc5a641e1e9302
| |   @@ -0,0 +1,12 @@
| |   +prefix=@prefix@
| |   +exec_prefix=@exec_prefix@
| |   +libdir=@libdir@
| |   +includedir=@includedir@
| |   +datadir=@datadir@
| |   +sysconfdir=@sysconfdir@
| |   +
| |   +Name: Pidgin
| |   +Description: Pidgin is a GTK2-based instant messenger application.
| |   +Version: @VERSION@
| |   +Requires: gtk+-2.0 purple
| |   +Cflags: -I${pc_top_builddir}/${pcfiledir}
| |   ============================================================
| |   --- Makefile.am	dcfdd8ff9df9971e9aa128ebee4374e8951a953e
| |   +++ Makefile.am	40dc54e02a0a41b8d9199dba80cce6099ae2869d
| |   @@ -11,10 +11,11 @@ EXTRA_DIST = \
| |    		README.dbus \
| |    		README.mingw \
| |    		gaim.pc.in \
| |   -		gaim.spec.in \
| |   +		gaim-uninstalled.pc.in \
| |    		gaim.apspec.in \
| |   -		pidgin.desktop.in \
| |    		gaim.service.in \
| |   +		pidgin.spec.in \
| |   +		pidgin.desktop.in \
| |    		intltool-extract.in \
| |    		intltool-merge.in \
| |    		intltool-update.in \
| |   @@ -23,19 +24,16 @@ noinst_HEADERS = config.h
| |    
| |    noinst_HEADERS = config.h
| |    
| |   -pkgconfigdir = $(libdir)/pkgconfig
| |   -pkgconfig_DATA = gaim.pc
| |   -
| |    if ENABLE_DBUS
| |    dbus_servicedir=$(DBUS_SERVICES_DIR)
| |    dbus_service_DATA=gaim.service
| |    endif
| |    
| |   -dist-hook: gaim.spec
| |   -	cp gaim.spec $(distdir)
| |   +dist-hook: pidgin.spec
| |   +	cp pidgin.spec $(distdir)
| |    	rm $(distdir)/config.h
| |    
| |   -distcheck-hook: libpurple/plugins/perl/common/Gaim.pm gtk/plugins/perl/common/GtkUI.pm
| |   +distcheck-hook: libpurple/plugins/perl/common/Purple.pm pidgin/plugins/perl/common/GtkUI.pm
| |    #	cp libpurple/plugins/perl/common/Gaim.pm $(distdir)/libpurple/plugins/perl/common
| |    
| |    appsdir = $(datadir)/applications
| |   @@ -66,7 +64,7 @@ distuninstallcheck_listfiles = \
| |    # breaks "make distcheck" unless we ignore perl things
| |    
| |    distuninstallcheck_listfiles = \
| |   -	find . -type f -print | grep -v perl | grep -v Gaim.3pm
| |   +	find . -type f -print | grep -v perl | grep -v Purple.3pm
| |    
| |    DISTCLEANFILES= pidgin.desktop libpurple/gconf/gaim.schemas intltool-extract \
| |    			intltool-merge intltool-update
| |   ============================================================
| |   --- configure.ac	1bb16232ab29837ef354c8bb308f9af0ef73e0c5
| |   +++ configure.ac	c517e4b2580e69d4a47001ecb44a83d1cb61f25f
| |   @@ -1,5 +1,5 @@ dnl Process this file with autoconf to p
| |    dnl Process this file with autoconf to produce a configure script.
| |   -AC_INIT([pidgin], [2.0.0beta7devel], [gaim-devel at lists.sourceforge.net])
| |   +AC_INIT([pidgin], [2.0.0beta7devel], [devel at pidgin.im])
| |    AC_CANONICAL_SYSTEM
| |    AM_CONFIG_HEADER(config.h)
| |    AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
| |   @@ -700,14 +700,14 @@ for i in $STATIC_PRPLS ; do
| |    extern_init=
| |    load_proto=
| |    for i in $STATIC_PRPLS ; do
| |   -	dnl Ugly special case for "libsilcgaim.a":
| |   +	dnl Ugly special case for "libsilcpurple.a":
| |    	if test "x$i" = "xsilc"; then
| |   -		STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib${i}gaim.a"
| |   +		STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib${i}purple.a"
| |    	else
| |    		STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a"
| |    	fi
| |   -	extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();"
| |   -	load_proto="$load_proto gaim_init_${i}_plugin();"
| |   +	extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
| |   +	load_proto="$load_proto purple_init_${i}_plugin();"
| |    	case $i in
| |    		bonjour)	static_bonjour=yes ;;
| |    		gg)			static_gg=yes ;;
| |   @@ -935,7 +935,7 @@ dnl Python is only required if --enable-
| |    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.
| |   +dnl the build process to generate the code, not for running pidgin.
| |    dnl This autogenerated code is system-independent, so in principle we
| |    dnl can generate all of it before shipping.  But I thought adding
| |    dnl auto-generated stuff to the repository is inelegant.
| |   @@ -1145,7 +1145,7 @@ if test "$enable_perl" = yes ; then
| |    
| |    		AC_ARG_WITH(perl-lib,
| |    		[AC_HELP_STRING([--with-perl-lib=[site|vendor|DIR]],
| |   -			[specify where to install the Perl libraries for gaim. Default is site.])],
| |   +			[specify where to install the Perl libraries for pidgin. Default is site.])],
| |    		[
| |    			if test "x$withval" = xsite; then
| |    				PERL_MM_PARAMS=""
| |   @@ -1890,7 +1890,7 @@ if test "x$enable_fatal_asserts" = "xyes
| |    AC_ARG_ENABLE(fatal-asserts, [AC_HELP_STRING([--enable-fatal-asserts],
| |    	[make assertions fatal (useful for debugging)])], , enable_fatal_asserts=no)
| |    if test "x$enable_fatal_asserts" = "xyes" ; then
| |   -	AC_DEFINE(GAIM_FATAL_ASSERTS, 1, [Define to make assertions fatal (useful for debugging).])
| |   +	AC_DEFINE(PURPLE_FATAL_ASSERTS, 1, [Define to make assertions fatal (useful for debugging).])
| |    fi
| |    
| |    AC_OUTPUT([Makefile
| |   @@ -1903,12 +1903,13 @@ AC_OUTPUT([Makefile
| |    		   m4macros/Makefile
| |    		   pidgin/Makefile
| |    		   pidgin/pidgin.pc
| |   +		   pidgin/pidgin-uninstalled.pc
| |    		   pidgin/pixmaps/Makefile
| |    		   pidgin/pixmaps/animations/Makefile
| |    		   pidgin/pixmaps/animations/16/Makefile
| |    		   pidgin/pixmaps/buddy_icons/Makefile
| |    		   pidgin/pixmaps/buddy_icons/qq/Makefile
| |   - 		   pidgin/pixmaps/dialogs/Makefile
| |   +		   pidgin/pixmaps/dialogs/Makefile
| |    		   pidgin/pixmaps/dialogs/16/Makefile
| |    		   pidgin/pixmaps/dialogs/16/scalable/Makefile
| |    		   pidgin/pixmaps/dialogs/64/Makefile
| |   @@ -1919,7 +1920,7 @@ AC_OUTPUT([Makefile
| |    		   pidgin/pixmaps/emotes/Makefile
| |    		   pidgin/pixmaps/emotes/default/Makefile
| |    		   pidgin/pixmaps/emotes/default/22/Makefile
| |   -		   pidgin/pixmaps/emotes/default/22/scalable/Makefile	
| |   +		   pidgin/pixmaps/emotes/default/22/scalable/Makefile
| |    		   pidgin/pixmaps/emotes/none/Makefile
| |    		   pidgin/pixmaps/protocols/Makefile
| |    		   pidgin/pixmaps/protocols/16/Makefile
| |   @@ -1958,6 +1959,7 @@ AC_OUTPUT([Makefile
| |    		   libpurple/example/Makefile
| |    		   libpurple/gconf/Makefile
| |    		   libpurple/purple.pc
| |   +		   libpurple/purple-uninstalled.pc
| |    		   libpurple/plugins/Makefile
| |    		   libpurple/plugins/mono/Makefile
| |    		   libpurple/plugins/mono/api/Makefile
| |   @@ -1989,9 +1991,7 @@ AC_OUTPUT([Makefile
| |    		   finch/libgnt/wms/Makefile
| |    		   finch/plugins/Makefile
| |    		   po/Makefile.in
| |   -		   gaim.pc
| |   -		   gaim-uninstalled.pc
| |   -		   gaim.spec
| |   +		   pidgin.spec
| |    		  ])
| |    
| |    echo
| |   @@ -2030,7 +2030,7 @@ echo
| |    echo Print debugging messages...... : $enable_debug
| |    echo Assertions are fatal.......... : $enable_fatal_asserts
| |    echo
| |   -eval eval echo Gaim will be installed in $bindir.
| |   +eval eval echo Pidgin will be installed in $bindir.
| |    if test "x$gaimpath" != "x" ; then
| |    	echo Warning: You have an old copy of gaim at $gaimpath.
| |    fi
| |   ============================================================
| |   --- finch/Makefile.am	843d42c8d5b9c17f699d72f9b0d7f8a29fca8bf7
| |   +++ finch/Makefile.am	85b211d0b89ae06d3510c44f881177aa9b313472
| |   @@ -43,7 +43,7 @@ finch_headers = \
| |    	gntstatus.h \
| |    	gntui.h
| |    
| |   -finchincludedir=$(includedir)/gaim/gnt
| |   +finchincludedir=$(includedir)/finch
| |    finchinclude_HEADERS = \
| |    	$(finch_headers)
| |    
| |   @@ -63,7 +63,7 @@ AM_CPPFLAGS = \
| |    	-DSTANDALONE \
| |    	-DBR_PTHREADS=0 \
| |    	-DDATADIR=\"$(datadir)\" \
| |   -	-DLIBDIR=\"$(libdir)/gaim/\" \
| |   +	-DLIBDIR=\"$(libdir)/finch/\" \
| |    	-DLOCALEDIR=\"$(datadir)/locale\" \
| |    	-DSYSCONFDIR=\"$(sysconfdir)\" \
| |    	-I$(top_srcdir)/libpurple/ \
| |   ============================================================
| |   --- finch/libgnt/wms/Makefile.am	7d301bfd8608f137a649dd9e370901ec49efeb80
| |   +++ finch/libgnt/wms/Makefile.am	5bd9331081ba2ec84475d4e2ce5cc139cc711fca
| |   @@ -1,9 +1,9 @@ plugin_LTLIBRARIES = \
| |    s_la_LDFLAGS             = -module -avoid-version
| |    
| |    plugin_LTLIBRARIES = \
| |    	s.la
| |    
| |   -plugindir = $(libdir)/gaim
| |   +plugindir = $(libdir)/finch
| |    
| |    s_la_SOURCES = s.c
| |    s_la_LIBADD =  \
| |   ============================================================
| |   --- finch/plugins/Makefile.am	bc8b3fe67a304bb936e177531482506ec7206193
| |   +++ finch/plugins/Makefile.am	788afb20a009ed2aa912ff2b4bcfc3ab38c6c3e0
| |   @@ -1,3 +1,4 @@
| |   +gntclipboard_la_LDFLAGS = -module -avoid-version
| |    gntgf_la_LDFLAGS      = -module -avoid-version
| |    gnthistory_la_LDFLAGS = -module -avoid-version
| |    gntlastlog_la_LDFLAGS    = -module -avoid-version
| |   @@ -5,18 +6,21 @@ plugin_LTLIBRARIES = \
| |    if PLUGINS
| |    
| |    plugin_LTLIBRARIES = \
| |   +	gntclipboard.la \
| |    	gntgf.la \
| |    	gnthistory.la \
| |    	gntlastlog.la
| |    
| |   -plugindir = $(libdir)/gaim
| |   +plugindir = $(libdir)/finch
| |    
| |   +gntclipboard_la_SOURCES = gntclipboard.c
| |    gntgf_la_SOURCES      = gntgf.c
| |    gnthistory_la_SOURCES = gnthistory.c
| |    gntlastlog_la_SOURCES = lastlog.c
| |    
| |    gntgf_la_CFLAGS = $(X11_CFLAGS)
| |    
| |   +gntclipboard_la_LIBADD = $(GLIB_LIBS)
| |    gntgf_la_LIBADD       = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
| |    gnthistory_la_LIBADD  = $(GLIB_LIBS)
| |    gntlastlog_la_LIBADD  = $(GLIB_LIBS)
| |   ============================================================
| |   --- finch/plugins/gntclipboard.c	b608256e1a88532cd9f10b04b16514bec0212487
| |   +++ finch/plugins/gntclipboard.c	ca6133b58589fc324e0dd4c8b09f142e1ba27bdf
| |   @@ -110,10 +110,12 @@ plugin_load(PurplePlugin *plugin)
| |    static gboolean
| |    plugin_load(PurplePlugin *plugin)
| |    {
| |   +#ifdef HAVE_X11
| |    	if (!XOpenDisplay(NULL)) {
| |    		purple_debug_warning("gntclipboard", "Couldn't find X display\n");
| |    		return FALSE;
| |    	}
| |   +#endif
| |    	if (!getenv("WINDOWID")) {
| |    		purple_debug_warning("gntclipboard", "Couldn't find window\n");
| |    		return FALSE;
| |   ============================================================
| |   --- gaim.pc.in	5cb4d5e1c89aed9477ff6a43736596c95752e323
| |   +++ gaim.pc.in	19a2bd994cb9c023f429e857f520dc46e61cd497
| |   @@ -5,10 +5,10 @@ sysconfdir=@sysconfdir@
| |    datarootdir=@datarootdir@
| |    datadir=@datadir@
| |    sysconfdir=@sysconfdir@
| |   - 
| |   +
| |    Name: Gaim
| |    Description: Gaim is a GTK2-based instant messenger application.
| |    Version: @VERSION@
| |    Requires: glib-2.0
| |   +Cflags: -I${includedir}/libpurple
| |   +Libs: -L${libdir} -lpurple
| |   -Cflags: -I${includedir}/gaim
| |   -Libs: -L${libdir} -lgaim
| |   ============================================================
| |   --- libpurple/Makefile.am	0a3dc5a09799557d8c71d6c83e9b2a404d304542
| |   +++ libpurple/Makefile.am	02143704a0dd9f1a16d987b4c722b762c2fb58e6
| |   @@ -1,12 +1,13 @@ EXTRA_DIST = \
| |    EXTRA_DIST = \
| |    		dbus-analyze-functions.py \
| |    		dbus-analyze-types.py \
| |   -		gaim-notifications-example \
| |   -		gaim-remote \
| |   -		gaim-send \
| |   -		gaim-send-async \
| |   -		gaim-url-handler \
| |   +		purple-notifications-example \
| |   +		purple-remote \
| |   +		purple-send \
| |   +		purple-send-async \
| |   +		purple-url-handler \
| |    		purple.pc.in \
| |   +		purple-uninstalled.pc.in \
| |    		Makefile.mingw \
| |    		win32/global.mak \
| |    		win32/libc_interface.c \
| |   @@ -15,7 +16,7 @@ EXTRA_DIST = \
| |    		win32/libpurplerc.rc.in \
| |    		win32/rules.mak \
| |    		win32/targets.mak \
| |   -		win32/wgaimerror.h \
| |   +		win32/wpurpleerror.h \
| |    		win32/win32dep.c \
| |    		win32/giowin32.c \
| |    		win32/win32dep.h
| |   @@ -29,7 +30,7 @@ SUBDIRS = $(GCONF_DIR) plugins protocols
| |    
| |    SUBDIRS = $(GCONF_DIR) plugins protocols tests . example
| |    
| |   -gaim_coresources = \
| |   +purple_coresources = \
| |    	account.c \
| |    	accountopt.c \
| |    	blist.c \
| |   @@ -77,7 +78,7 @@ gaim_coresources = \
| |    	xmlnode.c \
| |    	whiteboard.c
| |    
| |   -gaim_coreheaders = \
| |   +purple_coreheaders = \
| |    	account.h \
| |    	accountopt.h \
| |    	blist.h \
| |   @@ -137,9 +138,9 @@ CLEANFILES = \
| |    	dbus-types.h \
| |    	purple-client-bindings.c \
| |    	purple-client-bindings.h \
| |   -	gaim.service
| |   +	purple.service
| |    
| |   -# gaim dbus server
| |   +# purple dbus server
| |    
| |    dbus_sources  = dbus-server.c dbus-useful.c
| |    dbus_headers  = dbus-bindings.h dbus-purple.h dbus-server.h dbus-useful.h dbus-define-api.h
| |   @@ -148,64 +149,64 @@ dbus_exported = dbus-useful.h dbus-defin
| |                    connection.h conversation.h core.h log.h prefs.h roomlist.h \
| |                    savedstatuses.h status.h server.h xmlnode.h
| |    
| |   -gaim_build_coreheaders = $(addprefix $(srcdir)/, $(gaim_coreheaders))
| |   +purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders))
| |    dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
| |    
| |   -dbus-types.c: dbus-analyze-types.py $(gaim_coreheaders)
| |   -	cat $(gaim_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@
| |   +dbus-types.c: dbus-analyze-types.py $(purple_coreheaders)
| |   +	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@
| |    
| |    dbus-types.h: dbus-analyze-types.py $(dbus_coreheaders)
| |   -	cat $(gaim_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@
| |   +	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@
| |    
| |    dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported)
| |    	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@
| |    
| |    dbus-server.$(OBJEXT): dbus-bindings.c dbus-types.c dbus-types.h
| |    dbus-server.lo: dbus-bindings.c dbus-types.c dbus-types.h
| |   -$(libgaim_la_OBJECTS): dbus-types.h
| |   +$(libpurple_la_OBJECTS): dbus-types.h
| |    
| |   -# libgaim-client
| |   +# libpurple-client
| |    
| |   -libgaim_client_lib = libgaim-client.la
| |   +libpurple_client_lib = libpurple-client.la
| |    
| |   -libgaim_client_la_SOURCES = gaim-client.c gaim-client.h
| |   +libpurple_client_la_SOURCES = purple-client.c purple-client.h
| |    
| |   -libgaim_client_la_LIBADD = $(DBUS_LIBS)
| |   +libpurple_client_la_LIBADD = $(DBUS_LIBS)
| |    
| |    purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
| |    	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
| |    
| |   -purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(gaim_coreheaders) $(dbus_exported)
| |   -	cat $(gaim_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
| |   +purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(dbus_exported)
| |   +	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
| |    	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
| |    
| |   -$(libgaim_client_la_OBJECTS): purple-client-bindings.h purple-client-bindings.c
| |   +$(libpurple_client_la_OBJECTS): purple-client-bindings.h purple-client-bindings.c
| |    
| |   -# gaim-client-example
| |   +# purple-client-example
| |    
| |   -gaim_client_example_SOURCES = gaim-client-example.c
| |   +purple_client_example_SOURCES = purple-client-example.c
| |    
| |   -gaim_client_example_DEPENDENCIES = libgaim-client.la
| |   +purple_client_example_DEPENDENCIES = libpurple-client.la
| |    
| |   -gaim_client_example_LDADD = \
| |   -	libgaim-client.la \
| |   +purple_client_example_LDADD = \
| |   +	libpurple-client.la \
| |    	$(GLIB_LIBS) \
| |    	$(DBUS_LIBS)
| |    
| |   -bin_PROGRAMS = gaim-client-example
| |   +bin_PROGRAMS = purple-client-example
| |    
| |   -gaim-client-example.$(OBJEXT): purple-client-bindings.h
| |   +purple-client-example.$(OBJEXT): purple-client-bindings.h
| |    
| |    # scripts
| |    
| |   -bin_SCRIPTS = gaim-remote gaim-send gaim-send-async gaim-url-handler
| |   +bin_SCRIPTS = purple-remote purple-send purple-send-async purple-url-handler
| |    
| |    endif
| |    
| |   -lib_LTLIBRARIES = libpurple.la $(libgaim_client_lib)
| |   +lib_LTLIBRARIES = libpurple.la $(libpurple_client_lib)
| |    
| |    libpurple_la_SOURCES = \
| |   -	$(gaim_coresources) \
| |   +	$(purple_coresources) \
| |    	$(dbus_sources)
| |    
| |    noinst_HEADERS= \
| |   @@ -214,7 +215,7 @@ libpurpleinclude_HEADERS = \
| |    
| |    libpurpleincludedir=$(includedir)/libpurple
| |    libpurpleinclude_HEADERS = \
| |   -	$(gaim_coreheaders) \
| |   +	$(purple_coreheaders) \
| |    	$(dbus_headers)
| |    
| |    libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
| |   ============================================================
| |   --- libpurple/example/Makefile.am	4d9c3f2a1bc0765a68b5b81fe902109c8c831668
| |   +++ libpurple/example/Makefile.am	80a85834888c57c083744e66fb3b6209f071840a
| |   @@ -1,7 +1,7 @@ bin_PROGRAMS = nullclient
| |    bin_PROGRAMS = nullclient
| |    
| |   -nullclient_SOURCES = nullclient.c
| |   -nullclient_DEPENDENCIES = 
| |   +nullclient_SOURCES = defines.h nullclient.c
| |   +nullclient_DEPENDENCIES =
| |    nullclient_LDFLAGS = -export-dynamic
| |    nullclient_LDADD = \
| |    	$(DBUS_LIBS) \
| |   ============================================================
| |   --- libpurple/gconf/gaim.schemas.in	d281cfd08dddda91573f441141732fd0e0a8aad4
| |   +++ libpurple/gconf/gaim.schemas.in	5b66f70b01aa1b1c968ce2c32b8cdd5a5aedab60
| |   @@ -17,7 +17,7 @@
| |          <applyto>/desktop/gnome/url-handlers/aim/command</applyto>
| |          <owner>gaim</owner>
| |          <type>string</type>
| |   -      <default>gaim-url-handler "%s"</default>
| |   +      <default>pidgin-url-handler "%s"</default>
| |          <locale name="C">
| |            <short>The handler for "aim" URLs</short>
| |            <long>The command used to handle "aim" URLs, if enabled.</long>
| |   @@ -51,7 +51,7 @@
| |          <applyto>/desktop/gnome/url-handlers/gg/command</applyto>
| |          <owner>gaim</owner>
| |          <type>string</type>
| |   -      <default>gaim-url-handler "%s"</default>
| |   +      <default>pidgin-url-handler "%s"</default>
| |          <locale name="C">
| |            <short>The handler for "gg" URLs</short>
| |            <long>The command used to handle "gg" URLs, if enabled.</long>
| |   @@ -85,7 +85,7 @@
| |          <applyto>/desktop/gnome/url-handlers/icq/command</applyto>
| |          <owner>gaim</owner>
| |          <type>string</type>
| |   -      <default>gaim-url-handler "%s"</default>
| |   +      <default>pidgin-url-handler "%s"</default>
| |          <locale name="C">
| |            <short>The handler for "icq" URLs</short>
| |            <long>The command used to handle "icq" URLs, if enabled.</long>
| |   @@ -119,7 +119,7 @@
| |          <applyto>/desktop/gnome/url-handlers/irc/command</applyto>
| |          <owner>gaim</owner>
| |          <type>string</type>
| |   -      <default>gaim-url-handler "%s"</default>
| |   +      <default>pidgin-url-handler "%s"</default>
| |          <locale name="C">
| |            <short>The handler for "irc" URLs</short>
| |            <long>The command used to handle "irc" URLs, if enabled.</long>
| |   @@ -153,7 +153,7 @@
| |          <applyto>/desktop/gnome/url-handlers/msnim/command</applyto>
| |          <owner>gaim</owner>
| |          <type>string</type>
| |   -      <default>gaim-url-handler "%s"</default>
| |   +      <default>pidgin-url-handler "%s"</default>
| |          <locale name="C">
| |            <short>The handler for "msnim" URLs</short>
| |            <long>The command used to handle "msnim" URLs, if enabled.</long>
| |   @@ -187,7 +187,7 @@
| |          <applyto>/desktop/gnome/url-handlers/sip/command</applyto>
| |          <owner>gaim</owner>
| |          <type>string</type>
| |   -      <default>gaim-url-handler "%s"</default>
| |   +      <default>pidgin-url-handler "%s"</default>
| |          <locale name="C">
| |            <short>The handler for "sip" URLs</short>
| |            <long>The command used to handle "sip" URLs, if enabled.</long>
| |   @@ -221,7 +221,7 @@
| |          <applyto>/desktop/gnome/url-handlers/xmpp/command</applyto>
| |          <owner>gaim</owner>
| |          <type>string</type>
| |   -      <default>gaim-url-handler "%s"</default>
| |   +      <default>pidgin-url-handler "%s"</default>
| |          <locale name="C">
| |            <short>The handler for "xmpp" URLs</short>
| |            <long>The command used to handle "xmpp" URLs, if enabled.</long>
| |   @@ -255,7 +255,7 @@
| |          <applyto>/desktop/gnome/url-handlers/ymsgr/command</applyto>
| |          <owner>gaim</owner>
| |          <type>string</type>
| |   -      <default>gaim-url-handler "%s"</default>
| |   +      <default>pidgin-url-handler "%s"</default>
| |          <locale name="C">
| |            <short>The handler for "ymsgr" URLs</short>
| |            <long>The command used to handle "ymsgr" URLs, if enabled.</long>
| |   ============================================================
| |   --- libpurple/network.c	f4abab72cf68a07f04246d6c244420ca5ab42363
| |   +++ libpurple/network.c	22f861524940bdc880af8206d89ca394c3875e94
| |   @@ -250,6 +250,7 @@ purple_network_set_upnp_port_mapping_cb(
| |    	purple_network_listen_cancel(listen_data);
| |    }
| |    
| |   +#ifdef ENABLE_NAT_PMP
| |    static gboolean
| |    purple_network_finish_pmp_map_cb(gpointer data)
| |    {
| |   @@ -264,6 +265,7 @@ purple_network_finish_pmp_map_cb(gpointe
| |    
| |    	return FALSE;
| |    }
| |   +#endif
| |    
| |    static PurpleNetworkListenData *
| |    purple_network_do_listen(unsigned short port, int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data)
| |   ============================================================
| |   --- libpurple/plugin.c	9f84f09151f44c6d86857ef6331b3b7a57d3f1ab
| |   +++ libpurple/plugin.c	1b7e9f2899a3ea1e04a695b9058a393008d44e55
| |   @@ -369,6 +369,20 @@ purple_plugin_probe(const char *filename
| |    		return plugin;
| |    	}
| |    
| |   +	/* 
| |   + 	 * Check to make sure a plugin has defined an id.
| |   + 	 * Not having this check caused purple_plugin_unload to
| |   + 	 * enter an infinite loop in certain situations by passing
| |   + 	 * purple_find_plugin_by_id a NULL value. -- ecoffey
| |   + 	 */
| |   +	if (!plugin->info->id || !strcmp(plugin->info->id, ""))
| |   +	{
| |   +		plugin->error = g_strdup_printf(_("This plugin has not defined an ID."));
| |   +		purple_debug_error("plugins", "%s is not loadable: info->id is not defined.\n", plugin->path);
| |   +		plugin->unloadable = TRUE;
| |   +		return plugin;
| |   +	}
| |   +
| |    	/* Really old plugins. */
| |    	if (plugin->info->magic != PURPLE_PLUGIN_MAGIC)
| |    	{
| |   ============================================================
| |   --- libpurple/plugins/Makefile.am	8f2c8fa3826c7c8e797405d1fb4d137b4414b29c
| |   +++ libpurple/plugins/Makefile.am	caef9c7cd63380dc8b0ee7ee689976f835cae498
| |   @@ -100,6 +100,7 @@ EXTRA_DIST = \
| |    
| |    EXTRA_DIST = \
| |    	Makefile.mingw \
| |   +	ciphertest.c \
| |    	dbus-buddyicons-example.py \
| |    	filectl.c \
| |    	fortuneprofile.pl \
| |   ============================================================
| |   --- libpurple/plugins/mono/BooPlugin.boo	2cd05cbe7cccf93bd02b9a85629f4633debe4eb5
| |   +++ libpurple/plugins/mono/BooPlugin.boo	187836a5cb987b286f09b146d633005d55b564c7
| |   @@ -1,6 +1,6 @@
| |   -import Gaim
| |   +import Purple
| |    
| |   -class BooPlugin(GaimPlugin):
| |   +class BooPlugin(PurplePlugin):
| |    
| |    	def handle(*args as (object)):
| |    		b as Buddy
| |   @@ -18,5 +18,5 @@ class BooPlugin(GaimPlugin):
| |    		Debug.debug(Debug.INFO, "booplugin", "destroying...\n")
| |    		
| |    	override def Info():
| |   -		return GaimPluginInfo("Boo Plugin", "0.1", "Test Boo Plugin", "Longer Description", "Eoin Coffey", "urled")
| |   +		return PurplePluginInfo("mono-boo", "Boo Plugin", "0.1", "Test Boo Plugin", "Longer Description", "Eoin Coffey", "urled")
| |    		
| |   ============================================================
| |   --- libpurple/plugins/mono/GetBuddyBack.cs	d124c41fa7e1a51a8754651f913ea0f677512fa5
| |   +++ libpurple/plugins/mono/GetBuddyBack.cs	a01c7aea5566c539534a2d44f1a9c3878358cdbd
| |   @@ -1,8 +1,8 @@
| |   -using Gaim;
| |   +using Purple;
| |    
| |    public class GetBuddyBack : Plugin
| |    {
| |   -	private static PluginInfo info = new PluginInfo("C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled");
| |   +	private static PluginInfo info = new PluginInfo("mono-buddyback", "C# Get Buddy Back", "0.1", "Prints when a Buddy returns", "Longer Description", "Eoin Coffey", "urled");
| |    
| |    	public GetBuddyBack()
| |    		: base (info)
| |   @@ -21,7 +21,7 @@ public class GetBuddyBack : Plugin
| |    		Debug.debug(Debug.INFO, "buddyback", "loading...\n");
| |    		
| |    		/*Signal.connect(BuddyList.GetHandle(), this, "buddy-back", new Signal.Handler(HandleSig));*/
| |   -		/*BuddyList.OnBuddyBack.connect(this, new Signal.Handler(HandleSig));*/
| |   +		BuddyList.OnBuddyStatusChanged.connect(this, new Signal.Handler(HandleSig));
| |    	}
| |    	
| |    	public override void Unload()
| |   ============================================================
| |   --- libpurple/plugins/mono/MPlugin.cs	a48c40cb0a0203dfa10e694c82daf42b7b9fad35
| |   +++ libpurple/plugins/mono/MPlugin.cs	63d7a55ee4927cbaa17d0447907e735b7d43e8d1
| |   @@ -1,8 +1,8 @@
| |   -using Gaim;
| |   +using Purple;
| |    
| |    public class MPlugin : Plugin
| |    {
| |   -	private static PluginInfo info = new PluginInfo("C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled");
| |   +	private static PluginInfo info = new PluginInfo("mono-mplugin", "C# Plugin", "0.1", "Test C# Plugin", "Longer Description", "Eoin Coffey", "urled");
| |    
| |    	public MPlugin()
| |    		: base(info)
| |   ============================================================
| |   --- libpurple/plugins/mono/Makefile.am	bf2dfa253cebc50dcb3461a7ad3eda11b12322e9
| |   +++ libpurple/plugins/mono/Makefile.am	c3f7ead4dd5dd1d25d6b9d4231ec1b694f4c25fb
| |   @@ -12,8 +12,8 @@ SUFFIXES = .cs .dll
| |    all: $(mono_SCRIPTS)
| |    
| |    SUFFIXES = .cs .dll
| |   -.cs.dll: api/GaimAPI.dll $(mono_build_sources)
| |   -	mcs -t:library -lib:./api -out:$@ -r:GaimAPI.dll $<
| |   +.cs.dll: api/PurpleAPI.dll $(mono_build_sources)
| |   +	mcs -t:library -lib:./api -out:$@ -r:PurpleAPI.dll $<
| |    
| |    clean-local:
| |    	rm -f $(mono_SCRIPTS)
| |   ============================================================
| |   --- libpurple/plugins/mono/api/BlistNode.cs	666f83ea369976af6fda2ea6fb5192298b2daf23
| |   +++ libpurple/plugins/mono/api/BlistNode.cs	e5dc6848f41f609e45f500795b96d728faf237c2
| |   @@ -1,4 +1,4 @@
| |   -namespace Gaim {
| |   +namespace Purple {
| |    	public abstract class BlistNode {
| |    	}
| |    }
| |   ============================================================
| |   --- libpurple/plugins/mono/api/Buddy.cs	fd55af884a2be7a28b54c7b96f5359af46c87124
| |   +++ libpurple/plugins/mono/api/Buddy.cs	30d746b2181e6f950ab8fa81d3d2b96cd4844957
| |   @@ -1,4 +1,4 @@
| |   -namespace Gaim {
| |   +namespace Purple {
| |    	public class Buddy : BlistNode {
| |    		private string name;
| |    		private string alias;
| |   ============================================================
| |   --- libpurple/plugins/mono/api/BuddyList.cs	15c0a4af247d84925c023c22223efc7263914b02
| |   +++ libpurple/plugins/mono/api/BuddyList.cs	b63861dc4b86004ef4ba8d64e9ab04aa3433a960
| |   @@ -1,4 +1,4 @@
| |   -namespace Gaim {
| |   +namespace Purple {
| |    	using System;
| |    	using System.Runtime.CompilerServices;
| |    
| |   ============================================================
| |   --- libpurple/plugins/mono/api/Contact.cs	eb714be9ed260bd62f6c6cefd0c85fd5ebd912d0
| |   +++ libpurple/plugins/mono/api/Contact.cs	aa9e615c770f51341e966be0a1856c647ca2f6c6
| |   @@ -1,4 +1,4 @@
| |   -namespace Gaim {
| |   +namespace Purple {
| |    	public class Contact : BlistNode {
| |    	}
| |    }
| |   ============================================================
| |   --- libpurple/plugins/mono/api/Debug.cs	5d4c381030c9e35d8462cfbb88c75f636db95f8b
| |   +++ libpurple/plugins/mono/api/Debug.cs	7cfebe4b5a34d67af69c1800147a723f85759bb0
| |   @@ -1,7 +1,7 @@ using System.Runtime.CompilerServices;
| |    using System;
| |    using System.Runtime.CompilerServices;
| |    
| |   -namespace Gaim
| |   +namespace Purple
| |    {
| |    	public class Debug
| |    	{
| |   ============================================================
| |   --- libpurple/plugins/mono/api/Event.cs	69a53a98ae88aa2f5e3bf7ada1befee82095ab78
| |   +++ libpurple/plugins/mono/api/Event.cs	efee4dc74eceeb89b079fea4365ef8e158ac4f31
| |   @@ -1,6 +1,6 @@ using System;
| |    using System;
| |    
| |   -namespace Gaim
| |   +namespace Purple
| |    {
| |    	public class Event
| |    	{
| |   ============================================================
| |   --- libpurple/plugins/mono/api/Group.cs	71c5bb691c922633e07552f944fe2be023926c25
| |   +++ libpurple/plugins/mono/api/Group.cs	0b00a0537860ea40c161d1dbd6183ffdf9847c6f
| |   @@ -1,4 +1,4 @@
| |   -namespace Gaim {
| |   +namespace Purple {
| |    	public class Group : BlistNode {
| |    	}
| |    }
| |   ============================================================
| |   --- libpurple/plugins/mono/api/Makefile.am	b1e1c150e28dca5fd6d7561c61f264bb89d2771c
| |   +++ libpurple/plugins/mono/api/Makefile.am	8cba0799eeee3f816a9e7010b4d8ad97fcf0e581
| |   @@ -1,4 +1,5 @@
| |   -monodir=$(libdir)/gaim
| |   +monodir=$(libdir)/purple
| |   +
| |    mono_sources = \
| |    	BlistNode.cs \
| |    	BuddyList.cs \
| |   @@ -6,14 +7,14 @@ mono_sources = \
| |    	Contact.cs \
| |    	Debug.cs \
| |    	Event.cs \
| |   -	GaimPlugin.cs \
| |   +	PurplePlugin.cs \
| |    	Group.cs \
| |    	Signal.cs \
| |    	Status.cs
| |    
| |    EXTRA_DIST = $(mono_sources)
| |    
| |   -mono_SCRIPTS = GaimAPI.dll
| |   +mono_SCRIPTS = PurpleAPI.dll
| |    
| |    mono_build_sources = $(addprefix $(srcdir)/, $(mono_sources))
| |    
| |   ============================================================
| |   --- libpurple/plugins/mono/api/GaimPlugin.cs	ec61fd34227459d37206004fe0a5aff8dab8926d
| |   +++ libpurple/plugins/mono/api/PurplePlugin.cs	637efd4a0a51c70a624d6fa6667b219f4cc68709
| |   @@ -1,5 +1,6 @@
| |   -namespace Gaim {
| |   +namespace Purple {
| |    	public class PluginInfo {
| |   +		private string id;
| |    		private string name;
| |    		private string version;
| |    		private string summary;
| |   @@ -7,9 +8,10 @@ namespace Gaim {
| |    		private string author;
| |    		private string homepage;
| |    		
| |   -		public PluginInfo(string name, string version, string summary,
| |   +		public PluginInfo(string id, string name, string version, string summary,
| |    						  string description, string author, string homepage)
| |    		{
| |   +			this.id = id;
| |    			this.name = name;
| |    			this.version = version;
| |    			this.summary = summary;
| |   @@ -18,6 +20,10 @@ namespace Gaim {
| |    			this.homepage = homepage;	
| |    		}
| |    
| |   +		public string Id {
| |   +			get { return id; }
| |   +		}
| |   +
| |    		public string Name {
| |    			get { return name; }
| |    		}
| |   ============================================================
| |   --- libpurple/plugins/mono/api/Signal.cs	1e05c4a86b0e8ecd51c4fb13acd129c50214ded8
| |   +++ libpurple/plugins/mono/api/Signal.cs	00450b568053f082475f5929765a2566fb013231
| |   @@ -1,7 +1,7 @@ using System.Runtime.CompilerServices;
| |    using System;
| |    using System.Runtime.CompilerServices;
| |    
| |   -namespace Gaim
| |   +namespace Purple
| |    {
| |    	public class Signal
| |    	{
| |   ============================================================
| |   --- libpurple/plugins/mono/api/Status.cs	2ee47aed2ec75d9fe5a267d577f50ed40f683b1f
| |   +++ libpurple/plugins/mono/api/Status.cs	cd0ac31f1c1671e16c20dcfe2a5849367b9cadfc
| |   @@ -1,4 +1,4 @@
| |   -namespace Gaim
| |   +namespace Purple
| |    {
| |    	public class Status
| |    	{
| |   ============================================================
| |   --- libpurple/plugins/mono/loader/Makefile.am	77db9936b8eb1d27347ef2dbc3f79c328545972e
| |   +++ libpurple/plugins/mono/loader/Makefile.am	b003a76e88daf6d25939a44c6734700f03ad2446
| |   @@ -1,4 +1,4 @@
| |   -plugindir = $(libdir)/gaim
| |   +plugindir = $(libdir)/purple
| |    
| |    plugin_LTLIBRARIES = mono.la
| |    
| |   @@ -19,7 +19,7 @@ AM_CPPFLAGS = \
| |    AM_CPPFLAGS = \
| |    	-DVERSION=\"$(VERSION)\" \
| |    	-I$(top_srcdir) \
| |   -	-I$(top_srcdir)/libgaim \
| |   +	-I$(top_srcdir)/libpurple \
| |    	$(DEBUG_CFLAGS) \
| |    	$(PLUGIN_CFLAGS) \
| |    	$(MONO_CFLAGS)
| |   ============================================================
| |   --- libpurple/plugins/mono/loader/mono-helper.c	b7bc38794dd087e6db6b1107cd6450a52fa40043
| |   +++ libpurple/plugins/mono/loader/mono-helper.c	f76ab7151f91cb1ff6e2940c31cd5d791a46d47c
| |   @@ -84,10 +84,13 @@ MonoClass* ml_find_plugin_class(MonoImag
| |    	total = mono_image_get_table_rows (image, MONO_TABLE_TYPEDEF);
| |    	for (i = 1; i <= total; ++i) {
| |    		klass = mono_class_get (image, MONO_TOKEN_TYPE_DEF | i);
| |   +		
| |    		pklass = mono_class_get_parent(klass);
| |   -		if (pklass) 
| |   -			if (strcmp("PurplePlugin", mono_class_get_name(pklass)) == 0)
| |   +		if (pklass) {
| |   +		
| |   +			if (strcmp("Plugin", mono_class_get_name(pklass)) == 0)
| |    				return klass;
| |   +		}
| |    	}
| |    	
| |    	return NULL;
| |   @@ -126,6 +129,18 @@ gchar* ml_get_prop_string(MonoObject *ob
| |    	return mono_string_to_utf8(str);
| |    }
| |    
| |   +MonoObject* ml_get_info_prop(MonoObject *obj)
| |   +{
| |   +	MonoClass *klass;
| |   +	MonoProperty *prop;
| |   +	
| |   +	klass = mono_class_get_parent(mono_object_get_class(obj));
| |   +	
| |   +	prop = mono_class_get_property_from_name(klass, "Info");
| |   +	
| |   +	return mono_property_get_value(prop, obj, NULL, NULL);
| |   +}
| |   +
| |    gboolean ml_is_api_dll(MonoImage *image)
| |    {	
| |    	MonoClass *klass;
| |   ============================================================
| |   --- libpurple/plugins/mono/loader/mono-helper.h	5eab33e40052d5ddfc6c93aa7a3f30191d989bd4
| |   +++ libpurple/plugins/mono/loader/mono-helper.h	e9e0a53f3e3a875511b9d4c0bfe6cd1acb47c5b7
| |   @@ -40,6 +40,8 @@ void ml_set_prop_string(MonoObject *obj,
| |    
| |    void ml_set_prop_string(MonoObject *obj, char *field, char *data);
| |    
| |   +MonoObject* ml_get_info_prop(MonoObject *obj);
| |   +
| |    gboolean ml_is_api_dll(MonoImage *image);
| |    
| |    MonoDomain* ml_get_domain(void);
| |   ============================================================
| |   --- libpurple/plugins/mono/loader/mono.c	68fdc7bfa73ddaba708ca6fde2d12bb0faad50df
| |   +++ libpurple/plugins/mono/loader/mono.c	b361561ce55d11c5dafec343109841b8cad95cfb
| |   @@ -26,9 +26,8 @@ static gboolean probe_mono_plugin(Purple
| |    {
| |    	MonoAssembly *assm;
| |    	MonoMethod *m = NULL;
| |   -	MonoMethod *info_method = NULL;
| |    	MonoObject *plugin_info;
| |   -	gboolean found_load = FALSE, found_unload = FALSE, found_destroy = FALSE, found_info = FALSE;
| |   +	gboolean found_load = FALSE, found_unload = FALSE, found_destroy = FALSE;
| |    	gpointer iter = NULL;
| |    
| |    	PurplePluginInfo *info;
| |   @@ -71,6 +70,7 @@ static gboolean probe_mono_plugin(Purple
| |    	mono_runtime_object_init(mplug->obj);
| |    
| |    	while ((m = mono_class_get_methods(mplug->klass, &iter))) {
| |   +		purple_debug_info("mono", "plugin method: %s\n", mono_method_get_name(m));
| |    		if (strcmp(mono_method_get_name(m), "Load") == 0) {
| |    			mplug->load = m;
| |    			found_load = TRUE;
| |   @@ -80,22 +80,20 @@ static gboolean probe_mono_plugin(Purple
| |    		} else if (strcmp(mono_method_get_name(m), "Destroy") == 0) {
| |    			mplug->destroy = m;
| |    			found_destroy = TRUE;
| |   -		} else if (strcmp(mono_method_get_name(m), "Info") == 0) {
| |   -			info_method = m;
| |   -			found_info = TRUE;
| |    		}
| |    	}
| |    
| |   -	if (!(found_load && found_unload && found_destroy && found_info)) {
| |   +	if (!(found_load && found_unload && found_destroy)) {
| |    		purple_debug(PURPLE_DEBUG_ERROR, "mono", "did not find the required methods\n");
| |    		return FALSE;
| |    	}
| |   +	
| |   +	plugin_info = ml_get_info_prop(mplug->obj);
| |    
| |   -	plugin_info = ml_invoke(info_method, mplug->obj, NULL);
| |   -
| |    	/* now that the methods are filled out we can populate
| |    	   the info struct with all the needed info */
| |    
| |   +	info->id = ml_get_prop_string(plugin_info, "Id");
| |    	info->name = ml_get_prop_string(plugin_info, "Name");
| |    	info->version = ml_get_prop_string(plugin_info, "Version");
| |    	info->summary = ml_get_prop_string(plugin_info, "Summary");
| |   ============================================================
| |   --- libpurple/plugins/perl/Makefile.am	f15966906dc8e0c71b60eebb67606cd6caaf461c
| |   +++ libpurple/plugins/perl/Makefile.am	079a25305ef980f49194b166e57d9364af86bfb1
| |   @@ -1,13 +1,13 @@ plugin_LTLIBRARIES = perl.la
| |    plugindir = $(libdir)/libpurple
| |    hackdir = $(plugindir)/private
| |    
| |    perl_dirs = common
| |    
| |    plugin_LTLIBRARIES = perl.la
| |   -hack_LTLIBRARIES = libgaimperl.la
| |   +hack_LTLIBRARIES = libpurpleperl.la
| |    
| |    perl_la_LDFLAGS = -module -avoid-version
| |   -perl_la_LIBADD = $(GLIB_LIBS) $(PERL_LIBS) libgaimperl.la
| |   +perl_la_LIBADD = $(GLIB_LIBS) $(PERL_LIBS) libpurpleperl.la
| |    perl_la_SOURCES = \
| |    	perl.c \
| |    	perl-common.c \
| |   @@ -18,11 +18,11 @@ perl_la_DEPENDENCIES = \
| |    perl_la_DEPENDENCIES = \
| |    	.libs/libperl_orig.a \
| |    	.libs/DynaLoader.a \
| |   -	libgaimperl.la
| |   +	libpurpleperl.la
| |    
| |   -libgaimperl_la_LDFLAGS = -module -avoid-version
| |   -libgaimperl_la_LIBADD = $(GLIB_LIBS)
| |   -libgaimperl_la_SOURCES = libgaimperl.c
| |   +libpurpleperl_la_LDFLAGS = -module -avoid-version
| |   +libpurpleperl_la_LIBADD = $(GLIB_LIBS)
| |   +libpurpleperl_la_SOURCES = libpurpleperl.c
| |    
| |    .libs/libperl_orig.a:
| |    	@mkdir -p .libs
| |   @@ -55,8 +55,6 @@ common_sources = \
| |            common/Conversation.xs \
| |            common/Debug.xs \
| |            common/FT.xs \
| |   -        common/Purple.pm \
| |   -        common/Purple.xs \
| |            common/ImgStore.xs \
| |            common/Log.xs \
| |            common/Makefile.PL.in \
| |   @@ -69,6 +67,7 @@ common_sources = \
| |            common/Privacy.xs \
| |            common/Proxy.xs \
| |            common/Prpl.xs \
| |   +        common/Purple.pm \
| |            common/Request.xs \
| |            common/Roomlist.xs \
| |            common/SSLConn.xs \
| |   @@ -90,7 +89,7 @@ EXTRA_DIST = \
| |    	Makefile.mingw \
| |    	common/Makefile.mingw \
| |    	$(common_sources) \
| |   -	libgaimperl.c
| |   +	libpurpleperl.c
| |    
| |    common/Makefile: common/Makefile.PL
| |    	@if test "x${top_srcdir}" != "x${top_builddir}"; then \
| |   ============================================================
| |   --- libpurple/plugins/ssl/Makefile.am	0bf8d31f9691aa30bff43f91936fa1e4e634c1bf
| |   +++ libpurple/plugins/ssl/Makefile.am	78b40efdf4f8e734952051919e0d8c429347f262
| |   @@ -26,7 +26,7 @@ AM_CPPFLAGS = \
| |    
| |    AM_CPPFLAGS = \
| |    	-DDATADIR=\"$(datadir)\" \
| |   -	-DLIBDIR=\"$(libdir)/gaim/\" \
| |   +	-DLIBDIR=\"$(libdir)/libpurple\" \
| |    	-I$(top_srcdir)/libpurple \
| |    	$(DEBUG_CFLAGS) \
| |    	$(GLIB_CFLAGS) \
| |   ============================================================
| |   --- libpurple/protocols/bonjour/Makefile.am	c10a184c57f6c21109bd4dd89ac33f73a02198fb
| |   +++ libpurple/protocols/bonjour/Makefile.am	e16edb0ea30ccd29c43c63a00ed89b8ef06b705d
| |   @@ -19,7 +19,7 @@ if STATIC_BONJOUR
| |    
| |    if STATIC_BONJOUR
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES     = libbonjour.a
| |    libbonjour_a_SOURCES = $(BONJOURSOURCES)
| |    libbonjour_a_CFLAGS  = $(AM_CFLAGS)
| |   ============================================================
| |   --- libpurple/protocols/gg/Makefile.am	147714d120f53ee617647bd799f9f576b76a13c1
| |   +++ libpurple/protocols/gg/Makefile.am	87e4401eef2142a4e727f9d700e25acfab217e11
| |   @@ -51,7 +51,7 @@ if STATIC_GG
| |    
| |    if STATIC_GG
| |    
| |   -st = -DGAIM_STATIC_PRPL $(GADU_CFLAGS)
| |   +st = -DPURPLE_STATIC_PRPL $(GADU_CFLAGS)
| |    noinst_LIBRARIES = libgg.a
| |    pkg_LTLIBRARIES =
| |    
| |   ============================================================
| |   --- libpurple/protocols/irc/Makefile.am	833940ce92333b8570c67795e1fcd21f2f8b0bb1
| |   +++ libpurple/protocols/irc/Makefile.am	70b4656eab4dbb2f6eb82642a58c8873bb90f388
| |   @@ -10,7 +10,7 @@ if STATIC_IRC
| |    
| |    if STATIC_IRC
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES = libirc.a
| |    pkg_LTLIBRARIES =
| |    
| |   ============================================================
| |   --- libpurple/protocols/jabber/Makefile.am	96646da303d74f58517b8351f223bc7491ccc75a
| |   +++ libpurple/protocols/jabber/Makefile.am	1958dcfa660885763719eab854b01e9b963c77e7
| |   @@ -42,7 +42,7 @@ if STATIC_JABBER
| |    
| |    if STATIC_JABBER
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES = libjabber.a
| |    pkg_LTLIBRARIES =
| |    
| |   ============================================================
| |   --- libpurple/protocols/jabber/auth.c	d7da634da64e650c1e13347dfe4bbd519df0c94f
| |   +++ libpurple/protocols/jabber/auth.c	b28490f91e953997bf6c7ed054cdc92967ed7e7c
| |   @@ -20,18 +20,20 @@
| |     */
| |    #include "internal.h"
| |    
| |   +#include "account.h"
| |   +#include "debug.h"
| |   +#include "cipher.h"
| |   +#include "conversation.h"
| |   +#include "request.h"
| |   +#include "sslconn.h"
| |   +#include "util.h"
| |   +#include "xmlnode.h"
| |   +
| |    #include "jutil.h"
| |    #include "auth.h"
| |   -#include "xmlnode.h"
| |    #include "jabber.h"
| |    #include "iq.h"
| |    
| |   -#include "debug.h"
| |   -#include "util.h"
| |   -#include "cipher.h"
| |   -#include "sslconn.h"
| |   -#include "request.h"
| |   -
| |    static void auth_old_result_cb(JabberStream *js, xmlnode *packet,
| |    		gpointer data);
| |    
| |   ============================================================
| |   --- libpurple/protocols/jabber/jabber.c	3ef19ac71fa058baca546defbc3a3bf882a5bc0b
| |   +++ libpurple/protocols/jabber/jabber.c	141364b1f879c0a2c87215693729c9c3da54a339
| |   @@ -25,6 +25,7 @@
| |    #include "blist.h"
| |    #include "cmds.h"
| |    #include "connection.h"
| |   +#include "conversation.h"
| |    #include "debug.h"
| |    #include "dnssrv.h"
| |    #include "message.h"
| |   @@ -36,6 +37,7 @@
| |    #include "server.h"
| |    #include "util.h"
| |    #include "version.h"
| |   +#include "xmlnode.h"
| |    
| |    #include "auth.h"
| |    #include "buddy.h"
| |   ============================================================
| |   --- libpurple/protocols/jabber/jutil.c	1d344c7e97dcd21954733bd7571a8de3fbbf5877
| |   +++ libpurple/protocols/jabber/jutil.c	3569846a7d2dfc3ed4e396587f152d547cf231fa
| |   @@ -19,8 +19,11 @@
| |     *
| |     */
| |    #include "internal.h"
| |   +#include "account.h"
| |   +#include "conversation.h"
| |    #include "server.h"
| |    #include "util.h"
| |   +#include "xmlnode.h"
| |    
| |    #include "chat.h"
| |    #include "presence.h"
| |   ============================================================
| |   --- libpurple/protocols/jabber/jutil.h	f55a65b157435cefb2dc5fc47af51b3f0f64c8f6
| |   +++ libpurple/protocols/jabber/jutil.h	76147b456f1ea49fa54065f372ffe921f9f55643
| |   @@ -22,11 +22,6 @@
| |    #ifndef _PURPLE_JABBER_JUTIL_H_
| |    #define _PURPLE_JABBER_JUTIL_H_
| |    
| |   -#include "account.h"
| |   -#include "conversation.h"
| |   -#include "xmlnode.h"
| |   -
| |   -
| |    typedef struct _JabberID {
| |    	char *node;
| |    	char *domain;
| |   ============================================================
| |   --- libpurple/protocols/jabber/presence.c	20a70bc27ab344ab21b2ff8d0ebdafb81494d23b
| |   +++ libpurple/protocols/jabber/presence.c	a9483d678d25780d0bc875a2fe8969773ba96a95
| |   @@ -20,20 +20,22 @@
| |     */
| |    #include "internal.h"
| |    
| |   +#include "account.h"
| |    #include "cipher.h"
| |   +#include "conversation.h"
| |    #include "debug.h"
| |    #include "notify.h"
| |    #include "request.h"
| |    #include "server.h"
| |    #include "status.h"
| |    #include "util.h"
| |   +#include "xmlnode.h"
| |    
| |    #include "buddy.h"
| |    #include "chat.h"
| |    #include "presence.h"
| |    #include "iq.h"
| |    #include "jutil.h"
| |   -#include "xmlnode.h"
| |    
| |    
| |    static void chats_send_presence_foreach(gpointer key, gpointer val,
| |   ============================================================
| |   --- libpurple/protocols/msn/Makefile.am	a6fb4777ef4dd72c53abdd7590994ac4fe4280b1
| |   +++ libpurple/protocols/msn/Makefile.am	4d9f2fe94121fa6c078b33dc1b1a0c58c3561b22
| |   @@ -69,7 +69,7 @@ if STATIC_MSN
| |    
| |    if STATIC_MSN
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES = libmsn.a
| |    libmsn_a_SOURCES = $(MSNSOURCES)
| |    libmsn_a_CFLAGS  = $(AM_CFLAGS)
| |   ============================================================
| |   --- libpurple/protocols/novell/Makefile.am	f566f8d2a991c69a0eaf9337c0f776af5039d395
| |   +++ libpurple/protocols/novell/Makefile.am	90d177f9475e3700502593bf2a66cdc9eae3c1ae
| |   @@ -32,7 +32,7 @@ if STATIC_NOVELL
| |    
| |    if STATIC_NOVELL
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES = libnovell.a
| |    pkg_LTLIBRARIES =
| |    
| |   ============================================================
| |   --- libpurple/protocols/oscar/Makefile.am	36a578d0d8465c8fafb0cb8a28ab05a2bcc028f6
| |   +++ libpurple/protocols/oscar/Makefile.am	86ff38ee1030b7e9105853ae07ddd7ab97ed2fc7
| |   @@ -51,7 +51,7 @@ if STATIC_OSCAR
| |    libicq_la_LDFLAGS = -module -avoid-version
| |    if STATIC_OSCAR
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES   = liboscar.a libaim.a libicq.a
| |    liboscar_a_SOURCES = $(OSCARSOURCES)
| |    liboscar_a_CFLAGS  = $(AM_CFLAGS)
| |   ============================================================
| |   --- libpurple/protocols/qq/Makefile.am	a4cee198dceeafee654e12cdec9bfeddafc2b202
| |   +++ libpurple/protocols/qq/Makefile.am	1bf379fe76faaeee90b77c9cd291439fe03401b8
| |   @@ -77,7 +77,7 @@ if STATIC_QQ
| |    
| |    if STATIC_QQ
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES = libqq.a
| |    libqq_a_SOURCES  = $(QQSOURCES)
| |    libqq_a_CFLAGS   = $(AM_CFLAGS)
| |   @@ -94,7 +94,6 @@ AM_CPPFLAGS = \
| |    AM_CPPFLAGS = \
| |    	-I$(top_srcdir)/libpurple \
| |    	-DVERSION=\"$(VERSION)\" \
| |   -	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/gaim/buddy_icons/qq\" \
| |   +	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
| |    	$(DEBUG_CFLAGS) \
| |   +	$(GLIB_CFLAGS)
| |   -	$(GLIB_CFLAGS) \
| |   -	$(GAIM_CFLAGS)
| |   ============================================================
| |   --- libpurple/protocols/sametime/Makefile.am	082db1b830fe3aafd218922dbac18f03fae27c07
| |   +++ libpurple/protocols/sametime/Makefile.am	0ffc4d59cf44715fd45c684f44a5963b808ab044
| |   @@ -12,7 +12,7 @@ if STATIC_SAMETIME
| |    
| |    if STATIC_SAMETIME
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES   = libsametime.a
| |    libsametime_a_SOURCES = $(SAMETIMESOURCES)
| |    libsametime_a_CFLAGS  = $(AM_CFLAGS)
| |   ============================================================
| |   --- libpurple/protocols/silc/Makefile.am	f3ac034211ee26afb0bc833a59781f1a4a2562f8
| |   +++ libpurple/protocols/silc/Makefile.am	c6c4b8877a662946e7b77ef84084aac5e5ef88b4
| |   @@ -6,26 +6,26 @@ AM_CFLAGS = $(st)
| |    
| |    AM_CFLAGS = $(st)
| |    
| |   -libsilcgaim_la_LDFLAGS = -module -avoid-version
| |   +libsilcpurple_la_LDFLAGS = -module -avoid-version
| |    
| |    if STATIC_SILC
| |    
| |   -st = -DGAIM_STATIC_PRPL $(SILC_CFLAGS)
| |   -noinst_LIBRARIES = libsilcgaim.a
| |   +st = -DPURPLE_STATIC_PRPL $(SILC_CFLAGS)
| |   +noinst_LIBRARIES = libsilcpurple.a
| |    pkg_LTLIBRARIES =
| |    
| |   -libsilcgaim_a_SOURCES = $(SILCSOURCES)
| |   -libsilcgaim_a_CFLAGS  = $(AM_CFLAGS)
| |   -libsilcgaim_a_LIBADD  = $(SILC_LIBS)
| |   +libsilcpurple_a_SOURCES = $(SILCSOURCES)
| |   +libsilcpurple_a_CFLAGS  = $(AM_CFLAGS)
| |   +libsilcpurple_a_LIBADD  = $(SILC_LIBS)
| |    
| |    else
| |    
| |    st = $(SILC_CFLAGS)
| |   -pkg_LTLIBRARIES = libsilcgaim.la
| |   +pkg_LTLIBRARIES = libsilcpurple.la
| |    noinst_LIBRARIES =
| |    
| |   -libsilcgaim_la_SOURCES = $(SILCSOURCES)
| |   -libsilcgaim_la_LIBADD  = $(GLIB_LIBS) $(SILC_LIBS)
| |   +libsilcpurple_la_SOURCES = $(SILCSOURCES)
| |   +libsilcpurple_la_LIBADD  = $(GLIB_LIBS) $(SILC_LIBS)
| |    
| |    endif
| |    
| |   ============================================================
| |   --- libpurple/protocols/simple/Makefile.am	639c7907e103cd63182ebd76329f8bbc57fec257
| |   +++ libpurple/protocols/simple/Makefile.am	37854307c74313b2c761efa57ca1bdefe002545e
| |   @@ -15,7 +15,7 @@ if STATIC_MSN
| |    
| |    if STATIC_MSN
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES = libsimple.a
| |    libsimple_a_SOURCES = $(SIMPLESOURCES)
| |    libsimple_a_CFLAGS  = $(AM_CFLAGS)
| |   ============================================================
| |   --- libpurple/protocols/toc/Makefile.am	faf43b1c1e00b7fab61af0f5b0ef9956e65a8191
| |   +++ libpurple/protocols/toc/Makefile.am	cab0a15ba6b1360d1e37ceec721c9dfb4f2ee33b
| |   @@ -12,7 +12,7 @@ if STATIC_TOC
| |    
| |    if STATIC_TOC
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES = libtoc.a
| |    libtoc_a_SOURCES = $(TOCSOURCES)
| |    libtoc_a_CFLAGS  = $(AM_CFLAGS)
| |   ============================================================
| |   --- libpurple/protocols/yahoo/Makefile.am	c6a95cdb141352b34ca2527402dc88f4e5f4f1f0
| |   +++ libpurple/protocols/yahoo/Makefile.am	156f8b296a24e50a084d3b45ff85584ec6476006
| |   @@ -33,7 +33,7 @@ if STATIC_YAHOO
| |    
| |    if STATIC_YAHOO
| |    
| |   -st = -DGAIM_STATIC_PRPL
| |   +st = -DPURPLE_STATIC_PRPL
| |    noinst_LIBRARIES   = libyahoo.a
| |    libyahoo_a_SOURCES = $(YAHOOSOURCES)
| |    libyahoo_a_CFLAGS  = $(AM_CFLAGS)
| |   ============================================================
| |   --- libpurple/protocols/zephyr/Makefile.am	f87d8b31d63459e238d08bfa4e753715ef741b9e
| |   +++ libpurple/protocols/zephyr/Makefile.am	2a82d063e96aecea08ed015d0c91d9c768aeabb2
| |   @@ -77,7 +77,7 @@ if STATIC_ZEPHYR
| |    
| |    if STATIC_ZEPHYR
| |    
| |   -st = -DGAIM_STATIC_PRPL -Dlint
| |   +st = -DPURPLE_STATIC_PRPL -Dlint
| |    noinst_LIBRARIES = libzephyr.a
| |    libzephyr_a_SOURCES = $(ZEPHYRSOURCES)
| |    libzephyr_a_CFLAGS  = $(AM_CFLAGS)
| |   ============================================================
| |   --- libpurple/tests/Makefile.am	794a3214b19e88e4938e0f51c7ea056be0149c9f
| |   +++ libpurple/tests/Makefile.am	6d5e212193d1baa8bfa8f112a191fd1f9592f501
| |   @@ -14,6 +14,7 @@ check_libpurple_CFLAGS=\
| |    check_libpurple_CFLAGS=\
| |            @CHECK_CFLAGS@ \
| |    		$(GLIB_CFLAGS) \
| |   +		$(DEBUG_CFLAGS) \
| |    		-I.. \
| |    		-DBUILDDIR=\"$(top_builddir)\"
| |    
| |   ============================================================
| |   --- libpurple/tests/check_libpurple.c	c82c38b918622a39ad078b3e370be12a7449db9f
| |   +++ libpurple/tests/check_libpurple.c	e7af0b4865391aa5ff735e8c350fd460948bccd2
| |   @@ -1,8 +1,9 @@
| |    #include <glib.h>
| |    #include <stdlib.h>
| |    
| |    #include "../core.h"
| |    #include "../eventloop.h"
| |   +#include "../util.h"
| |    
| |    #include "tests.h"
| |    
| |   @@ -22,6 +23,7 @@ static PurpleEventLoopUiOps eventloop_ui
| |    	(guint (*)(guint))g_source_remove,
| |    	purple_check_input_add,
| |    	(guint (*)(guint))g_source_remove,
| |   +	NULL
| |    };
| |    
| |    static void
| |   ============================================================
| |   --- libpurple/tests/test_cipher.c	463d700802effbd67f6c69d453a9afe8fac1e739
| |   +++ libpurple/tests/test_cipher.c	0a3d78d2fddd57887934cc6c76e0a11c6179beca
| |   @@ -5,6 +5,8 @@
| |    
| |    #undef HAVE_DBUS
| |    
| |   +#include "tests.h"
| |   +
| |    #include "../cipher.h"
| |    #include "../signal.h"
| |    
| |   @@ -15,7 +17,6 @@
| |    	PurpleCipher *cipher = NULL; \
| |    	PurpleCipherContext *context = NULL; \
| |    	gchar cdigest[33]; \
| |   -	gchar *sdigest = NULL; \
| |    	gboolean ret = FALSE; \
| |    	\
| |    	cipher = purple_ciphers_find_cipher("md4"); \
| |   @@ -79,7 +80,6 @@ END_TEST
| |    	PurpleCipher *cipher = NULL; \
| |    	PurpleCipherContext *context = NULL; \
| |    	gchar cdigest[33]; \
| |   -	gchar *sdigest = NULL; \
| |    	gboolean ret = FALSE; \
| |    	\
| |    	cipher = purple_ciphers_find_cipher("md5"); \
| |   @@ -142,7 +142,6 @@ END_TEST
| |    	PurpleCipher *cipher = NULL; \
| |    	PurpleCipherContext *context = NULL; \
| |    	gchar cdigest[41]; \
| |   -	gchar *sdigest = NULL; \
| |    	gboolean ret = FALSE; \
| |    	\
| |    	cipher = purple_ciphers_find_cipher("sha1"); \
| |   @@ -198,7 +197,7 @@ cipher_suite(void) {
| |    cipher_suite(void) {
| |    	Suite *s = suite_create("Cipher Suite");
| |    	TCase *tc = NULL;
| |   -	
| |   +
| |    	/* md4 tests */
| |    	tc = tcase_create("MD4");
| |    	tcase_add_test(tc, test_md4_empty_string);
| |   ============================================================
| |   --- libpurple/tests/test_jabber_jutil.c	ab405155a462da744d2ced991505933a1c14e18a
| |   +++ libpurple/tests/test_jabber_jutil.c	358a91160795b2df7719b7202fd837c5d0b28d61
| |   @@ -1,4 +1,9 @@
| |   +#include <string.h>
| |   +
| |    #include "tests.h"
| |   +#include "../account.h"
| |   +#include "../conversation.h"
| |   +#include "../xmlnode.h"
| |    #include "../protocols/jabber/jutil.h"
| |    
| |    START_TEST(test_get_resource)
| |   @@ -29,12 +34,14 @@ START_TEST(test_nodeprep_validate)
| |    
| |    START_TEST(test_nodeprep_validate)
| |    {
| |   +	char *longnode;
| |   +
| |    	fail_unless(jabber_nodeprep_validate(NULL));
| |    	fail_unless(jabber_nodeprep_validate("foo"));
| |    	fail_unless(jabber_nodeprep_validate("%d"));
| |    	fail_unless(jabber_nodeprep_validate("y\\z"));
| |    
| |   -	char *longnode = g_strnfill(1023, 'a');
| |   +	longnode = g_strnfill(1023, 'a');
| |    	fail_unless(jabber_nodeprep_validate(longnode));
| |    	g_free(longnode);
| |    }
| |   ============================================================
| |   --- libpurple/tests/test_util.c	14c9433139c47c37d5aed3c6a2a02b030c24b85c
| |   +++ libpurple/tests/test_util.c	f2c4e35bf2eaced2d1b6e2402d45124690da2673
| |   @@ -1,3 +1,5 @@
| |   +#include <string.h>
| |   +
| |    #include "tests.h"
| |    #include "../util.h"
| |    
| |   ============================================================
| |   --- libpurple/tests/tests.h	545f4ac49cae4b2be569b0843f855b1fd5e6fee3
| |   +++ libpurple/tests/tests.h	54061f54902e97dfb7555de25c3220eb04e718fd
| |   @@ -6,6 +6,7 @@
| |    
| |    /* define the test suites here */
| |    /* remember to add the suite to the runner in check_libpurple.c */
| |   +Suite * master_suite(void);
| |    Suite * cipher_suite(void);
| |    Suite * jabber_jutil_suite(void);
| |    Suite * util_suite(void);
| |   ============================================================
| |   --- pidgin/Makefile.am	d042b3f488b5aea66655febe502b40c8f8901cb2
| |   +++ pidgin/Makefile.am	ecb83e557fc452d6fde17d840a2b3316146a534f
| |   @@ -1,9 +1,10 @@ EXTRA_DIST = \
| |    EXTRA_DIST = \
| |    		getopt.c \
| |    		getopt.h \
| |    		getopt1.c \
| |    		Makefile.mingw \
| |    		pidgin.pc.in \
| |   +		pidgin-uninstalled.pc.in \
| |    		win32/IdleTracker/Makefile.mingw \
| |    		win32/IdleTracker/idletrack.c \
| |    		win32/IdleTracker/idletrack.h \
| |   ============================================================
| |   --- pidgin/gtkconv.c	799d11d64aea5ba1ba85e97f3debe2287cffbccb
| |   +++ pidgin/gtkconv.c	e8b186bd4c383763fed35a411ddbd583007132d1
| |   @@ -3488,7 +3488,7 @@ get_chat_buddy_status_icon(PurpleConvCha
| |    	g_object_unref(pixbuf);
| |    
| |    	if (flags && purple_conv_chat_is_user_ignored(chat, name)) {
| |   -		filename = g_build_filename(DATADIR, "pixmaps", "purple", "status", "default", "ignored.png", NULL);
| |   +		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "status", "default", "ignored.png", NULL);
| |    		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
| |    		g_free(filename);
| |    		scale2 = gdk_pixbuf_scale_simple(pixbuf, 15, 15, GDK_INTERP_BILINEAR);
| |   ============================================================
| |   --- pidgin/gtkdialogs.c	23687f4c7904e2c3f3d5667842d8a949bf77a6f3
| |   +++ pidgin/gtkdialogs.c	e8485533cb3821546d10fc1ef852089fe314fbb8
| |   @@ -332,7 +332,7 @@ void pidgindialogs_about()
| |    	/* Generate a logo with a version number */
| |    	logo = gtk_window_new(GTK_WINDOW_TOPLEVEL);
| |    	gtk_widget_realize(logo);
| |   -	filename = g_build_filename(DATADIR, "pixmaps", "purple", "logo.png", NULL);
| |   +	filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL);
| |    	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
| |    	g_free(filename);
| |    	pidgin_logo_versionize(&pixbuf, logo);
| |   ============================================================
| |   --- pidgin/gtkdnd-hints.c	90634298bcee4e85497c864f8ff146af92f66b82
| |   +++ pidgin/gtkdnd-hints.c	59fb93594dc98bf87b1e40773abe3a9d95c965df
| |   @@ -122,7 +122,7 @@ dnd_hints_init(void)
| |    	for (i = 0; hint_windows[i].filename != NULL; i++) {
| |    		gchar *fname;
| |    
| |   -		fname = g_build_filename(DATADIR, "pixmaps", "purple",
| |   +		fname = g_build_filename(DATADIR, "pixmaps", "pidgin",
| |    								 hint_windows[i].filename, NULL);
| |    
| |    		hint_windows[i].widget = dnd_hints_init_window(fname);
| |   ============================================================
| |   --- pidgin/gtkstatusbox.c	9a99e05f90dda01e5123e0383118e13cb90cee75
| |   +++ pidgin/gtkstatusbox.c	b4b98fcf684e8038f096a2c08cd68bef2b99e802
| |   @@ -298,23 +298,22 @@ statusbox_got_url(PurpleUtilFetchUrlData
| |    
| |    static void
| |    statusbox_got_url(PurpleUtilFetchUrlData *url_data, gpointer user_data,
| |   -                const gchar *themedata, size_t len, const gchar *error_message, 
| |   -		PidginStatusBox *status_box)
| |   +                const gchar *themedata, size_t len, const gchar *error_message)
| |    {
| |   -        FILE *f;
| |   -        gchar *path;
| |   +	FILE *f;
| |   +	gchar *path;
| |    
| |   -        if ((error_message != NULL) || (len == 0))
| |   -                return;
| |   +	if ((error_message != NULL) || (len == 0))
| |   +		return;
| |    
| |   -        f = purple_mkstemp(&path, TRUE);
| |   -        fwrite(themedata, len, 1, f);
| |   -        fclose(f);
| |   +	f = purple_mkstemp(&path, TRUE);
| |   +	fwrite(themedata, len, 1, f);
| |   +	fclose(f);
| |    
| |   -	icon_choose_cb(path, status_box);
| |   +	icon_choose_cb(path, user_data);
| |    
| |   -        g_unlink(path);
| |   -        g_free(path);
| |   +	g_unlink(path);
| |   +	g_free(path);
| |    }
| |    
| |    
| |   @@ -322,7 +321,7 @@ statusbox_uri_handler(const char *proto,
| |    statusbox_uri_handler(const char *proto, const char *cmd, GHashTable *params, void *data)
| |    {
| |    	const char *src;
| |   -printf("%s %s\n", proto, cmd);
| |   +
| |    	if (g_ascii_strcasecmp(proto, "aim"))
| |    		return FALSE;
| |    
| |   ============================================================
| |   --- pidgin/pidgin.pc.in	5f679aa95fbf7892f9d86472dcf1a2c97c1113ea
| |   +++ pidgin/pidgin.pc.in	fc1e353b04fb41c04c2e8d0b63b136b658df55f5
| |   @@ -1,13 +1,13 @@ sysconfdir=@sysconfdir@
| |    prefix=@prefix@
| |    exec_prefix=@exec_prefix@
| |    libdir=@libdir@
| |    includedir=@includedir@
| |    datadir=@datadir@
| |    sysconfdir=@sysconfdir@
| |   - 
| |   +
| |    Name: Pidgin
| |    Description: Pidgin is a GTK2-based instant messenger application.
| |    Version: @VERSION@
| |   -Requires: glib-2.0 gtk+-2.0 purple
| |   +Requires: gtk+-2.0 purple
| |    Cflags: -I${includedir}/pidgin
| |    
| |   ============================================================
| |   --- pidgin/pixmaps/Makefile.am	bc0a88afc1948aa0183548aa343f94a10a9ac0ea
| |   +++ pidgin/pixmaps/Makefile.am	f338ef2b2f999d6cf871e614df503ee220d745d7
| |   @@ -10,7 +10,7 @@ EXTRA_DIST = \
| |    		edit.png			\
| |    		pidgin.png			\
| |    		gaim.svg			\
| |   -		info.png 			\
| |   +		info.png			\
| |    		insert-image.png		\
| |    		insert-image-small.png		\
| |    		insert-link-small.png		\
| |   @@ -23,7 +23,7 @@ EXTRA_DIST = \
| |    		pause.png			\
| |    		phone.png		        \
| |    		send-im.png			\
| |   -		status-online.png  		\
| |   +		status-online.png		\
| |    		status-offline.png		\
| |    		status-away.png			\
| |    		status-invisible.png		\
| |   @@ -46,8 +46,9 @@ EXTRA_DIST = \
| |    		text_smaller.png		\
| |    		typed.png			\
| |    		typing.png			\
| |   +		window-icon.png			\
| |    		Makefile.mingw			\
| |   -		gaim.ico			
| |   +		gaim.ico
| |    
| |    
| |    pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
| |   ============================================================
| |   --- pidgin/pixmaps/buddy_icons/qq/Makefile.am	8086643e323601a59c8666e24ef7db4b1186d7f1
| |   +++ pidgin/pixmaps/buddy_icons/qq/Makefile.am	2b10bacce3c1813be14de9da2b8943e0158911a0
| |   @@ -100,6 +100,6 @@ EXTRA_DIST = \
| |    	qq_99.png \
| |    	qq_100.png
| |    
| |   -qqbuddyiconspixdir = $(datadir)/pixmaps/gaim/buddy_icons/qq
| |   +qqbuddyiconspixdir = $(datadir)/pixmaps/purple/buddy_icons/qq
| |    
| |    qqbuddyiconspix_DATA = $(EXTRA_DIST)
| |   ============================================================
| |   --- pidgin/pixmaps/emblems/16/scalable/Makefile.am	379a4e1ef8f6ab5bb96aa69a92f5a2ebad987ef7
| |   +++ pidgin/pixmaps/emblems/16/scalable/Makefile.am	4c3a52586606c3135f94f0fa7ef76d67cad39d78
| |   @@ -1,9 +1,8 @@
| |   -EXTRA_DIST = 	aol-client.svg \
| |   +EXTRA_DIST =	aol-client.svg \
| |    		blocked.svg \
| |    		bot.svg \
| |    		external.svg \
| |    		female.svg \
| |   -		founder.svg \
| |    		free-for-chat.svg \
| |    		game.svg \
| |    		male.svg \
| |   ============================================================
| |   --- pidgin/pixmaps/emotes/none/Makefile.am	3d9313e14058df03b2f1fcf9556b0ff49dcab42a
| |   +++ pidgin/pixmaps/emotes/none/Makefile.am	162a5bb172f4f8bd88385f4acaf5787f141243e7
| |   @@ -1,5 +1,5 @@
| |   -gaimsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/none
| |   -gaimsmileypix_DATA = theme 
| |   +pidginsmileypixdir = $(datadir)/pixmaps/pidgin/emotes/none
| |   +pidginsmileypix_DATA = theme
| |    
| |   -EXTRA_DIST = $(gaimsmileypix_DATA) \
| |   +EXTRA_DIST = $(pidginsmileypix_DATA) \
| |    	Makefile.mingw
| |   ============================================================
| |   --- pidgin/pixmaps/status/default/Makefile.am	220f6696dc461bfc480c38e3b5ac8934175e2964
| |   +++ pidgin/pixmaps/status/default/Makefile.am	690bcf57cca5398890c5d2ffe449bdb108aa24e0
| |   @@ -42,6 +42,6 @@ EXTRA_DIST = \
| |    	yahoo.png \
| |    	zephyr.png
| |    
| |   -gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default
| |   +pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/default
| |    
| |   +pidginstatuspix_DATA = $(EXTRA_DIST)
| |   -gaimstatuspix_DATA = $(EXTRA_DIST)
| |   ============================================================
| |   --- pidgin/pixmaps/tray/16/Makefile.am	85840405fe9cec59fb1acb63e91d98c964c0a7f0
| |   +++ pidgin/pixmaps/tray/16/Makefile.am	e136ba4f826400f2b22b6b994c51dcd8f3048cd2
| |   @@ -6,13 +6,7 @@ TRAY_ICONS =	tray-away.png \
| |    		tray-offline.png \
| |    		tray-online.png
| |    
| |   -EXTRA_DIST = 	tray-away.ico \
| |   -		tray-busy.ico \
| |   -		tray-connecting.ico \
| |   -		tray-extended-away.ico \
| |   -		tray-message.ico \
| |   -		tray-offline.ico \
| |   -		tray-online.ico 
| |   +EXTRA_DIST = $(TRAY_ICONS)
| |    
| |    pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/16
| |    pidgintraypix_DATA = $(TRAY_ICONS)
| |   ============================================================
| |   --- pidgin/pixmaps/tray/22/Makefile.am	96f7e8a58aac8505be18244676d178e36519ca53
| |   +++ pidgin/pixmaps/tray/22/Makefile.am	77e603dad975f631243b9cab59971cc9d766af69
| |   @@ -6,13 +6,14 @@ TRAY_ICONS =	tray-away.png \
| |    		tray-offline.png \
| |    		tray-online.png
| |    
| |   -EXTRA_DIST = 	tray-away.ico \
| |   +EXTRA_DIST =	$(TRAY_ICONS) \
| |   +		tray-away.ico \
| |    		tray-busy.ico \
| |   -		tray-connecting.ico \
| |    		tray-extended-away.ico \
| |    		tray-message.ico \
| |    		tray-offline.ico \
| |   -		tray-online.ico 
| |   +		tray-online.ico
| |   +#		tray-connecting.ico
| |    
| |    pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/22
| |    pidgintraypix_DATA = $(TRAY_ICONS)
| |   ============================================================
| |   --- pidgin/plugins/gevolution/Makefile.am	1fba4f959230ab38d2cfe4ca66f622c749e81838
| |   +++ pidgin/plugins/gevolution/Makefile.am	6536ec54125ca04442198ac3002101f9591291d0
| |   @@ -1,4 +1,4 @@
| |   -plugindir = $(libdir)/gaim
| |   +plugindir = $(libdir)/pidgin
| |    
| |    gevolution_la_LDFLAGS = -module -avoid-version
| |    
| |   ============================================================
| |   --- pidgin/plugins/timestamp_format.c	558787215d905bd567008f48b5d115db8504c80c
| |   +++ pidgin/plugins/timestamp_format.c	4a4e681f7b53d6dad627be03ebe7dbf0296a92ed
| |   @@ -131,13 +131,13 @@ static PurplePluginInfo info =
| |    	PURPLE_PLUGIN_MAGIC,
| |    	PURPLE_MAJOR_VERSION,
| |    	PURPLE_MINOR_VERSION,
| |   -	PURPLE_PLUGIN_STANDARD,                             /**< type           */
| |   +	PURPLE_PLUGIN_STANDARD,                           /**< type           */
| |    	PIDGIN_PLUGIN_TYPE,                               /**< ui_requirement */
| |    	0,                                                /**< flags          */
| |    	NULL,                                             /**< dependencies   */
| |   -	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
| |   +	PURPLE_PRIORITY_DEFAULT,                          /**< priority       */
| |    
| |   -	NULL,                                             /**< id             */
| |   +	"core-timestamp_format",                          /**< id             */
| |    	N_("Message Timestamp Formats"),                  /**< name           */
| |    	VERSION,                                          /**< version        */
| |    	                                                  /**  summary        */
| |   @@ -147,7 +147,7 @@ static PurplePluginInfo info =
| |    	   "conversation and logging message timestamp "
| |    	   "formats."),
| |    	"Richard Laager <rlaager at pidgin.im>",             /**< author         */
| |   -	PURPLE_WEBSITE,                                     /**< homepage       */
| |   +	PURPLE_WEBSITE,                                   /**< homepage       */
| |    
| |    	plugin_load,                                      /**< load           */
| |    	plugin_unload,                                    /**< unload         */
| |   ============================================================
| |   --- gaim.spec.in	2b39d6c2ee1fc0c8c5bc58860dde55e3d67e39ee
| |   +++ pidgin.spec.in	215efbbd4c28f5134ebe00d188acb13840837313
| |   @@ -9,19 +9,19 @@
| |    #define beta 7
| |    
| |    %if 0%{?beta}
| |   -%define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')
| |   +%define pidginver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')
| |    %else
| |   -%define gaimver @VERSION@
| |   +%define pidginver @VERSION@
| |    %endif
| |    
| |    Summary:    A GTK+ based multiprotocol instant messaging client
| |    Name:       @PACKAGE@
| |   -Version:    %gaimver
| |   +Version:    %pidginver
| |    Release:    0%{?beta:.beta%{beta}}
| |   -Epoch:      1
| |   +Epoch:      0
| |    License:    GPL
| |    Group:      Applications/Internet
| |   -URL:        http://gaim.sourceforge.net/
| |   +URL:        http://pidgin.im/
| |    Packager:   %{packager}
| |    Source:     %{name}- at VERSION@.tar.bz2
| |    BuildRoot:  %{_tmppath}/%{name}-%{version}-root
| |   @@ -68,99 +68,99 @@ Requires: perl
| |    
| |    # For some reason perl isn't always automatically detected as a requirement :(
| |    Requires: perl
| |   -# Gadu-Gadu support was split out temporarily
| |   +# Gadu-Gadu support was split out temporarily (only as gaim)
| |    Provides: gaim-gadugadu = %{epoch}:%{version}-%{release}
| |    
| |    %package devel
| |   -Summary:    Development headers, documentation, and libraries for Gaim.
| |   +Summary:    Development headers, documentation, and libraries for Pidgin
| |    Group:      Applications/Internet
| |   -Requires:   pkgconfig, gaim = %{epoch}:%{version}
| |   +Requires:   pkgconfig, pidgin = %{epoch}:%{version}
| |    
| |    %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
| |    %package bonjour
| |   -Summary:    Bonjour plugin for Gaim
| |   +Summary:    Bonjour plugin for Pidgin
| |    Group:      Applications/Internet
| |   -Requires:   gaim = %{epoch}:%{version}
| |   +Requires:   pidgin = %{epoch}:%{version}
| |    %endif
| |    
| |    %if 0%{?_with_meanwhile:1}
| |    %package meanwhile
| |   -Summary:    Lotus Sametime plugin for Gaim using the Meanwhile library
| |   +Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
| |    Group:      Applications/Internet
| |   -Requires:   gaim = %{epoch}:%{version}
| |   +Requires:   pidgin = %{epoch}:%{version}
| |    %endif
| |    
| |    %if 0%{?_with_mono:1}
| |    %package mono
| |   -Summary:    Mono .NET plugin support for Gaim
| |   +Summary:    Mono .NET plugin support for Pidgin
| |    Group:      Applications/Internet
| |   -Requires:   gaim = %{epoch}:%{version}
| |   +Requires:   pidgin = %{epoch}:%{version}
| |    %endif
| |    
| |    %if 0%{?_with_silc:1}
| |    %package silc
| |   -Summary:    SILC (Secure Internet Live Conferencing) plugin for Gaim
| |   +Summary:    SILC (Secure Internet Live Conferencing) plugin for Pidgin
| |    Group:      Applications/Internet
| |   -Requires:   gaim = %{epoch}:%{version}
| |   +Requires:   pidgin = %{epoch}:%{version}
| |    %endif
| |    
| |    %if 0%{?_with_tcl:1}
| |    %package tcl
| |   -Summary:    Tcl scripting support for Gaim
| |   +Summary:    Tcl scripting support for Pidgin
| |    Group:      Applications/Internet
| |   -Requires:   gaim = %{epoch}:%{version}
| |   +Requires:   pidgin = %{epoch}:%{version}
| |    %endif
| |    
| |    %if 0%{!?_without_text:1}
| |   -%package text
| |   -Summary:    A text-based user interface for Gaim
| |   +%package -n finch
| |   +Summary:    A text-based user interface for Pidgin
| |    Group:      Applications/Internet
| |   -Requires:   gaim = %{epoch}:%{version}
| |   +Requires:   pidgin = %{epoch}:%{version}
| |    %endif
| |    
| |    %description
| |   -Gaim allows you to talk to anyone using a variety of messaging
| |   +Pidgin allows you to talk to anyone using a variety of messaging
| |    protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu,
| |    ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
| |    Zephyr.  These protocols are implemented using a modular, easy to
| |    use design.  To use a protocol, just add an account using the
| |    account editor.
| |    
| |   -Gaim supports many common features of other clients, as well as many
| |   +Pidgin supports many common features of other clients, as well as many
| |    unique features, such as perl scripting, TCL scripting and C plugins.
| |    
| |   -Gaim is not affiliated with or endorsed by America Online, Inc.,
| |   +Pidgin is not affiliated with or endorsed by America Online, Inc.,
| |    Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
| |    
| |    %description devel
| |   -The gaim-devel package contains the header files, developer
| |   -documentation, and libraries required for development of Gaim scripts
| |   +The pidgin-devel package contains the header files, developer
| |   +documentation, and libraries required for development of Pidgin scripts
| |    and plugins.
| |    
| |    %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
| |    %description bonjour
| |   -Bonjour plugin for Gaim.
| |   +Bonjour plugin for Pidgin.
| |    %endif
| |    
| |    %if 0%{?_with_meanwhile:1}
| |    %description meanwhile
| |   -Lotus Sametime plugin for Gaim using the Meanwhile library.
| |   +Lotus Sametime plugin for Pidgin using the Meanwhile library.
| |    %endif
| |    
| |    %if 0%{?_with_mono:1}
| |    %description mono
| |   -Mono plugin loader for Gaim.  This package will allow you to write or
| |   -use Gaim plugins written in the .NET programming language.
| |   +Mono plugin loader for Pidgin.  This package will allow you to write or
| |   +use Pidgin plugins written in the .NET programming language.
| |    %endif
| |    
| |    %if 0%{?_with_silc:1}
| |    %description silc
| |   -SILC (Secure Internet Live Conferencing) plugin for Gaim.
| |   +SILC (Secure Internet Live Conferencing) plugin for Pidgin.
| |    %endif
| |    
| |    %if 0%{!?without_text:1}
| |   -%description text
| |   -A text-based user interface for Gaim.  This can be run from a
| |   +%description -n finch
| |   +A text-based user interface for Pidgin.  This can be run from a
| |    standard text console or from a terminal within X Windows.  It
| |    uses ncurses and our homegrown gnt library for drawing windows
| |    and text.
| |   @@ -168,8 +168,8 @@ and text.
| |    
| |    %if 0%{?_with_tcl:1}
| |    %description tcl
| |   -Tcl plugin loader for Gaim.  This package will allow you to write or
| |   -use Gaim plugins written in the Tcl programming language.
| |   +Tcl plugin loader for Pidgin.  This package will allow you to write or
| |   +use Pidgin plugins written in the Tcl programming language.
| |    %endif
| |    
| |    %prep
| |   @@ -211,53 +211,51 @@ make DESTDIR=$RPM_BUILD_ROOT install
| |    %endif
| |    
| |    # Delete files that we don't want to put in any of the RPMs
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/*.la
| |   +rm -f $RPM_BUILD_ROOT%{_libdir}/finch/*.la
| |   +rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
| |   +rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/*.la
| |    rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
| |    rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
| |    find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
| |    find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
| |   +# do we want to ship the nullclient ?
| |   +rm -f $RPM_BUILD_ROOT%{_bindir}/nullclient
| |    
| |    %if 0%{!?_with_howl:1} && 0%{!?_with_avahi:1}
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libbonjour.so
| |   +rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/libbonjour.so
| |    %endif
| |    
| |    %if 0%{!?_with_meanwhile:1}
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libsametime.so
| |   +rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/libsametime.so
| |    %endif
| |    
| |    %if 0%{!?_with_mono:1}
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/mono.so
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/*.dll
| |   +rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/mono.so
| |   +rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/*.dll
| |    %endif
| |    
| |    %if 0%{!?_with_silc:1}
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libsilcgaim.so
| |   +rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/libsilcpurple.so
| |    %endif
| |    
| |    %if 0%{!?_with_tcl:1}
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/tcl.so
| |   +rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/tcl.so
| |    %endif
| |    
| |    %if 0%{?_without_text:1}
| |   -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gaim-text.*
| |   -rm -f $RPM_BUILD_ROOT%{_bindir}/gaim-text
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/gntgf.so
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/gnthistory.so
| |   -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/s.so
| |   +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/finch.*
| |   +rm -rf $RPM_BUILD_ROOT%{_bindir}/finch
| |    rm -f $RPM_BUILD_ROOT%{_libdir}/libgnt.so.*
| |    %endif
| |    
| |    %find_lang %{name}
| |    
| |   -find $RPM_BUILD_ROOT%{_libdir}/gaim -xtype f -print | \
| |   +find $RPM_BUILD_ROOT%{_libdir}/pidgin $RPM_BUILD_ROOT%{_libdir}/libpurple -xtype f -print | \
| |            sed "s@^$RPM_BUILD_ROOT@@g" | \
| |   -        grep -v /gntgf.so | \
| |   -        grep -v /gnthistory.so | \
| |            grep -v /libbonjour.so | \
| |   -        grep -v /libsilcgaim.so | \
| |   +        grep -v /libsilcpurple.so | \
| |            grep -v /libsametime.so | \
| |            grep -v /mono.so | \
| |   -        grep -v /s.so | \
| |            grep -v /tcl.so | \
| |            grep -v ".dll$" | \
| |            grep -v ".tcl$" > %{name}-%{version}-coreplugins
| |   @@ -307,31 +305,32 @@ fi
| |    %doc README.SVN
| |    %doc doc/FAQ
| |    %doc doc/the_penguin.txt
| |   -%doc %{_mandir}/man1/gaim.*
| |   +%doc %{_mandir}/man1/pidgin.*
| |    %doc %{_mandir}/man3*/*
| |    
| |   -%dir %{_libdir}/gaim
| |   -%attr(755, root, root) %{perl_vendorarch}/Gaim*
| |   -%attr(755, root, root) %{perl_vendorarch}/auto/Gaim
| |   +%dir %{_libdir}/pidgin
| |   +%dir %{_libdir}/libpurple
| |   +%attr(755, root, root) %{perl_vendorarch}/Purple*
| |   +%attr(755, root, root) %{perl_vendorarch}/auto/Purple
| |    
| |   -%{_bindir}/gaim
| |   +%{_bindir}/pidgin
| |    %{_datadir}/pixmaps/*
| |   -%dir %{_datadir}/sounds/gaim
| |   -%{_datadir}/sounds/gaim/*
| |   +%dir %{_datadir}/sounds/pidgin
| |   +%{_datadir}/sounds/pidgin/*
| |    %{_datadir}/applications/*
| |   -%{_libdir}/libgaim.so.*
| |   +%{_libdir}/libpurple.so.*
| |    %{_sysconfdir}/gconf/schemas/gaim.schemas
| |    
| |    %if 0%{?_with_dbus:1}
| |   -%{_bindir}/gaim-client-example
| |   -%{_bindir}/gaim-remote
| |   -%{_bindir}/gaim-send
| |   -%{_bindir}/gaim-send-async
| |   -%{_bindir}/gaim-url-handler
| |   -%{_libdir}/libgaim-client.so.*
| |   +%{_bindir}/purple-client-example
| |   +%{_bindir}/purple-remote
| |   +%{_bindir}/purple-send
| |   +%{_bindir}/purple-send-async
| |   +%{_bindir}/purple-url-handler
| |   +%{_libdir}/libpurple-client.so.*
| |    %{_datadir}/dbus-1/services/gaim.service
| |    %doc README.dbus
| |   -%doc libgaim/gaim-notifications-example
| |   +%doc libpurple/purple-notifications-example
| |    %endif
| |    
| |    %files devel
| |   @@ -342,70 +341,74 @@ fi
| |    %doc PLUGIN_HOWTO
| |    %doc PROGRAMMING_NOTES
| |    
| |   -%dir %{_includedir}/gaim
| |   -%{_includedir}/gaim/*.h
| |   -%dir %{_includedir}/gaim/gnt
| |   -%{_includedir}/gaim/gnt/*.h
| |   +%dir %{_includedir}/finch
| |    %dir %{_includedir}/gnt
| |   +%dir %{_includedir}/libpurple
| |   +%dir %{_includedir}/pidgin
| |   +%{_includedir}/finch/*.h
| |    %{_includedir}/gnt/*.h
| |   -%{_libdir}/libgaim.so
| |   +%{_includedir}/libpurple/*.h
| |   +%{_includedir}/pidgin/*.h
| |   +%{_libdir}/libpurple.so
| |    %{_libdir}/libgnt.so
| |   -%{_libdir}/pkgconfig/gaim.pc
| |   +%{_libdir}/pkgconfig/purple.pc
| |   +%{_libdir}/pkgconfig/pidgin.pc
| |    %{_libdir}/pkgconfig/gnt.pc
| |    %{_datadir}/aclocal/gaim.m4
| |    %if 0%{?_with_dbus:1}
| |   -%{_libdir}/libgaim-client.so
| |   +%{_libdir}/libpurple-client.so
| |    %endif
| |    
| |    %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
| |    %files bonjour
| |    %defattr(-, root, root)
| |    
| |   -%{_libdir}/gaim/libbonjour.*
| |   +%{_libdir}/libpurple/libbonjour.*
| |    %endif
| |    
| |    %if 0%{?_with_meanwhile:1}
| |    %files meanwhile
| |    %defattr(-, root, root)
| |    
| |   -%{_libdir}/gaim/libsametime.*
| |   +%{_libdir}/libpurple/libsametime.*
| |    %endif
| |    
| |    %if 0%{?_with_mono:1}
| |    %files mono
| |    %defattr(-, root, root)
| |    
| |   -%{_libdir}/gaim/mono.so
| |   -%{_libdir}/gaim/*.dll
| |   +%{_libdir}/libpurple/mono.so
| |   +%{_libdir}/libpurple/*.dll
| |    %endif
| |    
| |    %if 0%{?_with_silc:1}
| |    %files silc
| |    %defattr(-, root, root)
| |    
| |   -%{_libdir}/gaim/libsilcgaim.*
| |   +%{_libdir}/libpurple/libsilcpurple.*
| |    %endif
| |    
| |    %if 0%{?_with_tcl:1}
| |    %files tcl
| |    %defattr(-, root, root)
| |    
| |   -%{_libdir}/gaim/tcl.so
| |   +%{_libdir}/libpurple/tcl.so
| |    %endif
| |    
| |    %if 0%{!?_without_text:1}
| |   -%files text
| |   +%files -n finch
| |    %defattr(-, root, root)
| |    
| |   -%doc %{_mandir}/man1/gaim-text.*
| |   -%{_bindir}/gaim-text
| |   -%{_libdir}/gaim/gntgf.so
| |   -%{_libdir}/gaim/gnthistory.so
| |   -%{_libdir}/gaim/s.so
| |   +%doc %{_mandir}/man1/finch.*
| |   +%{_bindir}/finch
| |   +%{_libdir}/finch/*.so
| |    %{_libdir}/libgnt.so.*
| |    %endif
| |    
| |    %changelog
| |   +* Sat Mar 24 2007 Stu Tomlinson <stu at nosnilmot.com>
| |   +- Update to reflect renaming to pidgin/libpurple
| |   +
| |    * Sun Oct  1 2006 Stu Tomlinson <stu at nosnilmot.com>
| |    - We can build with internal gadu gadu again, so bring it back into the
| |      main package
| |   ============================================================
| |   --- po/POTFILES.in	5e3c279a4a172c38f30bd0c87a49a0b2adfeadc4
| |   +++ po/POTFILES.in	7f4e5eb5abbfff30b594a20e6f42536fd437c9d2
| |   @@ -1,12 +1,13 @@
| |   -pidgin.desktop.in
| |   +finch/finch.c
| |    finch/gntaccount.c
| |    finch/gntblist.c
| |    finch/gntconn.c
| |    finch/gntconv.c
| |    finch/gntdebug.c
| |   -finch/gntgaim.c
| |   +finch/gntft.c
| |    finch/gntnotify.c
| |    finch/gntplugin.c
| |   +finch/gntpounce.c
| |    finch/gntprefs.c
| |    finch/gntrequest.c
| |    finch/gntstatus.c
| |   @@ -25,73 +26,16 @@ finch/libgnt/gntwidget.c
| |    finch/libgnt/gnttree.c
| |    finch/libgnt/gntutils.c
| |    finch/libgnt/gntwidget.c
| |   +finch/plugins/gntclipboard.c
| |    finch/plugins/gntgf.c
| |    finch/plugins/gnthistory.c
| |    finch/plugins/lastlog.c
| |   -pidgin/eggtrayicon.c
| |   -pidgin/gaimcombobox.c
| |   -pidgin/gaimstock.c
| |   -pidgin/gtkaccount.c
| |   -pidgin/gtkblist.c
| |   -pidgin/gtkcellview.c
| |   -pidgin/gtkconn.c
| |   -pidgin/gtkconv.c
| |   -pidgin/gtkdebug.c
| |   -pidgin/gtkdialogs.c
| |   -pidgin/gtkdocklet.c
| |   -pidgin/gtkexpander.c
| |   -pidgin/gtkft.c
| |   -pidgin/gtkimhtml.c
| |   -pidgin/gtkimhtmltoolbar.c
| |   -pidgin/gtklog.c
| |   -pidgin/gtkmain.c
| |   -pidgin/gtknotify.c
| |   -pidgin/gtkplugin.c
| |   -pidgin/gtkpounce.c
| |   -pidgin/gtkprefs.c
| |   -pidgin/gtkprivacy.c
| |   -pidgin/gtkrequest.c
| |   -pidgin/gtkroomlist.c
| |   -pidgin/gtksavedstatuses.c
| |   -pidgin/gtksound.c
| |   -pidgin/gtkstatusbox.c
| |   -pidgin/gtkutils.c
| |   -pidgin/gtkwhiteboard.c
| |   -pidgin/plugins/cap/cap.c
| |   -pidgin/plugins/contact_priority.c
| |   -pidgin/plugins/convcolors.c
| |   -pidgin/plugins/extplacement.c
| |   -pidgin/plugins/gaiminc.c
| |   -pidgin/plugins/gaimrc.c
| |   -pidgin/plugins/gestures/gestures.c
| |   -pidgin/plugins/gevolution/add_buddy_dialog.c
| |   -pidgin/plugins/gevolution/assoc-buddy.c
| |   -pidgin/plugins/gevolution/eds-utils.c
| |   -pidgin/plugins/gevolution/gevolution.c
| |   -pidgin/plugins/gevolution/gevo-util.c
| |   -pidgin/plugins/gevolution/new_person_dialog.c
| |   -pidgin/plugins/gtk-signals-test.c
| |   -pidgin/plugins/history.c
| |   -pidgin/plugins/iconaway.c
| |   -pidgin/plugins/mailchk.c
| |   -pidgin/plugins/markerline.c
| |   -pidgin/plugins/musicmessaging/musicmessaging.c
| |   -pidgin/plugins/notify.c
| |   -pidgin/plugins/raw.c
| |   -pidgin/plugins/relnot.c
| |   -pidgin/plugins/spellchk.c
| |   -pidgin/plugins/ticker/ticker.c
| |   -pidgin/plugins/timestamp.c
| |   -pidgin/plugins/timestamp_format.c
| |   -pidgin/plugins/xmppconsole.c
| |   -pidgin/plugins/win32/transparency/win2ktrans.c
| |   -pidgin/plugins/win32/winprefs/winprefs.c
| |    libpurple/account.c
| |    libpurple/blist.c
| |    libpurple/connection.c
| |    libpurple/conversation.c
| |   -libpurple/desktopitem.c
| |    libpurple/dbus-server.c
| |   +libpurple/desktopitem.c
| |    libpurple/dnsquery.c
| |    libpurple/ft.c
| |    libpurple/gconf/gaim.schemas.in
| |   @@ -106,6 +50,7 @@ libpurple/plugins/ipc-test-server.c
| |    libpurple/plugins/idle.c
| |    libpurple/plugins/ipc-test-client.c
| |    libpurple/plugins/ipc-test-server.c
| |   +libpurple/plugins/joinpart.c
| |    libpurple/plugins/log_reader.c
| |    libpurple/plugins/mono/loader/mono.c
| |    libpurple/plugins/newline.c
| |   @@ -201,5 +146,62 @@ libpurple/util.c
| |    libpurple/server.c
| |    libpurple/status.c
| |    libpurple/util.c
| |   +pidgin.desktop.in
| |   +pidgin/eggtrayicon.c
| |   +pidgin/gtkaccount.c
| |   +pidgin/gtkblist.c
| |   +pidgin/gtkcellview.c
| |   +pidgin/gtkconn.c
| |   +pidgin/gtkconv.c
| |   +pidgin/gtkdebug.c
| |   +pidgin/gtkdialogs.c
| |   +pidgin/gtkdocklet.c
| |   +pidgin/gtkexpander.c
| |   +pidgin/gtkft.c
| |   +pidgin/gtkimhtml.c
| |   +pidgin/gtkimhtmltoolbar.c
| |   +pidgin/gtklog.c
| |   +pidgin/gtkmain.c
| |   +pidgin/gtknotify.c
| |   +pidgin/gtkplugin.c
| |   +pidgin/gtkpounce.c
| |   +pidgin/gtkprefs.c
| |   +pidgin/gtkprivacy.c
| |   +pidgin/gtkrequest.c
| |   +pidgin/gtkroomlist.c
| |   +pidgin/gtksavedstatuses.c
| |   +pidgin/gtksound.c
| |   +pidgin/gtkstatusbox.c
| |   +pidgin/gtkutils.c
| |   +pidgin/gtkwhiteboard.c
| |   +pidgin/pidgincombobox.c
| |   +pidgin/pidginstock.c
| |   +pidgin/plugins/cap/cap.c
| |   +pidgin/plugins/contact_priority.c
| |   +pidgin/plugins/convcolors.c
| |   +pidgin/plugins/extplacement.c
| |   +pidgin/plugins/gaiminc.c
| |   +pidgin/plugins/gaimrc.c
| |   +pidgin/plugins/gestures/gestures.c
| |   +pidgin/plugins/gevolution/add_buddy_dialog.c
| |   +pidgin/plugins/gevolution/assoc-buddy.c
| |   +pidgin/plugins/gevolution/eds-utils.c
| |   +pidgin/plugins/gevolution/gevolution.c
| |   +pidgin/plugins/gevolution/gevo-util.c
| |   +pidgin/plugins/gevolution/new_person_dialog.c
| |   +pidgin/plugins/gtk-signals-test.c
| |   +pidgin/plugins/history.c
| |   +pidgin/plugins/iconaway.c
| |   +pidgin/plugins/mailchk.c
| |   +pidgin/plugins/markerline.c
| |   +pidgin/plugins/musicmessaging/musicmessaging.c
| |   +pidgin/plugins/notify.c
| |   +pidgin/plugins/raw.c
| |   +pidgin/plugins/relnot.c
| |   +pidgin/plugins/spellchk.c
| |   +pidgin/plugins/ticker/ticker.c
| |   +pidgin/plugins/timestamp.c
| |   +pidgin/plugins/timestamp_format.c
| |   +pidgin/plugins/win32/transparency/win2ktrans.c
| |   +pidgin/plugins/win32/winprefs/winprefs.c
| |   +pidgin/plugins/xmppconsole.c
| |   -
| |   - 	  	 

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 94ea7876f0c62e34dd50c5a0b5abd4e99a2f78b9


More information about the Commits mailing list