--- a/ChangeLog Thu May 31 07:58:23 2007 +0000
+++ b/ChangeLog Thu May 31 08:38:41 2007 +0000
@@ -1,4 +1,9 @@
-2007-06-01 simon.zheng <[email protected]>
+2007-05-31 Rick Ju <[email protected]>
+ *SUNWgnome-im-client.spec, pidgin.spec, pidgin-otr.spec:
+ bump gaim 2.0.0beta6 to pidgin 2.0.1.
+ rename all the spec/patch files prefix from gaim to pidgin
+
+2007-05-31 simon.zheng <[email protected]>
* base-specs/gdm.spec: Point download path to 2.19.
--- a/SUNWgnome-im-client.spec Thu May 31 07:58:23 2007 +0000
+++ b/SUNWgnome-im-client.spec Thu May 31 08:38:41 2007 +0000
@@ -1,7 +1,7 @@
#
# # spec file for package SUNWgnome-im-client
#
-# includes module(s): gaim
+# includes module(s): pidgin, pidgin-otr
#
# Copyright (c) 2004 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
@@ -11,8 +11,8 @@
#
%include Solaris.inc
-%use gaim = gaim.spec
-%use gaimotr = gaim-otr.spec
+%use pidgin = pidgin.spec
+%use pidginotr = pidgin-otr.spec
Name: SUNWgnome-im-client
Summary: GNOME multi-protocol instant messaging client
@@ -71,37 +71,29 @@
%prep
rm -rf %name-%version
mkdir %name-%version
-%gaim.prep -d %name-%version
-%gaimotr.prep -d %name-%version
+%pidgin.prep -d %name-%version
+%pidginotr.prep -d %name-%version
cd %{_builddir}/%name-%version
gzcat %SOURCE0 | tar xf -
%build
-export PKG_CONFIG_PATH=../gaim-%{gaim.version}:%{_pkg_config_path}
+export PKG_CONFIG_PATH=../pidgin-%{pidgin.version}:%{_pkg_config_path}
export MSGFMT="/usr/bin/msgfmt"
export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
export CFLAGS="%optflags -DHAVE_ALLOCA_H"
export RPM_OPT_FLAGS="$CFLAGS"
export LDFLAGS="%_ldflags"
-%gaim.build -d %name-%version
-%gaimotr.build -d %name-%version
+%pidgin.build -d %name-%version
+%pidginotr.build -d %name-%version
%install
-%gaim.install -d %name-%version
-%gaimotr.install -d %name-%version
+%pidgin.install -d %name-%version
+%pidginotr.install -d %name-%version
rm -rf $RPM_BUILD_ROOT%{_mandir}
cd %{_builddir}/%name-%version/sun-manpages
make install DESTDIR=$RPM_BUILD_ROOT
-# Remove .la files.
-rm $RPM_BUILD_ROOT%{_libdir}/gaim/private/libgaimperl.la
-
-# Move demo to demo directory.
-#
-install -d $RPM_BUILD_ROOT%{_prefix}/demo/jds/bin
-mv $RPM_BUILD_ROOT%{_bindir}/gaim-client-example $RPM_BUILD_ROOT%{_prefix}/demo/jds/bin/gaim-client-example
-
%if %build_l10n
%else
# REMOVE l10n FILES
@@ -159,25 +151,23 @@
%{_bindir}/*
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/*.so*
-%{_libdir}/gaim/*.so*
-%{_libdir}/gaim/private/*.so
+%{_libdir}/pidgin/*.so*
+%{_libdir}/purple-2/*.so*
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/applications
%{_datadir}/applications/*
%dir %attr (0755, root, other) %{_datadir}/pixmaps
%{_datadir}/pixmaps/*
%{_datadir}/sounds
+%{_datadir}/icons
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/man1
%{_mandir}/man1/*
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1
-%dir %attr (0755, root, bin) %{_datadir}/dbus-1/services
-%{_datadir}/dbus-1/services/gaim.service
%files root
%defattr(-, root, sys)
%attr(0755, root, sys) %dir %{_sysconfdir}
-%{_sysconfdir}/gconf/schemas/gaim.schemas
+%{_sysconfdir}/gconf/schemas/purple.schemas
%files devel
%defattr (-, root, bin)
@@ -185,15 +175,12 @@
%dir %attr (0755, root, other) %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/*
%dir %attr (0755, root, bin) %{_includedir}
-%{_includedir}/gaim
+%{_includedir}/pidgin
+%{_includedir}/libpurple
%{_includedir}/libotr
%dir %attr (0755, root, sys) %{_datadir}
%dir %attr (0755, root, other) %{_datadir}/aclocal
%{_datadir}/aclocal/*
-%dir %attr (0755, root, bin) %dir %{_prefix}/demo
-%dir %attr (0755, root, bin) %dir %{_prefix}/demo/jds
-%dir %attr (0755, root, bin) %dir %{_prefix}/demo/jds/bin
-%{_prefix}/demo/jds/bin/gaim-client-example
%if %build_l10n
%files l10n
@@ -203,6 +190,8 @@
%endif
%changelog
+* Tue May 30 2007 - [email protected]
+- bump to pidgin 2.0.1
* Tue Apr 24 2007 - [email protected]
- s/0755/-/ in defattr so that files are not made all executable
* Fri Feb 9 2007 - [email protected]
--- a/base-specs/gaim-otr.spec Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-#
-# spec file for package gaim-otr
-#
-# Copyright (c) 2005 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Owner: rickju
-# bugdb :
-#
-Name: gaim-otr
-Version: 3.0.0
-%define libotr_version 3.0.0
-Release: 1
-License: GPL
-Group: Applications/Internet
-Distribution: Java Desktop System
-Vendor: Sun Microsystems, Inc.
-Summary: Off-the-Record (OTR) Messaging plugin for GAIM
-Source0: http://www.cypherpunks.ca/otr/%{name}-%{version}.tar.gz
-Source1: http://www.cypherpunks.ca/otr/libotr-%{libotr_version}.tar.gz
-# date:2006-12-18 owner:rickju type:feature
-Patch1: gaim-otr-01-upgrade-gaim2b2.diff
-# owner:rickju date:2007-03-07 type:bug bugster:6524858 state:upstream
-Patch2: gaim-otr-02-gtk-ui.diff
-# owner:rickju date:2007-04-03 type:bug bugster:6532728 state:upstream
-Patch3: gaim-otr-03-gtk-dialog.diff
-URL: http://www.cypherpunks.ca/otr/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Docdir: %{_defaultdocdir}/gaim
-Autoreqprov: on
-
-BuildRequires: gaim-devel
-
-%description
-Off-the-Record (OTR) Messaging allows you to have private
-conversations over instant messaging.
-This is a plugin for gaim which implements Off-the-Record
-Messaging over any IM network gaim supports.
-
-%package devel
-Summary: Off-the-Record (OTR) Messaging Plugin For GAIM
-Group: System/GUI/GNOME
-Autoreqprov: on
-Requires: %name = %version
-
-%description devel
-Off-the-Record (OTR) Messaging allows you to have private
-conversations over instant messaging.
-This is a plugin for gaim which implements Off-the-Record
-Messaging over any IM network gaim supports.
-
-%prep
-%setup -q -b 1 -n %{name}*
-#patch for libotr
-cd ../libotr*
-#patch for gaim-otr
-cd ../gaim-otr*
-%patch1 -p0
-%patch2 -p0
-%patch3 -p1
-
-%build
-%ifos linux
-if [ -x /usr/bin/getconf ]; then
- CPUS=`getconf _NPROCESSORS_ONLN`
-fi
-%else
- CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-%endif
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-
-#build libotr
-cd ../libotr*
-glib-gettextize -f
-libtoolize --force
-aclocal $ACLOCAL_FLAGS -I .
-autoheader
-automake -a -c -f
-autoconf
-
-CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS" \
-LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH"
-./configure \
- --prefix=%{_prefix} \
- --mandir=%{_mandir} \
- --sysconfdir=%{_sysconfdir}
-make -j $CPUS
-
-# get root dir
-cd ..
-export MYDIR=`pwd`
-
-#build gaim-otr
-cd libotr*
-if [ -d my_build_tmp ]; then rm -rf my_build_tmp; fi;
-mkdir my_build_tmp; mkdir my_build_tmp/libotr;
-cp src/*.h my_build_tmp/libotr
-cp toolkit/*.h my_build_tmp/libotr
-
-cd ../gaim-otr*
-glib-gettextize -f
-libtoolize --force
-aclocal $ACLOCAL_FLAGS -I . -I ${MYDIR}/libotr-%{libotr_version}
-autoheader
-automake -a -c -f
-autoconf
-
-CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS -I${MYDIR}/libotr-%{libotr_version}/my_build_tmp/libotr"
-LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH -L${MYDIR}/libotr-%{libotr_version}/src/.libs"
-./configure \
- --prefix=%{_prefix} \
- --mandir=%{_mandir} \
- --sysconfdir=%{_sysconfdir} \
- --with-libotr-inc-prefix=${MYDIR}/libotr-%{libotr_version}/my_build_tmp \
- --with-libotr-prefix=${MYDIR}/libotr-%{libotr_version}/src/.libs
-make -j $CPUS
-
-%install
-# install libotr
-cd ../libotr*
-make DESTDIR=$RPM_BUILD_ROOT install \
- SITEPREFIX=/dummy VENDORPREFIX=/dummy PERLPREFIX=/dummy
-# install gaim-otr
-cd ../gaim-otr*
-make DESTDIR=$RPM_BUILD_ROOT install \
- SITEPREFIX=/dummy VENDORPREFIX=/dummy PERLPREFIX=/dummy
-
-rm $RPM_BUILD_ROOT%{_libdir}/*.a
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gaim/*.la
-
-%files
-%defattr(-, root, root)
-# libotr
-%attr(755, root, root) %{_libdir}/*.so
-%{_bindir}/*
-%{_mandir}/man1/*
-%{_libdir}/lib*.so.*
-%{_libdir}/lib*.a
-# gaim-otr
-%attr(755, root, root) %{_libdir}/gaim/*.so
-%{_libdir}/gaim/*.la
-%{_libdir}/lib*.la
-
-%files devel
-%defattr(-, root, root)
-# libotr
-%{_includedir}/libotr/*
-%{_datadir}/aclocal
-# gaimotr
-
-%clean
-rm -r $RPM_BUILD_ROOT
-
-%changelog
-* Tue Apr 03 2007 - [email protected]
-- Add a gaim-otr-03-gtk-dialog.diff for bug#632728
-
-* Thu Jan 18 2007 - [email protected]
-- Remove the code from %install that deletes $RPM_BUILD_ROOT as it trashes the
- 'make install' of gaim when part of SUNWgnome-im-client build.
-
-* Thu Dec 21 2006 - [email protected]
-- Remove *.a and *.la files in %install.
-
-* Mon Dec 18 2006 - [email protected]
-- Add this new spec for libotr and gaim-otr
--- a/base-specs/gaim.spec Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,390 +0,0 @@
-#
-# spec file for package gaim
-#
-# Copyright (c) 2005 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Owner: rickju
-# bugdb: http://sourceforge.net/tracker/index.php?func=detail&group_id=235&atid=300235&aid=
-#
-%include l10n.inc
-Name: gaim
-Version: 2.0.0beta6
-Release: 1
-License: GPL
-Group: Applications/Internet
-Distribution: Java Desktop System
-Vendor: Sun Microsystems, Inc.
-Summary: Multiprotocol Instant Messaging Client
-Source: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
-# date:2003-08-01 owner:stephen type:feature
-Patch1: gaim-01-remove-unwanted-protocols.diff
-# date:2006-01-18 owner:dcarbery type:bug bugid:1637687
-Patch2: gaim-02-libgaimperl.diff
-# date:2006-08-28 owner:pwade type:bug bugster:6442067
-Patch3: gaim-03-proxy_mnemotics.diff
-# date:2006-11-02 owner:dcarbery type:bug bugid:1589599
-Patch4: gaim-04-gtk-func-def.diff
-# date:2006-11-13 owner:pwade type:bug bugster:6477194
-Patch5: gaim-05-protocol-mnemonics.diff
-# date:2006-11-16 owner:rickju type:branding bugster:6439103
-Patch6: gaim-06-gnome-keyring.diff
-# date:2006-11-16 owner:rickju type:bug bugid:407985
-# bugster:6430863,6489148,6473371,6491296,6483844,6448364
-Patch7: gaim-07-gtk-file-chooser.diff
-# date:2006-12-20 owner:rickju type:feature bugid:1643233
-Patch8: gaim-08-uninstalled-pc.diff
-# date:2007-01-20 owner:rickju type:bug bugid:6508240
-Patch9: gaim-09-dbus-abort.diff
-# date:2007-01-23 owner:rickju type:bug bugid:1536436
-Patch10: gaim-10-return-void.diff
-# date:2007-01-25 owner:rickju type:branding
-Patch11: gaim-11-static-prpls.diff
-# date:2007-03-07 owner:rickju type:bug bugster:6524856 state:upstream
-Patch12: gaim-12-jabber-msg.diff
-# date:2007-04-03 owner:rickju type:bug bugser:6524819 state:upstream
-Patch13: gaim-13-option-menu.diff
-# date:2007-05-03 owner:rickju type:branding bugser:6437319
-Patch14: gaim-14-enable-nss.diff
-URL: http://gaim.sourceforge.net/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Docdir: %{_defaultdocdir}/gaim
-Autoreqprov: on
-
-BuildRequires: gtk2-devel
-BuildRequires: glib2-devel
-
-%description
-Gaim allows you to chat over the Internet using a variety of
-messaging protocols, including AIM, ICQ, IRC, Yahoo!,
-MSN Messenger and Jabber.
-These protocols are implemented using a modular, easy to use
-design.
-
-%package devel
-Summary: Multiprotocol Instant Messaging Client
-Group: System/GUI/GNOME
-Autoreqprov: on
-Requires: %name = %version
-
-%description devel
-Gaim allows you to chat over the Internet using a variety of
-messaging protocols, including AIM, ICQ, IRC, Yahoo!,
-MSN Messenger and Jabber.
-These protocols are implemented using a modular, easy to use
-design.
-
-%prep
-%setup -q
-%if %build_l10n
-bzcat %SOURCE1 | tar xf -
-cd po-sun; make; cd ..
-%endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-
-%build
-%ifos linux
-if [ -x /usr/bin/getconf ]; then
- CPUS=`getconf _NPROCESSORS_ONLN`
-fi
-%else
- CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-%endif
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-
-glib-gettextize -f
-libtoolize --force
-aclocal $ACLOCAL_FLAGS -I .
-autoheader
-automake -a -c -f
-autoconf
-
-CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS" \
-LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH"
-./configure \
- --prefix=%{_prefix} \
- --mandir=%{_mandir} \
- --sysconfdir=%{_sysconfdir} \
- --disable-binreloc \
- --with-static-prpls=all \
- --enable-gnutls=no \
- --with-nss-includes=/usr/include/mps \
- --with-nss-libs=/usr/lib/mps \
- --with-nspr-includes=/usr/include/mps \
- --with-nspr-libs=/usr/lib/mps \
- --enable-gnome-keyring
-
-make -j $CPUS
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install \
- SITEPREFIX=/dummy VENDORPREFIX=/dummy PERLPREFIX=/dummy
-rm -Rf $RPM_BUILD_ROOT%{_libdir}/perl5
-rm -Rf $RPM_BUILD_ROOT/dummy
-rm $RPM_BUILD_ROOT%{_libdir}/gaim/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-
-%files
-%defattr(-, root, root)
-%doc doc/the_penguin.txt doc/CREDITS NEWS COPYING AUTHORS
-%doc doc/FAQ README ChangeLog HACKING
-%attr(755, root, root) %{_libdir}/gaim/*.so
-%{_bindir}/*
-%{_mandir}/man1/*
-%{_libdir}/lib*.so.*
-%{_datadir}/locale/*/*/*
-%{_datadir}/pixmaps/*
-%{_datadir}/sounds/gaim/*
-%{_datadir}/applications/*
-%{_datadir}/dbus-1
-
-%files devel
-%defattr(-, root, root)
-%{_libdir}/pkgconfig/*
-%{_includedir}/gaim/*
-%{_datadir}/aclocal
-
-%clean
-rm -r $RPM_BUILD_ROOT
-
-%changelog
-* Tue May 03 2007 - [email protected]
-- Reopen configure arguments for nss/nspr include/lib
-- Added patch 14-enable-nss.diff
-
-* Tue Apr 28 2007 - [email protected]
-- Added configure arguments for nss/nspr include/lib
-
-* Tue Apr 03 2007 - [email protected]
-- Added 13-option-menu.diff for bug#6524819
-
-* Wed Feb 21 2007 - [email protected]
-- Added l10n tarball. Fixes CR 6463000.
-
-* Thu Feb 8 2007 - [email protected]
-- Renumber 'Patch??:' lines to be sequential after Patch3 removal.
-
-* Thu Jan 25 2007 - [email protected]
-- gaim-03-long-preferences.diff removed. It's no longer needed.
-
-* Thu Jan 25 2007 - [email protected]
-- Bump to beta6. Add patches 11-return-void and 12-static-prpls. Rename patch
- 11-dbus-abort to 10-dbus-abort.
-
-* Sun Jan 21 2007 - [email protected]
-- Add patch 11-dbus-abort to fix #6508240.
-
-* Thu Jan 18 2007 - [email protected]
-- Remove the code from %install that deletes $RPM_BUILD_ROOT as it trashes the
- 'make install' of gaim-otr when part of SUNWgnome-im-client build.
-
-* Wed Jan 17 2007 - [email protected]
-- Remove unneded patch, 02-perl-common-argc, renumber remainder.
-
-* Thu Nov 30 2006 - [email protected]
-- Bump to 2.0.0beta5.
-
-* Thu Nov 30 2006 - [email protected]
-- Add configure argument enable-gnome-keying to fix #6439103.
-
-* Thu Nov 13 2006 - [email protected]
-- Add patches 08-gnome-keyring and 09-gtk-file-chooser; add
- --enable-gnome-keyring to configure and
-
-* Mon Nov 13 2006 - [email protected]
-- Add patch, 07-protocol-mnemonics, to add protocol mnemonics, CR#6477194
-
-* Mon Nov 06 2006 - [email protected]
-- Remove upstream patch 05-msn-crash. Rename rest.
-
-* Fri Nov 03 2006 - [email protected]
-- Specify sysconfdir in configure call as gaim.schemas is installed there.
-
-* Thu Nov 02 2006 - [email protected]
-- Add patch, 07-gtk-func-def, to fix inconsistency between a function
- declaration and definition. Submitted upstream via sourceforge.net bug db.
-
-* Thu Nov 02 2006 - [email protected]
-- Bump to 2.0.0beta4. Remove upstream patch, 05-nopyextension, and obsolete
- patch, 06-psychic, (referenced code no longer in module). Rename remainder.
-
-* Mon Oct 16 2006 - [email protected]
-- Remove the '-f' from the 'rm *.la *.a' lines so that any changes to the
- module source will be seen as a build error and action can be taken.
-
-* Mon Aug 28 2005 - [email protected]
-- Bump to 2.0.0beta3.1
-
-* Mon Aug 28 2006 - [email protected]
-- Add patch gaim-12-proxy_mnemonics.diff to add new mnemonics, CR#6442067
-
-* Wed May 10 2006 - [email protected]
-- Add patch gaim-11-nopyextensions.diff to remove .py extensions from
- executables and move gaim-notifications-example to
- /usr/share/doc/gaim/examples since it is a system-independant demo
- program.
-
-* Wed Feb 15 2006 - [email protected]
-- Bump to 2.0.0beta2. Remove obsolete patch, 11-forte.
-
-* Wed Jan 18 2006 - [email protected]
-- Bump to 2.0.0beta1, remove obsolete patches (08-sound_errors and
- 11-g11n-enable-im). Add patches 08-libgaimperl and 11-forte.
-
-* Tue Nov 29 2005 - laca.com
-- remove javahelp stuff
-
-* Mon Aug 15 2005 - [email protected]
-- Bump to 1.5.0.
-
-* Thu Jun 10 2005 - [email protected]
-- Bump to 1.3.0
-
-* Thu Mar 24 2005 - [email protected]
-- Rev to 1.3.0. Patches #9, 12, 17, 18 and 19 removed.
-
-* Thu Mar 24 2005 - [email protected]
-- Added gaim-19-yahoo-privacy-fix.diff patch, fixes yahoo
- privacy issue.
-
-* Tue Jan 25 2005 - [email protected]
-- Update docs with Linux specific tarball from [email protected].
-
-* Tue Jan 18 2005 - [email protected]
-- New backported patch to fix msn messenger. Fixes #6217610.
-
-* Wed Jan 12 2005 - [email protected]
-- Added gaim-15-g11n-enable-im.diff to enable Ja input method. Fix 4990149.
-- Added gaim-16-g11n-filename.diff to get/put localized filenames. Fixes 6216501
-
-* Tue Jan 11 2005 - [email protected]
-- Added patch #15. Fixes #6204972
-
-* Thu Dec 16 2004 - [email protected]
-- Update l10n help tarball to use linux version
-
-* Wed Dec 8 2004 - [email protected]
-- Update docs tarball from [email protected].
-
-* Fri Nov 12 2004 - [email protected]
-- Added workaround fix for 6193354
-
-* Fri Oct 29 2004 - [email protected]
-- Fixes msn security issues.
-
-* Thu Oct 21 2004 - [email protected]
-- Added patch #11. Fixes #5101982
-
-* Mon Sep 06 2004 - [email protected]
-- Add javahelp-convert for new docs
-
-* Fri Sep 03 2004 - [email protected]
-- Add docs tarball from [email protected].
-- Add patch to incorporate docs tarball.
-
-* Mon Aug 30 2004 - [email protected]
-- Bump to 0.82.1
-
-* Tue Aug 24 2004 - [email protected]
-- mandir/man3 added to base package
-
-* Tue Aug 24 2004 - [email protected]
-- Bump to 0.81 and create a devel package.
-
-* Fri Aug 20 2004 - [email protected]
-- Comment out removal of man3 files - these don't exist on Solaris.
-
-* Thu Jul 08 2004 - [email protected]
-- Updated l10n content to gaim-l10n-po-1.2.tar.bz2
-
-* Wed Jul 07 2004 - [email protected]
-- ported to rpm4
-
-* Wed Jul 07 2004 - [email protected]
-- added "-j $CPUS" to make to speed up builds
-
-* Wed Jun 09 2004 - [email protected]
-- Modified patch gaim-02-remove-unwanted-protocols.diff to remove the
- unnecessary protocols from the build.
-
-* Fri Jun 04 2004 - [email protected]
-- Add patch gaim-10-iconv-open.diff. Fixes the irc protocol on
- Solaris
-
-* Wed May 12 2004 - [email protected]
-- Updated l10n content to gaim-l10n-po-1.1.tar.bz2
-
-* Sun May 02 2004 - [email protected]
-- add patch #9 (void-return) for a void function returning a value
-
-* Tue Apr 27 2004 - [email protected]
-- Bumped new tarball 0.76 version and updated spec file
- accordingly.
-
-* Mon Apr 05 2004 - [email protected]
-- ifos'ify glib-gettexttize, to stop nameless .mo files being
- generated on cinnabar/linux.
-
-* Sun Apr 04 2004 - [email protected]
-- add glib-gettextize to make the build work with Solaris msgfmt
-
-* Wed Mar 31 2004 - [email protected]
-- replace tar jxf with the more solaris friendly
- bzcat piped through tar
-
-* Mon Mar 29 2004 - [email protected]
-- Adding gaim-l10n-po-1.0.tar.bz2 l10n content
-
-* Mon Mar 08 2004 - [email protected]
-- Fixes all vulnerabilities reproted in the bug report.
-
-* Thu Mar 04 2004 - [email protected]
-- Removed gaim-01-menu-entry.diff
-- Added gaim-01-g11n-menu-entry.diff to fix 4957377
-- Added gaim-08-g11n-potfiles.diff
-
-* Wed Mar 03 2004 - <[email protected]>
-- fix Solaris build by forcing the use of the glib gettext test macro
-
-* Fri Feb 20 2004 - <[email protected]>
-- Distro to Cinnabar, fixed patch gaim-06-po-mkinstalldirs.diff
-
-* Thu Feb 19 2004 - <[email protected]>
-- Update to 0.75.
-
-* Fri Oct 31 2003 - <[email protected]>
-- Remove the Sun Supported keyword from the menu
- patch.
-
-* Mon Oct 20 2003 - <[email protected]>
-- update to 0.70 and removed potfiles patch
-
-* Thu Aug 14 2003 - <[email protected]>
-- remove *.a, *.la
-
-* Tue Aug 05 2003 [email protected]
-- Added POTFILES.in patch again (updated)
-
-* Fri Aug 01 2003 [email protected]
-- removed unwanted protocols
-
-* Fri Aug 01 2003 [email protected]
-- why was there no changelog for this before? well
- new tarball, bumped release, reset release, added lbgaim-remote.so.*
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/pidgin-otr.spec Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,173 @@
+#
+# spec file for package pidgin-otr
+#
+# Copyright (c) 2005 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Owner: rickju
+# bugdb :
+#
+Name: pidgin-otr
+Version: 3.0.1
+%define libotr_version 3.0.0
+Release: 1
+License: GPL
+Group: Applications/Internet
+Distribution: Java Desktop System
+Vendor: Sun Microsystems, Inc.
+Summary: Off-the-Record (OTR) Messaging plugin for GAIM
+Source0: http://www.cypherpunks.ca/otr/%{name}-%{version}.tar.gz
+Source1: http://www.cypherpunks.ca/otr/libotr-%{libotr_version}.tar.gz
+# owner:rickju date:2007-03-07 type:bug bugster:6524858 state:upstream
+Patch1: pidgin-otr-01-gtk-ui.diff
+# owner:rickju date:2007-04-03 type:bug bugster:6532728 state:upstream
+Patch2: pidgin-otr-02-gtk-dialog.diff
+# owner:rickju date:2007-05-27 type:branding
+Patch3: pidgin-otr-03-makefile.diff
+URL: http://www.cypherpunks.ca/otr/
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Docdir: %{_defaultdocdir}/pidgin
+Autoreqprov: on
+
+BuildRequires: pidgin-devel
+
+%description
+Off-the-Record (OTR) Messaging allows you to have private
+conversations over instant messaging.
+This is a plugin for pdgin which implements Off-the-Record
+Messaging over any IM network pidgin supports.
+
+%package devel
+Summary: Off-the-Record (OTR) Messaging Plugin For GAIM
+Group: System/GUI/GNOME
+Autoreqprov: on
+Requires: %name = %version
+
+%description devel
+Off-the-Record (OTR) Messaging allows you to have private
+conversations over instant messaging.
+This is a plugin for pidgin which implements Off-the-Record
+Messaging over any IM network pidgin supports.
+
+%prep
+%setup -q -b 1 -n %{name}*
+#patch for libotr
+cd ../libotr*
+#patch for pidgin-otr
+cd ../pidgin-otr*
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+ CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+ CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+#build libotr
+cd ../libotr*
+glib-gettextize -f
+libtoolize --force
+aclocal $ACLOCAL_FLAGS -I .
+autoheader
+automake -a -c -f
+autoconf
+
+CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS" \
+LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH"
+./configure \
+ --prefix=%{_prefix} \
+ --mandir=%{_mandir} \
+ --sysconfdir=%{_sysconfdir}
+make -j $CPUS
+
+# get root dir
+cd ..
+export MYDIR=`pwd`
+
+#build pidgin-otr
+cd libotr*
+if [ -d my_build_tmp ]; then rm -rf my_build_tmp; fi;
+mkdir my_build_tmp; mkdir my_build_tmp/libotr;
+cp src/*.h my_build_tmp/libotr
+cp toolkit/*.h my_build_tmp/libotr
+
+cd ../pidgin-otr*
+glib-gettextize -f
+libtoolize --force
+aclocal $ACLOCAL_FLAGS -I . -I ${MYDIR}/libotr-%{libotr_version}
+autoheader
+automake -a -c -f
+autoconf
+
+CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS -I${MYDIR}/libotr-%{libotr_version}/my_build_tmp/libotr"
+LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH -L${MYDIR}/libotr-%{libotr_version}/src/.libs"
+./configure \
+ --prefix=%{_prefix} \
+ --mandir=%{_mandir} \
+ --sysconfdir=%{_sysconfdir} \
+ --with-libotr-inc-prefix=${MYDIR}/libotr-%{libotr_version}/my_build_tmp \
+ --with-libotr-prefix=${MYDIR}/libotr-%{libotr_version}/src/.libs
+make -j $CPUS
+
+%install
+# install libotr
+cd ../libotr*
+make DESTDIR=$RPM_BUILD_ROOT install \
+ SITEPREFIX=/dummy VENDORPREFIX=/dummy PERLPREFIX=/dummy
+# install pidgin-otr
+cd ../pidgin-otr*
+make DESTDIR=$RPM_BUILD_ROOT install \
+ SITEPREFIX=/dummy VENDORPREFIX=/dummy PERLPREFIX=/dummy
+
+rm $RPM_BUILD_ROOT%{_libdir}/*.a
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+
+%files
+%defattr(-, root, root)
+# libotr
+%attr(755, root, root) %{_libdir}/*.so
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_libdir}/lib*.so.*
+%{_libdir}/lib*.a
+# pidgin-otr
+%attr(755, root, root) %{_libdir}/pidgin/*.so
+%{_libdir}/pidgin/*.la
+%{_libdir}/lib*.la
+
+%files devel
+%defattr(-, root, root)
+# libotr
+%{_includedir}/libotr/*
+%{_datadir}/aclocal
+# pidgin-otr
+
+%clean
+rm -r $RPM_BUILD_ROOT
+
+%changelog
+* Tue May 30 2007 - [email protected]
+- bump to pidgin-otr 3.0.1
+
+* Tue Apr 03 2007 - [email protected]
+- Add a gaim-otr-03-gtk-dialog.diff for bug#632728
+
+* Thu Jan 18 2007 - [email protected]
+- Remove the code from %install that deletes $RPM_BUILD_ROOT as it trashes the
+ 'make install' of gaim when part of SUNWgnome-im-client build.
+
+* Thu Dec 21 2006 - [email protected]
+- Remove *.a and *.la files in %install.
+
+* Mon Dec 18 2006 - [email protected]
+- Add this new spec for libotr and gaim-otr
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/pidgin.spec Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,384 @@
+#
+# spec file for package pidgin
+#
+# Copyright (c) 2005 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Owner: rickju
+# bugdb: http://sourceforge.net/tracker/index.php?func=detail&group_id=235&atid=300235&aid=
+#
+%include l10n.inc
+Name: pidgin
+Version: 2.0.1
+Release: 1
+License: GPL
+Group: Applications/Internet
+Distribution: Java Desktop System
+Vendor: Sun Microsystems, Inc.
+Summary: Multiprotocol Instant Messaging Client
+Source: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
+Source1: gaim-po-sun-%{po_sun_version}.tar.bz2
+# date:2006-08-28 owner:pwade type:bug bugster:6442067
+Patch1: pidgin-01-proxy_mnemotics.diff
+# date:2006-11-02 owner:dcarbery type:bug bugid:1589599
+Patch2: pidgin-02-gtk-func-def.diff
+# date:2006-11-13 owner:pwade type:bug bugster:6477194
+Patch3: pidgin-03-protocol-mnemonics.diff
+# date:2006-11-16 owner:rickju type:branding bugster:6439103
+Patch4: pidgin-04-gnome-keyring.diff
+# date:2006-12-20 owner:rickju type:feature bugid:1643233
+Patch5: pidgin-05-uninstalled-pc.diff
+# date:2007-01-20 owner:rickju type:bug bugid:6508240
+Patch6: pidgin-06-dbus-abort.diff
+# date:2007-03-07 owner:rickju type:bug bugster:6524856 state:upstream
+Patch7: pidgin-07-jabber-msg.diff
+# date:2007-04-03 owner:rickju type:bug bugser:6524819 state:upstream
+Patch8: pidgin-08-option-menu.diff
+# date:2007-05-03 owner:rickju type:branding bugser:6437319
+Patch9: pidgin-09-enable-nss.diff
+URL: http://www.pidgin.im
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Docdir: %{_defaultdocdir}/pidgin
+Autoreqprov: on
+
+BuildRequires: gtk2-devel
+BuildRequires: glib2-devel
+
+%description
+Gaim allows you to chat over the Internet using a variety of
+messaging protocols, including AIM, ICQ, IRC, Yahoo!,
+MSN Messenger and Jabber.
+These protocols are implemented using a modular, easy to use
+design.
+
+%package devel
+Summary: Multiprotocol Instant Messaging Client
+Group: System/GUI/GNOME
+Autoreqprov: on
+Requires: %name = %version
+
+%description devel
+Gaim allows you to chat over the Internet using a variety of
+messaging protocols, including AIM, ICQ, IRC, Yahoo!,
+MSN Messenger and Jabber.
+These protocols are implemented using a modular, easy to use
+design.
+
+%prep
+%setup -q
+%if %build_l10n
+bzcat %SOURCE1 | tar xf -
+cd po-sun; make; cd ..
+%endif
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+ CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+ CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+
+glib-gettextize -f
+libtoolize --force
+aclocal $ACLOCAL_FLAGS -I .
+autoheader
+automake -a -c -f
+autoconf
+
+CFLAGS="$RPM_OPT_FLAGS -DG_IMPLEMENT_INLINES -DG_HAVE_ISO_VARARGS" \
+LD_LIBRARY_PATH="%{_libdir}:$LD_LIBRARY_PATH"
+./configure \
+ --prefix=%{_prefix} \
+ --mandir=%{_mandir} \
+ --sysconfdir=%{_sysconfdir} \
+ --disable-binreloc \
+ --disable-dbus \
+ --enable-gnutls=no \
+ --with-nss-includes=/usr/include/mps \
+ --with-nss-libs=/usr/lib/mps \
+ --with-nspr-includes=/usr/include/mps \
+ --with-nspr-libs=/usr/lib/mps \
+ --enable-gnome-keyring
+
+make -j $CPUS
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT install \
+ SITEPREFIX=/dummy VENDORPREFIX=/dummy PERLPREFIX=/dummy
+rm -Rf $RPM_BUILD_ROOT%{_libdir}/perl5
+rm -Rf $RPM_BUILD_ROOT/dummy
+rm $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -rf %PM_BUILD_ROOT%{_libdir}/purple-2/libgg.so
+rm -rf %PM_BUILD_ROOT%{_libdir}/purple-2/libxmpp.so
+rm -rf %PM_BUILD_ROOT%{_libdir}/purple-2/libqq.so
+rm -rf %PM_BUILD_ROOT%{_libdir}/purple-2/libsimple.so
+rm -rf %PM_BUILD_ROOT%{_libdir}/purple-2/libzephyr.so
+
+%files
+%defattr(-, root, root)
+%doc doc/the_penguin.txt doc/CREDITS NEWS COPYING AUTHORS
+%doc doc/FAQ README ChangeLog HACKING
+%attr(755, root, root) %{_libdir}/pidgin/*.so
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_libdir}/lib*.so.*
+%{_datadir}/locale/*/*/*
+%{_datadir}/pixmaps/*
+%{_datadir}/sounds/pidgin/*
+%{_datadir}/icons/*
+%{_datadir}/applications/*
+%{_datadir}/dbus-1
+
+%files devel
+%defattr(-, root, root)
+%{_libdir}/pkgconfig/*
+%{_includedir}/pidgin/*
+%{_datadir}/aclocal
+
+%clean
+rm -r $RPM_BUILD_ROOT
+
+%changelog
+* Tue May 30 2007 - [email protected]
+- bump to pidgin 2.0.1
+
+* Tue May 03 2007 - [email protected]
+- Reopen configure arguments for nss/nspr include/lib
+- Added patch 14-enable-nss.diff
+
+* Tue Apr 28 2007 - [email protected]
+- Added configure arguments for nss/nspr include/lib
+
+* Tue Apr 03 2007 - [email protected]
+- Added 13-option-menu.diff for bug#6524819
+
+* Wed Feb 21 2007 - [email protected]
+- Added l10n tarball. Fixes CR 6463000.
+
+* Thu Feb 8 2007 - [email protected]
+- Renumber 'Patch??:' lines to be sequential after Patch3 removal.
+
+* Thu Jan 25 2007 - [email protected]
+- gaim-03-long-preferences.diff removed. It's no longer needed.
+
+* Thu Jan 25 2007 - [email protected]
+- Bump to beta6. Add patches 11-return-void and 12-static-prpls. Rename patch
+ 11-dbus-abort to 10-dbus-abort.
+
+* Sun Jan 21 2007 - [email protected]
+- Add patch 11-dbus-abort to fix #6508240.
+
+* Thu Jan 18 2007 - [email protected]
+- Remove the code from %install that deletes $RPM_BUILD_ROOT as it trashes the
+ 'make install' of gaim-otr when part of SUNWgnome-im-client build.
+
+* Wed Jan 17 2007 - [email protected]
+- Remove unneded patch, 02-perl-common-argc, renumber remainder.
+
+* Thu Nov 30 2006 - [email protected]
+- Bump to 2.0.0beta5.
+
+* Thu Nov 30 2006 - [email protected]
+- Add configure argument enable-gnome-keying to fix #6439103.
+
+* Thu Nov 13 2006 - [email protected]
+- Add patches 08-gnome-keyring and 09-gtk-file-chooser; add
+ --enable-gnome-keyring to configure and
+
+* Mon Nov 13 2006 - [email protected]
+- Add patch, 07-protocol-mnemonics, to add protocol mnemonics, CR#6477194
+
+* Mon Nov 06 2006 - [email protected]
+- Remove upstream patch 05-msn-crash. Rename rest.
+
+* Fri Nov 03 2006 - [email protected]
+- Specify sysconfdir in configure call as gaim.schemas is installed there.
+
+* Thu Nov 02 2006 - [email protected]
+- Add patch, 07-gtk-func-def, to fix inconsistency between a function
+ declaration and definition. Submitted upstream via sourceforge.net bug db.
+
+* Thu Nov 02 2006 - [email protected]
+- Bump to 2.0.0beta4. Remove upstream patch, 05-nopyextension, and obsolete
+ patch, 06-psychic, (referenced code no longer in module). Rename remainder.
+
+* Mon Oct 16 2006 - [email protected]
+- Remove the '-f' from the 'rm *.la *.a' lines so that any changes to the
+ module source will be seen as a build error and action can be taken.
+
+* Mon Aug 28 2005 - [email protected]
+- Bump to 2.0.0beta3.1
+
+* Mon Aug 28 2006 - [email protected]
+- Add patch gaim-12-proxy_mnemonics.diff to add new mnemonics, CR#6442067
+
+* Wed May 10 2006 - [email protected]
+- Add patch gaim-11-nopyextensions.diff to remove .py extensions from
+ executables and move gaim-notifications-example to
+ /usr/share/doc/gaim/examples since it is a system-independant demo
+ program.
+
+* Wed Feb 15 2006 - [email protected]
+- Bump to 2.0.0beta2. Remove obsolete patch, 11-forte.
+
+* Wed Jan 18 2006 - [email protected]
+- Bump to 2.0.0beta1, remove obsolete patches (08-sound_errors and
+ 11-g11n-enable-im). Add patches 08-libgaimperl and 11-forte.
+
+* Tue Nov 29 2005 - laca.com
+- remove javahelp stuff
+
+* Mon Aug 15 2005 - [email protected]
+- Bump to 1.5.0.
+
+* Thu Jun 10 2005 - [email protected]
+- Bump to 1.3.0
+
+* Thu Mar 24 2005 - [email protected]
+- Rev to 1.3.0. Patches #9, 12, 17, 18 and 19 removed.
+
+* Thu Mar 24 2005 - [email protected]
+- Added gaim-19-yahoo-privacy-fix.diff patch, fixes yahoo
+ privacy issue.
+
+* Tue Jan 25 2005 - [email protected]
+- Update docs with Linux specific tarball from [email protected].
+
+* Tue Jan 18 2005 - [email protected]
+- New backported patch to fix msn messenger. Fixes #6217610.
+
+* Wed Jan 12 2005 - [email protected]
+- Added gaim-15-g11n-enable-im.diff to enable Ja input method. Fix 4990149.
+- Added gaim-16-g11n-filename.diff to get/put localized filenames. Fixes 6216501
+
+* Tue Jan 11 2005 - [email protected]
+- Added patch #15. Fixes #6204972
+
+* Thu Dec 16 2004 - [email protected]
+- Update l10n help tarball to use linux version
+
+* Wed Dec 8 2004 - [email protected]
+- Update docs tarball from [email protected].
+
+* Fri Nov 12 2004 - [email protected]
+- Added workaround fix for 6193354
+
+* Fri Oct 29 2004 - [email protected]
+- Fixes msn security issues.
+
+* Thu Oct 21 2004 - [email protected]
+- Added patch #11. Fixes #5101982
+
+* Mon Sep 06 2004 - [email protected]
+- Add javahelp-convert for new docs
+
+* Fri Sep 03 2004 - [email protected]
+- Add docs tarball from [email protected].
+- Add patch to incorporate docs tarball.
+
+* Mon Aug 30 2004 - [email protected]
+- Bump to 0.82.1
+
+* Tue Aug 24 2004 - [email protected]
+- mandir/man3 added to base package
+
+* Tue Aug 24 2004 - [email protected]
+- Bump to 0.81 and create a devel package.
+
+* Fri Aug 20 2004 - [email protected]
+- Comment out removal of man3 files - these don't exist on Solaris.
+
+* Thu Jul 08 2004 - [email protected]
+- Updated l10n content to gaim-l10n-po-1.2.tar.bz2
+
+* Wed Jul 07 2004 - [email protected]
+- ported to rpm4
+
+* Wed Jul 07 2004 - [email protected]
+- added "-j $CPUS" to make to speed up builds
+
+* Wed Jun 09 2004 - [email protected]
+- Modified patch gaim-02-remove-unwanted-protocols.diff to remove the
+ unnecessary protocols from the build.
+
+* Fri Jun 04 2004 - [email protected]
+- Add patch gaim-10-iconv-open.diff. Fixes the irc protocol on
+ Solaris
+
+* Wed May 12 2004 - [email protected]
+- Updated l10n content to gaim-l10n-po-1.1.tar.bz2
+
+* Sun May 02 2004 - [email protected]
+- add patch #9 (void-return) for a void function returning a value
+
+* Tue Apr 27 2004 - [email protected]
+- Bumped new tarball 0.76 version and updated spec file
+ accordingly.
+
+* Mon Apr 05 2004 - [email protected]
+- ifos'ify glib-gettexttize, to stop nameless .mo files being
+ generated on cinnabar/linux.
+
+* Sun Apr 04 2004 - [email protected]
+- add glib-gettextize to make the build work with Solaris msgfmt
+
+* Wed Mar 31 2004 - [email protected]
+- replace tar jxf with the more solaris friendly
+ bzcat piped through tar
+
+* Mon Mar 29 2004 - [email protected]
+- Adding gaim-l10n-po-1.0.tar.bz2 l10n content
+
+* Mon Mar 08 2004 - [email protected]
+- Fixes all vulnerabilities reproted in the bug report.
+
+* Thu Mar 04 2004 - [email protected]
+- Removed gaim-01-menu-entry.diff
+- Added gaim-01-g11n-menu-entry.diff to fix 4957377
+- Added gaim-08-g11n-potfiles.diff
+
+* Wed Mar 03 2004 - <[email protected]>
+- fix Solaris build by forcing the use of the glib gettext test macro
+
+* Fri Feb 20 2004 - <[email protected]>
+- Distro to Cinnabar, fixed patch gaim-06-po-mkinstalldirs.diff
+
+* Thu Feb 19 2004 - <[email protected]>
+- Update to 0.75.
+
+* Fri Oct 31 2003 - <[email protected]>
+- Remove the Sun Supported keyword from the menu
+ patch.
+
+* Mon Oct 20 2003 - <[email protected]>
+- update to 0.70 and removed potfiles patch
+
+* Thu Aug 14 2003 - <[email protected]>
+- remove *.a, *.la
+
+* Tue Aug 05 2003 [email protected]
+- Added POTFILES.in patch again (updated)
+
+* Fri Aug 01 2003 [email protected]
+- removed unwanted protocols
+
+* Fri Aug 01 2003 [email protected]
+- why was there no changelog for this before? well
+ new tarball, bumped release, reset release, added lbgaim-remote.so.*
--- a/patches/gaim-01-remove-unwanted-protocols.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- gaim-2.0.0beta4/configure.ac.orig 2006-11-02 18:16:21.418278000 +0000
-+++ gaim-2.0.0beta4/configure.ac 2006-11-02 18:19:13.774308000 +0000
-@@ -671,7 +671,7 @@
- fi
-
- if test "x$STATIC_PRPLS" = "xall" ; then
-- STATIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
-+ STATIC_PRPLS="irc jabber msn novell oscar silc yahoo"
- fi
- if test "x$have_meanwhile" != "xyes" ; then
- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
---- gaim-2.0.0beta4/libgaim/protocols/Makefile.am.orig 2006-11-02 18:17:12.771764000 +0000
-+++ gaim-2.0.0beta4/libgaim/protocols/Makefile.am 2006-11-02 18:21:59.775442000 +0000
-@@ -1,5 +1,5 @@
- EXTRA_DIST = Makefile.mingw
-
--DIST_SUBDIRS = bonjour gg irc jabber msn novell oscar qq sametime silc toc simple yahoo zephyr
-+DIST_SUBDIRS = irc jabber msn novell oscar silc toc yahoo
-
- SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
--- a/patches/gaim-02-libgaimperl.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- gaim-2.0.0beta6/libgaim/plugins/perl/libgaimperl.c.orig 2006-08-20 04:36:31.000000000 +0800
-+++ gaim-2.0.0beta6/libgaim/plugins/perl/libgaimperl.c 2006-08-30 14:46:14.189305000 +0800
-@@ -1,7 +1,16 @@
- #include <gmodule.h>
-+
-+#ifdef __SUNPRO_C
-+#pragma init (my_init)
-+void my_init(void);
-+
-+void my_init() {
-+#else
- void __attribute__ ((constructor)) my_init(void);
-
- void __attribute__ ((constructor)) my_init() {
-+#endif
-+
- /* Very evil hack...puts perl.so's symbols in the global table
- * but does not create a circular dependancy because g_module_open
- * will only open the library once. */
--- a/patches/gaim-03-proxy_mnemotics.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- gaim-2.0.0beta2/gtk/gtkaccount.c 2006-08-28 15:15:43.894062000 +0100
-+++ gaim-2.0.0beta2.new/gtk/gtkaccount.c 2006-08-28 15:33:06.235893000 +0100
-@@ -184,6 +184,7 @@
-
- gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, GAIM_HIG_BORDER);
- gtk_widget_show(widget);
-+ gtk_label_set_mnemonic_widget(GTK_LABEL(label), widget);
- gaim_set_accessible_label (widget, label);
-
- return hbox;
--- a/patches/gaim-04-gtk-func-def.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- gaim-2.0.0beta4/configure.ac.orig 2006-11-02 22:50:02.516349000 +0000
-+++ gaim-2.0.0beta4/configure.ac 2006-11-02 22:50:46.487764000 +0000
-@@ -689,9 +689,9 @@
- for i in $STATIC_PRPLS ; do
- dnl Ugly special case for "libsilcgaim.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 \$(top_builddir)/libgaim/protocols/$i/lib${i}gaim.a"
- else
-- STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a"
-+ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib$i.a"
- fi
- extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();"
- load_proto="$load_proto gaim_init_${i}_plugin();"
--- a/patches/gaim-05-protocol-mnemonics.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,128 +0,0 @@
---- 2.0b6/gtk/gtkaccount.c-ori 2007-01-23 16:00:00.269995000 +0800
-+++ 2.0b6/gtk/gtkaccount.c 2007-01-23 16:21:38.057634000 +0800
-@@ -404,12 +404,14 @@
- dialog->protocol_menu = gaim_gtk_protocol_option_menu_new(
- dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog);
-
-- add_pref_box(dialog, vbox, _("Protocol:"), dialog->protocol_menu);
-+ /* SUN_BRANDING */
-+ add_pref_box(dialog, vbox, _("Pro_tocol:"), dialog->protocol_menu);
-
- /* Screen name */
- dialog->screenname_entry = gtk_entry_new();
-
-- add_pref_box(dialog, vbox, _("Screen name:"), dialog->screenname_entry);
-+ /* SUN_BRANDING */
-+ add_pref_box(dialog, vbox, _("Screen nam_e:"), dialog->screenname_entry);
-
- g_signal_connect(G_OBJECT(dialog->screenname_entry), "changed",
- G_CALLBACK(screenname_changed_cb), dialog);
-@@ -432,7 +434,7 @@
- GaimAccountUserSplit *split = l->data;
- char *buf;
-
-- buf = g_strdup_printf("%s:", gaim_account_user_split_get_text(split));
-+ buf = g_strdup_printf("_%s:", gaim_account_user_split_get_text(split));
-
- entry = gtk_entry_new();
-
-@@ -484,16 +486,19 @@
- gtk_entry_set_visibility(GTK_ENTRY(dialog->password_entry), FALSE);
- if (gtk_entry_get_invisible_char(GTK_ENTRY(dialog->password_entry)) == '*')
- gtk_entry_set_invisible_char(GTK_ENTRY(dialog->password_entry), GAIM_INVISIBLE_CHAR);
-- dialog->password_box = add_pref_box(dialog, vbox, _("Password:"),
-+ /* SUN_BRANDING */
-+ dialog->password_box = add_pref_box(dialog, vbox, _("_Password:"),
- dialog->password_entry);
-
- /* Alias */
- dialog->alias_entry = gtk_entry_new();
-- add_pref_box(dialog, vbox, _("Local alias:"), dialog->alias_entry);
-+ /* SUN_BRANDING */
-+ add_pref_box(dialog, vbox, _("_Local alias:"), dialog->alias_entry);
-
- /* Remember Password */
- dialog->remember_pass_check =
-- gtk_check_button_new_with_label(_("Remember password"));
-+ /* SUN_BRANDING */
-+ gtk_check_button_new_with_mnemonic(_("Remember pass_word"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->remember_pass_check),
- FALSE);
- gtk_box_pack_start(GTK_BOX(vbox), dialog->remember_pass_check,
-@@ -564,12 +569,14 @@
-
- /* New mail notifications */
- dialog->new_mail_check =
-- gtk_check_button_new_with_label(_("New mail notifications"));
-+ /* SUN_BRANDING */
-+ gtk_check_button_new_with_mnemonic(_("New mail noti_fications"));
- gtk_box_pack_start(GTK_BOX(vbox), dialog->new_mail_check, FALSE, FALSE, 0);
- gtk_widget_show(dialog->new_mail_check);
-
- /* Buddy icon */
-- dialog->icon_check = gtk_check_button_new_with_label(_("Use this buddy icon for this account:"));
-+ /* SUN_BRANDING */
-+ dialog->icon_check = gtk_check_button_new_with_mnemonic(_("Use this buddy _icon for this account:"));
- g_signal_connect(G_OBJECT(dialog->icon_check), "toggled", G_CALLBACK(icon_check_cb), dialog);
- gtk_widget_show(dialog->icon_check);
- gtk_box_pack_start(GTK_BOX(vbox), dialog->icon_check, FALSE, FALSE, 0);
-@@ -715,8 +722,10 @@
- gaim_account_option_get_default_bool(option));
- }
-
-- check = gtk_check_button_new_with_label(
-- gaim_account_option_get_text(option));
-+ char *tmp = g_strconcat("_",
-+ gaim_account_option_get_text(option), NULL);
-+ check = gtk_check_button_new_with_mnemonic(tmp);
-+ g_free(tmp);
-
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check),
- bool_value);
-@@ -748,7 +757,7 @@
- entry = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(entry), buf);
-
-- title = g_strdup_printf("%s:",
-+ title = g_strdup_printf("_%s:",
- gaim_account_option_get_text(option));
-
- add_pref_box(dialog, vbox, title, entry);
-@@ -785,7 +794,7 @@
- if (str_value != NULL)
- gtk_entry_set_text(GTK_ENTRY(entry), str_value);
-
-- title = g_strdup_printf("%s:",
-+ title = g_strdup_printf("_%s:",
- gaim_account_option_get_text(option));
-
- add_pref_box(dialog, vbox, title, entry);
-@@ -846,7 +855,7 @@
- gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo),
- renderer, "text", 0, NULL);
-
-- title = g_strdup_printf("%s:",
-+ title = g_strdup_printf("_%s:",
- gaim_account_option_get_text(option));
-
- add_pref_box(dialog, vbox, title, combo);
-@@ -972,7 +981,8 @@
- if (dialog->proxy_frame != NULL)
- gtk_widget_destroy(dialog->proxy_frame);
-
-- frame = gaim_gtk_make_frame(parent, _("Proxy Options"));
-+ /* SUN_BRANDING */
-+ frame = gaim_gtk_make_frame(parent, _("Pro_xy Options"));
- dialog->proxy_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame));
-
- gtk_box_reorder_child(GTK_BOX(parent), dialog->proxy_frame, 1);
-@@ -1460,7 +1470,8 @@
- dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, GAIM_HIG_BORDER);
- gtk_container_set_border_width(GTK_CONTAINER(dbox), GAIM_HIG_BORDER);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox,
-- gtk_label_new_with_mnemonic(_("_Advanced")));
-+ /* SUN_BRANDING */
-+ gtk_label_new_with_mnemonic(_("A_dvanced")));
- gtk_widget_show(dbox);
-
- /** Setup the bottom frames. */
--- a/patches/gaim-06-gnome-keyring.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
---- 2.0b4-my/configure.ac 2006-11-13 18:29:02.830447000 +0800
-+++ 2.0b4-my2/configure.ac 2006-11-13 17:05:20.491984000 +0800
-@@ -1783,6 +1783,20 @@
- LDFLAGS="$orig_LDFLAGS"
- fi
-
-+dnl #######################################################################
-+dnl # Check for gnome-keyring
-+dnl #--enable-gnome-keyring=(yes|no)
-+dnl #######################################################################
-+AC_ARG_ENABLE(gnome-keyring,
-+ AC_HELP_STRING([--enable-gnome-keyring],
-+ [use gnome keyring for storing password [default=no]]),,
-+ enable_gnome_keyring=no)
-+if test "x$enable_gnome_keyring" = "xyes"; then
-+ PKG_CHECK_MODULES(GAIM_KEYRING,
-+ gnome-keyring-1,
-+ AC_DEFINE(GAIM_ENABLE_KEYRING, [], [Set if we should use gnome-keyring]))
-+fi
-+
- AM_BINRELOC
-
- AC_MSG_CHECKING(for me pot o' gold)
---- 2.0b4-my/libgaim/Makefile.am 2006-10-19 01:38:16.000000000 +0800
-+++ 2.0b4-my2/libgaim/Makefile.am 2006-11-13 18:28:51.383417000 +0800
-@@ -221,6 +221,7 @@
- $(LIBXML_LIBS) \
- $(LIBNM_LIBS) \
- $(STATIC_LINK_LIBS) \
-+ $(GAIM_KEYRING_LIBS) \
- $(INTLLIBS) \
- -lm
-
-@@ -233,5 +234,6 @@
- $(GLIB_CFLAGS) \
- $(DEBUG_CFLAGS) \
- $(DBUS_CFLAGS) \
-+ $(GAIM_KEYRING_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(LIBNM_CFLAGS)
---- 2.0b4-my/libgaim/account.c 2006-10-19 01:38:16.000000000 +0800
-+++ 2.0b4-my2/libgaim/account.c 2006-11-13 18:26:19.409755000 +0800
-@@ -40,6 +40,13 @@
- #include "util.h"
- #include "xmlnode.h"
-
-+#ifdef GAIM_ENABLE_KEYRING
-+#include <gnome-keyring.h>
-+
-+static char * gaim_account_get_password_from_keyring (const char *_prpl, const char *_user);
-+static gboolean gaim_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *password);
-+#endif
-+
- /* TODO: Should use GaimValue instead of this? What about "ui"? */
- typedef struct
- {
-@@ -321,8 +328,13 @@
- if (gaim_account_get_remember_password(account) &&
- ((tmp = gaim_account_get_password(account)) != NULL))
- {
-+#ifdef GAIM_ENABLE_KEYRING
-+ gaim_account_set_password_in_keyring( gaim_account_get_protocol_id(account),
-+ gaim_account_get_username(account), tmp);
-+#else
- child = xmlnode_new_child(node, "password");
- xmlnode_insert_data(child, tmp, -1);
-+#endif
- }
-
- if ((tmp = gaim_account_get_alias(account)) != NULL)
-@@ -703,17 +715,30 @@
- }
-
- ret = gaim_account_new(name, protocol_id);
-- g_free(name);
-- g_free(protocol_id);
--
-- /* Read the password */
-- child = xmlnode_get_child(node, "password");
-- if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL))
-+ gboolean got_pwd = FALSE;
-+#ifdef GAIM_ENABLE_KEYRING
-+ data = gaim_account_get_password_from_keyring(protocol_id, name);
-+ if (data)
- {
-+ got_pwd = TRUE;
- gaim_account_set_remember_password(ret, TRUE);
- gaim_account_set_password(ret, data);
- g_free(data);
- }
-+#endif
-+ if (!got_pwd)
-+ {
-+ /* Read the password */
-+ child = xmlnode_get_child(node, "password");
-+ if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL))
-+ {
-+ gaim_account_set_remember_password(ret, TRUE);
-+ gaim_account_set_password(ret, data);
-+ g_free(data);
-+ }
-+ }
-+ g_free(name);
-+ g_free(protocol_id);
-
- /* Read the alias */
- child = xmlnode_get_child(node, "alias");
-@@ -2352,3 +2377,60 @@
-
- gaim_signals_unregister_by_instance(gaim_accounts_get_handle());
- }
-+
-+#ifdef GAIM_ENABLE_KEYRING
-+static char *
-+gaim_account_get_password_from_keyring(const char *_prpl, const char *_user)
-+{
-+ GnomeKeyringNetworkPasswordData *found_item;
-+ GnomeKeyringResult result;
-+ GList *matches;
-+ char *password;
-+
-+ matches = NULL;
-+
-+ result = gnome_keyring_find_network_password_sync (
-+ _user, /* user */
-+ NULL, /* domain */
-+ "gaim.local", /* server */
-+ NULL, /* object */
-+ _prpl, /* protocol */
-+ NULL, /* authtype */
-+ 1863, /* port */
-+ &matches);
-+
-+ if (result != GNOME_KEYRING_RESULT_OK)
-+ return NULL;
-+
-+ g_assert (matches != NULL && matches->data != NULL);
-+
-+ found_item = (GnomeKeyringNetworkPasswordData *) matches->data;
-+
-+ password = g_strdup (found_item->password);
-+
-+ gnome_keyring_network_password_list_free (matches);
-+
-+ return password;
-+}
-+
-+static gboolean
-+gaim_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *_password)
-+{
-+ GnomeKeyringResult result;
-+ guint32 item_id;
-+
-+ result = gnome_keyring_set_network_password_sync (
-+ NULL, /* default keyring */
-+ _user, /* user */
-+ NULL, /* domain */
-+ "gaim.local", /* server */
-+ NULL, /* object */
-+ _prpl, /* protocol */
-+ NULL, /* authtype */
-+ 1863, /* port */
-+ _password, /* password */
-+ &item_id);
-+
-+ return result == GNOME_KEYRING_RESULT_OK;
-+}
-+#endif
--- a/patches/gaim-07-gtk-file-chooser.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,442 +0,0 @@
---- gaim-ori/gtk/gtkimhtml.c 2006-10-19 01:37:48.000000000 +0800
-+++ gaim/gtk/gtkimhtml.c 2006-11-16 16:25:55.154676000 +0800
-@@ -3376,14 +3376,12 @@
- g_free(filename);
- }
-
--#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
- static void
- image_save_cancel_cb(GtkIMHtmlImage *image)
- {
- gtk_widget_destroy(image->filesel);
- image->filesel = NULL;
- }
--#endif /* FILECHOOSER */
-
- static void
- gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImage *image)
-@@ -3393,19 +3391,6 @@
- return;
- }
-
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- image->filesel = gtk_file_chooser_dialog_new(_("Save Image"),
-- NULL,
-- GTK_FILE_CHOOSER_ACTION_SAVE,
-- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-- NULL);
-- gtk_dialog_set_default_response(GTK_DIALOG(image->filesel), GTK_RESPONSE_ACCEPT);
-- if (image->filename != NULL)
-- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(image->filesel), image->filename);
-- g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(image->filesel)), "response",
-- G_CALLBACK(image_save_check_if_exists_cb), image);
--#else /* FILECHOOSER */
- image->filesel = gtk_file_selection_new(_("Save Image"));
- if (image->filename != NULL)
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(image->filesel), image->filename);
-@@ -3415,7 +3400,6 @@
- "clicked", G_CALLBACK(image_save_cancel_cb), image);
- g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(image->filesel)->ok_button), "clicked",
- G_CALLBACK(image_save_check_if_exists_cb), image);
--#endif /* FILECHOOSER */
-
- gtk_widget_show(image->filesel);
- }
---- gaim-ori/gtk/gtkimhtmltoolbar.c 2006-10-19 01:37:48.000000000 +0800
-+++ gaim/gtk/gtkimhtmltoolbar.c 2006-11-16 16:27:36.053762000 +0800
-@@ -438,33 +438,23 @@
- GtkTextIter iter;
- GtkTextMark *ins;
-
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- if (response != GTK_RESPONSE_ACCEPT) {
--#else /* FILECHOOSER */
- if (response != GTK_RESPONSE_OK) {
--#endif /* FILECHOOSER */
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
- return;
- }
-
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
--#else /* FILECHOOSER */
- filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(widget)));
--#endif /* FILECHOOSER */
-
- if (filename == NULL) {
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
- return;
- }
-
--#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
- if (gaim_gtk_check_if_dir(filename, GTK_FILE_SELECTION(widget))) {
- g_free(filename);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
- return;
- }
--#endif /* FILECHOOSER */
-
- /* The following triggers a callback that closes the widget */
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
-@@ -509,22 +499,10 @@
- GtkWidget *window;
-
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->image))) {
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- window = gtk_file_chooser_dialog_new(_("Insert Image"),
-- NULL,
-- GTK_FILE_CHOOSER_ACTION_OPEN,
-- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-- NULL);
-- gtk_dialog_set_default_response(GTK_DIALOG(window), GTK_RESPONSE_ACCEPT);
-- g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(window)),
-- "response", G_CALLBACK(do_insert_image_cb), toolbar);
--#else /* FILECHOOSER */
- window = gtk_file_selection_new(_("Insert Image"));
- gtk_dialog_set_default_response(GTK_DIALOG(window), GTK_RESPONSE_OK);
- g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(window)),
- "response", G_CALLBACK(do_insert_image_cb), toolbar);
--#endif /* FILECHOOSER */
-
- gtk_widget_show(window);
- toolbar->image_dialog = window;
---- gaim-ori/gtkrequest.c 2007-01-23 16:29:11.954980000 +0800
-+++ gaim/gtk/gtkrequest.c 2007-01-23 16:55:50.881490000 +0800
-@@ -1396,34 +1396,6 @@
- }
- }
-
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
--static void
--file_ok_check_if_exists_cb(GtkWidget *widget, gint response, GaimGtkRequestData *data)
--{
-- gchar *current_folder;
--
-- generic_response_start(data);
--
-- if (response != GTK_RESPONSE_ACCEPT) {
-- if (data->cbs[0] != NULL)
-- ((GaimRequestFileCb)data->cbs[0])(data->user_data, NULL);
-- gaim_request_close(data->type, data);
-- return;
-- }
--
-- data->u.file.name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(data->dialog));
-- current_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(data->dialog));
-- if (current_folder != NULL) {
-- if (data->u.file.savedialog) {
-- gaim_prefs_set_path("/gaim/gtk/filelocations/last_save_folder", current_folder);
-- } else {
-- gaim_prefs_set_path("/gaim/gtk/filelocations/last_open_folder", current_folder);
-- }
-- g_free(current_folder);
-- }
--
--#else /* FILECHOOSER */
--
- static void
- file_ok_check_if_exists_cb(GtkWidget *button, GaimGtkRequestData *data)
- {
-@@ -1462,7 +1434,6 @@
- g_free(current_folder);
- }
-
--#endif /* FILECHOOSER */
-
- if ((data->u.file.savedialog == TRUE) &&
- (g_file_test(data->u.file.name, G_FILE_TEST_EXISTS))) {
-@@ -1474,7 +1445,6 @@
- file_yes_no_cb(data, 1);
- }
-
--#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
- static void
- file_cancel_cb(GaimGtkRequestData *data)
- {
-@@ -1485,7 +1455,6 @@
-
- gaim_request_close(data->type, data);
- }
--#endif /* FILECHOOSER */
-
- static void *
- gaim_gtk_request_file(const char *title, const char *filename,
-@@ -1509,52 +1478,6 @@
- data->cbs[1] = ok_cb;
- data->u.file.savedialog = savedialog;
-
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- filesel = gtk_file_chooser_dialog_new(
-- title ? title : (savedialog ? _("Save File...")
-- : _("Open File...")),
-- NULL,
-- savedialog ? GTK_FILE_CHOOSER_ACTION_SAVE
-- : GTK_FILE_CHOOSER_ACTION_OPEN,
-- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-- savedialog ? GTK_STOCK_SAVE
-- : GTK_STOCK_OPEN,
-- GTK_RESPONSE_ACCEPT,
-- NULL);
-- gtk_dialog_set_default_response(GTK_DIALOG(filesel), GTK_RESPONSE_ACCEPT);
--
-- if (savedialog) {
-- current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_save_folder");
-- } else {
-- current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_open_folder");
-- }
--
-- if ((filename != NULL) && (*filename != '\0')) {
-- if (savedialog)
-- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(filesel), filename);
-- else
-- gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(filesel), filename);
-- }
-- if ((current_folder != NULL) && (*current_folder != '\0')) {
-- folder_set = gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(filesel), current_folder);
-- }
--
--#ifdef _WIN32
-- if (!folder_set) {
-- char *my_documents = wgaim_get_special_folder(CSIDL_PERSONAL);
--
-- if (my_documents != NULL) {
-- gtk_file_chooser_set_current_folder(
-- GTK_FILE_CHOOSER(filesel), my_documents);
--
-- g_free(my_documents);
-- }
-- }
--
--#endif
-- g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(filesel)), "response",
-- G_CALLBACK(file_ok_check_if_exists_cb), data);
--#else /* FILECHOOSER */
- filesel = gtk_file_selection_new(
- title ? title : (savedialog ? _("Save File...")
- : _("Open File...")));
-@@ -1577,7 +1500,6 @@
- "clicked", G_CALLBACK(file_cancel_cb), data);
- g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked",
- G_CALLBACK(file_ok_check_if_exists_cb), data);
--#endif /* FILECHOOSER */
-
- data->dialog = filesel;
- gtk_widget_show(filesel);
-@@ -1602,22 +1524,6 @@
- data->cbs[1] = ok_cb;
- data->u.file.savedialog = FALSE;
-
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- dirsel = gtk_file_chooser_dialog_new(
-- title ? title : _("Select Folder..."),
-- NULL,
-- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
-- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-- GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
-- NULL);
-- gtk_dialog_set_default_response(GTK_DIALOG(dirsel), GTK_RESPONSE_ACCEPT);
--
-- if ((dirname != NULL) && (*dirname != '\0'))
-- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dirsel), dirname);
--
-- g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(dirsel)), "response",
-- G_CALLBACK(file_ok_check_if_exists_cb), data);
--#else
- dirsel = gtk_file_selection_new(title ? title : _("Select Folder..."));
-
- g_signal_connect_swapped(G_OBJECT(dirsel), "delete_event",
-@@ -1626,7 +1532,6 @@
- "clicked", G_CALLBACK(file_cancel_cb), data);
- g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(dirsel)->ok_button), "clicked",
- G_CALLBACK(file_ok_check_if_exists_cb), data);
--#endif
-
- data->dialog = dirsel;
- gtk_widget_show(dirsel);
---- gaim-ori/gtk/gtkutils.c-ori 2007-01-23 16:47:54.342036000 +0800
-+++ gaim/gtk/gtkutils.c 2007-01-23 16:52:14.832892000 +0800
-@@ -2225,7 +2225,6 @@
- gpointer data;
- };
-
--#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
- static void
- icon_filesel_delete_cb(GtkWidget *w, struct _icon_chooser *dialog)
- {
-@@ -2237,35 +2236,9 @@
-
- g_free(dialog);
- }
--#endif /* FILECHOOSER */
-
-
-
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
--static void
--icon_filesel_choose_cb(GtkWidget *widget, gint response, struct _icon_chooser *dialog)
--{
-- char *filename, *current_folder;
--
-- if (response != GTK_RESPONSE_ACCEPT) {
-- if (response == GTK_RESPONSE_CANCEL) {
-- gtk_widget_destroy(dialog->icon_filesel);
-- }
-- dialog->icon_filesel = NULL;
-- if (dialog->callback)
-- dialog->callback(NULL, dialog->data);
-- g_free(dialog);
-- return;
-- }
--
-- filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->icon_filesel));
-- current_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog->icon_filesel));
-- if (current_folder != NULL) {
-- gaim_prefs_set_path("/gaim/gtk/filelocations/last_icon_folder", current_folder);
-- g_free(current_folder);
-- }
--
--#else /* FILECHOOSER */
- static void
- icon_filesel_choose_cb(GtkWidget *w, struct _icon_chooser *dialog)
- {
-@@ -2288,7 +2261,6 @@
- g_free(current_folder);
- }
-
--#endif /* FILECHOOSER */
- if (dialog->callback)
- dialog->callback(filename, dialog->data);
- gtk_widget_destroy(dialog->icon_filesel);
-@@ -2298,11 +2270,7 @@
-
-
- static void
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
--icon_preview_change_cb(GtkFileChooser *widget, struct _icon_chooser *dialog)
--#else /* FILECHOOSER */
- icon_preview_change_cb(GtkTreeSelection *sel, struct _icon_chooser *dialog)
--#endif /* FILECHOOSER */
- {
- GdkPixbuf *pixbuf, *scale;
- int height, width;
-@@ -2310,13 +2278,8 @@
- struct stat st;
- char *filename;
-
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- filename = gtk_file_chooser_get_preview_filename(
-- GTK_FILE_CHOOSER(dialog->icon_filesel));
--#else /* FILECHOOSER */
- filename = g_strdup(gtk_file_selection_get_filename(
- GTK_FILE_SELECTION(dialog->icon_filesel)));
--#endif /* FILECHOOSER */
-
- if (!filename || g_stat(filename, &st))
- {
-@@ -2328,10 +2291,6 @@
- if (!pixbuf) {
- gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_preview), NULL);
- gtk_label_set_markup(GTK_LABEL(dialog->icon_text), "");
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- gtk_file_chooser_set_preview_widget_active(
-- GTK_FILE_CHOOSER(dialog->icon_filesel), FALSE);
--#endif /* FILECHOOSER */
- g_free(filename);
- return;
- }
-@@ -2348,10 +2307,6 @@
- scale = gdk_pixbuf_scale_simple(pixbuf, width * 50 / height,
- 50, GDK_INTERP_BILINEAR);
- gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_preview), scale);
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- gtk_file_chooser_set_preview_widget_active(
-- GTK_FILE_CHOOSER(dialog->icon_filesel), TRUE);
--#endif /* FILECHOOSER */
- gtk_label_set_markup(GTK_LABEL(dialog->icon_text), markup);
-
- g_object_unref(G_OBJECT(pixbuf));
-@@ -2366,11 +2321,9 @@
- GtkWidget *gaim_gtk_buddy_icon_chooser_new(GtkWindow *parent, void(*callback)(const char *, gpointer), gpointer data) {
- struct _icon_chooser *dialog = g_new0(struct _icon_chooser, 1);
-
--#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
- GtkWidget *hbox;
- GtkWidget *tv;
- GtkTreeSelection *sel;
--#endif /* FILECHOOSER */
- const char *current_folder;
-
- dialog->callback = callback;
-@@ -2382,30 +2335,6 @@
- }
-
- current_folder = gaim_prefs_get_path("/gaim/gtk/filelocations/last_icon_folder");
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
--
-- dialog->icon_filesel = gtk_file_chooser_dialog_new(_("Buddy Icon"),
-- parent,
-- GTK_FILE_CHOOSER_ACTION_OPEN,
-- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-- NULL);
-- gtk_dialog_set_default_response(GTK_DIALOG(dialog->icon_filesel), GTK_RESPONSE_ACCEPT);
-- if ((current_folder != NULL) && (*current_folder != '\0'))
-- gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog->icon_filesel),
-- current_folder);
--
-- dialog->icon_preview = gtk_image_new();
-- dialog->icon_text = gtk_label_new(NULL);
-- gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview), -1, 50);
-- gtk_file_chooser_set_preview_widget(GTK_FILE_CHOOSER(dialog->icon_filesel),
-- GTK_WIDGET(dialog->icon_preview));
-- g_signal_connect(G_OBJECT(dialog->icon_filesel), "update-preview",
-- G_CALLBACK(icon_preview_change_cb), dialog);
-- g_signal_connect(G_OBJECT(dialog->icon_filesel), "response",
-- G_CALLBACK(icon_filesel_choose_cb), dialog);
-- icon_preview_change_cb(NULL, dialog);
--#else /* FILECHOOSER */
- dialog->icon_filesel = gtk_file_selection_new(_("Buddy Icon"));
- dialog->icon_preview = gtk_image_new();
- dialog->icon_text = gtk_label_new(NULL);
-@@ -2437,7 +2366,6 @@
- G_CALLBACK(icon_filesel_delete_cb), dialog);
- g_signal_connect(G_OBJECT(dialog->icon_filesel), "destroy",
- G_CALLBACK(icon_filesel_delete_cb), dialog);
--#endif /* FILECHOOSER */
- return dialog->icon_filesel;
- }
-
---- gaim-ori/gtk/gtkwhiteboard.c 2006-10-19 01:37:48.000000000 +0800
-+++ gaim/gtk/gtkwhiteboard.c 2006-11-16 16:32:01.677911000 +0800
-@@ -752,29 +752,8 @@
-
- int result;
-
--#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-- dialog = gtk_file_chooser_dialog_new (_("Save File"),
-- GTK_WINDOW(gtkwb->window),
-- GTK_FILE_CHOOSER_ACTION_SAVE,
-- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-- NULL);
--
-- /* gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog), (gboolean)(TRUE)); */
--
-- /* if(user_edited_a_new_document) */
-- {
-- /* gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), default_folder_for_saving); */
-- gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), "whiteboard.jpg");
-- }
-- /*
-- else
-- gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog), filename_for_existing_document);
-- */
--#else
- dialog = gtk_file_selection_new(_("Save File"));
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog), "whiteboard.jpg");
--#endif
- result = gtk_dialog_run(GTK_DIALOG(dialog));
-
- if(result == GTK_RESPONSE_ACCEPT)
--- a/patches/gaim-08-uninstalled-pc.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- /dev/null 2006-12-20 17:41:06.000000000 +0800
-+++ gaim/gaim-uninstalled.pc.in 2006-12-22 16:32:46.308280000 +0800
-@@ -0,0 +1,13 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+datadir=@datadir@
-+sysconfdir=@sysconfdir@
-+
-+Name: Gaim
-+Description: Gaim is a GTK2-based instant messenger application.
-+Version: @VERSION@
-+Requires: glib-2.0
-+Cflags: -I${pc_top_builddir}/${pcfiledir}/libgaim -I${pc_top_builddir}/${pcfiledir}/gtk
-+Libs: ${pc_top_builddir}/${pcfiledir}/libgaim/libgaim.la
---- gaim-orig/configure.ac.orig 2006-12-22 16:35:42.870514000 +0800
-+++ gaim/configure.ac 2006-12-22 16:35:02.633637000 +0800
-@@ -1913,6 +1913,7 @@
- console/plugins/Makefile
- po/Makefile.in
- gaim.pc
-+ gaim-uninstalled.pc
- gaim.spec
- ])
-
--- a/patches/gaim-09-dbus-abort.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- gaim-2.0.0beta5/libgaim/dbus-server.c 2006-11-10 15:24:19.000000000 +0800
-+++ 2.0b5/libgaim/dbus-server.c 2007-01-22 13:50:36.440652000 +0800
-@@ -115,7 +115,7 @@
- {
- gaim_debug_warning("dbus",
- "Need to register an object with the dbus subsystem.\n");
-- g_return_val_if_reached(0);
-+ return 0;
- }
- return id;
- }
---- gaim-2.0.0beta6/libgaim/core.c 2007-02-08 14:41:06.101168135 +0800
-+++ gaim-2.0.0beta6/libgaim/core.c 2007-02-08 14:50:05.317147889 +0800
-@@ -104,13 +104,14 @@
- gaim_dbus_init();
- #endif
-
-+ gaim_plugins_init();
-+
- /* Initialize all static protocols. */
- static_proto_init();
-
- /* Since plugins get probed so early we should probably initialize their
- * subsystem right away too.
- */
-- gaim_plugins_init();
- gaim_plugins_probe(G_MODULE_SUFFIX);
-
- /* Accounts use status and buddy icons, so initialize these before accounts */
--- a/patches/gaim-10-return-void.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- gaim-ori/libgaim/protocols/oscar/misc.c 2007-01-23 17:09:42.486769000 +0800
-+++ gaim/libgaim/protocols/oscar/misc.c 2007-01-23 17:10:12.425626000 +0800
-@@ -70,7 +70,10 @@
- aim_snacid_t snacid;
-
- if (!longdata)
-- return aim_genericreq_n(od, conn, family, subtype);
-+ {
-+ aim_genericreq_n(od, conn, family, subtype);
-+ return;
-+ }
-
- frame = flap_frame_new(od, 0x02, 10+4);
-
-@@ -89,7 +92,10 @@
- aim_snacid_t snacid;
-
- if (!shortdata)
-- return aim_genericreq_n(od, conn, family, subtype);
-+ {
-+ aim_genericreq_n(od, conn, family, subtype);
-+ return;
-+ }
-
- frame = flap_frame_new(od, 0x02, 10+2);
-
--- a/patches/gaim-11-static-prpls.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- gaim-old/configure.ac 2007-01-25 16:18:56.186385000 +0800
-+++ gaim/configure.ac 2007-01-25 16:19:58.809098000 +0800
-@@ -701,13 +701,25 @@
- load_proto=
- for i in $STATIC_PRPLS ; do
- dnl Ugly special case for "libsilcgaim.a":
-- if test "x$i" = "xsilc"; then
-- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib${i}gaim.a"
-- else
-- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib$i.a"
-- fi
-- extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();"
-- load_proto="$load_proto gaim_init_${i}_plugin();"
-+ if test "x$i" = "xsilc"; then
-+ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib${i}gaim.a"
-+ elif test "x$i" = "xoscar"; then
-+ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/oscar/libaim.a"
-+ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/oscar/libicq.a"
-+ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/oscar/liboscar.a"
-+ else
-+ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib$i.a"
-+ fi
-+ if test "x$i" = "xoscar"; then
-+ extern_init="$extern_init extern gboolean gaim_init_aim_plugin(); extern gboolean gaim_init_icq_plugin();"
-+ else
-+ extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();"
-+ fi
-+ if test "x$i" = "xoscar"; then
-+ load_proto="$load_proto gaim_init_aim_plugin(); gaim_init_icq_plugin();"
-+ else
-+ load_proto="$load_proto gaim_init_${i}_plugin();"
-+ fi
- case $i in
- bonjour) static_bonjour=yes ;;
- gg) static_gg=yes ;;
--- a/patches/gaim-12-jabber-msg.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gaim-ori/libgaim/protocols/jabber/jabber-ori.c 2007-03-07 12:16:24.828217000 +0800
-+++ gaim/libgaim/protocols/jabber/jabber.c 2007-03-07 12:16:34.984597000 +0800
-@@ -160,6 +160,8 @@
- static void jabber_stream_handle_error(JabberStream *js, xmlnode *packet)
- {
- char *msg = jabber_parse_error(js, packet);
-+ if (!msg)
-+ return;
-
- gaim_connection_error(js->gc, msg);
- g_free(msg);
--- a/patches/gaim-13-option-menu.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- gaim-2.0.0beta6/gtk/gtkaccount.c-ori 2007-04-03 15:27:40.388947000 +0800
-+++ gaim-2.0.0beta6/gtk/gtkaccount.c 2007-04-03 15:29:02.395556000 +0800
-@@ -404,6 +404,7 @@
- /* Protocol */
- dialog->protocol_menu = gaim_gtk_protocol_option_menu_new(
- dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog);
-+ gtk_widget_show(dialog->protocol_menu);
-
- /* SUN_BRANDING */
- add_pref_box(dialog, vbox, _("Pro_tocol:"), dialog->protocol_menu);
---- gaim-2.0.0beta6/libgaim/signals.c-ori 2007-04-03 15:28:03.320887000 +0800
-+++ gaim-2.0.0beta6/libgaim/signals.c 2007-04-03 15:29:30.222262000 +0800
-@@ -339,8 +339,8 @@
- /* Get the instance data */
- instance_data =
- (GaimInstanceData *)g_hash_table_lookup(instance_table, instance);
--
-- g_return_if_fail(instance_data != NULL);
-+ if (instance_data == NULL)
-+ return;
-
- /* Get the signal data */
- signal_data =
--- a/patches/gaim-14-enable-nss.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- gaim-ori/libgaim/plugins/ssl/ssl-nss.c 2007-05-03 12:21:47.980121000 +0800
-+++ gaim/libgaim/plugins/ssl/ssl-nss.c 2007-05-03 12:21:56.323297000 +0800
-@@ -32,7 +32,6 @@
- #undef HAVE_LONG_LONG /* Make Mozilla less angry. If angry, Mozilla SMASH! */
-
- #include <nspr.h>
--#include <private/pprio.h>
- #include <nss.h>
- #include <pk11func.h>
- #include <prio.h>
--- a/patches/gaim-otr-01-upgrade-gaim2b2.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,300 +0,0 @@
-Index: ChangeLog
-===================================================================
-RCS file: gaim-otr/ChangeLog,v
-retrieving revision 1.13
-retrieving revision 1.15
-diff -u -r1.13 -r1.15
---- ChangeLog 2 Nov 2005 22:04:47 -0000 1.13
-+++ ChangeLog 20 Jan 2006 15:22:06 -0000 1.15
-@@ -1,3 +1,13 @@
-+2006-01-20
-+
-+ * otr-plugin.c: Track the gaim-2 API changes.
-+
-+2005-12-18
-+
-+ * gtk-dialog.c:
-+ * otr-plugin.c: Compile against either gaim-1.x or gaim-2.x,
-+ based on a patch from Dustin Howett <[email protected]>.
-+
- 2005-11-02
-
- * INSTALL: Add instruction for doing autoreconf from CVS
-Index: gtk-dialog.c
-===================================================================
-RCS file: gaim-otr/gtk-dialog.c,v
-retrieving revision 1.9
-retrieving revision 1.10
-diff -u -r1.9 -r1.10
---- gtk-dialog.c 28 Oct 2005 03:38:21 -0000 1.9
-+++ gtk-dialog.c 18 Dec 2005 18:33:48 -0000 1.10
-@@ -26,7 +26,12 @@
- #include <gcrypt.h>
-
- /* gaim headers */
-+#include "version.h"
-+#if GAIM_MAJOR_VERSION < 2
- #include "stock.h"
-+#else
-+#include "gaimstock.h"
-+#endif
- #include "plugin.h"
- #include "notify.h"
- #include "gtkconv.h"
-@@ -779,7 +784,11 @@
- account = gaim_accounts_find(accountname, protocol);
- if (!account) return -1;
-
-+#if GAIM_MAJOR_VERSION < 2
- conv = gaim_find_conversation_with_account(username, account);
-+#else
-+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account);
-+#endif
- if (!conv) return -1;
-
- gaim_conversation_write(conv, NULL, msg, GAIM_MESSAGE_SYSTEM, time(NULL));
-@@ -908,7 +917,11 @@
- GtkWidget *menuquerylabel;
- GtkWidget *menuview;
- GtkWidget *menuverf;
-+#if GAIM_MAJOR_VERSION < 2
-+ /* gaim-2.0.0 no longer has the row of buttons, so it doesn't have
-+ * the button_type pref */
- GaimButtonStyle buttonstyle;
-+#endif
- GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
- label = gaim_conversation_get_data(conv, "otr-label");
- icon = gaim_conversation_get_data(conv, "otr-icon");
-@@ -919,7 +932,9 @@
- menuend = gaim_conversation_get_data(conv, "otr-menuend");
- menuview = gaim_conversation_get_data(conv, "otr-menuview");
- menuverf = gaim_conversation_get_data(conv, "otr-menuverf");
-+#if GAIM_MAJOR_VERSION < 2
- buttonstyle = gaim_prefs_get_int("/gaim/gtk/conversations/button_type");
-+#endif
-
- /* Set the button's icon, label and tooltip. */
- otr_icon(icon, level);
-@@ -948,6 +963,7 @@
-
- /* Set the appropriate visibility */
- gtk_widget_show_all(button);
-+#if GAIM_MAJOR_VERSION < 2
- if (buttonstyle == GAIM_BUTTON_IMAGE) {
- /* Hide the text */
- gtk_widget_hide(icontext);
-@@ -958,6 +974,7 @@
- gtk_widget_hide(icontext);
- gtk_widget_hide(icon);
- }
-+#endif
- }
-
- static void dialog_update_label(ConnContext *context)
-@@ -968,7 +985,11 @@
-
- account = gaim_accounts_find(context->accountname, context->protocol);
- if (!account) return;
-+#if GAIM_MAJOR_VERSION < 2
- conv = gaim_find_conversation_with_account(context->username, account);
-+#else
-+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, context->username, account);
-+#endif
- if (!conv) return;
- dialog_update_label_conv(conv, level);
- }
-@@ -1252,7 +1273,11 @@
- account = gaim_accounts_find(accountname, protocol);
- if (!account) return;
-
-+#if GAIM_MAJOR_VERSION < 2
- conv = gaim_find_conversation_with_account(username, account);
-+#else
-+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account);
-+#endif
- if (!conv) return;
-
- buf = g_strdup_printf("%s has ended his private conversation with you; "
-@@ -1406,9 +1431,13 @@
- GtkWidget *whatsthis;
-
- /* Do nothing if this isn't an IM conversation */
-+#if GAIM_MAJOR_VERSION < 2
- if (gaim_conversation_get_type(conv) != GAIM_CONV_IM) return;
--
- bbox = gtkconv->bbox;
-+#else
-+ if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) return;
-+ bbox = gtkconv->lower_hbox;
-+#endif
-
- context = otrg_plugin_conv_to_context(conv);
-
-@@ -1515,7 +1544,11 @@
- GtkWidget *button;
-
- /* Do nothing if this isn't an IM conversation */
-+#if GAIM_MAJOR_VERSION < 2
- if (gaim_conversation_get_type(conv) != GAIM_CONV_IM) return;
-+#else
-+ if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) return;
-+#endif
-
- button = gaim_conversation_get_data(conv, "otr-button");
- if (button) gtk_object_destroy(GTK_OBJECT(button));
-@@ -1531,7 +1564,11 @@
- OtrlPolicy policy;
-
- /* Do nothing if this isn't an IM conversation */
-+#if GAIM_MAJOR_VERSION < 2
- if (gaim_conversation_get_type(conv) != GAIM_CONV_IM) return;
-+#else
-+ if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) return;
-+#endif
-
- account = gaim_conversation_get_account(conv);
- name = gaim_conversation_get_name(conv);
-Index: otr-plugin.c
-===================================================================
-RCS file: gaim-otr/otr-plugin.c,v
-retrieving revision 1.10
-retrieving revision 1.12
-diff -u -r1.10 -r1.12
---- otr-plugin.c 27 Oct 2005 16:01:59 -0000 1.10
-+++ otr-plugin.c 20 Jan 2006 15:22:06 -0000 1.12
-@@ -32,11 +32,11 @@
-
- /* gaim headers */
- #include "gaim.h"
--#include "core.h"
- #include "notify.h"
- #include "version.h"
- #include "util.h"
- #include "debug.h"
-+#include "core.h"
-
- #ifdef USING_GTK
- /* gaim GTK headers */
-@@ -156,7 +156,11 @@
- buddy = gaim_find_buddy(account, recipient);
- if (!buddy) return -1;
-
-+#if GAIM_MAJOR_VERSION < 2
- return (buddy->present == GAIM_BUDDY_ONLINE);
-+#else
-+ return (GAIM_BUDDY_IS_ONLINE(buddy));
-+#endif
- }
-
- static void inject_message_cb(void *opdata, const char *accountname,
-@@ -395,6 +399,8 @@
- otrg_dialog_resensitize_all();
- }
-
-+#if GAIM_MAJOR_VERSION < 2
-+/* gaim-2.0.0 no longer has the row of buttons in question */
- static void process_button_type_change(const char *name, GaimPrefType type,
- gpointer value, gpointer data)
- {
-@@ -404,6 +410,7 @@
- * buttons as well. */
- otrg_dialog_resensitize_all();
- }
-+#endif
-
- static void otr_options_cb(GaimBlistNode *node, gpointer user_data)
- {
-@@ -416,7 +423,11 @@
-
- static void supply_extended_menu(GaimBlistNode *node, GList **menu)
- {
-+#if GAIM_MAJOR_VERSION < 2
- GaimBlistNodeAction *act;
-+#else
-+ GaimMenuAction *act;
-+#endif
- GaimBuddy *buddy;
- GaimAccount *acct;
- const char *proto;
-@@ -430,7 +441,12 @@
- proto = gaim_account_get_protocol_id(acct);
- if (!otrg_plugin_proto_supports_otr(proto)) return;
-
-+#if GAIM_MAJOR_VERSION < 2
- act = gaim_blist_node_action_new("OTR Settings", otr_options_cb, NULL);
-+#else
-+ act = gaim_menu_action_new("OTR Settings", (GaimCallback)otr_options_cb,
-+ NULL, NULL);
-+#endif
- *menu = g_list_append(*menu, act);
- }
-
-@@ -482,9 +498,17 @@
- account = gaim_accounts_find(context->accountname, context->protocol);
- if (account == NULL) return NULL;
-
-+#if GAIM_MAJOR_VERSION < 2
- conv = gaim_find_conversation_with_account(context->username, account);
-+#else
-+ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, context->username, account);
-+#endif
- if (conv == NULL && force_create) {
-+#if GAIM_MAJOR_VERSION < 2
- conv = gaim_conversation_new(GAIM_CONV_IM, account, context->username);
-+#else
-+ conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, context->username);
-+#endif
- }
-
- return conv;
-@@ -523,7 +547,10 @@
- }
- }
-
-+#if GAIM_MAJOR_VERSION < 2
-+/* gaim-2.0.0 no longer has the row of buttons in question */
- static guint button_type_cbid;
-+#endif
-
- static gboolean otr_plugin_load(GaimPlugin *handle)
- {
-@@ -567,9 +594,11 @@
- GAIM_CALLBACK(process_connection_change), NULL);
- gaim_signal_connect(blist_handle, "blist-node-extended-menu",
- otrg_plugin_handle, GAIM_CALLBACK(supply_extended_menu), NULL);
-+#if GAIM_MAJOR_VERSION < 2
- button_type_cbid = gaim_prefs_connect_callback(
- "/gaim/gtk/conversations/button_type",
- process_button_type_change, NULL);
-+#endif
-
- gaim_conversation_foreach(otrg_dialog_new_conv);
-
-@@ -601,7 +630,9 @@
- GAIM_CALLBACK(process_connection_change));
- gaim_signal_disconnect(blist_handle, "blist-node-extended-menu",
- otrg_plugin_handle, GAIM_CALLBACK(supply_extended_menu));
-+#if GAIM_MAJOR_VERSION < 2
- gaim_prefs_disconnect_callback(button_type_cbid);
-+#endif
-
- gaim_conversation_foreach(otrg_dialog_remove_conv);
-
-@@ -640,10 +671,16 @@
- {
- GAIM_PLUGIN_MAGIC,
-
-+#if GAIM_MAJOR_VERSION < 2
- /* We stick with the functions in the gaim 1.0.x API for
- * compatibility. */
-- 1, /* major version */
-+ 1, /* major version */
- 0, /* minor version */
-+#else
-+ /* Use the 2.0.x API */
-+ 2, /* major version */
-+ 0, /* minor version */
-+#endif
-
- GAIM_PLUGIN_STANDARD, /* type */
- PLUGIN_TYPE, /* ui_requirement */
--- a/patches/gaim-otr-02-gtk-ui.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
---- gtk-ui.c 2007-03-06 11:52:06.032022000 +0800
-+++ gtk-ui.c 2007-03-06 11:53:51.632355000 +0800
-@@ -143,10 +143,14 @@
-
- static void clist_all_unselected(void)
- {
-- gtk_widget_set_sensitive(ui_layout.connect_button, 0);
-- gtk_widget_set_sensitive(ui_layout.disconnect_button, 0);
-- gtk_widget_set_sensitive(ui_layout.forget_button, 0);
-- gtk_widget_set_sensitive(ui_layout.verify_button, 0);
-+ if (ui_layout.connect_button)
-+ gtk_widget_set_sensitive(ui_layout.connect_button, 0);
-+ if (ui_layout.disconnect_button)
-+ gtk_widget_set_sensitive(ui_layout.disconnect_button, 0);
-+ if (ui_layout.forget_button)
-+ gtk_widget_set_sensitive(ui_layout.forget_button, 0);
-+ if (ui_layout.verify_button)
-+ gtk_widget_set_sensitive(ui_layout.verify_button, 0);
- ui_layout.selected_fprint = NULL;
- }
-
--- a/patches/gaim-otr-03-gtk-dialog.diff Thu May 31 07:58:23 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- gaim-otr-3.0.0/gtk-dialog.c-ori 2007-04-03 15:28:26.552884000 +0800
-+++ gaim-otr-3.0.0/gtk-dialog.c 2007-04-03 15:30:19.236093000 +0800
-@@ -1395,6 +1395,9 @@
- * pointing to it. */
- static void button_destroyed(GtkWidget *w, GaimConversation *conv)
- {
-+ if (!conv || !conv->data)
-+ return;
-+
- GtkWidget *menu = gaim_conversation_get_data(conv, "otr-menu");
- if (menu) gtk_object_destroy(GTK_OBJECT(menu));
- g_hash_table_remove(conv->data, "otr-label");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-01-proxy_mnemotics.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,10 @@
+--- gaim-2.0.0beta2/pidgin/gtkaccount.c 2006-08-28 15:15:43.894062000 +0100
++++ gaim-2.0.0beta2.new/pidgin/gtkaccount.c 2006-08-28 15:33:06.235893000 +0100
+@@ -184,6 +184,7 @@
+
+ gtk_box_pack_start(GTK_BOX(hbox), widget, TRUE, TRUE, PIDGIN_HIG_BORDER);
+ gtk_widget_show(widget);
++ gtk_label_set_mnemonic_widget(GTK_LABEL(label), widget);
+ pidgin_set_accessible_label (widget, label);
+
+ return hbox;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-02-gtk-func-def.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,14 @@
+--- gaim-2.0.0beta4/configure.ac.orig 2006-11-02 22:50:02.516349000 +0000
++++ gaim-2.0.0beta4/configure.ac 2006-11-02 22:50:46.487764000 +0000
+@@ -689,9 +689,9 @@
+ for i in $STATIC_PRPLS ; do
+ dnl Ugly special case for "libsilcpurple.a":
+ if test "x$i" = "xsilc"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib${i}purple.a"
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.a"
+ else
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a"
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.a"
+ fi
+ extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+ load_proto="$load_proto purple_init_${i}_plugin();"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-03-protocol-mnemonics.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,131 @@
+--- pidgin-2.0.0-ori/pidgin/gtkaccount.c 2007-05-04 12:41:49.000000000 +0800
++++ pidgin-2.0.0-tainted/pidgin/gtkaccount.c 2007-05-09 17:43:10.980253000 +0800
+@@ -427,7 +427,8 @@
+ gtk_widget_ref(dialog->protocol_menu);
+ }
+
+- hbox = add_pref_box(dialog, vbox, _("Protocol:"), dialog->protocol_menu);
++ /* SUN_BRANDING */
++ hbox = add_pref_box(dialog, vbox, _("Pro_tocol:"), dialog->protocol_menu);
+ g_object_set_data(G_OBJECT(dialog->protocol_menu), "container", hbox);
+
+ gtk_widget_unref(dialog->protocol_menu);
+@@ -435,7 +436,8 @@
+ /* Screen name */
+ dialog->screenname_entry = gtk_entry_new();
+
+- add_pref_box(dialog, vbox, _("Screen name:"), dialog->screenname_entry);
++ /* SUN_BRANDING */
++ add_pref_box(dialog, vbox, _("Screen nam_e:"), dialog->screenname_entry);
+
+ g_signal_connect(G_OBJECT(dialog->screenname_entry), "changed",
+ G_CALLBACK(screenname_changed_cb), dialog);
+@@ -458,7 +460,7 @@
+ PurpleAccountUserSplit *split = l->data;
+ char *buf;
+
+- buf = g_strdup_printf("%s:", purple_account_user_split_get_text(split));
++ buf = g_strdup_printf("_%s:", purple_account_user_split_get_text(split));
+
+ entry = gtk_entry_new();
+
+@@ -517,16 +519,19 @@
+ gtk_entry_set_visibility(GTK_ENTRY(dialog->password_entry), FALSE);
+ if (gtk_entry_get_invisible_char(GTK_ENTRY(dialog->password_entry)) == '*')
+ gtk_entry_set_invisible_char(GTK_ENTRY(dialog->password_entry), PIDGIN_INVISIBLE_CHAR);
+- dialog->password_box = add_pref_box(dialog, vbox, _("Password:"),
++ /* SUN_BRANDING */
++ dialog->password_box = add_pref_box(dialog, vbox, _("_Password:"),
+ dialog->password_entry);
+
+ /* Alias */
+ dialog->alias_entry = gtk_entry_new();
+- add_pref_box(dialog, vbox, _("Local alias:"), dialog->alias_entry);
++ /* SUN_BRANDING */
++ add_pref_box(dialog, vbox, _("_Local alias:"), dialog->alias_entry);
+
+ /* Remember Password */
+ dialog->remember_pass_check =
+- gtk_check_button_new_with_label(_("Remember password"));
++ /* SUN_BRANDING */
++ gtk_check_button_new_with_label(_("Remember pass_word"));
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->remember_pass_check),
+ FALSE);
+ gtk_box_pack_start(GTK_BOX(vbox), dialog->remember_pass_check,
+@@ -597,12 +602,14 @@
+
+ /* New mail notifications */
+ dialog->new_mail_check =
+- gtk_check_button_new_with_label(_("New mail notifications"));
++ /* SUN_BRANDING */
++ gtk_check_button_new_with_mnemonic(_("New mail noti_fications"));
+ gtk_box_pack_start(GTK_BOX(vbox), dialog->new_mail_check, FALSE, FALSE, 0);
+ gtk_widget_show(dialog->new_mail_check);
+
+ /* Buddy icon */
+- dialog->icon_check = gtk_check_button_new_with_label(_("Use this buddy icon for this account:"));
++ /* SUN_BRANDING */
++ dialog->icon_check = gtk_check_button_new_with_mnemonic(_("Use this buddy _icon for this account:"));
+ g_signal_connect(G_OBJECT(dialog->icon_check), "toggled", G_CALLBACK(icon_check_cb), dialog);
+ gtk_widget_show(dialog->icon_check);
+ gtk_box_pack_start(GTK_BOX(vbox), dialog->icon_check, FALSE, FALSE, 0);
+@@ -756,8 +763,10 @@
+ purple_account_option_get_default_bool(option));
+ }
+
+- check = gtk_check_button_new_with_label(
+- purple_account_option_get_text(option));
++ char *tmp = g_strconcat("_",
++ purple_account_option_get_text(option), NULL);
++ check = gtk_check_button_new_with_mnemonic(tmp);
++ g_free(tmp);
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check),
+ bool_value);
+@@ -789,7 +798,7 @@
+ entry = gtk_entry_new();
+ gtk_entry_set_text(GTK_ENTRY(entry), buf);
+
+- title = g_strdup_printf("%s:",
++ title = g_strdup_printf("_%s:",
+ purple_account_option_get_text(option));
+
+ add_pref_box(dialog, vbox, title, entry);
+@@ -834,7 +843,7 @@
+ if (str_value != NULL)
+ gtk_entry_set_text(GTK_ENTRY(entry), str_value);
+
+- title = g_strdup_printf("%s:",
++ title = g_strdup_printf("_%s:",
+ purple_account_option_get_text(option));
+
+ add_pref_box(dialog, vbox, title, entry);
+@@ -895,7 +904,7 @@
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo),
+ renderer, "text", 0, NULL);
+
+- title = g_strdup_printf("%s:",
++ title = g_strdup_printf("_%s:",
+ purple_account_option_get_text(option));
+
+ add_pref_box(dialog, vbox, title, combo);
+@@ -1021,7 +1030,8 @@
+ if (dialog->proxy_frame != NULL)
+ gtk_widget_destroy(dialog->proxy_frame);
+
+- frame = pidgin_make_frame(parent, _("Proxy Options"));
++ /* SUN_BRANDING */
++ frame = pidgin_make_frame(parent, _("Pro_xy Options"));
+ dialog->proxy_frame = gtk_widget_get_parent(gtk_widget_get_parent(frame));
+
+ gtk_box_reorder_child(GTK_BOX(parent), dialog->proxy_frame, 1);
+@@ -1504,7 +1514,8 @@
+ dialog->bottom_vbox = dbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BORDER);
+ gtk_container_set_border_width(GTK_CONTAINER(dbox), PIDGIN_HIG_BORDER);
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dbox,
+- gtk_label_new_with_mnemonic(_("_Advanced")));
++ /* SUN_BRANDING */
++ gtk_label_new_with_mnemonic(_("A_dvanced")));
+ gtk_widget_show(dbox);
+
+ /** Setup the bottom frames. */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-04-gnome-keyring.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,173 @@
+--- 2.0b4-my/libpurple/Makefile.am 2006-10-19 01:38:16.000000000 +0800
++++ 2.0b4-my2/libpurple/Makefile.am 2006-11-13 18:28:51.383417000 +0800
+@@ -221,6 +221,7 @@
+ $(LIBXML_LIBS) \
+ $(LIBNM_LIBS) \
+ $(STATIC_LINK_LIBS) \
++ $(GAIM_KEYRING_LIBS) \
+ $(INTLLIBS) \
+ -lm
+
+@@ -233,5 +234,6 @@
+ $(GLIB_CFLAGS) \
+ $(DEBUG_CFLAGS) \
+ $(DBUS_CFLAGS) \
++ $(GAIM_KEYRING_CFLAGS) \
+ $(LIBXML_CFLAGS) \
+ $(LIBNM_CFLAGS)
+--- 2.0b4-my/libpurple/account.c 2006-10-19 01:38:16.000000000 +0800
++++ 2.0b4-my2/libpurple/account.c 2006-11-13 18:26:19.409755000 +0800
+@@ -40,6 +40,13 @@
+ #include "util.h"
+ #include "xmlnode.h"
+
++#ifdef GAIM_ENABLE_KEYRING
++#include <gnome-keyring.h>
++
++static char * gaim_account_get_password_from_keyring (const char *_prpl, const char *_user);
++static gboolean gaim_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *password);
++#endif
++
+ /* TODO: Should use PurpleValue instead of this? What about "ui"? */
+ typedef struct
+ {
+@@ -324,8 +331,13 @@
+ if (purple_account_get_remember_password(account) &&
+ ((tmp = purple_account_get_password(account)) != NULL))
+ {
++#ifdef GAIM_ENABLE_KEYRING
++ gaim_account_set_password_in_keyring( purple_account_get_protocol_id(account),
++ purple_account_get_username(account), tmp);
++#else
+ child = xmlnode_new_child(node, "password");
+ xmlnode_insert_data(child, tmp, -1);
++#endif
+ }
+
+ if ((tmp = purple_account_get_alias(account)) != NULL)
+@@ -700,17 +712,30 @@
+ }
+
+ ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
+- g_free(name);
+- g_free(protocol_id);
+-
+- /* Read the password */
+- child = xmlnode_get_child(node, "password");
+- if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL))
+- {
+- purple_account_set_remember_password(ret, TRUE);
+- purple_account_set_password(ret, data);
+- g_free(data);
+- }
++ gboolean got_pwd = FALSE;
++#ifdef GAIM_ENABLE_KEYRING
++ data = gaim_account_get_password_from_keyring(protocol_id, name);
++ if (data)
++ {
++ got_pwd = TRUE;
++ purple_account_set_remember_password(ret, TRUE);
++ purple_account_set_password(ret, data);
++ g_free(data);
++ }
++#endif
++ if (!got_pwd)
++ {
++ /* Read the password */
++ child = xmlnode_get_child(node, "password");
++ if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL))
++ {
++ purple_account_set_remember_password(ret, TRUE);
++ purple_account_set_password(ret, data);
++ g_free(data);
++ }
++ }
++ g_free(name);
++ g_free(protocol_id);
+
+ /* Read the alias */
+ child = xmlnode_get_child(node, "alias");
+@@ -2439,3 +2464,60 @@
+
+ purple_signals_unregister_by_instance(purple_accounts_get_handle());
+ }
++
++#ifdef GAIM_ENABLE_KEYRING
++static char *
++gaim_account_get_password_from_keyring(const char *_prpl, const char *_user)
++{
++ GnomeKeyringNetworkPasswordData *found_item;
++ GnomeKeyringResult result;
++ GList *matches;
++ char *password;
++
++ matches = NULL;
++
++ result = gnome_keyring_find_network_password_sync (
++ _user, /* user */
++ NULL, /* domain */
++ "gaim.local", /* server */
++ NULL, /* object */
++ _prpl, /* protocol */
++ NULL, /* authtype */
++ 1863, /* port */
++ &matches);
++
++ if (result != GNOME_KEYRING_RESULT_OK)
++ return NULL;
++
++ g_assert (matches != NULL && matches->data != NULL);
++
++ found_item = (GnomeKeyringNetworkPasswordData *) matches->data;
++
++ password = g_strdup (found_item->password);
++
++ gnome_keyring_network_password_list_free (matches);
++
++ return password;
++}
++
++static gboolean
++gaim_account_set_password_in_keyring (const char *_prpl, const char *_user, const char *_password)
++{
++ GnomeKeyringResult result;
++ guint32 item_id;
++
++ result = gnome_keyring_set_network_password_sync (
++ NULL, /* default keyring */
++ _user, /* user */
++ NULL, /* domain */
++ "gaim.local", /* server */
++ NULL, /* object */
++ _prpl, /* protocol */
++ NULL, /* authtype */
++ 1863, /* port */
++ _password, /* password */
++ &item_id);
++
++ return result == GNOME_KEYRING_RESULT_OK;
++}
++#endif
+--- pidgin-2.0.0/configure.ac-ori 2007-05-24 14:26:55.133319000 +0800
++++ pidgin-2.0.0/configure.ac 2007-05-24 14:27:12.141394000 +0800
+@@ -1914,6 +1914,20 @@
+ LDFLAGS="$orig_LDFLAGS"
+ fi
+
++dnl #######################################################################
++dnl # Check for gnome-keyring
++dnl #--enable-gnome-keyring=(yes|no)
++dnl #######################################################################
++AC_ARG_ENABLE(gnome-keyring,
++ AC_HELP_STRING([--enable-gnome-keyring],
++ [use gnome keyring for storing password [default=no]]),,
++ enable_gnome_keyring=no)
++if test "x$enable_gnome_keyring" = "xyes"; then
++ PKG_CHECK_MODULES(GAIM_KEYRING,
++ gnome-keyring-1,
++ AC_DEFINE(GAIM_ENABLE_KEYRING, [], [Set if we should use gnome-keyring]))
++fi
++
+ AC_MSG_CHECKING(for me pot o' gold)
+ AC_MSG_RESULT(no)
+ AC_CHECK_FUNCS(gethostid lrand48)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-05-uninstalled-pc.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,26 @@
+--- /dev/null 2006-12-20 17:41:06.000000000 +0800
++++ gaim/pidgin-uninstalled.pc.in 2006-12-22 16:32:46.308280000 +0800
+@@ -0,0 +1,13 @@
++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
++Cflags: -I${pc_top_builddir}/${pcfiledir}/libpurple -I${pc_top_builddir}/${pcfiledir}/pidgin
++Libs: ${pc_top_builddir}/${pcfiledir}/libpurple/libpurple.la
+--- gaim-orig/configure.ac.orig 2006-12-22 16:35:42.870514000 +0800
++++ gaim/configure.ac 2006-12-22 16:35:02.633637000 +0800
+@@ -2026,6 +2026,7 @@
+
+ AC_OUTPUT([Makefile
+ Doxyfile
++ pidgin-uninstalled.pc
+ doc/Makefile
+ doc/pidgin.1
+ doc/finch.1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-06-dbus-abort.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,29 @@
+--- 2.0beta5/libpurple/dbus-server.c 2006-11-10 15:24:19.000000000 +0800
++++ 2.0b5/libpurple/dbus-server.c 2007-01-22 13:50:36.440652000 +0800
+@@ -115,7 +115,7 @@
+ {
+ purple_debug_warning("dbus",
+ "Need to register an object with the dbus subsystem.\n");
+- g_return_val_if_reached(0);
++ return 0;
+ }
+ return id;
+ }
+--- gaim-2.0.0beta6/libpurple/core.c 2007-02-08 14:41:06.101168135 +0800
++++ gaim-2.0.0beta6/libpurple/core.c 2007-02-08 14:50:05.317147889 +0800
+@@ -117,6 +117,7 @@
+ #endif
+
+ purple_ciphers_init();
++ purple_plugins_init();
+
+ /* Initialize all static protocols. */
+ static_proto_init();
+@@ -124,7 +125,6 @@
+ /* Since plugins get probed so early we should probably initialize their
+ * subsystem right away too.
+ */
+- purple_plugins_init();
+ purple_plugins_probe(G_MODULE_SUFFIX);
+
+ /* The buddy icon code uses the imgstore, so init it early. */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-07-jabber-msg.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,11 @@
+--- gaim-ori/libpurple/protocols/jabber/jabber-ori.c 2007-03-07 12:16:24.828217000 +0800
++++ gaim/libpurple/protocols/jabber/jabber.c 2007-03-07 12:16:34.984597000 +0800
+@@ -160,6 +160,8 @@
+ static void jabber_stream_handle_error(JabberStream *js, xmlnode *packet)
+ {
+ char *msg = jabber_parse_error(js, packet);
++ if (!msg)
++ return;
+
+ purple_connection_error(js->gc, msg);
+ g_free(msg);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-08-option-menu.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,23 @@
+--- gaim-2.0.0beta6/pidgin/gtkaccount.c-ori 2007-04-03 15:27:40.388947000 +0800
++++ gaim-2.0.0beta6/pidgin/gtkaccount.c 2007-04-03 15:29:02.395556000 +0800
+@@ -425,6 +425,7 @@
+ dialog->protocol_menu = pidgin_protocol_option_menu_new(
+ dialog->protocol_id, G_CALLBACK(set_account_protocol_cb), dialog);
+ gtk_widget_ref(dialog->protocol_menu);
++ gtk_widget_show(dialog->protocol_menu);
+ }
+
+ /* SUN_BRANDING */
+--- gaim-2.0.0beta6/libpurple/signals.c-ori 2007-04-03 15:28:03.320887000 +0800
++++ gaim-2.0.0beta6/libpurple/signals.c 2007-04-03 15:29:30.222262000 +0800
+@@ -339,8 +339,8 @@
+ /* Get the instance data */
+ instance_data =
+ (PurpleInstanceData *)g_hash_table_lookup(instance_table, instance);
+-
+- g_return_if_fail(instance_data != NULL);
++ if (instance_data == NULL)
++ return;
+
+ /* Get the signal data */
+ signal_data =
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-09-enable-nss.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,10 @@
+--- gaim-ori/libpurple/plugins/ssl/ssl-nss.c 2007-05-03 12:21:47.980121000 +0800
++++ gaim/libpurple/plugins/ssl/ssl-nss.c 2007-05-03 12:21:56.323297000 +0800
+@@ -32,7 +32,6 @@
+ #undef HAVE_LONG_LONG /* Make Mozilla less angry. If angry, Mozilla SMASH! */
+
+ #include <nspr.h>
+-#include <private/pprio.h>
+ #include <nss.h>
+ #include <pk11func.h>
+ #include <prio.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-otr-01-gtk-ui.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,21 @@
+--- pidginotr/gtk-ui.c 2007-03-06 11:52:06.032022000 +0800
++++ pidginotr/gtk-ui.c 2007-03-06 11:53:51.632355000 +0800
+@@ -143,10 +143,14 @@
+
+ static void clist_all_unselected(void)
+ {
+- gtk_widget_set_sensitive(ui_layout.connect_button, 0);
+- gtk_widget_set_sensitive(ui_layout.disconnect_button, 0);
+- gtk_widget_set_sensitive(ui_layout.forget_button, 0);
+- gtk_widget_set_sensitive(ui_layout.verify_button, 0);
++ if (ui_layout.connect_button)
++ gtk_widget_set_sensitive(ui_layout.connect_button, 0);
++ if (ui_layout.disconnect_button)
++ gtk_widget_set_sensitive(ui_layout.disconnect_button, 0);
++ if (ui_layout.forget_button)
++ gtk_widget_set_sensitive(ui_layout.forget_button, 0);
++ if (ui_layout.verify_button)
++ gtk_widget_set_sensitive(ui_layout.verify_button, 0);
+ ui_layout.selected_fprint = NULL;
+ }
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-otr-02-gtk-dialog.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,12 @@
+--- pidgin-otr-3.0.1-ori/gtk-dialog.c 2007-05-29 17:14:37.009826000 +0800
++++ pidgin-otr-3.0.1/gtk-dialog.c 2007-05-29 17:15:02.195060000 +0800
+@@ -1384,6 +1384,9 @@
+ * pointing to it. */
+ static void button_destroyed(GtkWidget *w, PurpleConversation *conv)
+ {
++ if (!conv || !conv->data)
++ return;
++
+ GtkWidget *menu = purple_conversation_get_data(conv, "otr-menu");
+ if (menu) gtk_object_destroy(GTK_OBJECT(menu));
+ g_hash_table_remove(conv->data, "otr-label");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pidgin-otr-03-makefile.diff Thu May 31 08:38:41 2007 +0000
@@ -0,0 +1,15 @@
+--- pidgin-otr/Makefile.am 2007-05-29 14:09:20.189688000 +0800
++++ pidgin-otr-my/Makefile.am 2007-05-29 14:09:06.814341000 +0800
+@@ -6,9 +6,9 @@
+
+ plugin_LTLIBRARIES= pidgin-otr.la
+
+-gaim_otr_la_SOURCES= otr-plugin.c ui.c dialogs.c gtk-ui.c gtk-dialog.c
+-gaim_otr_la_LDFLAGS= -module -avoid-version
+-gaim_otr_la_LDFLAGS+= @LIBGCRYPT_LIBS@ @LIBOTR_LIBS@
++pidgin_otr_la_SOURCES= otr-plugin.c ui.c dialogs.c gtk-ui.c gtk-dialog.c
++pidgin_otr_la_LDFLAGS= -module -avoid-version
++pidgin_otr_la_LDFLAGS+= @LIBGCRYPT_LIBS@ @LIBOTR_LIBS@
+
+ EXTRA_DIST= dialogs.h gtk-dialog.h gtk-ui.h otr-plugin.h ui.h \
+ Makefile.mingw packaging