From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 11 Sep 2008 15:34:29 +0000 Subject: Merge revisions 36016:36303 from trunk. svn path=/branches/kill-bonobo/; revision=36307 --- plugins/ipod-sync/ChangeLog | 20 ++++++++++++++++ plugins/ipod-sync/evolution-ipod-sync.h | 19 ++++++++++++--- plugins/ipod-sync/format-handler.h | 28 ++++++++++++---------- plugins/ipod-sync/ipod.c | 19 +++++++++++++-- .../org-gnome-ipod-sync-evolution.eplug.xml | 2 +- 5 files changed, 69 insertions(+), 19 deletions(-) (limited to 'plugins/ipod-sync') diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog index 2afd831e4c..c9f0e90046 100644 --- a/plugins/ipod-sync/ChangeLog +++ b/plugins/ipod-sync/ChangeLog @@ -1,3 +1,23 @@ +2008-09-02 Sankar P + +License Changes + + * evolution-ipod-sync.h: + * ipod.c: + +2008-08-27 Philip Withnall + + ** Fix for bug #534762 + + * org-gnome-ipod-sync-evolution.eplug.xml: Change "addressbook" to + "address book" in translatable strings. + +2008-08-27 Sankar P + +License Changes + + * format-handler.h: + 2008-08-12 Milan Crha * ipod-sync.c: Added missing include. diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h index 5984b8a059..6fbf1e985c 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.h +++ b/plugins/ipod-sync/evolution-ipod-sync.h @@ -1,9 +1,22 @@ /* - * evolution-ipod-sync.h + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * (C)2004 Justin Wake + * 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 + * Lesser General Public License for more details. * - * Licensed under the GNU GPL v2. See COPYING. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * Copyright (C) 2004 Justin Wake * */ diff --git a/plugins/ipod-sync/format-handler.h b/plugins/ipod-sync/format-handler.h index e648ba3fdb..d061f4ce86 100644 --- a/plugins/ipod-sync/format-handler.h +++ b/plugins/ipod-sync/format-handler.h @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Philip Van Hoof + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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 + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * Authors: + * Philip Van Hoof + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c index 4edfd6a2dd..26e3d49475 100644 --- a/plugins/ipod-sync/ipod.c +++ b/plugins/ipod-sync/ipod.c @@ -1,9 +1,24 @@ /* * ipod.c - Find an iPod mount point using HAL * - * (C)2004 Justin Wake + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Licensed under the GNU GPL v2. See COPYING. + * 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * Copyright (C) 2004 Justin Wake * */ diff --git a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml index 6e3afa8037..e95b63b3b9 100644 --- a/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml +++ b/plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml @@ -4,7 +4,7 @@ _name="iPod Synchronization" location="@PLUGINDIR@/liborg-gnome-ipod-sync-evolution@SOEXT@"> - <_description>Synchronize the selected task/memo/calendar/addressbook with Apple iPod + <_description>Synchronize the selected task/memo/calendar/address book with Apple iPod -- cgit v1.2.3