Mercurial > pidgin.yaz
changeset 19696:481749fc0b6b
merge of '1c7910841138381c841363256ca3c7905b1f26b0'
and '5818cbd5fe95d6a167f1555b882526f36790b141'
line wrap: on
line diff
--- a/COPYING Thu Sep 06 04:08:41 2007 +0000 +++ b/COPYING Mon Sep 10 13:57:15 2007 +0000 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA Also add information on how to contact you by electronic and paper mail.
--- a/COPYRIGHT Thu Sep 06 04:08:41 2007 +0000 +++ b/COPYRIGHT Mon Sep 10 13:57:15 2007 +0000 @@ -338,7 +338,6 @@ Michael Shkutkov Ettore Simone John Silvestri -Ankit Singla Craig Slusher Alex Smith Brad Smith
--- a/doc/SIGNAL-HOWTO.dox Thu Sep 06 04:08:41 2007 +0000 +++ b/doc/SIGNAL-HOWTO.dox Mon Sep 10 13:57:15 2007 +0000 @@ -78,7 +78,7 @@ @todo Describe this more. - @See value.h + @see value.h @section connect Connecting to the signal Once the signal is registered, you can connect callbacks to it. First, you
--- a/doc/finch.1.in Thu Sep 06 04:08:41 2007 +0000 +++ b/doc/finch.1.in Mon Sep 10 13:57:15 2007 +0000 @@ -494,7 +494,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA .SH AUTHORS Sadrul Habib Chowdhury <\fIsadrul@users.sourceforge.net\fR>
--- a/doc/pidgin.1.in Thu Sep 06 04:08:41 2007 +0000 +++ b/doc/pidgin.1.in Mon Sep 10 13:57:15 2007 +0000 @@ -526,7 +526,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA .SH AUTHORS Pidgin's active developers are:
--- a/finch/finch.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/finch.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "finch.h"
--- a/finch/finch.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/finch.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h>
--- a/finch/gntaccount.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntaccount.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <gnt.h> #include <gntbox.h>
--- a/finch/gntaccount.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntaccount.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_ACCOUNT_H #define _GNT_ACCOUNT_H
--- a/finch/gntblist.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntblist.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "finch.h"
--- a/finch/gntblist.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntblist.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_BLIST_H #define _GNT_BLIST_H
--- a/finch/gntcertmgr.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntcertmgr.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/finch/gntcertmgr.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntcertmgr.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _GNT_CERTMGR_H
--- a/finch/gntconn.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntconn.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "finch.h"
--- a/finch/gntconn.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntconn.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_CONN_H #define _GNT_CONN_H
--- a/finch/gntconv.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntconv.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <string.h>
--- a/finch/gntconv.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntconv.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_CONV_H #define _GNT_CONV_H
--- a/finch/gntdebug.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntdebug.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <gnt.h> #include <gntbox.h>
--- a/finch/gntdebug.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntdebug.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_DEBUG_H #define _GNT_DEBUG_H
--- a/finch/gntft.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntft.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <gnt.h> #include <gntbox.h>
--- a/finch/gntft.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntft.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _FINCHFT_H_ #define _FINCHFT_H_
--- a/finch/gntidle.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntidle.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/finch/gntidle.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntidle.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_IDLE_H_ #define _GNT_IDLE_H_
--- a/finch/gntnotify.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntnotify.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <gnt.h> #include <gntbox.h>
--- a/finch/gntnotify.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntnotify.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_NOTIFY_H #define _GNT_NOTIFY_H
--- a/finch/gntplugin.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntplugin.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <gnt.h> #include <gntbox.h>
--- a/finch/gntplugin.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntplugin.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_PLUGIN_H #define _GNT_PLUGIN_H
--- a/finch/gntpounce.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntpounce.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include <gnt.h>
--- a/finch/gntpounce.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntpounce.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _FINCHPOUNCE_H_ #define _FINCHPOUNCE_H_
--- a/finch/gntprefs.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntprefs.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "finch.h"
--- a/finch/gntprefs.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntprefs.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_PREFS_H #define _GNT_PREFS_H
--- a/finch/gntrequest.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntrequest.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <gnt.h> #include <gntbox.h>
--- a/finch/gntrequest.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntrequest.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_REQUEST_H #define _GNT_REQUEST_H
--- a/finch/gntsound.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntsound.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "finch.h"
--- a/finch/gntsound.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntsound.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_SOUND_H #define _GNT_SOUND_H
--- a/finch/gntstatus.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntstatus.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <gnt.h> #include <gntbox.h>
--- a/finch/gntstatus.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntstatus.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_STATUS_H #define _GNT_STATUS_H
--- a/finch/gntui.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntui.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" @@ -91,8 +91,6 @@ gnt_register_action(_("Statuses"), finch_savedstatus_show_all); #ifdef STANDALONE - - finch_plugins_save_loaded(); } void gnt_ui_uninit()
--- a/finch/gntui.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/gntui.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GNT_UI_H #define _GNT_UI_H
--- a/finch/libgnt/COPYING Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/COPYING Mon Sep 10 13:57:15 2007 +0000 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA Also add information on how to contact you by electronic and paper mail.
--- a/finch/libgnt/gnt-skel.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gnt-skel.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gnt-skel.h"
--- a/finch/libgnt/gnt-skel.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gnt-skel.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_SKEL_H
--- a/finch/libgnt/gnt.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gnt.h Mon Sep 10 13:57:15 2007 +0000 @@ -27,7 +27,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h>
--- a/finch/libgnt/gntbindable.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntbindable.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <string.h>
--- a/finch/libgnt/gntbindable.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntbindable.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_BINDABLE_H
--- a/finch/libgnt/gntbox.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntbox.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntbox.h"
--- a/finch/libgnt/gntbox.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntbox.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_BOX_H
--- a/finch/libgnt/gntbutton.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntbutton.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <stdlib.h>
--- a/finch/libgnt/gntbutton.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntbutton.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_BUTTON_H
--- a/finch/libgnt/gntcheckbox.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntcheckbox.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntcheckbox.h"
--- a/finch/libgnt/gntcheckbox.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntcheckbox.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_CHECK_BOX_H
--- a/finch/libgnt/gntclipboard.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntclipboard.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntclipboard.h"
--- a/finch/libgnt/gntclipboard.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntclipboard.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_CLIPBOARD_H
--- a/finch/libgnt/gntcolors.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntcolors.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "config.h"
--- a/finch/libgnt/gntcolors.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntcolors.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_COLORS_H
--- a/finch/libgnt/gntcombobox.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntcombobox.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntbox.h"
--- a/finch/libgnt/gntcombobox.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntcombobox.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_COMBO_BOX_H
--- a/finch/libgnt/gntentry.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntentry.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <ctype.h>
--- a/finch/libgnt/gntentry.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntentry.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_ENTRY_H
--- a/finch/libgnt/gntfilesel.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntfilesel.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntbutton.h"
--- a/finch/libgnt/gntfilesel.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntfilesel.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_FILE_SEL_H
--- a/finch/libgnt/gntkeys.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntkeys.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntkeys.h"
--- a/finch/libgnt/gntkeys.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntkeys.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_KEYS_H
--- a/finch/libgnt/gntlabel.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntlabel.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntlabel.h"
--- a/finch/libgnt/gntlabel.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntlabel.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_LABEL_H
--- a/finch/libgnt/gntline.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntline.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntline.h"
--- a/finch/libgnt/gntline.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntline.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_LINE_H
--- a/finch/libgnt/gntmain.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntmain.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #define _GNU_SOURCE
--- a/finch/libgnt/gntmenu.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntmenu.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntmenu.h"
--- a/finch/libgnt/gntmenu.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntmenu.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_MENU_H
--- a/finch/libgnt/gntmenuitem.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntmenuitem.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntmenu.h"
--- a/finch/libgnt/gntmenuitem.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntmenuitem.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_MENUITEM_H
--- a/finch/libgnt/gntmenuitemcheck.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntmenuitemcheck.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntmenuitemcheck.h"
--- a/finch/libgnt/gntmenuitemcheck.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntmenuitemcheck.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_MENU_ITEM_CHECK_H
--- a/finch/libgnt/gntslider.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntslider.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntcolors.h"
--- a/finch/libgnt/gntslider.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntslider.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_SLIDER_H
--- a/finch/libgnt/gntstyle.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntstyle.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntstyle.h"
--- a/finch/libgnt/gntstyle.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntstyle.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gnt.h"
--- a/finch/libgnt/gnttextview.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gnttextview.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntstyle.h"
--- a/finch/libgnt/gnttextview.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gnttextview.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_TEXT_VIEW_H
--- a/finch/libgnt/gnttree.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gnttree.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntmarshal.h"
--- a/finch/libgnt/gnttree.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gnttree.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_TREE_H
--- a/finch/libgnt/gntutils.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntutils.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntbutton.h"
--- a/finch/libgnt/gntutils.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntutils.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h>
--- a/finch/libgnt/gntwidget.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntwidget.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* Stuff brutally ripped from Gflib */
--- a/finch/libgnt/gntwidget.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntwidget.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_WIDGET_H
--- a/finch/libgnt/gntwindow.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntwindow.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gntstyle.h"
--- a/finch/libgnt/gntwindow.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntwindow.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNT_WINDOW_H
--- a/finch/libgnt/gntwm.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntwm.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #define _GNU_SOURCE
--- a/finch/libgnt/gntwm.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntwm.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNTWM_H
--- a/finch/libgnt/gntws.h Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/gntws.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef GNTWS_H
--- a/finch/libgnt/pygnt/example/rss/gnthtml.py Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/pygnt/example/rss/gnthtml.py Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with this application; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA """
--- a/finch/libgnt/pygnt/example/rss/gntrss-ui.py Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/pygnt/example/rss/gntrss-ui.py Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with this application; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA """
--- a/finch/libgnt/pygnt/example/rss/gntrss.py Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/pygnt/example/rss/gntrss.py Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with this application; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA """
--- a/finch/libgnt/pygnt/gntbox.override Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/pygnt/gntbox.override Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 * USA */ %%
--- a/finch/libgnt/pygnt/gntfilesel.override Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/pygnt/gntfilesel.override Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 * USA */ %%
--- a/finch/libgnt/pygnt/gnttree.override Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/pygnt/gnttree.override Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 * USA */ %%
--- a/finch/libgnt/pygnt/gntwidget.override Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/libgnt/pygnt/gntwidget.override Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 * USA */ %%
--- a/finch/plugins/gntclipboard.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/plugins/gntclipboard.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/finch/plugins/gntgf.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/plugins/gntgf.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/finch/plugins/gnthistory.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/plugins/gnthistory.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* Ripped from gtk/plugins/history.c */
--- a/finch/plugins/lastlog.c Thu Sep 06 04:08:41 2007 +0000 +++ b/finch/plugins/lastlog.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/account.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/account.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "account.h"
--- a/libpurple/account.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/account.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref account-signals */
--- a/libpurple/accountopt.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/accountopt.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/accountopt.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/accountopt.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_ACCOUNTOPT_H_ #define _PURPLE_ACCOUNTOPT_H_
--- a/libpurple/blist.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/blist.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/blist.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/blist.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref blist-signals */
--- a/libpurple/buddyicon.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/buddyicon.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "buddyicon.h"
--- a/libpurple/buddyicon.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/buddyicon.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_BUDDYICON_H_ #define _PURPLE_BUDDYICON_H_
--- a/libpurple/certificate.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/certificate.c Mon Sep 10 13:57:15 2007 +0000 @@ -23,7 +23,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h> @@ -1256,6 +1256,9 @@ } /* For when we've never communicated with this party before */ +/* TODO: Need ways to specify possibly multiple problems with a cert, or at + least reprioritize them. For example, maybe the signature ought to be + checked BEFORE the hostname checking? */ static void x509_tls_cached_unknown_peer(PurpleCertificateVerificationRequest *vrq) { @@ -1296,7 +1299,27 @@ return; } /* if (name mismatch) */ - + /* TODO: Figure out a way to check for a bad signature, as opposed to + "not self-signed" */ + if ( purple_certificate_signed_by(peer_crt, peer_crt) ) { + gchar *msg; + + purple_debug_info("certificate/x509/tls_cached", + "Certificate for %s is self-signed.\n", + vrq->subject_name); + + /* Prompt the user to authenticate the certificate */ + /* vrq will be completed by user_auth */ + msg = g_strdup_printf(_("The certificate presented by \"%s\" " + "is self-signed. It cannot be " + "automatically checked."), + vrq->subject_name); + + x509_tls_cached_user_auth(vrq,msg); + + g_free(msg); + return; + } /* if (name mismatch) */ /* Next, check that the certificate chain is valid */ if ( ! purple_certificate_check_signature_chain(chain) ) {
--- a/libpurple/certificate.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/certificate.h Mon Sep 10 13:57:15 2007 +0000 @@ -23,7 +23,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_CERTIFICATE_H
--- a/libpurple/cipher.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/cipher.c Mon Sep 10 13:57:15 2007 +0000 @@ -48,7 +48,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h> #include <string.h>
--- a/libpurple/cipher.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/cipher.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref cipher-signals */
--- a/libpurple/circbuffer.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/circbuffer.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/circbuffer.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/circbuffer.h Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _CIRCBUFFER_H #define _CIRCBUFFER_H
--- a/libpurple/cmds.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/cmds.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/cmds.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/cmds.h Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _PURPLE_CMDS_H_
--- a/libpurple/connection.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/connection.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "account.h"
--- a/libpurple/connection.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/connection.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref connection-signals */
--- a/libpurple/conversation.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/conversation.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "blist.h"
--- a/libpurple/conversation.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/conversation.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref conversation-signals */ @@ -184,7 +184,7 @@ time_t mtime); /** Add @a cbuddies to a chat. - * @param cbuddies A @C GList of #PurpleConvChatBuddy structs. + * @param cbuddies A @c GList of #PurpleConvChatBuddy structs. * @param new_arrivals Whether join notices should be shown. * (Join notices are actually written to the * conversation by #purple_conv_chat_add_users().) @@ -200,7 +200,7 @@ void (*chat_rename_user)(PurpleConversation *conv, const char *old_name, const char *new_name, const char *new_alias); /** Remove @a users from a chat. - * @param users A @C GList of <tt>const char *</tt>s. + * @param users A @c GList of <tt>const char *</tt>s. * @see purple_conv_chat_rename_user() */ void (*chat_remove_users)(PurpleConversation *conv, GList *users);
--- a/libpurple/core.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/core.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "cipher.h"
--- a/libpurple/core.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/core.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref core-signals */
--- a/libpurple/dbus-bindings.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/dbus-bindings.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/dbus-purple.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/dbus-purple.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/dbus-server.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/dbus-server.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/dbus-server.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/dbus-server.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref dbus-server-signals */
--- a/libpurple/debug.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/debug.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "debug.h" #include "internal.h"
--- a/libpurple/debug.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/debug.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_DEBUG_H_ #define _PURPLE_DEBUG_H_
--- a/libpurple/desktopitem.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/desktopitem.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ @@ -48,8 +48,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ #include <errno.h>
--- a/libpurple/desktopitem.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/desktopitem.h Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ @@ -48,8 +48,8 @@ * * You should have received a copy of the GNU Library General Public * License along with the Gnome Library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ #ifndef _PURPLE_DESKTOP_ITEM_H_
--- a/libpurple/dnsquery.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/dnsquery.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/dnsquery.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/dnsquery.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_DNSQUERY_H_ #define _PURPLE_DNSQUERY_H_
--- a/libpurple/dnssrv.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/dnssrv.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/dnssrv.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/dnssrv.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_DNSSRV_H
--- a/libpurple/eventloop.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/eventloop.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "eventloop.h" #include "internal.h"
--- a/libpurple/eventloop.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/eventloop.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_EVENTLOOP_H_ #define _PURPLE_EVENTLOOP_H_
--- a/libpurple/example/nullclient.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/example/nullclient.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/ft.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/ft.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/ft.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/ft.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref xfer-signals */
--- a/libpurple/gaim-compat.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/gaim-compat.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref account-signals */
--- a/libpurple/idle.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/idle.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/idle.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/idle.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_IDLE_H_ #define _PURPLE_IDLE_H_
--- a/libpurple/imgstore.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/imgstore.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/imgstore.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/imgstore.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref imgstore-signals */
--- a/libpurple/internal.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/internal.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_INTERNAL_H_ #define _PURPLE_INTERNAL_H_
--- a/libpurple/log.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/log.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/log.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/log.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref log-signals */
--- a/libpurple/mime.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/mime.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/mime.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/mime.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/network.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/network.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/network.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/network.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_NETWORK_H_ #define _PURPLE_NETWORK_H_
--- a/libpurple/notify.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/notify.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "dbus-maybe.h"
--- a/libpurple/notify.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/notify.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref notify-signals */ @@ -213,6 +213,11 @@ PurpleNotifySearchResults *results, PurpleNotifyCloseCallback cb, gpointer user_data); +/** + * Frees a PurpleNotifySearchResults object. + * + * @param results The PurpleNotifySearchResults to free. + */ void purple_notify_searchresults_free(PurpleNotifySearchResults *results); /**
--- a/libpurple/ntlm.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/ntlm.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h>
--- a/libpurple/ntlm.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/ntlm.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_NTLM_H
--- a/libpurple/plugin.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugin.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/plugin.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugin.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref plugin-signals * @see @ref plugin-ids
--- a/libpurple/pluginpref.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/pluginpref.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifdef HAVE_CONFIG_H # include <config.h>
--- a/libpurple/pluginpref.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/pluginpref.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _PURPLE_PLUGINPREF_H_
--- a/libpurple/plugins/autoaccept.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/autoaccept.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h"
--- a/libpurple/plugins/buddynote.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/buddynote.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include "internal.h"
--- a/libpurple/plugins/ciphertest.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/ciphertest.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #ifdef HAVE_CONFIG_H
--- a/libpurple/plugins/codeinline.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/codeinline.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/plugins/dbus-buddyicons-example.py Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/dbus-buddyicons-example.py Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA # import dbus
--- a/libpurple/plugins/dbus-example.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/dbus-example.c Mon Sep 10 13:57:15 2007 +0000 @@ -32,7 +32,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/plugins/fortuneprofile.pl Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/fortuneprofile.pl Mon Sep 10 13:57:15 2007 +0000 @@ -40,7 +40,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA use Gaim;
--- a/libpurple/plugins/idle.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/idle.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/plugins/ipc-test-client.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/ipc-test-client.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h" #include "debug.h"
--- a/libpurple/plugins/ipc-test-server.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/ipc-test-server.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #define IPC_TEST_SERVER_PLUGIN_ID "core-ipc-test-server"
--- a/libpurple/plugins/joinpart.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/joinpart.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/plugins/newline.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/newline.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include "internal.h"
--- a/libpurple/plugins/offlinemsg.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/offlinemsg.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h"
--- a/libpurple/plugins/perl/perl.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/perl/perl.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifdef HAVE_CONFIG_H #include <config.h>
--- a/libpurple/plugins/pluginpref_example.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/pluginpref_example.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #ifdef HAVE_CONFIG_H
--- a/libpurple/plugins/signals-test.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/signals-test.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #define SIGNAL_TEST_PLUGIN_ID "core-signals-test"
--- a/libpurple/plugins/ssl/ssl-gnutls.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-gnutls.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "debug.h"
--- a/libpurple/plugins/ssl/ssl-nss.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-nss.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "debug.h" @@ -107,6 +107,20 @@ } } +static gchar *get_error_text() +{ + PRInt32 len = PR_GetErrorTextLength(); + gchar *ret = NULL; + + if (len > 0) { + ret = g_malloc(len + 1); + len = PR_GetErrorText(ret); + ret[len] = '\0'; + } + + return ret; +} + static void ssl_nss_init_nss(void) { @@ -220,11 +234,14 @@ * It seems to work because it'll eventually use the cached value */ if(SSL_ForceHandshake(nss_data->in) != SECSuccess) { + gchar *error_txt; set_errno(PR_GetError()); if (errno == EAGAIN || errno == EWOULDBLOCK) return; - purple_debug_error("nss", "Handshake failed %d\n", PR_GetError()); + error_txt = get_error_text(); + purple_debug_error("nss", "Handshake failed %s (%d)\n", error_txt ? error_txt : "", PR_GetError()); + g_free(error_txt); if (gsc->error_cb != NULL) gsc->error_cb(gsc, PURPLE_SSL_HANDSHAKE_FAILED, gsc->connect_cb_data); @@ -265,8 +282,11 @@ socket_opt.option = PR_SockOpt_Nonblocking; socket_opt.value.non_blocking = PR_TRUE; - if (PR_SetSocketOption(nss_data->fd, &socket_opt) != PR_SUCCESS) - purple_debug_warning("nss", "unable to set socket into non-blocking mode: %d\n", PR_GetError()); + if (PR_SetSocketOption(nss_data->fd, &socket_opt) != PR_SUCCESS) { + gchar *error_txt = get_error_text(); + purple_debug_warning("nss", "unable to set socket into non-blocking mode: %s (%d)\n", error_txt ? error_txt : "", PR_GetError()); + g_free(error_txt); + } nss_data->in = SSL_ImportFD(NULL, nss_data->fd); @@ -365,10 +385,12 @@ ssl_nss_peer_certs(PurpleSslConnection *gsc) { PurpleSslNssData *nss_data = PURPLE_SSL_NSS_DATA(gsc); + CERTCertificate *cert; +/* GList *chain = NULL; - CERTCertificate *cert; void *pinArg; SECStatus status; +*/ /* TODO: this is a blind guess */ cert = SSL_PeerCertificate(nss_data->fd); @@ -487,6 +509,7 @@ g_free(crt); } +#if 0 /** Determines whether one certificate has been issued and signed by another * * @param crt Certificate to check the signature of @@ -501,6 +524,7 @@ { return FALSE; } +#endif static GByteArray * x509_sha1sum(PurpleCertificate *crt)
--- a/libpurple/plugins/ssl/ssl.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/ssl/ssl.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "debug.h"
--- a/libpurple/plugins/startup.py Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/startup.py Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA # import sys
--- a/libpurple/plugins/tcl/tcl.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/tcl/tcl.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "config.h"
--- a/libpurple/plugins/tcl/tcl_cmd.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_cmd.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <tcl.h>
--- a/libpurple/plugins/tcl/tcl_cmds.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_cmds.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <tcl.h>
--- a/libpurple/plugins/tcl/tcl_glib.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_glib.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * TERMS 2 *
--- a/libpurple/plugins/tcl/tcl_glib.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_glib.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_TCL_GLIB_H_
--- a/libpurple/plugins/tcl/tcl_purple.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_purple.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_TCL_PURPLE_H_
--- a/libpurple/plugins/tcl/tcl_ref.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_ref.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <tcl.h>
--- a/libpurple/plugins/tcl/tcl_signals.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_signals.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <tcl.h> #include <stdarg.h>
--- a/libpurple/pounce.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/pounce.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "conversation.h"
--- a/libpurple/pounce.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/pounce.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_POUNCE_H_ #define _PURPLE_POUNCE_H_
--- a/libpurple/prefs.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/prefs.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ @@ -329,9 +329,13 @@ purple_prefs_set_string_list(pref_name_full->str, NULL); break; case PURPLE_PREF_PATH: - decoded = g_filename_from_utf8(pref_value, -1, NULL, NULL, NULL); - purple_prefs_set_path(pref_name_full->str, decoded); - g_free(decoded); + if (pref_value) { + decoded = g_filename_from_utf8(pref_value, -1, NULL, NULL, NULL); + purple_prefs_set_path(pref_name_full->str, decoded); + g_free(decoded); + } else { + purple_prefs_set_path(pref_name_full->str, NULL); + } break; case PURPLE_PREF_PATH_LIST: purple_prefs_set_path_list(pref_name_full->str, NULL);
--- a/libpurple/prefs.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/prefs.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _PURPLE_PREFS_H_
--- a/libpurple/privacy.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/privacy.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/privacy.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/privacy.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_PRIVACY_H_ #define _PURPLE_PRIVACY_H_
--- a/libpurple/protocols/bonjour/bonjour.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h> #ifndef _WIN32 @@ -592,8 +592,8 @@ fullname = info->pw_gecos; else if ((info != NULL) && (info->pw_name != NULL) && (info->pw_name[0] != '\0')) fullname = info->pw_name; - else if (((fullname = getlogin()) != NULL) && (fullname[0] != '\0')) - ; + else if (((fullname = getlogin()) != NULL) && (fullname[0] == '\0')) + fullname = NULL; #else /* The Win32 username lookup functions are synchronous so we do it in a thread */ g_thread_create(_win32_name_lookup_thread, NULL, FALSE, NULL);
--- a/libpurple/protocols/bonjour/bonjour.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/bonjour/buddy.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/buddy.c Mon Sep 10 13:57:15 2007 +0000 @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include <glib.h>
--- a/libpurple/protocols/bonjour/buddy.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/buddy.h Mon Sep 10 13:57:15 2007 +0000 @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #ifndef _BONJOUR_BUDDY
--- a/libpurple/protocols/bonjour/jabber.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/jabber.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _WIN32 #include <sys/socket.h>
--- a/libpurple/protocols/bonjour/jabber.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/jabber.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/bonjour/mdns_avahi.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_avahi.c Mon Sep 10 13:57:15 2007 +0000 @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include "internal.h"
--- a/libpurple/protocols/bonjour/mdns_common.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_common.c Mon Sep 10 13:57:15 2007 +0000 @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include <string.h>
--- a/libpurple/protocols/bonjour/mdns_common.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_common.h Mon Sep 10 13:57:15 2007 +0000 @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #ifndef _BONJOUR_MDNS_COMMON
--- a/libpurple/protocols/bonjour/mdns_howl.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_howl.c Mon Sep 10 13:57:15 2007 +0000 @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include "internal.h"
--- a/libpurple/protocols/bonjour/mdns_interface.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_interface.h Mon Sep 10 13:57:15 2007 +0000 @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #ifndef _BONJOUR_MDNS_INTERFACE
--- a/libpurple/protocols/bonjour/mdns_types.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_types.h Mon Sep 10 13:57:15 2007 +0000 @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #ifndef _BONJOUR_MDNS_TYPES
--- a/libpurple/protocols/bonjour/mdns_win32.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/mdns_win32.c Mon Sep 10 13:57:15 2007 +0000 @@ -11,7 +11,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include "internal.h"
--- a/libpurple/protocols/bonjour/parser.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/parser.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/bonjour/parser.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/bonjour/parser.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_BONJOUR_PARSER_H_ #define _PURPLE_BONJOUR_PARSER_H_
--- a/libpurple/protocols/gg/buddylist.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/buddylist.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/protocols/gg/buddylist.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/buddylist.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/protocols/gg/confer.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/confer.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/protocols/gg/confer.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/confer.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/protocols/gg/gg-utils.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/gg-utils.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/protocols/gg/gg-utils.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/gg-utils.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_GG_UTILS_H
--- a/libpurple/protocols/gg/gg.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/gg.c Mon Sep 10 13:57:15 2007 +0000 @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/gg/gg.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/gg.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/protocols/gg/lib/COPYING Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/COPYING Mon Sep 10 13:57:15 2007 +0000 @@ -2,7 +2,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -485,7 +485,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA Also add information on how to contact you by electronic and paper mail.
--- a/libpurple/protocols/gg/lib/common.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/common.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/lib/compat.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/compat.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/lib/dcc.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/dcc.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/lib/events.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/events.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/lib/http.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/http.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/lib/libgadu.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/libgadu.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/lib/libgadu.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/libgadu.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/lib/obsolete.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/obsolete.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/lib/pubdir.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/pubdir.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/lib/pubdir50.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/lib/pubdir50.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, * USA. */
--- a/libpurple/protocols/gg/search.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/search.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/protocols/gg/search.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/gg/search.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/protocols/irc/cmds.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/irc/cmds.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/irc/dcc_send.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/irc/dcc_send.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/irc/irc.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/irc/irc.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/irc/irc.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/irc/irc.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_IRC_H
--- a/libpurple/protocols/irc/msgs.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/irc/msgs.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/irc/parse.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/irc/parse.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/jabber/auth.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/auth.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h" @@ -203,8 +203,15 @@ return TRUE; } -static void auth_pass_cb(JabberStream *js, PurpleRequestFields *fields) +static void auth_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields) { + JabberStream *js; + + /* The password prompt dialog doesn't get disposed if the account disconnects */ + if (!PURPLE_CONNECTION_IS_VALID(conn)) + return; + + js = conn->proto_data; if (!auth_pass_generic(js, fields)) return; @@ -217,8 +224,16 @@ } static void -auth_old_pass_cb(JabberStream *js, PurpleRequestFields *fields) +auth_old_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields) { + JabberStream *js; + + /* The password prompt dialog doesn't get disposed if the account disconnects */ + if (!PURPLE_CONNECTION_IS_VALID(conn)) + return; + + js = conn->proto_data; + if (!auth_pass_generic(js, fields)) return; @@ -228,9 +243,17 @@ static void -auth_no_pass_cb(JabberStream *js, PurpleRequestFields *fields) +auth_no_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields) { - purple_connection_error(js->gc, _("Password is required to sign on.")); + JabberStream *js; + + /* The password prompt dialog doesn't get disposed if the account disconnects */ + if (!PURPLE_CONNECTION_IS_VALID(conn)) + return; + + js = conn->proto_data; + + purple_connection_error(conn, _("Password is required to sign on.")); } static void jabber_auth_start_cyrus(JabberStream *js) @@ -283,7 +306,7 @@ */ if (!purple_account_get_password(js->gc->account)) { - purple_account_request_password(js->gc->account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js); + purple_account_request_password(js->gc->account, G_CALLBACK(auth_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc); return; /* If we've got a password, but aren't sending @@ -597,7 +620,7 @@ */ if (!purple_account_get_password(js->gc->account)) { - purple_account_request_password(js->gc->account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js); + purple_account_request_password(js->gc->account, G_CALLBACK(auth_old_pass_cb), G_CALLBACK(auth_no_pass_cb), js->gc); return; } #endif
--- a/libpurple/protocols/jabber/auth.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/auth.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_AUTH_H_ #define _PURPLE_JABBER_AUTH_H_
--- a/libpurple/protocols/jabber/buddy.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/buddy.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/jabber/buddy.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/buddy.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_BUDDY_H_ #define _PURPLE_JABBER_BUDDY_H_
--- a/libpurple/protocols/jabber/chat.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/chat.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h" @@ -833,12 +833,18 @@ gboolean jabber_chat_ban_user(JabberChat *chat, const char *who, const char *why) { + JabberChatMember *jcm; + const char *jid; + char *to; JabberIq *iq; - JabberChatMember *jcm = g_hash_table_lookup(chat->members, who); - char *to; xmlnode *query, *item, *reason; - if(!jcm || !jcm->jid) + jcm = g_hash_table_lookup(chat->members, who); + if (jcm && jcm->jid) + jid = jcm->jid; + else if (g_utf8_strchr(who, -1, '@') != NULL) + jid = who; + else return FALSE; iq = jabber_iq_new_query(chat->js, JABBER_IQ_SET, @@ -850,7 +856,7 @@ query = xmlnode_get_child(iq->node, "query"); item = xmlnode_new_child(query, "item"); - xmlnode_set_attrib(item, "jid", jcm->jid); + xmlnode_set_attrib(item, "jid", jid); xmlnode_set_attrib(item, "affiliation", "outcast"); if(why) { reason = xmlnode_new_child(item, "reason"); @@ -864,14 +870,18 @@ gboolean jabber_chat_affiliate_user(JabberChat *chat, const char *who, const char *affiliation) { + JabberChatMember *jcm; + const char *jid; char *to; JabberIq *iq; xmlnode *query, *item; - JabberChatMember *jcm; jcm = g_hash_table_lookup(chat->members, who); - - if (!jcm || !jcm->jid) + if (jcm && jcm->jid) + jid = jcm->jid; + else if (g_utf8_strchr(who, -1, '@') != NULL) + jid = who; + else return FALSE; iq = jabber_iq_new_query(chat->js, JABBER_IQ_SET, @@ -883,7 +893,7 @@ query = xmlnode_get_child(iq->node, "query"); item = xmlnode_new_child(query, "item"); - xmlnode_set_attrib(item, "jid", jcm->jid); + xmlnode_set_attrib(item, "jid", jid); xmlnode_set_attrib(item, "affiliation", affiliation); jabber_iq_send(iq);
--- a/libpurple/protocols/jabber/chat.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/chat.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_CHAT_H_ #define _PURPLE_JABBER_CHAT_H_
--- a/libpurple/protocols/jabber/disco.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/disco.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/jabber/disco.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/disco.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_DISCO_H_ #define _PURPLE_JABBER_DISCO_H_
--- a/libpurple/protocols/jabber/google.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/google.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/jabber/google.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/google.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_GOOGLE_H_
--- a/libpurple/protocols/jabber/iq.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/iq.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/jabber/iq.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/iq.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_IQ_H_ #define _PURPLE_JABBER_IQ_H_
--- a/libpurple/protocols/jabber/jabber.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Mon Sep 10 13:57:15 2007 +0000 @@ -10,12 +10,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h" @@ -71,7 +71,7 @@ char *open_stream; open_stream = g_strdup_printf("<stream:stream to='%s' " - "xmlns='jabber:client' " + "xmlns='jabber:client' " "xmlns:stream='http://etherx.jabber.org/streams' " "version='1.0'>", js->user->domain); @@ -461,7 +461,7 @@ } js = gc->proto_data; - + if(js->state == JABBER_STREAM_CONNECTING) jabber_send_raw(js, "<?xml version='1.0' ?>", -1); jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING); @@ -630,7 +630,7 @@ { JabberStream *js = data; PurpleAccount *account = purple_connection_get_account(js->gc); - + jabber_parser_free(js); purple_account_disconnect(account); @@ -654,7 +654,7 @@ if(!strcmp(type, "result")) { if(js->registration) { - buf = g_strdup_printf(_("Registration of %s@%s successful"), + buf = g_strdup_printf(_("Registration of %s@%s successful"), js->user->node, js->user->domain); if(account->registration_cb) (account->registration_cb)(account, TRUE, account->registration_cb_user_data); @@ -679,7 +679,7 @@ } g_free(to); if(js->registration) - jabber_connection_schedule_close(js); + jabber_connection_schedule_close(js); } static void @@ -749,56 +749,56 @@ return; } } else { - const char *value = purple_request_field_string_get_value(field); - - if(!strcmp(id, "username")) { - y = xmlnode_new_child(query, "username"); - } else if(!strcmp(id, "password")) { - y = xmlnode_new_child(query, "password"); - } else if(!strcmp(id, "name")) { - y = xmlnode_new_child(query, "name"); - } else if(!strcmp(id, "email")) { - y = xmlnode_new_child(query, "email"); - } else if(!strcmp(id, "nick")) { - y = xmlnode_new_child(query, "nick"); - } else if(!strcmp(id, "first")) { - y = xmlnode_new_child(query, "first"); - } else if(!strcmp(id, "last")) { - y = xmlnode_new_child(query, "last"); - } else if(!strcmp(id, "address")) { - y = xmlnode_new_child(query, "address"); - } else if(!strcmp(id, "city")) { - y = xmlnode_new_child(query, "city"); - } else if(!strcmp(id, "state")) { - y = xmlnode_new_child(query, "state"); - } else if(!strcmp(id, "zip")) { - y = xmlnode_new_child(query, "zip"); - } else if(!strcmp(id, "phone")) { - y = xmlnode_new_child(query, "phone"); - } else if(!strcmp(id, "url")) { - y = xmlnode_new_child(query, "url"); - } else if(!strcmp(id, "date")) { - y = xmlnode_new_child(query, "date"); - } else { - continue; - } - xmlnode_insert_data(y, value, -1); + const char *value = purple_request_field_string_get_value(field); + + if(!strcmp(id, "username")) { + y = xmlnode_new_child(query, "username"); + } else if(!strcmp(id, "password")) { + y = xmlnode_new_child(query, "password"); + } else if(!strcmp(id, "name")) { + y = xmlnode_new_child(query, "name"); + } else if(!strcmp(id, "email")) { + y = xmlnode_new_child(query, "email"); + } else if(!strcmp(id, "nick")) { + y = xmlnode_new_child(query, "nick"); + } else if(!strcmp(id, "first")) { + y = xmlnode_new_child(query, "first"); + } else if(!strcmp(id, "last")) { + y = xmlnode_new_child(query, "last"); + } else if(!strcmp(id, "address")) { + y = xmlnode_new_child(query, "address"); + } else if(!strcmp(id, "city")) { + y = xmlnode_new_child(query, "city"); + } else if(!strcmp(id, "state")) { + y = xmlnode_new_child(query, "state"); + } else if(!strcmp(id, "zip")) { + y = xmlnode_new_child(query, "zip"); + } else if(!strcmp(id, "phone")) { + y = xmlnode_new_child(query, "phone"); + } else if(!strcmp(id, "url")) { + y = xmlnode_new_child(query, "url"); + } else if(!strcmp(id, "date")) { + y = xmlnode_new_child(query, "date"); + } else { + continue; + } + xmlnode_insert_data(y, value, -1); if(cbdata->js->registration && !strcmp(id, "username")) { if(cbdata->js->user->node) g_free(cbdata->js->user->node); cbdata->js->user->node = g_strdup(value); - } + } if(cbdata->js->registration && !strcmp(id, "password")) purple_account_set_password(cbdata->js->gc->account, value); - } } } + } if(cbdata->js->registration) { username = g_strdup_printf("%s@%s/%s", cbdata->js->user->node, cbdata->js->user->domain, cbdata->js->user->resource); purple_account_set_username(cbdata->js->gc->account, username); - g_free(username); + g_free(username); } jabber_iq_set_callback(iq, jabber_registration_result_cb, cbdata->who); @@ -815,7 +815,7 @@ if(account->registration_cb) (account->registration_cb)(account, FALSE, account->registration_cb_user_data); jabber_connection_schedule_close(cbdata->js); - } +} g_free(cbdata->who); g_free(cbdata); } @@ -841,11 +841,11 @@ PurpleAccount *account = purple_connection_get_account(js->gc); const char *type; const char *from = xmlnode_get_attrib(packet, "from"); - PurpleRequestFields *fields; - PurpleRequestFieldGroup *group; - PurpleRequestField *field; - xmlnode *query, *x, *y; - char *instructions; + PurpleRequestFields *fields; + PurpleRequestFieldGroup *group; + PurpleRequestField *field; + xmlnode *query, *x, *y; + char *instructions; JabberRegisterCBData *cbdata; gboolean registered = FALSE; @@ -856,9 +856,9 @@ /* get rid of the login thingy */ purple_connection_set_state(js->gc, PURPLE_CONNECTED); - query = xmlnode_get_child(packet, "query"); + query = xmlnode_get_child(packet, "query"); - if(xmlnode_get_child(query, "registered")) { + if(xmlnode_get_child(query, "registered")) { registered = TRUE; if(js->registration) { @@ -871,35 +871,35 @@ } } - if((x = xmlnode_get_child_with_namespace(packet, "x", - "jabber:x:data"))) { + if((x = xmlnode_get_child_with_namespace(packet, "x", + "jabber:x:data"))) { jabber_x_data_request(js, x, jabber_register_x_data_cb, g_strdup(from)); - return; - } else if((x = xmlnode_get_child_with_namespace(packet, "x", - "jabber:x:oob"))) { - xmlnode *url; + return; + } else if((x = xmlnode_get_child_with_namespace(packet, "x", + "jabber:x:oob"))) { + xmlnode *url; - if((url = xmlnode_get_child(x, "url"))) { - char *href; - if((href = xmlnode_get_data(url))) { - purple_notify_uri(NULL, href); - g_free(href); + if((url = xmlnode_get_child(x, "url"))) { + char *href; + if((href = xmlnode_get_data(url))) { + purple_notify_uri(NULL, href); + g_free(href); if(js->registration) { js->gc->wants_to_die = TRUE; if(account->registration_cb) /* succeeded, but we have no login info */ (account->registration_cb)(account, TRUE, account->registration_cb_user_data); jabber_connection_schedule_close(js); } - return; + return; + } } } - } - /* as a last resort, use the old jabber:iq:register syntax */ + /* as a last resort, use the old jabber:iq:register syntax */ - fields = purple_request_fields_new(); - group = purple_request_field_group_new(NULL); - purple_request_fields_add_group(fields, group); + fields = purple_request_fields_new(); + group = purple_request_field_group_new(NULL); + purple_request_fields_add_group(fields, group); if(js->registration) field = purple_request_field_string_new("username", _("Username"), @@ -908,7 +908,7 @@ field = purple_request_field_string_new("username", _("Username"), NULL, FALSE); - purple_request_field_group_add_field(group, field); + purple_request_field_group_add_field(group, field); if(js->registration) field = purple_request_field_string_new("password", _("Password"), @@ -917,87 +917,87 @@ field = purple_request_field_string_new("password", _("Password"), NULL, FALSE); - purple_request_field_string_set_masked(field, TRUE); - purple_request_field_group_add_field(group, field); + purple_request_field_string_set_masked(field, TRUE); + purple_request_field_group_add_field(group, field); - if(xmlnode_get_child(query, "name")) { + if(xmlnode_get_child(query, "name")) { if(js->registration) field = purple_request_field_string_new("name", _("Name"), purple_account_get_alias(js->gc->account), FALSE); else field = purple_request_field_string_new("name", _("Name"), NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "email")) { - field = purple_request_field_string_new("email", _("E-mail"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "nick")) { - field = purple_request_field_string_new("nick", _("Nickname"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "first")) { - field = purple_request_field_string_new("first", _("First name"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "last")) { - field = purple_request_field_string_new("last", _("Last name"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "address")) { - field = purple_request_field_string_new("address", _("Address"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "city")) { - field = purple_request_field_string_new("city", _("City"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "state")) { - field = purple_request_field_string_new("state", _("State"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "zip")) { - field = purple_request_field_string_new("zip", _("Postal code"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "phone")) { - field = purple_request_field_string_new("phone", _("Phone"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "url")) { - field = purple_request_field_string_new("url", _("URL"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } - if(xmlnode_get_child(query, "date")) { - field = purple_request_field_string_new("date", _("Date"), - NULL, FALSE); - purple_request_field_group_add_field(group, field); - } + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "email")) { + field = purple_request_field_string_new("email", _("E-mail"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "nick")) { + field = purple_request_field_string_new("nick", _("Nickname"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "first")) { + field = purple_request_field_string_new("first", _("First name"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "last")) { + field = purple_request_field_string_new("last", _("Last name"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "address")) { + field = purple_request_field_string_new("address", _("Address"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "city")) { + field = purple_request_field_string_new("city", _("City"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "state")) { + field = purple_request_field_string_new("state", _("State"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "zip")) { + field = purple_request_field_string_new("zip", _("Postal code"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "phone")) { + field = purple_request_field_string_new("phone", _("Phone"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "url")) { + field = purple_request_field_string_new("url", _("URL"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } + if(xmlnode_get_child(query, "date")) { + field = purple_request_field_string_new("date", _("Date"), + NULL, FALSE); + purple_request_field_group_add_field(group, field); + } if(registered) { field = purple_request_field_bool_new("unregister", _("Unregister"), FALSE); purple_request_field_group_add_field(group, field); } - if((y = xmlnode_get_child(query, "instructions"))) - instructions = xmlnode_get_data(y); + if((y = xmlnode_get_child(query, "instructions"))) + instructions = xmlnode_get_data(y); else if(registered) instructions = g_strdup(_("Please fill out the information below " "to change your account registration.")); - else - instructions = g_strdup(_("Please fill out the information below " - "to register your new account.")); - + else + instructions = g_strdup(_("Please fill out the information below " + "to register your new account.")); + cbdata = g_new0(JabberRegisterCBData, 1); cbdata->js = js; cbdata->who = g_strdup(from); @@ -1021,8 +1021,8 @@ g_free(title); } - g_free(instructions); -} + g_free(instructions); + } void jabber_register_start(JabberStream *js) { @@ -1100,14 +1100,14 @@ if(!js->gsc) { if (connect_server[0]) { jabber_login_connect(js, js->user->domain, server, - purple_account_get_int(account, - "port", 5222)); + purple_account_get_int(account, + "port", 5222)); } else { js->srv_query_data = purple_srv_resolve("xmpp-client", - "tcp", - js->user->domain, - srv_resolved_cb, - js); + "tcp", + js->user->domain, + srv_resolved_cb, + js); } } } @@ -1463,7 +1463,7 @@ g_free(moodplustext); } else purple_notify_user_info_add_pair(user_info, _("Mood"), mood); - } + } } for(l=jb->resources; l; l = l->next) { @@ -1743,17 +1743,17 @@ PurplePluginAction *act; act = purple_plugin_action_new(_("Set User Info..."), - jabber_setup_set_info); + jabber_setup_set_info); m = g_list_append(m, act); /* if (js->protocol_options & CHANGE_PASSWORD) { */ act = purple_plugin_action_new(_("Change Password..."), - jabber_password_change); + jabber_password_change); m = g_list_append(m, act); /* } */ act = purple_plugin_action_new(_("Search for Users..."), - jabber_user_search_begin); + jabber_user_search_begin); m = g_list_append(m, act); purple_debug_info("jabber", "jabber_actions: have pep: %s\n", js->pep?"YES":"NO"); @@ -2058,10 +2058,10 @@ return PURPLE_CMD_RET_FAILED; if (strcmp(args[1], "owner") != 0 && - strcmp(args[1], "admin") != 0 && - strcmp(args[1], "member") != 0 && - strcmp(args[1], "outcast") != 0 && - strcmp(args[1], "none") != 0) { + strcmp(args[1], "admin") != 0 && + strcmp(args[1], "member") != 0 && + strcmp(args[1], "outcast") != 0 && + strcmp(args[1], "none") != 0) { *error = g_strdup_printf(_("Unknown affiliation: \"%s\""), args[1]); return PURPLE_CMD_RET_FAILED; } @@ -2083,16 +2083,16 @@ return PURPLE_CMD_RET_FAILED; if (strcmp(args[1], "moderator") != 0 && - strcmp(args[1], "participant") != 0 && - strcmp(args[1], "visitor") != 0 && - strcmp(args[1], "none") != 0) { + strcmp(args[1], "participant") != 0 && + strcmp(args[1], "visitor") != 0 && + strcmp(args[1], "none") != 0) { *error = g_strdup_printf(_("Unknown role: \"%s\""), args[1]); return PURPLE_CMD_RET_FAILED; } if (!jabber_chat_role_user(chat, args[0], args[1])) { *error = g_strdup_printf(_("Unable to set role \"%s\" for user: %s"), - args[1], args[0]); + args[1], args[0]); return PURPLE_CMD_RET_FAILED; } @@ -2241,75 +2241,75 @@ void jabber_register_commands(void) { purple_cmd_register("config", "", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, - "prpl-jabber", jabber_cmd_chat_config, - _("config: Configure a chat room."), NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, + "prpl-jabber", jabber_cmd_chat_config, + _("config: Configure a chat room."), NULL); purple_cmd_register("configure", "", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, - "prpl-jabber", jabber_cmd_chat_config, - _("configure: Configure a chat room."), NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, + "prpl-jabber", jabber_cmd_chat_config, + _("configure: Configure a chat room."), NULL); purple_cmd_register("nick", "s", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, - "prpl-jabber", jabber_cmd_chat_nick, - _("nick <new nickname>: Change your nickname."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, + "prpl-jabber", jabber_cmd_chat_nick, + _("nick <new nickname>: Change your nickname."), + NULL); purple_cmd_register("part", "s", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", - jabber_cmd_chat_part, _("part [room]: Leave the room."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", + jabber_cmd_chat_part, _("part [room]: Leave the room."), + NULL); purple_cmd_register("register", "", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, - "prpl-jabber", jabber_cmd_chat_register, - _("register: Register with a chat room."), NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, + "prpl-jabber", jabber_cmd_chat_register, + _("register: Register with a chat room."), NULL); /* XXX: there needs to be a core /topic cmd, methinks */ purple_cmd_register("topic", "s", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", - jabber_cmd_chat_topic, - _("topic [new topic]: View or change the topic."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", + jabber_cmd_chat_topic, + _("topic [new topic]: View or change the topic."), + NULL); purple_cmd_register("ban", "ws", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", - jabber_cmd_chat_ban, - _("ban <user> [room]: Ban a user from the room."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", + jabber_cmd_chat_ban, + _("ban <user> [room]: Ban a user from the room."), + NULL); purple_cmd_register("affiliate", "ws", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", - jabber_cmd_chat_affiliate, - _("affiliate <user> <owner|admin|member|outcast|none>: Set a user's affiliation with the room."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", + jabber_cmd_chat_affiliate, + _("affiliate <user> <owner|admin|member|outcast|none>: Set a user's affiliation with the room."), + NULL); purple_cmd_register("role", "ws", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", - jabber_cmd_chat_role, - _("role <user> <moderator|participant|visitor|none>: Set a user's role in the room."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", + jabber_cmd_chat_role, + _("role <user> <moderator|participant|visitor|none>: Set a user's role in the room."), + NULL); purple_cmd_register("invite", "ws", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", - jabber_cmd_chat_invite, - _("invite <user> [message]: Invite a user to the room."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", + jabber_cmd_chat_invite, + _("invite <user> [message]: Invite a user to the room."), + NULL); purple_cmd_register("join", "ws", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", - jabber_cmd_chat_join, - _("join: <room> [server]: Join a chat on this server."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", + jabber_cmd_chat_join, + _("join: <room> [server]: Join a chat on this server."), + NULL); purple_cmd_register("kick", "ws", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | - PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", - jabber_cmd_chat_kick, - _("kick <user> [room]: Kick a user from the room."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY | + PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, "prpl-jabber", + jabber_cmd_chat_kick, + _("kick <user> [room]: Kick a user from the room."), + NULL); purple_cmd_register("msg", "ws", PURPLE_CMD_P_PRPL, - PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, - "prpl-jabber", jabber_cmd_chat_msg, - _("msg <user> <message>: Send a private message to another user."), - NULL); + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_PRPL_ONLY, + "prpl-jabber", jabber_cmd_chat_msg, + _("msg <user> <message>: Send a private message to another user."), + NULL); purple_cmd_register("ping", "w", PURPLE_CMD_P_PRPL, PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_PRPL_ONLY, @@ -2325,5 +2325,5 @@ void jabber_init_plugin(PurplePlugin *plugin) { - my_protocol = plugin; + my_protocol = plugin; }
--- a/libpurple/protocols/jabber/jabber.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.h Mon Sep 10 13:57:15 2007 +0000 @@ -12,38 +12,38 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_H_ #define _PURPLE_JABBER_H_ typedef enum { - JABBER_CAP_NONE = 0, - JABBER_CAP_XHTML = 1 << 0, - JABBER_CAP_COMPOSING = 1 << 1, - JABBER_CAP_SI = 1 << 2, - JABBER_CAP_SI_FILE_XFER = 1 << 3, - JABBER_CAP_BYTESTREAMS = 1 << 4, - JABBER_CAP_IBB = 1 << 5, - JABBER_CAP_CHAT_STATES = 1 << 6, - JABBER_CAP_IQ_SEARCH = 1 << 7, - JABBER_CAP_IQ_REGISTER = 1 << 8, - + JABBER_CAP_NONE = 0, + JABBER_CAP_XHTML = 1 << 0, + JABBER_CAP_COMPOSING = 1 << 1, + JABBER_CAP_SI = 1 << 2, + JABBER_CAP_SI_FILE_XFER = 1 << 3, + JABBER_CAP_BYTESTREAMS = 1 << 4, + JABBER_CAP_IBB = 1 << 5, + JABBER_CAP_CHAT_STATES = 1 << 6, + JABBER_CAP_IQ_SEARCH = 1 << 7, + JABBER_CAP_IQ_REGISTER = 1 << 8, + /* Google Talk extensions: - * http://code.google.com/apis/talk/jep_extensions/extensions.html - */ - JABBER_CAP_GMAIL_NOTIFY = 1 << 9, + * http://code.google.com/apis/talk/jep_extensions/extensions.html + */ + JABBER_CAP_GMAIL_NOTIFY = 1 << 9, JABBER_CAP_GOOGLE_ROSTER = 1 << 10, - + JABBER_CAP_PING = 1 << 11, JABBER_CAP_ADHOC = 1 << 12, - JABBER_CAP_RETRIEVED = 1 << 31 + JABBER_CAP_RETRIEVED = 1 << 31 } JabberCapabilities; typedef struct _JabberStream JabberStream; @@ -159,16 +159,16 @@ int sasl_state; int sasl_maxbuf; GString *sasl_mechs; - + gboolean unregistration; PurpleAccountUnregistrationCb unregistration_cb; void *unregistration_user_data; gboolean vcard_fetched; - + /* does the local server support PEP? */ gboolean pep; - + /* Is Buzz enabled? */ gboolean allowBuzz;
--- a/libpurple/protocols/jabber/jutil.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/jutil.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/jabber/jutil.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/jutil.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_JUTIL_H_ #define _PURPLE_JABBER_JUTIL_H_
--- a/libpurple/protocols/jabber/libxmpp.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/jabber/message.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/message.c Mon Sep 10 13:57:15 2007 +0000 @@ -10,12 +10,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h" @@ -62,7 +62,7 @@ if(jabber_find_unnormalized_conv(jm->from, jm->js->gc->account)) { from = g_strdup(jm->from); - } else if(jid->node) { + } else if(jid->node) { if(jid->resource) { PurpleConversation *conv; @@ -100,13 +100,13 @@ escaped = g_markup_escape_text(who, -1); g_snprintf(buf, sizeof(buf), - _("%s has left the conversation."), escaped); + _("%s has left the conversation."), escaped); /* At some point when we restructure PurpleConversation, * this should be able to be implemented by removing the * user from the conversation like we do with chats now. */ purple_conversation_write(conv, "", buf, - PURPLE_MESSAGE_SYSTEM, time(NULL)); + PURPLE_MESSAGE_SYSTEM, time(NULL)); } } serv_got_typing_stopped(jm->js->gc, from); @@ -150,7 +150,7 @@ char *title; GString *body; GList *etc; - + if(!jm->xhtml && !jm->body) return; /* ignore headlines without any content */ @@ -365,8 +365,8 @@ if(!jm->xhtml && xmlnode_get_child(child, "body")) { char *c; jm->xhtml = xmlnode_to_str(child, NULL); - /* Convert all newlines to whitespace. Technically, even regular, non-XML HTML is supposed to ignore newlines, but Pidgin has, as convention - * treated \n as a newline for compatibility with other protocols + /* Convert all newlines to whitespace. Technically, even regular, non-XML HTML is supposed to ignore newlines, but Pidgin has, as convention + * treated \n as a newline for compatibility with other protocols */ for (c = jm->xhtml; *c != '\0'; c++) { if (*c == '\n') @@ -459,7 +459,7 @@ } } } - + if(jm->hasBuzz) handle_buzz(jm);
--- a/libpurple/protocols/jabber/message.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/message.h Mon Sep 10 13:57:15 2007 +0000 @@ -12,12 +12,12 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_MESSAGE_H_ #define _PURPLE_JABBER_MESSAGE_H_
--- a/libpurple/protocols/jabber/oob.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/oob.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/jabber/oob.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/oob.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_OOB_H_ #define _PURPLE_JABBER_OOB_H_
--- a/libpurple/protocols/jabber/parser.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/parser.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/jabber/parser.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/parser.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_PARSER_H_ #define _PURPLE_JABBER_PARSER_H_
--- a/libpurple/protocols/jabber/presence.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/presence.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/jabber/presence.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/presence.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_PRESENCE_H_ #define _PURPLE_JABBER_PRESENCE_H_
--- a/libpurple/protocols/jabber/roster.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/roster.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/jabber/roster.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/roster.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_ROSTER_H_ #define _PURPLE_JABBER_ROSTER_H_
--- a/libpurple/protocols/jabber/si.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/si.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ @@ -708,6 +708,10 @@ jabber_iq_set_callback(iq, jabber_si_xfer_send_method_cb, xfer); + /* Store the IQ id so that we can cancel the callback */ + g_free(jsx->iq_id); + jsx->iq_id = g_strdup(iq->id); + jabber_iq_send(iq); } @@ -722,6 +726,8 @@ purple_proxy_connect_cancel(jsx->connect_data); if (jsx->listen_data != NULL) purple_network_listen_cancel(jsx->listen_data); + if (jsx->iq_id != NULL) + jabber_iq_remove_callback_by_id(js, jsx->iq_id); g_free(jsx->stream_id); g_free(jsx->iq_id);
--- a/libpurple/protocols/jabber/si.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/si.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_SI_H_ #define _PURPLE_JABBER_SI_H_
--- a/libpurple/protocols/jabber/win32/posix.uname.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/win32/posix.uname.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ /*
--- a/libpurple/protocols/jabber/xdata.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/xdata.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/jabber/xdata.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/jabber/xdata.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_JABBER_XDATA_H_ #define _PURPLE_JABBER_XDATA_H_
--- a/libpurple/protocols/msn/cmdproc.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/cmdproc.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "cmdproc.h"
--- a/libpurple/protocols/msn/cmdproc.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/cmdproc.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_CMDPROC_H_ #define _MSN_CMDPROC_H_
--- a/libpurple/protocols/msn/command.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/command.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "command.h"
--- a/libpurple/protocols/msn/command.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/command.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_COMMAND_H #define _MSN_COMMAND_H
--- a/libpurple/protocols/msn/dialog.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/dialog.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h"
--- a/libpurple/protocols/msn/dialog.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/dialog.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_DIALOG_H_ #define _MSN_DIALOG_H_
--- a/libpurple/protocols/msn/directconn.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/directconn.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "directconn.h"
--- a/libpurple/protocols/msn/directconn.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/directconn.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_DIRECTCONN_H_ #define _MSN_DIRECTCONN_H_
--- a/libpurple/protocols/msn/error.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/error.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "error.h"
--- a/libpurple/protocols/msn/error.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/error.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_ERROR_H_ #define _MSN_ERROR_H_
--- a/libpurple/protocols/msn/group.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/group.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "group.h"
--- a/libpurple/protocols/msn/group.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/group.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_GROUP_H_ #define _MSN_GROUP_H_
--- a/libpurple/protocols/msn/history.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/history.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "history.h"
--- a/libpurple/protocols/msn/history.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/history.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_HISTORY_H #define _MSN_HISTORY_H
--- a/libpurple/protocols/msn/httpconn.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/httpconn.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "debug.h"
--- a/libpurple/protocols/msn/httpconn.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/httpconn.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_HTTPCONN_H_ #define _MSN_HTTPCONN_H_
--- a/libpurple/protocols/msn/msg.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/msg.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "msg.h"
--- a/libpurple/protocols/msn/msg.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/msg.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_MSG_H_ #define _MSN_MSG_H_
--- a/libpurple/protocols/msn/msn-utils.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/msn-utils.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "msn-utils.h"
--- a/libpurple/protocols/msn/msn-utils.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/msn-utils.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_UTILS_H_ #define _MSN_UTILS_H_
--- a/libpurple/protocols/msn/msn.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #define PHOTO_SUPPORT 1
--- a/libpurple/protocols/msn/msn.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/msn.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_H_ #define _MSN_H_
--- a/libpurple/protocols/msn/nexus.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/nexus.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "nexus.h"
--- a/libpurple/protocols/msn/nexus.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/nexus.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_NEXUS_H_ #define _MSN_NEXUS_H_
--- a/libpurple/protocols/msn/notification.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "notification.h"
--- a/libpurple/protocols/msn/notification.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/notification.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_NOTIFICATION_H_ #define _MSN_NOTIFICATION_H_
--- a/libpurple/protocols/msn/object.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/object.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "object.h" #include "debug.h"
--- a/libpurple/protocols/msn/object.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/object.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_OBJECT_H_ #define _MSN_OBJECT_H_
--- a/libpurple/protocols/msn/page.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/page.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "page.h"
--- a/libpurple/protocols/msn/page.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/page.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_PAGE_H_ #define _MSN_PAGE_H_
--- a/libpurple/protocols/msn/servconn.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/servconn.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "servconn.h"
--- a/libpurple/protocols/msn/servconn.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/servconn.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SERVCONN_H_ #define _MSN_SERVCONN_H_
--- a/libpurple/protocols/msn/session.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/session.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "session.h"
--- a/libpurple/protocols/msn/session.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/session.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SESSION_H_ #define _MSN_SESSION_H_
--- a/libpurple/protocols/msn/slp.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slp.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "slp.h"
--- a/libpurple/protocols/msn/slp.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slp.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SLP_H_ #define _MSN_SLP_H_
--- a/libpurple/protocols/msn/slpcall.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slpcall.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "slpcall.h"
--- a/libpurple/protocols/msn/slpcall.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slpcall.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SLPCALL_H_ #define _MSN_SLPCALL_H_
--- a/libpurple/protocols/msn/slplink.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slplink.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "slplink.h"
--- a/libpurple/protocols/msn/slplink.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slplink.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SLPLINK_H_ #define _MSN_SLPLINK_H_
--- a/libpurple/protocols/msn/slpmsg.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slpmsg.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "slpmsg.h"
--- a/libpurple/protocols/msn/slpmsg.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slpmsg.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SLPMSG_H_ #define _MSN_SLPMSG_H_
--- a/libpurple/protocols/msn/slpsession.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slpsession.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "slpsession.h"
--- a/libpurple/protocols/msn/slpsession.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/slpsession.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SLPSESSION_H_ #define _MSN_SLPSESSION_H_
--- a/libpurple/protocols/msn/state.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/state.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "state.h"
--- a/libpurple/protocols/msn/state.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/state.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_STATE_H_ #define _MSN_STATE_H_
--- a/libpurple/protocols/msn/switchboard.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/switchboard.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "prefs.h"
--- a/libpurple/protocols/msn/switchboard.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/switchboard.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SWITCHBOARD_H_ #define _MSN_SWITCHBOARD_H_
--- a/libpurple/protocols/msn/sync.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/sync.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "sync.h"
--- a/libpurple/protocols/msn/sync.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/sync.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_SYNC_H_ #define _MSN_SYNC_H_
--- a/libpurple/protocols/msn/table.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/table.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "table.h"
--- a/libpurple/protocols/msn/table.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/table.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_TABLE_H_ #define _MSN_TABLE_H_
--- a/libpurple/protocols/msn/transaction.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/transaction.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "transaction.h"
--- a/libpurple/protocols/msn/transaction.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/transaction.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_TRANSACTION_H #define _MSN_TRANSACTION_H
--- a/libpurple/protocols/msn/user.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/user.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "user.h"
--- a/libpurple/protocols/msn/user.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/user.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_USER_H_ #define _MSN_USER_H_
--- a/libpurple/protocols/msn/userlist.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/userlist.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "msn.h" #include "userlist.h"
--- a/libpurple/protocols/msn/userlist.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/msn/userlist.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MSN_USERLIST_H_ #define _MSN_USERLIST_H_
--- a/libpurple/protocols/myspace/markup.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/markup.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "myspace.h"
--- a/libpurple/protocols/myspace/markup.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/markup.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MYSPACE_MARKUP_H
--- a/libpurple/protocols/myspace/message.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/message.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "myspace.h"
--- a/libpurple/protocols/myspace/message.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/message.h Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MYSPACE_MESSAGE_H
--- a/libpurple/protocols/myspace/myspace.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.c Mon Sep 10 13:57:15 2007 +0000 @@ -28,7 +28,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #define PURPLE_PLUGIN @@ -1543,6 +1543,12 @@ if (msim_msg_get_integer(msg, "uniquenick") == session->userid) { purple_debug_info("msim_we_are_logged_on", "TODO: pick username\n"); + /* No username is set. */ + purple_notify_error(session->account, + _("No username set"), + _("Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."), NULL); + purple_connection_error(session->gc, _("No username set")); + return FALSE; } body = msim_msg_new( @@ -1864,9 +1870,14 @@ purple_debug_info("msim", "msim_status: found buddy %s\n", username); } - /* The status headline is plaintext, but libpurple treats it as HTML, - * so escape any HTML characters to their entity equivalents. */ - status_headline_escaped = g_markup_escape_text(status_headline, strlen(status_headline)); + if (status_headline) { + /* The status headline is plaintext, but libpurple treats it as HTML, + * so escape any HTML characters to their entity equivalents. */ + status_headline_escaped = g_markup_escape_text(status_headline, strlen(status_headline)); + } else { + status_headline_escaped = NULL; + } + g_free(status_headline); if (user->headline)
--- a/libpurple/protocols/myspace/myspace.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MYSPACE_MYSPACE_H
--- a/libpurple/protocols/myspace/persist.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/persist.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MYSPACE_PERSIST_H
--- a/libpurple/protocols/myspace/session.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/session.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/libpurple/protocols/myspace/session.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/session.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MYSPACE_SESSION_H
--- a/libpurple/protocols/myspace/user.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/user.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "myspace.h"
--- a/libpurple/protocols/myspace/user.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/user.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MYSPACE_USER_H
--- a/libpurple/protocols/myspace/zap.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/zap.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "myspace.h"
--- a/libpurple/protocols/myspace/zap.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/myspace/zap.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _MYSPACE_ZAP_H
--- a/libpurple/protocols/novell/nmconference.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmconference.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmconference.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmconference.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmconn.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmconn.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmconn.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmconn.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmcontact.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmcontact.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmcontact.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmcontact.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmevent.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmevent.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmevent.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmevent.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmfield.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmfield.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmfield.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmfield.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmmessage.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmmessage.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmmessage.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmmessage.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmrequest.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmrequest.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmrequest.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmrequest.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmrtf.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmrtf.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmrtf.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmrtf.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmuser.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmuser.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmuser.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmuser.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmuserrecord.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmuserrecord.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/nmuserrecord.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/nmuserrecord.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/novell/novell.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/novell/novell.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/null/nullprpl.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/null/nullprpl.c Mon Sep 10 13:57:15 2007 +0000 @@ -37,7 +37,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <stdarg.h>
--- a/libpurple/protocols/oscar/COPYING Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/COPYING Mon Sep 10 13:57:15 2007 +0000 @@ -2,7 +2,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -485,7 +485,7 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA Also add information on how to contact you by electronic and paper mail.
--- a/libpurple/protocols/oscar/bstream.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/bstream.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_admin.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_admin.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_advert.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_advert.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_alert.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_alert.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_auth.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_auth.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_bart.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_bart.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_bos.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_bos.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_buddy.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_buddy.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_chat.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_chat.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_chatnav.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_chatnav.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_feedbag.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_feedbag.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_icbm.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_icbm.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_icq.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_icq.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_invite.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_invite.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_locate.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* @@ -636,13 +636,11 @@ * Parse out the Type-Length-Value triples as they're found. */ for (curtlv = 0; curtlv < tlvcnt; curtlv++) { - guint16 type; - guint8 number, length; + guint16 type, length; int endpos; type = byte_stream_get16(bs); - number = byte_stream_get8(bs); - length = byte_stream_get8(bs); + length = byte_stream_get16(bs); endpos = byte_stream_curpos(bs) + MIN(length, byte_stream_empty(bs));
--- a/libpurple/protocols/oscar/family_odir.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_odir.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_oservice.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_oservice.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_popup.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_popup.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_stats.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_stats.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_translate.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_translate.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/family_userlookup.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/family_userlookup.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/flap_connection.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/flap_connection.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "oscar.h"
--- a/libpurple/protocols/oscar/libaim.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/libaim.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/oscar/libicq.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/libicq.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/oscar/misc.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/misc.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/msgcookie.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/msgcookie.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/odc.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/odc.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* From the oscar PRPL */
--- a/libpurple/protocols/oscar/oft.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/oft.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* @@ -266,7 +266,7 @@ size_t length; ByteStream bs; - length = 192 + MAX(64, frame->name_length + 1); + length = 192 + frame->name_length; byte_stream_new(&bs, length); byte_stream_putraw(&bs, conn->magic, 4); byte_stream_put16(&bs, length); @@ -300,7 +300,7 @@ * The name can be more than 64 characters, but if it is less than * 64 characters it is padded with NULLs. */ - byte_stream_putraw(&bs, frame->name, MAX(64, frame->name_length + 1)); + byte_stream_putraw(&bs, frame->name, frame->name_length); peer_connection_send(conn, &bs); @@ -340,8 +340,7 @@ peer_oft_send_done(PeerConnection *conn) { conn->xferdata.type = PEER_TYPE_DONE; - conn->xferdata.filesleft = 0; - conn->xferdata.partsleft = 0; + conn->xferdata.rfrcsum = 0xffff0000; conn->xferdata.nrecvd = purple_xfer_get_bytes_sent(conn->xfer); peer_oft_send(conn, &conn->xferdata); } @@ -677,12 +676,12 @@ conn->xferdata.rfrcsum = 0xffff0000; conn->xferdata.rfcsum = 0xffff0000; conn->xferdata.recvcsum = 0xffff0000; - strncpy((gchar *)conn->xferdata.idstring, "OFT_Windows ICBMFT V1.1 32", 31); + strncpy((gchar *)conn->xferdata.idstring, "Cool FileXfer", 31); conn->xferdata.modtime = 0; conn->xferdata.cretime = 0; xfer->filename = g_path_get_basename(xfer->local_filename); - conn->xferdata.name = (guchar *)g_strdup(xfer->filename); - conn->xferdata.name_length = strlen(xfer->filename); + conn->xferdata.name_length = MAX(64, strlen(xfer->filename) + 1); + conn->xferdata.name = (guchar *)g_strndup(xfer->filename, conn->xferdata.name_length - 1); peer_oft_checksum_file(conn, xfer, peer_oft_checksum_calculated_cb, G_MAXUINT32);
--- a/libpurple/protocols/oscar/oscar.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Sep 10 13:57:15 2007 +0000 @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ @@ -2125,28 +2125,11 @@ } else if (args->status == AIM_RENDEZVOUS_CONNECTED) { - /* Remote user has accepted our peer request */ - PeerConnection *conn; - - conn = peer_connection_find_by_cookie(od, userinfo->sn, args->cookie); /* - * If conn is NULL it means we haven't tried to create - * a connection with that user. They may be trying to - * do something malicious. + * Remote user has accepted our peer request. If we + * wanted to we could look up the PeerConnection using + * args->cookie, but we don't need to do anything here. */ - if (conn != NULL) - { - if (conn->listenerfd != -1) - { - /* - * If they are connecting directly to us then - * continue the peer negotiation by - * accepting connections on our listener port. - */ - conn->watcher_incoming = purple_input_add(conn->listenerfd, - PURPLE_INPUT_READ, peer_connection_listen_cb, conn); - } - } } }
--- a/libpurple/protocols/oscar/oscar.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/oscar_data.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/oscar_data.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "oscar.h"
--- a/libpurple/protocols/oscar/oscarcommon.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/oscarcommon.h Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/oscar/peer.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/peer.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* @@ -416,6 +416,25 @@ { purple_input_remove(conn->watcher_outgoing); conn->watcher_outgoing = 0; + /* + * The buffer is currently empty, so reset the current input + * and output positions to the start of the buffer. We do + * this so that the next chunk of data that we put into the + * buffer can be read back out of the buffer in one fell swoop. + * Otherwise it gets fragmented and we have to read from the + * second half of the buffer than go back and read the rest of + * the chunk from the first half. + * + * We're using TCP, which is a stream based protocol, so this + * isn't supposed to matter. However, experience has shown + * that at least the proxy file transfer code in AIM 6.1.41.2 + * requires that the entire OFT frame arrive all at once. If + * the frame is fragmented then AIM freaks out and aborts the + * file transfer. Somebody should teach those guys how to + * write good TCP code. + */ + conn->buffer_outgoing->inptr = conn->buffer_outgoing->buffer; + conn->buffer_outgoing->outptr = conn->buffer_outgoing->buffer; return; } @@ -652,6 +671,10 @@ account = purple_connection_get_account(gc); conn->listenerfd = listenerfd; + /* Watch for new connections on our listener socket */ + conn->watcher_incoming = purple_input_add(conn->listenerfd, + PURPLE_INPUT_READ, peer_connection_listen_cb, conn); + /* Send the "please connect to me!" ICBM */ bos_conn = flap_connection_findbygroup(od, SNAC_FAMILY_ICBM); if (bos_conn == NULL)
--- a/libpurple/protocols/oscar/peer.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/peer.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/peer_proxy.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/peer_proxy.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifdef HAVE_CONFIG_H
--- a/libpurple/protocols/oscar/rxhandlers.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/rxhandlers.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "oscar.h"
--- a/libpurple/protocols/oscar/snac.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/snac.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/snactypes.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/snactypes.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/oscar/tlv.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/tlv.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "oscar.h"
--- a/libpurple/protocols/oscar/util.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/oscar/util.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/libpurple/protocols/qq/buddy_info.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/buddy_info.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/buddy_info.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/buddy_info.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_BUDDY_INFO_H_
--- a/libpurple/protocols/qq/buddy_list.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/buddy_list.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <string.h>
--- a/libpurple/protocols/qq/buddy_list.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/buddy_list.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_BUDDY_LIST_H_
--- a/libpurple/protocols/qq/buddy_opt.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/buddy_opt.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "debug.h"
--- a/libpurple/protocols/qq/buddy_opt.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/buddy_opt.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_BUDDY_OPT_H_
--- a/libpurple/protocols/qq/buddy_status.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/buddy_status.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <string.h>
--- a/libpurple/protocols/qq/buddy_status.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/buddy_status.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/qq/char_conv.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/char_conv.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "debug.h"
--- a/libpurple/protocols/qq/char_conv.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/char_conv.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_CHAR_CONV_H_
--- a/libpurple/protocols/qq/crypt.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/crypt.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * * QQ encryption algorithm
--- a/libpurple/protocols/qq/crypt.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/crypt.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_CRYPT_H_
--- a/libpurple/protocols/qq/file_trans.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/file_trans.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifdef _WIN32
--- a/libpurple/protocols/qq/file_trans.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/file_trans.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_QQ_FILE_TRANS_H_
--- a/libpurple/protocols/qq/group.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/group.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_H_
--- a/libpurple/protocols/qq/group_conv.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_conv.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h>
--- a/libpurple/protocols/qq/group_conv.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_conv.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_CONV_H_
--- a/libpurple/protocols/qq/group_find.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_find.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "qq.h"
--- a/libpurple/protocols/qq/group_find.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_find.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_FIND_H_
--- a/libpurple/protocols/qq/group_free.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_free.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/group_free.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_free.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_FREE_H_
--- a/libpurple/protocols/qq/group_im.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_im.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/group_im.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_im.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_IM_H_
--- a/libpurple/protocols/qq/group_info.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_info.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/group_info.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_info.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_INFO_H_
--- a/libpurple/protocols/qq/group_internal.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_internal.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/group_internal.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_internal.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_HASH_H_
--- a/libpurple/protocols/qq/group_join.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_join.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/group_join.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_join.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_JOIN_H_
--- a/libpurple/protocols/qq/group_network.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_network.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/group_network.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_network.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_NETWORK_H_
--- a/libpurple/protocols/qq/group_opt.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_opt.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "qq.h"
--- a/libpurple/protocols/qq/group_opt.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_opt.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_OPT_H_
--- a/libpurple/protocols/qq/group_search.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_search.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/group_search.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/group_search.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_GROUP_SEARCH_H_
--- a/libpurple/protocols/qq/header_info.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/header_info.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/header_info.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/header_info.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_HEADER_INFO_H_
--- a/libpurple/protocols/qq/im.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/im.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/im.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/im.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_IM_H_
--- a/libpurple/protocols/qq/keep_alive.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/keep_alive.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * * OICQ encryption algorithm
--- a/libpurple/protocols/qq/keep_alive.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/keep_alive.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/qq/login_logout.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/login_logout.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "debug.h"
--- a/libpurple/protocols/qq/login_logout.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/login_logout.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_LOGIN_LOGOUT_H_
--- a/libpurple/protocols/qq/packet_parse.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/packet_parse.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <string.h>
--- a/libpurple/protocols/qq/packet_parse.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/packet_parse.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_PACKET_PARSE_H_
--- a/libpurple/protocols/qq/qq.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/qq.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/qq.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/qq.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_QQ_H_
--- a/libpurple/protocols/qq/qq_proxy.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/qq_proxy.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "cipher.h"
--- a/libpurple/protocols/qq/qq_proxy.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/qq_proxy.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_PROXY_H
--- a/libpurple/protocols/qq/recv_core.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/recv_core.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "debug.h"
--- a/libpurple/protocols/qq/recv_core.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/recv_core.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_RECV_CORE_H_
--- a/libpurple/protocols/qq/send_core.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/send_core.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "debug.h"
--- a/libpurple/protocols/qq/send_core.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/send_core.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_SEND_CORE_H_
--- a/libpurple/protocols/qq/send_file.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/send_file.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "qq.h"
--- a/libpurple/protocols/qq/send_file.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/send_file.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_QQ_SEND_FILE_H_
--- a/libpurple/protocols/qq/sendqueue.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/sendqueue.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/qq/sendqueue.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/sendqueue.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_SEND_QUEUE_H_
--- a/libpurple/protocols/qq/sys_msg.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/sys_msg.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "debug.h"
--- a/libpurple/protocols/qq/sys_msg.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/sys_msg.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_SYS_MSG_H_
--- a/libpurple/protocols/qq/udp_proxy_s5.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/udp_proxy_s5.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "debug.h"
--- a/libpurple/protocols/qq/udp_proxy_s5.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/udp_proxy_s5.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_UDP_PROXY_S5_H_
--- a/libpurple/protocols/qq/utils.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/utils.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "cipher.h"
--- a/libpurple/protocols/qq/utils.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/qq/utils.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _QQ_MY_UTILS_H_
--- a/libpurple/protocols/sametime/sametime.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */
--- a/libpurple/protocols/simple/simple.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/simple/simple.c Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" @@ -1066,6 +1066,7 @@ if(!pidf) { purple_debug_info("simple", "process_incoming_notify: no parseable pidf\n"); g_free(from); + send_sip_response(sip->gc, msg, 200, "OK", NULL); return; }
--- a/libpurple/protocols/simple/simple.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/simple/simple.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_SIMPLE_H
--- a/libpurple/protocols/simple/sipmsg.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/simple/sipmsg.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/simple/sipmsg.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/simple/sipmsg.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_SIPMSG_H
--- a/libpurple/protocols/toc/PROTOCOL Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/toc/PROTOCOL Mon Sep 10 13:57:15 2007 +0000 @@ -12,7 +12,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. # Note from Jim Duchek, former libpurple maintainer -- this may not be # the latest version of this document, I provide it as a service.
--- a/libpurple/protocols/toc/toc.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/toc/toc.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/protocols/yahoo/util.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/util.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoo.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ @@ -3505,7 +3505,7 @@ static void yahoo_show_chat_goto(PurplePluginAction *action) { PurpleConnection *gc = (PurpleConnection *) action->context; - purple_request_input(gc, NULL, _("Join who in chat?"), NULL, + purple_request_input(gc, NULL, _("Join whom in chat?"), NULL, "", FALSE, FALSE, NULL, _("OK"), G_CALLBACK(yahoo_chat_goto), _("Cancel"), NULL,
--- a/libpurple/protocols/yahoo/yahoo.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _YAHOO_H_
--- a/libpurple/protocols/yahoo/yahoo_aliases.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_aliases.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoo_aliases.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_aliases.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoo_crypt.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_crypt.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02111-1301 USA. */ /* warmenhoven took this file and made it work with the md5.[ch] we * already had. isn't that lovely. people should just use linux or
--- a/libpurple/protocols/yahoo/yahoo_crypt.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_crypt.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _YAHOO_CRYPT_H_ #define _YAHOO_CRYPT_H_
--- a/libpurple/protocols/yahoo/yahoo_doodle.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_doodle.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoo_doodle.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_doodle.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _YAHOO_DOODLE_H_
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/protocols/yahoo/yahoo_filexfer.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_filexfer.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _YAHOO_FILEXFER_H_ #define _YAHOO_FILEXFER_H_
--- a/libpurple/protocols/yahoo/yahoo_friend.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_friend.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoo_friend.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_friend.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _YAHOO_FRIEND_H_
--- a/libpurple/protocols/yahoo/yahoo_packet.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_packet.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoo_packet.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_packet.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _YAHOO_PACKET_H_
--- a/libpurple/protocols/yahoo/yahoo_picture.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_picture.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoo_picture.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_picture.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoo_profile.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo_profile.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoochat.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.c Mon Sep 10 13:57:15 2007 +0000 @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/protocols/yahoo/yahoochat.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _YAHOOCHAT_H_
--- a/libpurple/protocols/yahoo/ycht.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/ycht.c Mon Sep 10 13:57:15 2007 +0000 @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <string.h>
--- a/libpurple/protocols/yahoo/ycht.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/yahoo/ycht.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_YCHT_H_
--- a/libpurple/protocols/zephyr/zephyr.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/protocols/zephyr/zephyr.c Mon Sep 10 13:57:15 2007 +0000 @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/proxy.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/proxy.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/proxy.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/proxy.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_PROXY_H_ #define _PURPLE_PROXY_H_
--- a/libpurple/prpl.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/prpl.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/prpl.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/prpl.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* this file should be all that prpls need to include. therefore, by including
--- a/libpurple/request.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/request.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/request.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/request.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_REQUEST_H_ #define _PURPLE_REQUEST_H_
--- a/libpurple/roomlist.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/roomlist.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h>
--- a/libpurple/roomlist.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/roomlist.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_ROOMLIST_H_
--- a/libpurple/savedstatuses.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/savedstatuses.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/savedstatuses.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/savedstatuses.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref savedstatus-signals */
--- a/libpurple/server.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/server.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/server.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/server.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_SERVER_H_ #define _PURPLE_SERVER_H_ @@ -64,7 +64,7 @@ * * @param gc The connection to send the message on. * @param who Whose attention to request. - * @param type An index into the prpl's attention_types list determining the type + * @param type_code An index into the prpl's attention_types list determining the type * of the attention request command to send. 0 if prpl only defines one * (for example, Yahoo and MSN), but some protocols define more (MySpaceIM). * @@ -77,7 +77,7 @@ * * @param gc The connection that received the attention message. * @param who Who requested your attention. - * @param type An index into the prpl's attention_types list determining the type + * @param type_code An index into the prpl's attention_types list determining the type * of the attention request command to send. */ void serv_got_attention(PurpleConnection *gc, const char *who, guint type_code);
--- a/libpurple/signals.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/signals.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/signals.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/signals.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_SIGNALS_H_ #define _PURPLE_SIGNALS_H_
--- a/libpurple/sound.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/sound.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/libpurple/sound.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/sound.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @see @ref sound-signals */
--- a/libpurple/sslconn.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/sslconn.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/sslconn.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/sslconn.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_SSLCONN_H_ #define _PURPLE_SSLCONN_H_
--- a/libpurple/status.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/status.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/status.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/status.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_STATUS_H_ #define _PURPLE_STATUS_H_
--- a/libpurple/stringref.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/stringref.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/stringref.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/stringref.h Mon Sep 10 13:57:15 2007 +0000 @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _PURPLE_STRINGREF_H_
--- a/libpurple/stun.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/stun.c Mon Sep 10 13:57:15 2007 +0000 @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/stun.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/stun.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_STUN_H_ #define _PURPLE_STUN_H_
--- a/libpurple/upnp.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/upnp.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/upnp.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/upnp.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_UPNP_H_
--- a/libpurple/util.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/util.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/util.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/util.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * * @todo Rename the functions so that they live somewhere in the purple * namespace.
--- a/libpurple/value.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/value.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/value.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/value.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_VALUE_H_ #define _PURPLE_VALUE_H_
--- a/libpurple/version.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/version.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/libpurple/version.h.in Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/version.h.in Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_VERSION_H_ #define _PURPLE_VERSION_H_
--- a/libpurple/whiteboard.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/whiteboard.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/libpurple/whiteboard.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/whiteboard.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_WHITEBOARD_H_
--- a/libpurple/win32/giowin32.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/win32/giowin32.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,8 +18,8 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ /*
--- a/libpurple/win32/libc_interface.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/win32/libc_interface.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include <winsock2.h>
--- a/libpurple/win32/libc_interface.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/win32/libc_interface.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _LIBC_INTERFACE_H_
--- a/libpurple/win32/libc_internal.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/win32/libc_internal.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _LIBC_INTERNAL_
--- a/libpurple/win32/win32dep.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/win32/win32dep.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #define _WIN32_IE 0x500
--- a/libpurple/win32/win32dep.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/win32/win32dep.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _WIN32DEP_H_
--- a/libpurple/win32/wpurpleerror.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/win32/wpurpleerror.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _WPURPLEERROR_H
--- a/libpurple/xmlnode.c Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/xmlnode.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* A lot of this code at least resembles the code in libxode, but since
--- a/libpurple/xmlnode.h Thu Sep 06 04:08:41 2007 +0000 +++ b/libpurple/xmlnode.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PURPLE_XMLNODE_H_ #define _PURPLE_XMLNODE_H_
--- a/pidgin/eggtrayicon.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/eggtrayicon.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ #include <config.h>
--- a/pidgin/eggtrayicon.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/eggtrayicon.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ #ifndef __EGG_TRAY_ICON_H__
--- a/pidgin/gtkaccount.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkaccount.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/pidgin/gtkaccount.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkaccount.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINACCOUNT_H_ #define _PIDGINACCOUNT_H_
--- a/pidgin/gtkblist.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkblist.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/pidgin/gtkblist.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkblist.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINBLIST_H_ #define _PIDGINBLIST_H_ @@ -378,7 +378,7 @@ * This tooltip will be destroyed the next time this function is called, or when XXXX * is called * - * @param buddy The buddy to show a tooltip for + * @param node The buddy list node to show a tooltip for * @param widget The widget to draw the tooltip on */ void pidgin_blist_draw_tooltip(PurpleBlistNode *node, GtkWidget *widget);
--- a/pidgin/gtkcelllayout.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcelllayout.c Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ /*
--- a/pidgin/gtkcelllayout.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcelllayout.h Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ #ifndef __GTK_CELL_LAYOUT_H__
--- a/pidgin/gtkcellrendererexpander.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcellrendererexpander.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/gtkcellrendererexpander.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcellrendererexpander.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _PIDGINCELLRENDEREREXPANDER_H_
--- a/pidgin/gtkcellrendererprogress.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcellrendererprogress.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/gtkcellrendererprogress.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcellrendererprogress.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _PIDGINCELLRENDERERPROGRESS_H_
--- a/pidgin/gtkcellview.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcellview.c Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ /*
--- a/pidgin/gtkcellview.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcellview.h Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ #ifndef __GTK_CELL_VIEW_H__
--- a/pidgin/gtkcellviewmenuitem.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcellviewmenuitem.c Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ /*
--- a/pidgin/gtkcellviewmenuitem.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcellviewmenuitem.h Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ #ifndef __GTK_CELL_VIEW_MENU_ITEM_H__
--- a/pidgin/gtkcertmgr.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcertmgr.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/gtkcertmgr.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkcertmgr.h Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/gtkconn.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkconn.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtkconn.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkconn.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINCONN_H_ #define _PIDGINCONN_H_
--- a/pidgin/gtkconv.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkconv.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h" @@ -929,6 +929,7 @@ PurpleConversation *conv = (PurpleConversation *)user_data; FILE *fp; const char *name; + char **lines; gchar *text; if ((fp = g_fopen(filename, "w+")) == NULL) { @@ -940,10 +941,12 @@ fprintf(fp, "<html>\n<head><title>%s</title></head>\n<body>", name); fprintf(fp, _("<h1>Conversation with %s</h1>\n"), name); - text = gtk_imhtml_get_markup( + lines = gtk_imhtml_get_markup_lines( GTK_IMHTML(PIDGIN_CONVERSATION(conv)->imhtml)); + text = g_strjoinv("<br>\n", lines); fprintf(fp, "%s", text); g_free(text); + g_strfreev(lines); fprintf(fp, "\n</body>\n</html>\n"); fclose(fp); @@ -1301,6 +1304,7 @@ add_remove_cb(NULL, PIDGIN_CONVERSATION(conv)); } +#if 0 static void menu_hide_conv_cb(gpointer data, guint action, GtkWidget *widget) { @@ -1311,6 +1315,7 @@ "conversation-hiding", gtkconv); purple_conversation_set_ui_ops(conv, NULL); } +#endif static void menu_close_conv_cb(gpointer data, guint action, GtkWidget *widget) @@ -2903,8 +2908,6 @@ { "/Conversation/sep4", NULL, NULL, 0, "<Separator>", NULL }, - { N_("/Conversation/_Hide"), NULL, menu_hide_conv_cb, 0, - "<Item>", NULL}, { N_("/Conversation/_Close"), NULL, menu_close_conv_cb, 0, "<StockItem>", GTK_STOCK_CLOSE }, @@ -7655,7 +7658,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h" @@ -9023,6 +9026,9 @@ win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv); + g_signal_handlers_disconnect_matched(win->window, G_SIGNAL_MATCH_DATA, + 0, 0, NULL, NULL, gtkconv); + if (win->gtkconvs && win->gtkconvs->next == NULL) pidgin_conv_tab_pack(win, win->gtkconvs->data);
--- a/pidgin/gtkconv.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkconv.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGIN_CONVERSATION_H_ #define _PIDGIN_CONVERSATION_H_
--- a/pidgin/gtkconvwin.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkconvwin.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGIN_CONVERSATION_WINDOW_H_ #define _PIDGIN_CONVERSATION_WINDOW_H_
--- a/pidgin/gtkdebug.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkdebug.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtkdebug.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkdebug.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINDEBUG_H_ #define _PIDGINDEBUG_H_
--- a/pidgin/gtkdialogs.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkdialogs.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h" @@ -95,8 +95,7 @@ /* Order: Alphabetical by Last Name */ static struct developer patch_writers[] = { {"John 'rekkanoryo' Bailey", NULL, NULL}, - {"Peter 'Bleeter' Lawler", NULL, NULL}, - {"Dennis 'EvilDennisR' Ristuccia", N_("Senior Contributor/QA"), NULL}, + {"Dennis 'EvilDennisR' Ristuccia", N_("Senior Contributor/QA"), NULL}, {"Peter 'Fmoo' Ruibal", NULL, NULL}, {"Gabriel 'Nix' Schulhof", NULL, NULL}, {"Will 'resiak' Thompson", NULL, NULL}, @@ -122,6 +121,7 @@ static struct developer retired_patch_writers[] = { {"Felipe 'shx' Contreras", NULL, NULL}, {"Decklin Foster", NULL, NULL}, + {"Peter 'Bleeter' Lawler", NULL, NULL}, {"Robert 'Robot101' McQueen", NULL, NULL}, {"Benjamin Miller", NULL, NULL}, {NULL, NULL, NULL} @@ -305,14 +305,14 @@ context = gtk_widget_get_pango_context(widget); layout = pango_layout_new(context); - markup = g_strdup_printf("<span foreground=\"#FFFFFF\">%s</span>", VERSION); + markup = g_strdup_printf("<span foreground=\"#000000\">%s</span>", VERSION); pango_layout_set_font_description(layout, style->font_desc); pango_layout_set_markup(layout, markup, strlen(markup)); g_free(markup); pango_layout_get_pixel_size(layout, &lwidth, &lheight); gdk_draw_layout(GDK_DRAWABLE(pixmap), style->bg_gc[GTK_STATE_NORMAL], - width - (lwidth + 3), height - (lheight + 1), layout); + width - (lwidth + 3), 1, layout); g_object_unref(G_OBJECT(layout)); *original = gdk_pixbuf_get_from_drawable(NULL, pixmap, NULL, @@ -396,6 +396,9 @@ g_string_append(str, "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\"" PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</A><BR/><BR/>"); + g_string_append(str, "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"" + "http://developer.pidgin.im/wiki/FAQ\">" + "http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"); g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> " "#pidgin on irc.freenode.net<BR><BR>"));
--- a/pidgin/gtkdialogs.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkdialogs.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINDIALOGS_H_ #define _PIDGINDIALOGS_H_
--- a/pidgin/gtkdnd-hints.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkdnd-hints.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include "gtkdnd-hints.h"
--- a/pidgin/gtkdnd-hints.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkdnd-hints.h Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #ifndef _PIDGIN_DND_HINTS_H_ #define _PIDGIN_DND_HINTS_H_
--- a/pidgin/gtkdocklet-x11.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,8 +18,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h"
--- a/pidgin/gtkdocklet.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkdocklet.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,8 +18,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtkdocklet.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkdocklet.h Mon Sep 10 13:57:15 2007 +0000 @@ -18,8 +18,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #ifndef _GTKDOCKLET_H_
--- a/pidgin/gtkeventloop.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkeventloop.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <glib.h>
--- a/pidgin/gtkeventloop.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkeventloop.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINEVENTLOOP_H_ #define _PIDGINEVENTLOOP_H_
--- a/pidgin/gtkexpander.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkexpander.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. * * Authors: * Mark McLoughlin <mark@skynet.ie>
--- a/pidgin/gtkexpander.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkexpander.h Mon Sep 10 13:57:15 2007 +0000 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. * * Authors: * Mark McLoughlin <mark@skynet.ie>
--- a/pidgin/gtkft.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkft.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtkft.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkft.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINFT_H_ #define _PIDGINFT_H_
--- a/pidgin/gtkgaim-compat.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkgaim-compat.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _GTKGAIM_COMPAT_H_
--- a/pidgin/gtkidle.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkidle.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/pidgin/gtkidle.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkidle.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGIN_IDLE_H_ #define _PIDGIN_IDLE_H_
--- a/pidgin/gtkimhtml.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkimhtml.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ @@ -4890,7 +4890,7 @@ } else if (c == '"') { str = g_string_append(str, """); } else if (c == '\n') { - str = g_string_append(str, "<br>\n"); + str = g_string_append(str, "<br>"); } else { str = g_string_append_unichar(str, c); }
--- a/pidgin/gtkimhtml.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkimhtml.h Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINIMHTML_H_ #define _PIDGINIMHTML_H_
--- a/pidgin/gtkimhtmltoolbar.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/pidgin/gtkimhtmltoolbar.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _PIDGINIMHTMLTOOLBAR_H_
--- a/pidgin/gtklog.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtklog.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtklog.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtklog.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINLOG_H_ #define _PIDGINLOG_H_
--- a/pidgin/gtkmain.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkmain.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/gtkmenutray.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkmenutray.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "debug.h"
--- a/pidgin/gtkmenutray.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkmenutray.h Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef PIDGIN_MENU_TRAY_H #define PIDGIN_MENU_TRAY_H
--- a/pidgin/gtknickcolors.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtknickcolors.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINNICKCOLORS_H_ #define _PIDGINNICKCOLORS_H_
--- a/pidgin/gtknotify.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtknotify.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtknotify.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtknotify.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINNOTIFY_H_ #define _PIDGINNOTIFY_H_
--- a/pidgin/gtkplugin.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkplugin.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtkplugin.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkplugin.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINPLUGIN_H_ #define _PIDGINPLUGIN_H_
--- a/pidgin/gtkpluginpref.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkpluginpref.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifdef HAVE_CONFIG_H # include <config.h>
--- a/pidgin/gtkpluginpref.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkpluginpref.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _PIDGINPLUGINPREF_H_
--- a/pidgin/gtkpounce.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkpounce.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/pidgin/gtkpounce.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkpounce.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINPOUNCE_H_ #define _PIDGINPOUNCE_H_
--- a/pidgin/gtkprefs.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkprefs.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h" @@ -1510,6 +1510,7 @@ gtk_widget_set_sensitive(vbox, strcmp(method, "none")); } +#endif /* !_WIN32 */ #ifdef USE_GSTREAMER static void @@ -1524,7 +1525,6 @@ !strcmp(method, "esd")); } #endif /* USE_GSTREAMER */ -#endif /* !_WIN32 */ static void @@ -1693,9 +1693,11 @@ int j; const char *file; char *pref; +#if !defined _WIN32 || defined USE_GSTREAMER + GtkWidget *label; +#endif #ifndef _WIN32 GtkWidget *dd; - GtkWidget *label; GtkWidget *entry; const char *cmd; #endif
--- a/pidgin/gtkprefs.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkprefs.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _PIDGINPREFS_H_
--- a/pidgin/gtkprivacy.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkprivacy.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtkprivacy.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkprivacy.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINPRIVACY_H_ #define _PIDGINPRIVACY_H_
--- a/pidgin/gtkrequest.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkrequest.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtkrequest.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkrequest.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINREQUEST_H_ #define _PIDGINREQUEST_H_
--- a/pidgin/gtkroomlist.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkroomlist.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/pidgin/gtkroomlist.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkroomlist.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINROOMLIST_H_ #define _PIDGINROOMLIST_H_
--- a/pidgin/gtksavedstatuses.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/pidgin/gtksavedstatuses.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksavedstatuses.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINSAVEDSTATUSES_H_ #define _PIDGINSAVEDSTATUSES_H_
--- a/pidgin/gtkscrollbook.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkscrollbook.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "gtkscrollbook.h"
--- a/pidgin/gtkscrollbook.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkscrollbook.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef __PIDGIN_SCROLL_BOOK_H__
--- a/pidgin/gtksession.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksession.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/pidgin/gtksession.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksession.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINSESSION_H_ #define _PIDGINSESSION_H_
--- a/pidgin/gtksound.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksound.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h" @@ -446,6 +446,8 @@ g_free(command); return; } +#endif /* _WIN32 */ + #ifdef USE_GSTREAMER if (gst_init_failed) /* Perhaps do gdk_beep instead? */ return; @@ -460,7 +462,9 @@ purple_debug_error("sound", "Unable to create GStreamer audiosink.\n"); return; } - } else if (!strcmp(method, "esd")) { + } +#ifndef _WIN32 + else if (!strcmp(method, "esd")) { sink = gst_element_factory_make("esdsink", "sink"); if (!sink) { purple_debug_error("sound", "Unable to create GStreamer audiosink.\n"); @@ -472,7 +476,9 @@ purple_debug_error("sound", "Unable to create GStreamer audiosink.\n"); return; } - } else { + } +#endif + else { purple_debug_error("sound", "Unknown sound method '%s'\n", method); return; } @@ -498,9 +504,9 @@ g_free(uri); #else /* USE_GSTREAMER */ + +#ifndef _WIN32 gdk_beep(); - return; -#endif /* USE_GSTREAMER */ #else /* _WIN32 */ purple_debug_info("sound", "Playing %s\n", filename); @@ -518,6 +524,8 @@ g_free(l_filename); } #endif /* _WIN32 */ + +#endif /* USE_GSTREAMER */ } static void
--- a/pidgin/gtksound.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksound.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINSOUND_H_ #define _PIDGINSOUND_H_
--- a/pidgin/gtksourceiter.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksourceiter.c Mon Sep 10 13:57:15 2007 +0000 @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU Library General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ /*
--- a/pidgin/gtksourceiter.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksourceiter.h Mon Sep 10 13:57:15 2007 +0000 @@ -22,7 +22,7 @@ * * You should have received a copy of the GNU Library General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #ifndef _PIDGINSOURCEITER_H_
--- a/pidgin/gtksourceundomanager.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksourceundomanager.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,8 +19,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ #ifdef HAVE_CONFIG_H
--- a/pidgin/gtksourceundomanager.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtksourceundomanager.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,8 +19,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. * * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. * * */ #ifndef __GTK_SOURCE_UNDO_MANAGER_H__
--- a/pidgin/gtkstatusbox.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkstatusbox.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /*
--- a/pidgin/gtkstatusbox.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkstatusbox.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
--- a/pidgin/gtkthemes.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkthemes.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/pidgin/gtkthemes.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkthemes.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINTHEMES_H_ #define _PIDGINTHEMES_H_
--- a/pidgin/gtkutils.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkutils.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/gtkutils.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkutils.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINUTILS_H_ #define _PIDGINUTILS_H_ @@ -311,7 +311,7 @@ * The default filter function for screenname autocomplete. * * @param completion_entry The completion entry to filter. - * @param online_accounts If this is @c FALSE, only the autocompletion entries + * @param all_accounts If this is @c FALSE, only the autocompletion entries * which belong to an online account will be filtered. * @return Returns @c TRUE if the autocompletion entry is filtered. */ @@ -435,7 +435,7 @@ * @param y Address of the gint representing the vertical position * where the menu shall be drawn. This is an output parameter. * @param push_in This is an output parameter? - * @param user_data Not used by this particular position function. + * @param data Not used by this particular position function. */ void pidgin_menu_position_func_helper(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpointer data);
--- a/pidgin/gtkwhiteboard.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkwhiteboard.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/gtkwhiteboard.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/gtkwhiteboard.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _PIDGINWHITEBOARD_H_
--- a/pidgin/pidgin.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/pidgin.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ /* #warning ***pidgin*** */ #ifndef _PIDGIN_H_
--- a/pidgin/pidgincombobox.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/pidgincombobox.c Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ /*
--- a/pidgin/pidgincombobox.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/pidgincombobox.h Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ #ifndef __PIDGIN_COMBO_BOX_H__
--- a/pidgin/pidginstock.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/pidginstock.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include "internal.h"
--- a/pidgin/pidginstock.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/pidginstock.h Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include <gtk/gtkstock.h>
--- a/pidgin/plugins/cap/cap-mysql.sql Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/cap/cap-mysql.sql Mon Sep 10 13:57:15 2007 +0000 @@ -14,8 +14,8 @@ -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software --- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --- 02111-1307, USA. +-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +-- 02111-1301, USA. drop table if exists cap_status; drop table if exists cap_message;
--- a/pidgin/plugins/cap/cap.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/cap/cap.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "cap.h"
--- a/pidgin/plugins/cap/cap.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/cap/cap.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #ifndef _CAP_H_
--- a/pidgin/plugins/cap/cap_statistics.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/cap/cap_statistics.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #ifndef _CAP_STATISTICS_H_
--- a/pidgin/plugins/contact_priority.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/contact_priority.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include "internal.h"
--- a/pidgin/plugins/convcolors.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/convcolors.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h"
--- a/pidgin/plugins/extplacement.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/extplacement.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include "internal.h"
--- a/pidgin/plugins/gestures/gestures.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gestures/gestures.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h" #include "gtkblist.h"
--- a/pidgin/plugins/gevolution/assoc-buddy.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gevolution/assoc-buddy.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h" #include "gtkblist.h"
--- a/pidgin/plugins/gevolution/eds-utils.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gevolution/eds-utils.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h"
--- a/pidgin/plugins/gevolution/gevo-util.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gevolution/gevo-util.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h" #include "gtkblist.h"
--- a/pidgin/plugins/gevolution/gevolution.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/plugins/gevolution/gevolution.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gevolution/gevolution.h Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #ifndef _GEVOLUTION_H_ #define _GEVOLUTION_H_
--- a/pidgin/plugins/gevolution/new_person_dialog.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gevolution/new_person_dialog.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/plugins/gtk-signals-test.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gtk-signals-test.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #define GTK_SIGNAL_TEST_PLUGIN_ID "gtk-signals-test"
--- a/pidgin/plugins/gtkbuddynote.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/gtkbuddynote.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. */ #include "internal.h"
--- a/pidgin/plugins/iconaway.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/iconaway.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h" #include "pidgin.h"
--- a/pidgin/plugins/markerline.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/markerline.c Mon Sep 10 13:57:15 2007 +0000 @@ -14,8 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h"
--- a/pidgin/plugins/musicmessaging/musicmessaging.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/musicmessaging/musicmessaging.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include "internal.h"
--- a/pidgin/plugins/notify.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/notify.c Mon Sep 10 13:57:15 2007 +0000 @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/plugins/pidginrc.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/pidginrc.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #include "internal.h"
--- a/pidgin/plugins/raw.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/raw.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/plugins/relnot.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/relnot.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,8 +15,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #ifdef HAVE_CONFIG_H
--- a/pidgin/plugins/spellchk.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/spellchk.c Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/plugins/ticker/gtkticker.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/ticker/gtkticker.c Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ /*
--- a/pidgin/plugins/ticker/gtkticker.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/ticker/gtkticker.h Mon Sep 10 13:57:15 2007 +0000 @@ -13,8 +13,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ /*
--- a/pidgin/plugins/ticker/ticker.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/ticker/ticker.c Mon Sep 10 13:57:15 2007 +0000 @@ -16,8 +16,8 @@ * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02111-1301, USA. */ /*
--- a/pidgin/plugins/timestamp.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/timestamp.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/plugins/win32/transparency/win2ktrans.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/win32/transparency/win2ktrans.c Mon Sep 10 13:57:15 2007 +0000 @@ -1,23 +1,24 @@ /* - * purple - Transparency plugin + * Pidgin - Transparency plugin * - * copyright (c) 1998-2002, rob flynn <rob@marko.net> - * copyright (c) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com> - * copyright (c) 2005, Daniel Atallah <daniel_atallah@yahoo.com> + * Copyright (C) 1998-2002, Rob Flynn <rob@marko.net> + * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com> + * Copyright (C) 2005, Daniel Atallah <daniel_atallah@yahoo.com> * - * this program is free software; you can redistribute it and/or modify - * it under the terms of the gnu general public license as published by - * the free software foundation; either version 2 of the license, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. * - * this program is distributed in the hope that it will be useful, - * but without any warranty; without even the implied warranty of - * merchantability or fitness for a particular purpose. see the - * gnu general public license for more details. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. * - * you should have received a copy of the gnu general public license - * along with this program; if not, write to the free software - * foundation, inc., 59 temple place, suite 330, boston, ma 02111-1307 usa + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. * */ #ifndef _WIN32_WINNT
--- a/pidgin/plugins/win32/winprefs/gtkappbar.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/win32/winprefs/gtkappbar.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ /*
--- a/pidgin/plugins/win32/winprefs/gtkappbar.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/win32/winprefs/gtkappbar.h Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _GTKAPPBAR_H_
--- a/pidgin/plugins/win32/winprefs/winprefs.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/win32/winprefs/winprefs.c Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include <gtk/gtk.h>
--- a/pidgin/plugins/xmppconsole.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/plugins/xmppconsole.c Mon Sep 10 13:57:15 2007 +0000 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/win32/gtkdocklet-win32.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/win32/gtkdocklet-win32.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,8 +18,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02111-1301, USA. */ #include <windows.h>
--- a/pidgin/win32/gtkwin32dep.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/win32/gtkwin32dep.c Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #define _WIN32_IE 0x500
--- a/pidgin/win32/gtkwin32dep.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/win32/gtkwin32dep.h Mon Sep 10 13:57:15 2007 +0000 @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef _GTKWIN32DEP_H_ #define _GTKWIN32DEP_H_
--- a/pidgin/win32/nsis/pidgin-installer.nsi Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Mon Sep 10 13:57:15 2007 +0000 @@ -694,6 +694,7 @@ Delete "$INSTDIR\ca-certs\Equifax_Secure_CA.pem" Delete "$INSTDIR\ca-certs\GTE_CyberTrust_Global_Root.pem" + Delete "$INSTDIR\ca-certs\Verisign_Class3_Extended_Validation_CA.pem" Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem" Delete "$INSTDIR\ca-certs\Verisign_RSA_Secure_Server_CA.pem" RMDir "$INSTDIR\ca-certs" @@ -704,7 +705,7 @@ Delete "$INSTDIR\plugins\buddynote.dll" Delete "$INSTDIR\plugins\convcolors.dll" Delete "$INSTDIR\plugins\extplacement.dll" - Delete "$INSTDIR\plugins\pidginrc.dll" + Delete "$INSTDIR\plugins\gtkbuddynote.dll" Delete "$INSTDIR\plugins\history.dll" Delete "$INSTDIR\plugins\iconaway.dll" Delete "$INSTDIR\plugins\idle.dll" @@ -731,6 +732,7 @@ Delete "$INSTDIR\plugins\notify.dll" Delete "$INSTDIR\plugins\offlinemsg.dll" Delete "$INSTDIR\plugins\perl.dll" + Delete "$INSTDIR\plugins\pidginrc.dll" Delete "$INSTDIR\plugins\psychic.dll" Delete "$INSTDIR\plugins\relnot.dll" Delete "$INSTDIR\plugins\spellchk.dll" @@ -744,12 +746,12 @@ Delete "$INSTDIR\plugins\win2ktrans.dll" Delete "$INSTDIR\plugins\winprefs.dll" RMDir "$INSTDIR\plugins" - Delete "$INSTDIR\sounds\pidgin\alert.wav" - Delete "$INSTDIR\sounds\pidgin\login.wav" - Delete "$INSTDIR\sounds\pidgin\logout.wav" - Delete "$INSTDIR\sounds\pidgin\receive.wav" - Delete "$INSTDIR\sounds\pidgin\send.wav" - RMDir "$INSTDIR\sounds\pidgin" + Delete "$INSTDIR\sounds\purple\alert.wav" + Delete "$INSTDIR\sounds\purple\login.wav" + Delete "$INSTDIR\sounds\purple\logout.wav" + Delete "$INSTDIR\sounds\purple\receive.wav" + Delete "$INSTDIR\sounds\purple\send.wav" + RMDir "$INSTDIR\sounds\purple" RMDir "$INSTDIR\sounds" Delete "$INSTDIR\freebl3.dll" Delete "$INSTDIR\idletrack.dll"
--- a/pidgin/win32/winpidgin.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/win32/winpidgin.c Mon Sep 10 13:57:15 2007 +0000 @@ -21,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */
--- a/pidgin/win32/wspell.c Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/win32/wspell.c Mon Sep 10 13:57:15 2007 +0000 @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #include <windows.h>
--- a/pidgin/win32/wspell.h Thu Sep 06 04:08:41 2007 +0000 +++ b/pidgin/win32/wspell.h Mon Sep 10 13:57:15 2007 +0000 @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA * */ #ifndef _WSPELL_H_
--- a/po/af.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/af.po Mon Sep 10 13:57:15 2007 +0000 @@ -11331,7 +11331,7 @@ msgstr "Aktiveer watter ID?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Sluit wie by geselsie aan?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/am.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/am.po Mon Sep 10 13:57:15 2007 +0000 @@ -10501,7 +10501,7 @@ #: src/protocols/yahoo/yahoo.c:2972 #, fuzzy -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "ውሪን አገጣጥም" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/ar.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ar.po Mon Sep 10 13:57:15 2007 +0000 @@ -13172,7 +13172,7 @@ msgstr "وضعية رقم الانترنت النشطة" #: ../src/protocols/yahoo/yahoo.c:3094 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "" #: ../src/protocols/yahoo/yahoo.c:3104
--- a/po/az.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/az.po Mon Sep 10 13:57:15 2007 +0000 @@ -10340,7 +10340,7 @@ msgstr "Hansı ID fəallaşdırılsın?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Söhbəttə kimə qoşulsun?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/bg.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/bg.po Mon Sep 10 13:57:15 2007 +0000 @@ -14520,7 +14520,7 @@ msgstr "Активиране на коя идентификация?" #: ../libgaim/protocols/yahoo/yahoo.c:3214 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Присъединяване към кого в чата?" #: ../libgaim/protocols/yahoo/yahoo.c:3224
--- a/po/bn.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/bn.po Mon Sep 10 13:57:15 2007 +0000 @@ -14284,7 +14284,7 @@ msgstr "কোন আইডি সক্রিয় করা হবে?" #: ../libgaim/protocols/yahoo/yahoo.c:3214 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "কার সাথে আড্ডা?" #: ../libgaim/protocols/yahoo/yahoo.c:3224
--- a/po/bs.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/bs.po Mon Sep 10 13:57:15 2007 +0000 @@ -10646,7 +10646,7 @@ msgstr "Aktivirati koji ID?" #: src/protocols/yahoo/yahoo.c:2947 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Kome se želite pridružiti na chat?" #: src/protocols/yahoo/yahoo.c:2957
--- a/po/ca.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ca.po Mon Sep 10 13:57:15 2007 +0000 @@ -10594,7 +10594,7 @@ msgstr "Quin ID voleu activar?" #: ../libpurple/protocols/yahoo/yahoo.c:3234 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "A qui us voleu unir al xat?" #: ../libpurple/protocols/yahoo/yahoo.c:3244
--- a/po/ca@valencia.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ca@valencia.po Mon Sep 10 13:57:15 2007 +0000 @@ -11263,7 +11263,7 @@ msgstr "Quin ID voleu activar?" #: ../libpurple/protocols/yahoo/yahoo.c:3256 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "A qui vos voleu unir al xat?" #: ../libpurple/protocols/yahoo/yahoo.c:3268
--- a/po/cs.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/cs.po Mon Sep 10 13:57:15 2007 +0000 @@ -11905,7 +11905,7 @@ msgstr "Které ID aktivovat?" #: ../src/protocols/yahoo/yahoo.c:3069 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Připojit koho k chatu?" #: ../src/protocols/yahoo/yahoo.c:3079
--- a/po/da.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/da.po Mon Sep 10 13:57:15 2007 +0000 @@ -14318,7 +14318,7 @@ msgstr "Aktivér hvilket ID?" #: ../libgaim/protocols/yahoo/yahoo.c:3214 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Deltag med hvem i chat?" #: ../libgaim/protocols/yahoo/yahoo.c:3224
--- a/po/de.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/de.po Mon Sep 10 13:57:15 2007 +0000 @@ -11443,7 +11443,7 @@ msgstr "Welche ID aktivieren?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Wen wollen Sie zum Chat einladen?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/dz.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/dz.po Mon Sep 10 13:57:15 2007 +0000 @@ -13959,7 +13959,7 @@ msgstr "ཨའི་ཌི་ག་འདི་ཤུགས་ལྡན་སྨོ?" #: ../libgaim/protocols/yahoo/yahoo.c:3220 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "ག་ ཁ་སླབ་ཀྱི་གྲངས་སུ་འཛུལ་ཡི?" #: ../libgaim/protocols/yahoo/yahoo.c:3230
--- a/po/el.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/el.po Mon Sep 10 13:57:15 2007 +0000 @@ -10628,7 +10628,7 @@ msgstr "Ενεργοποίηση ποιανού ID;" #: ../libpurple/protocols/yahoo/yahoo.c:3239 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Ποιανού συμμετοχή στη συζήτηση;" #: ../libpurple/protocols/yahoo/yahoo.c:3251
--- a/po/en_AU.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/en_AU.po Mon Sep 10 13:57:15 2007 +0000 @@ -10735,8 +10735,8 @@ msgstr "Active which ID?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" -msgstr "Join who in chat?" +msgid "Join whom in chat?" +msgstr "Join whom in chat?" #: src/protocols/yahoo/yahoo.c:2982 msgid "Activate ID..."
--- a/po/en_CA.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/en_CA.po Mon Sep 10 13:57:15 2007 +0000 @@ -10715,8 +10715,8 @@ msgstr "Active which ID?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" -msgstr "Join who in chat?" +msgid "Join whom in chat?" +msgstr "Join whom in chat?" #: src/protocols/yahoo/yahoo.c:2982 msgid "Activate ID..."
--- a/po/en_GB.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/en_GB.po Mon Sep 10 13:57:15 2007 +0000 @@ -10576,8 +10576,8 @@ msgstr "Active which ID?" #: ../libpurple/protocols/yahoo/yahoo.c:3241 -msgid "Join who in chat?" -msgstr "Join who in chat?" +msgid "Join whom in chat?" +msgstr "Join whom in chat?" #: ../libpurple/protocols/yahoo/yahoo.c:3253 msgid "Activate ID..."
--- a/po/eo.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/eo.po Mon Sep 10 13:57:15 2007 +0000 @@ -10243,7 +10243,7 @@ msgstr "Ŝaltu kiun ID?" #: ../libpurple/protocols/yahoo/yahoo.c:3234 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Kiun kuniĝi en babilejo?" #: ../libpurple/protocols/yahoo/yahoo.c:3244
--- a/po/es.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/es.po Mon Sep 10 13:57:15 2007 +0000 @@ -11319,7 +11319,7 @@ msgstr "¿Qué ID quiere activar?" #: ../libpurple/protocols/yahoo/yahoo.c:3256 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "¿Juntarse con quién en un chat?" #: ../libpurple/protocols/yahoo/yahoo.c:3268
--- a/po/et.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/et.po Mon Sep 10 13:57:15 2007 +0000 @@ -11029,7 +11029,7 @@ msgstr "Milline ID aktiveerida?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Kellega ühineda jututoas?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/eu.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/eu.po Mon Sep 10 13:57:15 2007 +0000 @@ -12276,7 +12276,7 @@ msgstr "Zein ID aktibatu?" #: ../src/protocols/yahoo/yahoo.c:3070 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Norekin elkartu nahi duzu berriketan?" #: ../src/protocols/yahoo/yahoo.c:3080
--- a/po/fa.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/fa.po Mon Sep 10 13:57:15 2007 +0000 @@ -10510,7 +10510,7 @@ msgstr "فعالسازی کدام شناسه؟" #: ../libpurple/protocols/yahoo/yahoo.c:3234 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "پیوستن به کی در گپ؟" #: ../libpurple/protocols/yahoo/yahoo.c:3244
--- a/po/fi.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/fi.po Mon Sep 10 13:57:15 2007 +0000 @@ -11327,7 +11327,7 @@ msgstr "Mikä tunnus (ID) aktivoidaan?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/fr.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/fr.po Mon Sep 10 13:57:15 2007 +0000 @@ -11413,7 +11413,7 @@ msgstr "Activer quelle identité ?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Qui joindre dans une discussion ?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/gl.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/gl.po Mon Sep 10 13:57:15 2007 +0000 @@ -11270,7 +11270,7 @@ msgstr "Que ID activar?" #: ../libpurple/protocols/yahoo/yahoo.c:3406 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "A quen quere unir á conversa?" #: ../libpurple/protocols/yahoo/yahoo.c:3418
--- a/po/gu.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/gu.po Mon Sep 10 13:57:15 2007 +0000 @@ -10469,7 +10469,7 @@ msgstr "કયું ID સક્રિય કરવું છે?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "જોડાવ કે કોણ સંવાદમાં છે?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/he.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/he.po Mon Sep 10 13:57:15 2007 +0000 @@ -11164,7 +11164,7 @@ msgstr "איזה ID להפעיל?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "להצטרף למי בצ'אט?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/hi.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/hi.po Mon Sep 10 13:57:15 2007 +0000 @@ -10987,7 +10987,7 @@ msgstr "कोनसा आइ डी क्रियांवित करें?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "किससे संवाद करें ?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/hu.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/hu.po Mon Sep 10 13:57:15 2007 +0000 @@ -10433,7 +10433,7 @@ msgstr "Melyik azonosítót aktiválja?" #: ../libpurple/protocols/yahoo/yahoo.c:3239 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Kihez csatlakozik a csevegésben?" #: ../libpurple/protocols/yahoo/yahoo.c:3251
--- a/po/id.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/id.po Mon Sep 10 13:57:15 2007 +0000 @@ -14281,7 +14281,7 @@ msgstr "Aktifkan ID yang mana?" #: ../libgaim/protocols/yahoo/yahoo.c:3214 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Gabung siapa dalam percakapan?" #: ../libgaim/protocols/yahoo/yahoo.c:3224
--- a/po/it.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/it.po Mon Sep 10 13:57:15 2007 +0000 @@ -11163,7 +11163,7 @@ msgstr "Quale ID vuoi attivare?" #: ../libpurple/protocols/yahoo/yahoo.c:3256 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "A chi vuoi unirti nella chat?" #: ../libpurple/protocols/yahoo/yahoo.c:3268
--- a/po/ja.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ja.po Mon Sep 10 13:57:15 2007 +0000 @@ -11162,7 +11162,7 @@ msgstr "どの ID を有効化しますか？" #: ../libpurple/protocols/yahoo/yahoo.c:3256 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "どのチャットへ参加しますか？" #: ../libpurple/protocols/yahoo/yahoo.c:3268
--- a/po/ka.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ka.po Mon Sep 10 13:57:15 2007 +0000 @@ -11603,7 +11603,7 @@ msgstr "" #: ../src/protocols/yahoo/yahoo.c:3017 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "" #: ../src/protocols/yahoo/yahoo.c:3027
--- a/po/kn.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/kn.po Mon Sep 10 13:57:15 2007 +0000 @@ -13709,7 +13709,7 @@ msgstr "" #: ../libgaim/protocols/yahoo/yahoo.c:3174 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "ಮಾತುಕತೆಯಲ್ಲಿ ಯಾರೊಡನೆ ಸೇರಬೇಕು?" #: ../libgaim/protocols/yahoo/yahoo.c:3184
--- a/po/ko.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ko.po Mon Sep 10 13:57:15 2007 +0000 @@ -14341,7 +14341,7 @@ msgstr "어느 ID 를 활성화 하시겠습니까?" #: ../libgaim/protocols/yahoo/yahoo.c:3214 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "어느 대화에 참가하시겠습니까?" #: ../libgaim/protocols/yahoo/yahoo.c:3224
--- a/po/ku.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ku.po Mon Sep 10 13:57:15 2007 +0000 @@ -11671,7 +11671,7 @@ msgstr "" #: ../src/protocols/yahoo/yahoo.c:3070 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "" #: ../src/protocols/yahoo/yahoo.c:3080
--- a/po/lt.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/lt.po Mon Sep 10 13:57:15 2007 +0000 @@ -11555,7 +11555,7 @@ msgstr "Kurį ID aktyvuoti?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Prisijungti prie ko į pokalbį?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/mk.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/mk.po Mon Sep 10 13:57:15 2007 +0000 @@ -11347,7 +11347,7 @@ msgstr "Кој ID. да го активирам?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Кого да приклучам во разговорот?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/my_MM.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/my_MM.po Mon Sep 10 13:57:15 2007 +0000 @@ -10730,8 +10730,8 @@ msgstr "Active which ID?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" -msgstr "Join who in chat?" +msgid "Join whom in chat?" +msgstr "Join whom in chat?" #: src/protocols/yahoo/yahoo.c:2982 msgid "Activate ID..."
--- a/po/nb.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/nb.po Mon Sep 10 13:57:15 2007 +0000 @@ -10857,7 +10857,7 @@ msgstr "Aktiver hvilken ID?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Bli med hvem i samtalegruppe?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/ne.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ne.po Mon Sep 10 13:57:15 2007 +0000 @@ -10498,7 +10498,7 @@ msgstr "कुन ID सक्रिय गर्ने?" #: src/protocols/yahoo/yahoo.c:3028 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "जडान गर्नुहोस् को कुराकानीमा छ?" #: src/protocols/yahoo/yahoo.c:3038
--- a/po/nl.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/nl.po Mon Sep 10 13:57:15 2007 +0000 @@ -13683,7 +13683,7 @@ msgstr "Welk ID activeren?" #: ../libgaim/protocols/yahoo/yahoo.c:3158 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Deelnemen aan wiens chat?" #: ../libgaim/protocols/yahoo/yahoo.c:3168
--- a/po/nn.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/nn.po Mon Sep 10 13:57:15 2007 +0000 @@ -11191,7 +11191,7 @@ msgstr "Kva ID skal takast i bruk?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Kven skal bli med i praterommet?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/pa.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/pa.po Mon Sep 10 13:57:15 2007 +0000 @@ -10385,7 +10385,7 @@ msgstr "ਕਿਹੜਾ ID ਸਰਗਰਮ ਕਰਨਾ ਹੈ?" #: ../libpurple/protocols/yahoo/yahoo.c:3239 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਕੌਣ ਸ਼ਾਮਿਲ ?" #: ../libpurple/protocols/yahoo/yahoo.c:3251
--- a/po/pl.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/pl.po Mon Sep 10 13:57:15 2007 +0000 @@ -11665,7 +11665,7 @@ msgstr "Które ID aktywować?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Kogo przyłączyć do konferencji?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/ps.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ps.po Mon Sep 10 13:57:15 2007 +0000 @@ -13801,7 +13801,7 @@ msgstr "" #: ../libgaim/protocols/yahoo/yahoo.c:3214 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "چه سره ګپ شپ کول غواړی؟" #: ../libgaim/protocols/yahoo/yahoo.c:3224
--- a/po/pt.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/pt.po Mon Sep 10 13:57:15 2007 +0000 @@ -12084,7 +12084,7 @@ msgstr "Activar qual ID?" #: ../src/protocols/yahoo/yahoo.c:3070 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Juntar a quem no chat?" #: ../src/protocols/yahoo/yahoo.c:3080
--- a/po/pt_BR.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/pt_BR.po Mon Sep 10 13:57:15 2007 +0000 @@ -11386,7 +11386,7 @@ msgstr "Ativar qual ID?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Juntar-se a quem no bate-papo?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/ro.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ro.po Mon Sep 10 13:57:15 2007 +0000 @@ -11251,7 +11251,7 @@ msgstr "Ce identitate doriţi să activaţi?" #: ../libpurple/protocols/yahoo/yahoo.c:3256 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Cui doriţi să vă alăturaţi în chat?" #: ../libpurple/protocols/yahoo/yahoo.c:3268
--- a/po/ru.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ru.po Mon Sep 10 13:57:15 2007 +0000 @@ -11217,7 +11217,7 @@ msgstr "Какой ID активировать?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "К кому присоединиться в чате?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/sk.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/sk.po Mon Sep 10 13:57:15 2007 +0000 @@ -11360,7 +11360,7 @@ msgstr "Aktivovať s ID?" #: ../libpurple/protocols/yahoo/yahoo.c:3406 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "S kým sa spojiť v chate?" #: ../libpurple/protocols/yahoo/yahoo.c:3418
--- a/po/sl.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/sl.po Mon Sep 10 13:57:15 2007 +0000 @@ -11254,7 +11254,7 @@ msgstr "Kateri ID naj bo aktiviran?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Komu se želite pridružiti v pomenku?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/sq.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/sq.po Mon Sep 10 13:57:15 2007 +0000 @@ -10811,7 +10811,7 @@ msgstr "Veprues cili ID?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "T'i bashkohem kujt në fjalosje?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/sr.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/sr.po Mon Sep 10 13:57:15 2007 +0000 @@ -10533,7 +10533,7 @@ msgstr "Активирај ИД (који)?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Прикључи се коме разговору?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/sr@Latn.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/sr@Latn.po Mon Sep 10 13:57:15 2007 +0000 @@ -10770,7 +10770,7 @@ msgstr "Aktiviraj ID (koji)?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Priključi se kome razgovoru?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/stats.pl Thu Sep 06 04:08:41 2007 +0000 +++ b/po/stats.pl Mon Sep 10 13:57:15 2007 +0000 @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 50 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 50 Temple Place, Suite 330, Boston, MA 02111-1301 USA # use POSIX qw(strftime);
--- a/po/sv.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/sv.po Mon Sep 10 13:57:15 2007 +0000 @@ -11233,7 +11233,7 @@ msgstr "Vilket ID ska aktiveras?" #: ../libpurple/protocols/yahoo/yahoo.c:3345 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Anslut vem till chatten?" #: ../libpurple/protocols/yahoo/yahoo.c:3357
--- a/po/ta.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/ta.po Mon Sep 10 13:57:15 2007 +0000 @@ -11877,7 +11877,7 @@ msgstr "எந்த முகப்பை செயல்படுத்த?" #: ../src/protocols/yahoo/yahoo.c:3070 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "எந்த அரட்டையில் இருப்பவருடன் சேர ?" #: ../src/protocols/yahoo/yahoo.c:3080
--- a/po/te.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/te.po Mon Sep 10 13:57:15 2007 +0000 @@ -10983,7 +10983,7 @@ msgstr "ఏ IDని యాక్టివ్ చేద్దాం?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "ఎవరితో మాట్లాడుదాం ?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/th.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/th.po Mon Sep 10 13:57:15 2007 +0000 @@ -11710,7 +11710,7 @@ msgstr "" #: ../src/protocols/yahoo/yahoo.c:3070 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "" #: ../src/protocols/yahoo/yahoo.c:3080
--- a/po/tr.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/tr.po Mon Sep 10 13:57:15 2007 +0000 @@ -11001,7 +11001,7 @@ msgstr "Hangi ID aktifleştirilecek?" #: ../libpurple/protocols/yahoo/yahoo.c:3256 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Kullanıcıyla sohbet et..." #: ../libpurple/protocols/yahoo/yahoo.c:3268
--- a/po/uk.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/uk.po Mon Sep 10 13:57:15 2007 +0000 @@ -10786,7 +10786,7 @@ msgstr "Активувати який ID?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "До кого приєднатись у розмові?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/vi.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/vi.po Mon Sep 10 13:57:15 2007 +0000 @@ -10824,7 +10824,7 @@ msgstr "Kích hoạt ID nào ?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Tham gia với ai trong Chat?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/xh.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/xh.po Mon Sep 10 13:57:15 2007 +0000 @@ -10832,7 +10832,7 @@ msgstr "Sesiphi Isazisi esisebenzayo?" #: src/protocols/yahoo/yahoo.c:2972 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "Ngenela incoko?" #: src/protocols/yahoo/yahoo.c:2982
--- a/po/zh_CN.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/zh_CN.po Mon Sep 10 13:57:15 2007 +0000 @@ -10329,7 +10329,7 @@ msgstr "激活哪个 ID？" #: ../libpurple/protocols/yahoo/yahoo.c:3234 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "将谁加入聊天？" #: ../libpurple/protocols/yahoo/yahoo.c:3244
--- a/po/zh_HK.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/zh_HK.po Mon Sep 10 13:57:15 2007 +0000 @@ -10839,7 +10839,7 @@ # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」 #: ../libpurple/protocols/yahoo/yahoo.c:3239 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "加入哪個好友目前所在的聊天室？" #: ../libpurple/protocols/yahoo/yahoo.c:3251
--- a/po/zh_TW.po Thu Sep 06 04:08:41 2007 +0000 +++ b/po/zh_TW.po Mon Sep 10 13:57:15 2007 +0000 @@ -11426,7 +11426,7 @@ # NOTE #gaim 的 Vann 及 LSchiere 解：如果選取了的好友目前處於一個聊天，便加入該個聊天 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」 #: ../libpurple/protocols/yahoo/yahoo.c:3256 -msgid "Join who in chat?" +msgid "Join whom in chat?" msgstr "加入哪個好友目前所在的聊天室？" #: ../libpurple/protocols/yahoo/yahoo.c:3268