From 1bad915150e2d5e97cbbf1a77f7a85e338c07f28 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 27 Aug 2008 10:33:22 +0000 Subject: License Changes svn path=/trunk/; revision=36116 --- smime/ChangeLog | 15 +++++++++++++++ smime/gui/ca-trust-dialog.c | 30 +++++++++++++++--------------- smime/gui/ca-trust-dialog.h | 29 +++++++++++++++-------------- smime/gui/certificate-manager.c | 30 +++++++++++++++--------------- smime/gui/e-cert-selector.c | 26 ++++++++++++++------------ smime/gui/e-cert-selector.h | 26 +++++++++++++------------- smime/lib/e-asn1-object.h | 29 +++++++++++++++-------------- smime/lib/e-cert-trust.h | 29 +++++++++++++++-------------- smime/lib/e-cert.h | 29 +++++++++++++++-------------- smime/lib/e-pkcs12.h | 29 +++++++++++++++-------------- smime/tests/import-cert.c | 19 +++++++++++++++++++ 11 files changed, 166 insertions(+), 125 deletions(-) (limited to 'smime') diff --git a/smime/ChangeLog b/smime/ChangeLog index 585396bcfe..9e7b639d7b 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,18 @@ +2008-08-27 Sankar P + +License Changes + + * gui/ca-trust-dialog.c: + * gui/ca-trust-dialog.h: + * gui/certificate-manager.c: + * gui/e-cert-selector.c: + * gui/e-cert-selector.h: + * lib/e-asn1-object.h: + * lib/e-cert-trust.h: + * lib/e-cert.h: + * lib/e-pkcs12.h: + * tests/import-cert.c: + 2008-05-22 Matthew Barnes ** Fixes part of bug #534360 diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c index a82f72199f..f0d6cea90f 100644 --- a/smime/gui/ca-trust-dialog.c +++ b/smime/gui/ca-trust-dialog.c @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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. * - * 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 + * Lesser 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 Lesser General Public + * License along with the program; if not, see * - * You 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/smime/gui/ca-trust-dialog.h b/smime/gui/ca-trust-dialog.h index 31bf6704d4..1ebd05e780 100644 --- a/smime/gui/ca-trust-dialog.h +++ b/smime/gui/ca-trust-dialog.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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. * - * 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 + * Lesser 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 Lesser General Public + * License along with the program; if not, see * - * You 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index dfd2bf48e9..546745199f 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -1,26 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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. * - * 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 + * Lesser 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 Lesser General Public + * License along with the program; if not, see * - * You 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index d7101d6ec8..dacf33198f 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -1,24 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* Copyright 2003, Novell Inc. - * - * Author(s): Michael Zucchi +/* * * 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. + * 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. * * 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. + * 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: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You 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. */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h index 47f865b616..130d90920c 100644 --- a/smime/gui/e-cert-selector.h +++ b/smime/gui/e-cert-selector.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-cert-selector.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: Michael Zucchi +/* * * 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. + * 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. * * 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. + * 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 * - * You 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: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/lib/e-asn1-object.h b/smime/lib/e-asn1-object.h index 0c99ffea18..b761730ec3 100644 --- a/smime/lib/e-asn1-object.h +++ b/smime/lib/e-asn1-object.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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. * - * 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 + * Lesser 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 Lesser General Public + * License along with the program; if not, see * - * You 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/lib/e-cert-trust.h b/smime/lib/e-cert-trust.h index 19f830c6db..65a925d7bb 100644 --- a/smime/lib/e-cert-trust.h +++ b/smime/lib/e-cert-trust.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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. * - * 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 + * Lesser 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 Lesser General Public + * License along with the program; if not, see * - * You 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/lib/e-cert.h b/smime/lib/e-cert.h index 20eb1b2ccf..e152031a5d 100644 --- a/smime/lib/e-cert.h +++ b/smime/lib/e-cert.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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. * - * 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 + * Lesser 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 Lesser General Public + * License along with the program; if not, see * - * You 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/lib/e-pkcs12.h b/smime/lib/e-pkcs12.h index d2d6ab01a3..9e4e5857a7 100644 --- a/smime/lib/e-pkcs12.h +++ b/smime/lib/e-pkcs12.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * 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. * - * 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 + * Lesser 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 Lesser General Public + * License along with the program; if not, see * - * You 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/tests/import-cert.c b/smime/tests/import-cert.c index e30b085317..006cb2c313 100644 --- a/smime/tests/import-cert.c +++ b/smime/tests/import-cert.c @@ -1,3 +1,22 @@ +/* + * + * 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. + * + * 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 + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ #include #include -- cgit v1.2.3 From 14fa5c8a8cf736e3207b9d9e414586d9ff3a623f Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Tue, 2 Sep 2008 16:25:53 +0000 Subject: Change License from GPL to LGPL. 2nd batch. More changes to come. svn path=/trunk/; revision=36247 --- smime/ChangeLog | 14 ++++++++++++++ smime/gui/cert-trust-dialog.c | 30 +++++++++++++++--------------- smime/gui/cert-trust-dialog.h | 30 +++++++++++++++--------------- smime/gui/certificate-manager.h | 28 ++++++++++++++-------------- smime/gui/certificate-viewer.c | 29 ++++++++++++++--------------- smime/gui/certificate-viewer.h | 28 ++++++++++++++-------------- smime/gui/component.c | 29 ++++++++++++++--------------- smime/gui/component.h | 28 ++++++++++++++-------------- smime/lib/e-cert-db.h | 28 ++++++++++++++-------------- smime/lib/e-pkcs12.c | 26 +++++++++++++------------- 10 files changed, 141 insertions(+), 129 deletions(-) (limited to 'smime') diff --git a/smime/ChangeLog b/smime/ChangeLog index 9e7b639d7b..87bb1d3091 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,17 @@ +2008-09-02 Sankar P + +License Changes + + * gui/cert-trust-dialog.c: + * gui/cert-trust-dialog.h: + * gui/certificate-manager.h: + * gui/certificate-viewer.c: + * gui/certificate-viewer.h: + * gui/component.c: + * gui/component.h: + * lib/e-cert-db.h: + * lib/e-pkcs12.c: + 2008-08-27 Sankar P License Changes diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c index 5e155def67..0b82182972 100644 --- a/smime/gui/cert-trust-dialog.c +++ b/smime/gui/cert-trust-dialog.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok - * Michael Zucchi + * 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 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. + * 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: + * Chris Toshok + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/gui/cert-trust-dialog.h b/smime/gui/cert-trust-dialog.h index acc69089e1..a9c3e9ca8b 100644 --- a/smime/gui/cert-trust-dialog.h +++ b/smime/gui/cert-trust-dialog.h @@ -1,23 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok - * Michael Zucchi + * 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 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. + * 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: + * Chris Toshok + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/gui/certificate-manager.h b/smime/gui/certificate-manager.h index 888f92a752..6a0898d6e2 100644 --- a/smime/gui/certificate-manager.h +++ b/smime/gui/certificate-manager.h @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok + * 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 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. + * 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c index 8595e5cc19..5c587139a5 100644 --- a/smime/gui/certificate-viewer.c +++ b/smime/gui/certificate-viewer.c @@ -1,26 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok + * 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 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. + * 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/smime/gui/certificate-viewer.h b/smime/gui/certificate-viewer.h index 902a61c2b0..2f088dd6c3 100644 --- a/smime/gui/certificate-viewer.h +++ b/smime/gui/certificate-viewer.h @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok + * 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 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. + * 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/gui/component.c b/smime/gui/component.c index 22a65a5ea8..339adabbbf 100644 --- a/smime/gui/component.c +++ b/smime/gui/component.c @@ -1,26 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok + * 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 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. + * 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifdef HAVE_CONFIG_H #include #endif diff --git a/smime/gui/component.h b/smime/gui/component.h index a7215e3208..5a7492a342 100644 --- a/smime/gui/component.h +++ b/smime/gui/component.h @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok + * 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 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. + * 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h index ecef5022de..b3a69632d1 100644 --- a/smime/lib/e-cert-db.h +++ b/smime/lib/e-cert-db.h @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok + * 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 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. + * 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 5c0bf3fcd7..2c1dcee143 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-pkcs12.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * 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. + * 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. * * 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. + * Lesser 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. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Toshok (toshok@ximian.com) + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * Author: Chris Toshok (toshok@ximian.com) */ /* The following is the mozilla license blurb, as the bodies some of -- cgit v1.2.3 From 9b2f1c77d223c99b86b564d51902a3ff20da6a3f Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Sat, 6 Sep 2008 15:32:10 +0000 Subject: esthetic license header cleans, and fix e-pkcs12 svn path=/trunk/; revision=36264 --- smime/lib/e-pkcs12.c | 22 ---------------------- smime/lib/e-pkcs12.h | 3 --- 2 files changed, 25 deletions(-) (limited to 'smime') diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index 2c1dcee143..cd79b21a4b 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -1,25 +1,3 @@ -/* - * 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. - * - * 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: - * Chris Toshok (toshok@ximian.com) - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - /* The following is the mozilla license blurb, as the bodies some of these functions were derived from the mozilla source. */ diff --git a/smime/lib/e-pkcs12.h b/smime/lib/e-pkcs12.h index 9e4e5857a7..950a2d3899 100644 --- a/smime/lib/e-pkcs12.h +++ b/smime/lib/e-pkcs12.h @@ -1,5 +1,4 @@ /* - * * 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 @@ -13,12 +12,10 @@ * You should have received a copy of the GNU Lesser General Public * License along with the program; if not, see * - * * Authors: * Chris Toshok * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * */ #ifndef _E_PKCS12_H_ -- cgit v1.2.3 From 3fa5c34a8f0d5194824b91ec89115bb6a9df9780 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 10 Oct 2008 05:09:27 +0000 Subject: License changes svn path=/trunk/; revision=36583 --- smime/ChangeLog | 10 ++++++ smime/lib/e-asn1-object.c | 77 ++++++++++++++++++--------------------------- smime/lib/e-cert-db.c | 76 ++++++++++++++++++--------------------------- smime/lib/e-cert-trust.c | 79 +++++++++++++++++------------------------------ smime/lib/e-cert.c | 77 ++++++++++++++++++--------------------------- smime/lib/e-pkcs12.c | 57 ++++++++++++++++++---------------- 6 files changed, 160 insertions(+), 216 deletions(-) (limited to 'smime') diff --git a/smime/ChangeLog b/smime/ChangeLog index 87bb1d3091..249a44fb14 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,13 @@ +2008-10-10 Sankar P + +License Changes + + * lib/e-asn1-object.c: + * lib/e-cert-db.c: + * lib/e-cert-trust.c: + * lib/e-cert.c: + * lib/e-pkcs12.c: + 2008-09-02 Sankar P License Changes diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c index f8465e2212..b3cfe9e726 100644 --- a/smime/lib/e-asn1-object.c +++ b/smime/lib/e-asn1-object.c @@ -1,61 +1,44 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-cert.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * 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. - * - * 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. - * - * Author: Chris Toshok (toshok@ximian.com) - */ - /* The following is the mozilla license blurb, as the bodies some of these functions were derived from the mozilla source. */ - /* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * - * The Original Code is the Netscape security libraries. + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 2000 Netscape Communications Corporation. All - * Rights Reserved. + * The Original Code is the Netscape security libraries. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1994-2000 + * the Initial Developer. All Rights Reserved. * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. */ - +/* + * Author: Chris Toshok (toshok@ximian.com) + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + */ #ifdef HAVE_CONFIG_H #include #endif diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 1c879177f1..d2a140aeb7 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -1,61 +1,45 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* The following is the mozilla license blurb, as the bodies some of + these functions were derived from the mozilla source. */ /* e-cert-db.c * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * - * 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. + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * - * 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. + * The Original Code is the Netscape security libraries. * - * You 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. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1994-2000 + * the Initial Developer. All Rights Reserved. * - * Author: Chris Toshok (toshok@ximian.com) + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. */ -/* The following is the mozilla license blurb, as the bodies of most - of these functions were derived from the mozilla source. */ - /* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. + * Author: Chris Toshok (toshok@ximian.com) * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ - - #ifdef HAVE_CONFIG_H #include #endif diff --git a/smime/lib/e-cert-trust.c b/smime/lib/e-cert-trust.c index 6432c14435..8509f3ffee 100644 --- a/smime/lib/e-cert-trust.c +++ b/smime/lib/e-cert-trust.c @@ -1,65 +1,44 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* The following is the mozilla license blurb, as the bodies some of + these functions were derived from the mozilla source. */ /* - * Authors: Chris Toshok + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * - * 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. + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * - * 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. + * The Original Code is the Netscape security libraries. * - * You 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. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1994-2000 + * the Initial Developer. All Rights Reserved. * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. */ -/* this code is pretty much cut&pasted and renamed from mozilla. - here's their copyright/blurb */ - /* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * Ian McGreer - * Javier Delgadillo - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. + * Author: Chris Toshok (toshok@ximian.com) * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ - - #ifdef HAVE_CONFIG_H #include #endif diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index 34a2b09bd2..cbede0a5fe 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -1,61 +1,44 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-cert.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * 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. - * - * 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. - * - * Author: Chris Toshok (toshok@ximian.com) - */ - /* The following is the mozilla license blurb, as the bodies some of these functions were derived from the mozilla source. */ - /* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * - * The Original Code is the Netscape security libraries. + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 2000 Netscape Communications Corporation. All - * Rights Reserved. + * The Original Code is the Netscape security libraries. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1994-2000 + * the Initial Developer. All Rights Reserved. * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. */ - +/* + * Author: Chris Toshok (toshok@ximian.com) + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + */ #ifdef HAVE_CONFIG_H #include #endif diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index cd79b21a4b..98f16d6e75 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -1,39 +1,44 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* The following is the mozilla license blurb, as the bodies some of these functions were derived from the mozilla source. */ - /* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * - * The Original Code is the Netscape security libraries. + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 2000 Netscape Communications Corporation. All - * Rights Reserved. + * The Original Code is the Netscape security libraries. * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1994-2000 + * the Initial Developer. All Rights Reserved. * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. */ - +/* + * Author: Chris Toshok (toshok@ximian.com) + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + */ #ifdef HAVE_CONFIG_H #include #endif -- cgit v1.2.3 From 6c721ffaebd623d08ab1d11f7778779ad3c14486 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 25 Feb 2009 11:28:08 +0000 Subject: ** Fix for bug #572975 2009-02-25 Milan Crha ** Fix for bug #572975 * gui/smime-ui.glade: Center dialogs. * gui/certificate-manager.c: (import_your), (import_contact), (import_ca): Destroy file chooser dialog early enough to not have hidden any other windows below it. svn path=/trunk/; revision=37333 --- smime/ChangeLog | 9 +++++++++ smime/gui/certificate-manager.c | 33 +++++++++++++++++++++------------ smime/gui/smime-ui.glade | 6 +++--- 3 files changed, 33 insertions(+), 15 deletions(-) (limited to 'smime') diff --git a/smime/ChangeLog b/smime/ChangeLog index 249a44fb14..4b0a58a82c 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,12 @@ +2009-02-25 Milan Crha + + ** Fix for bug #572975 + + * gui/smime-ui.glade: Center dialogs. + * gui/certificate-manager.c: (import_your), (import_contact), + (import_ca): Destroy file chooser dialog early enough to not have + hidden any other windows below it. + 2008-10-10 Sankar P License Changes diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 546745199f..2bfeec3ed3 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -130,7 +130,6 @@ static void import_your (GtkWidget *widget, CertificateManagerData *cfm) { GtkWidget *filesel; - const char *filename; GtkFileFilter* filter; @@ -153,7 +152,10 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm) gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); + char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); + + /* destroy dialog to get rid of it in the GUI */ + gtk_widget_destroy (filesel); if (e_cert_db_import_pkcs12_file (e_cert_db_peek (), filename, NULL /* XXX */)) { @@ -163,9 +165,10 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm) load_certs (cfm, E_CERT_USER, add_user_cert); gtk_tree_view_expand_all (GTK_TREE_VIEW (cfm->yourcerts_treeview)); } - } - gtk_widget_destroy (filesel); + g_free (filename); + } else + gtk_widget_destroy (filesel); } static void @@ -373,7 +376,6 @@ static void import_contact (GtkWidget *widget, CertificateManagerData *cfm) { GtkWidget *filesel; - const char *filename; GtkFileFilter *filter; @@ -396,7 +398,10 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm) gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); + char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); + + /* destroy dialog to get rid of it in the GUI */ + gtk_widget_destroy (filesel); if (e_cert_db_import_certs_from_file (e_cert_db_peek (), filename, @@ -409,9 +414,10 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm) load_certs (cfm, E_CERT_CONTACT, add_contact_cert); gtk_tree_view_expand_all (GTK_TREE_VIEW (cfm->contactcerts_treeview)); } - } - gtk_widget_destroy (filesel); + g_free (filename); + } else + gtk_widget_destroy (filesel); } static void @@ -597,7 +603,6 @@ static void import_ca (GtkWidget *widget, CertificateManagerData *cfm) { GtkWidget *filesel; - const char *filename; GtkFileFilter *filter; @@ -620,7 +625,10 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm) gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) { - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); + char *filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel)); + + /* destroy dialog to get rid of it in the GUI */ + gtk_widget_destroy (filesel); if (e_cert_db_import_certs_from_file (e_cert_db_peek (), filename, @@ -632,9 +640,10 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm) unload_certs (cfm, E_CERT_CA); load_certs (cfm, E_CERT_CA, add_ca_cert); } - } - gtk_widget_destroy (filesel); + g_free (filename); + } else + gtk_widget_destroy (filesel); } static void diff --git a/smime/gui/smime-ui.glade b/smime/gui/smime-ui.glade index 2ea8fe3b8d..41d119f2ce 100644 --- a/smime/gui/smime-ui.glade +++ b/smime/gui/smime-ui.glade @@ -6,7 +6,7 @@ dialog1 GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER False True False @@ -1850,7 +1850,7 @@ Certificate Authority Trust GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER False True False @@ -2173,7 +2173,7 @@ Email Certificate Trust Settings GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER False True False -- cgit v1.2.3 From f8d913a688c5cdff082b18cccfb847650a900ff0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 7 Apr 2009 12:08:30 +0000 Subject: ** Fix for bug #529745 2009-04-07 Milan Crha ** Fix for bug #529745 * gui/certificate-manager.c: (import_your), (import_contact): Add more file types in a file filter. svn path=/trunk/; revision=37499 --- smime/ChangeLog | 7 +++++++ smime/gui/certificate-manager.c | 2 ++ 2 files changed, 9 insertions(+) (limited to 'smime') diff --git a/smime/ChangeLog b/smime/ChangeLog index 4b0a58a82c..f9fd35914e 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,10 @@ +2009-04-07 Milan Crha + + ** Fix for bug #529745 + + * gui/certificate-manager.c: (import_your), (import_contact): + Add more file types in a file filter. + 2009-02-25 Milan Crha ** Fix for bug #572975 diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 2bfeec3ed3..330fef7187 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -143,6 +143,7 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm) filter = gtk_file_filter_new(); gtk_file_filter_set_name (filter, _("All PKCS12 files")); + gtk_file_filter_add_mime_type (filter, "application/x-x509-user-cert"); gtk_file_filter_add_mime_type (filter, "application/x-pkcs12"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); @@ -390,6 +391,7 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm) filter = gtk_file_filter_new(); gtk_file_filter_set_name (filter, _("All email certificate files")); gtk_file_filter_add_mime_type (filter, "application/x-x509-email-cert"); + gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter); filter = gtk_file_filter_new (); -- cgit v1.2.3 From 7b76c88e4d1a4a510ac88c2e1f177fd8c9c3f830 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 7 Apr 2009 12:11:12 +0000 Subject: ** Fix for bug #539002 2009-04-07 Milan Crha ** Fix for bug #539002 * gui/certificate-manager.c: (load_certs): Show all other certificates in a contact tab. svn path=/trunk/; revision=37500 --- smime/ChangeLog | 7 +++++++ smime/gui/certificate-manager.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'smime') diff --git a/smime/ChangeLog b/smime/ChangeLog index f9fd35914e..3677604add 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,10 @@ +2009-04-07 Milan Crha + + ** Fix for bug #539002 + + * gui/certificate-manager.c: (load_certs): + Show all other certificates in a contact tab. + 2009-04-07 Milan Crha ** Fix for bug #529745 diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c index 330fef7187..2d1c8c17c4 100644 --- a/smime/gui/certificate-manager.c +++ b/smime/gui/certificate-manager.c @@ -963,7 +963,10 @@ load_certs (CertificateManagerData *cfm, !CERT_LIST_END(node, certList); node = CERT_LIST_NEXT(node)) { ECert *cert = e_cert_new ((CERTCertificate*)node->cert); - if (e_cert_get_cert_type(cert) == type) { + ECertType ct = e_cert_get_cert_type (cert); + + /* show everything else in a contact tab */ + if (ct == type || (type == E_CERT_CONTACT && ct != E_CERT_CA && ct != E_CERT_USER)) { add_cert (cfm, cert); } } -- cgit v1.2.3 From 035c9fbfa8d43eded3d91869df0471defc39f1fd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Apr 2009 05:58:10 +0000 Subject: ** Remove a bunch of juvenile comments. Source code should look 2009-04-12 Matthew Barnes ** Remove a bunch of juvenile comments. Source code should look professional, even if some developers are not. svn path=/trunk/; revision=37514 --- smime/lib/e-cert-db.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'smime') diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index d2a140aeb7..ed25356bd4 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -48,8 +48,6 @@ #include #include -/* XXX toshok why oh *why* god WHY did they do this? no fucking - sense */ /* private NSS defines used by PSM */ /* (must be declated before cert.h) */ #define CERT_NewTempCertificate __CERT_NewTempCertificate -- cgit v1.2.3 From e42f27652709397453431b75c32601a4f4effd48 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 10:02:07 -0400 Subject: =?UTF-8?q?Bug=20577929=20=E2=80=93=20Consolidate=20marshallers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate all marshalling specifications to e-util/e-marshal.list. This reduces code duplication and makes it slightly easier to locate unused marshallers. --- smime/lib/Makefile.am | 9 --------- smime/lib/e-cert-db.c | 7 +++---- smime/lib/smime-marshal.list | 3 --- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 smime/lib/smime-marshal.list (limited to 'smime') diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index df055929dd..52ad228baa 100644 --- a/smime/lib/Makefile.am +++ b/smime/lib/Makefile.am @@ -16,7 +16,6 @@ INCLUDES = \ privsolib_LTLIBRARIES = libessmime.la libessmime_la_SOURCES = \ - $(MARSHAL_GENERATED) \ e-asn1-object.c \ e-asn1-object.h \ e-cert.c \ @@ -33,11 +32,3 @@ libessmime_la_LIBADD = \ $(CERT_UI_LIBS) libessmime_la_LDFLAGS = $(NO_UNDEFINED) - -MARSHAL_GENERATED = smime-marshal.c smime-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = smime-marshal.list diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index ed25356bd4..73bfc72131 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -53,7 +53,6 @@ #define CERT_NewTempCertificate __CERT_NewTempCertificate #define CERT_AddTempCertToPerm __CERT_AddTempCertToPerm -#include "smime-marshal.h" #include "e-cert-db.h" #include "e-cert-trust.h" #include "e-pkcs12.h" @@ -316,7 +315,7 @@ e_cert_db_class_init (ECertDBClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECertDBClass, pk11_passwd), NULL, NULL, - smime_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER, + e_marshal_BOOLEAN__POINTER_BOOLEAN_POINTER, G_TYPE_BOOLEAN, 3, G_TYPE_POINTER, G_TYPE_BOOLEAN, G_TYPE_POINTER); @@ -326,7 +325,7 @@ e_cert_db_class_init (ECertDBClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECertDBClass, pk11_change_passwd), NULL, NULL, - smime_marshal_BOOLEAN__POINTER_POINTER, + e_marshal_BOOLEAN__POINTER_POINTER, G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_POINTER); @@ -336,7 +335,7 @@ e_cert_db_class_init (ECertDBClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ECertDBClass, confirm_ca_cert_import), NULL, NULL, - smime_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER, + e_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER, G_TYPE_BOOLEAN, 4, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER); } diff --git a/smime/lib/smime-marshal.list b/smime/lib/smime-marshal.list deleted file mode 100644 index 6eb2617ec0..0000000000 --- a/smime/lib/smime-marshal.list +++ /dev/null @@ -1,3 +0,0 @@ -BOOL:POINTER,BOOL,POINTER -BOOL:POINTER,POINTER -BOOL:POINTER,POINTER,POINTER,POINTER -- cgit v1.2.3 From 8a072ffc7c0ddcde472877a51ace0bb14f86fb0a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 24 Apr 2009 11:45:21 +0200 Subject: GN-bug #572348 - Removed deprecated Gtk+ symbols Some still left, because those gone in kill-bonobo branch. --- smime/ChangeLog | 8 ++ smime/gui/e-cert-selector.c | 21 ++-- smime/gui/smime-ui.glade | 241 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 253 insertions(+), 17 deletions(-) (limited to 'smime') diff --git a/smime/ChangeLog b/smime/ChangeLog index 3677604add..8310f3dbfb 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,11 @@ +2009-04-24 Milan Crha + + ** Fix for bug #572348 + + * gui/smime-ui.glade: + * gui/e-cert-selector.c: + Remove deprecated Gtk+ symbols. + 2009-04-07 Milan Crha ** Fix for bug #539002 diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c index dacf33198f..770f95c1cd 100644 --- a/smime/gui/e-cert-selector.c +++ b/smime/gui/e-cert-selector.c @@ -41,7 +41,7 @@ struct _ECertSelectorPrivate { CERTCertList *certlist; - GtkWidget *menu, *description; + GtkWidget *combobox, *description; }; enum { @@ -73,7 +73,7 @@ ecs_find_current(ECertSelector *ecs) if (p->certlist == NULL || CERT_LIST_EMPTY(p->certlist)) return NULL; - n = gtk_option_menu_get_history((GtkOptionMenu *)p->menu); + n = gtk_combo_box_get_active (GTK_COMBO_BOX (p->combobox)); node = CERT_LIST_HEAD(p->certlist); while (n>0 && !CERT_LIST_END(node, p->certlist)) { n--; @@ -149,7 +149,7 @@ e_cert_selector_new(int type, const char *currentid) CERTCertList *certlist; CERTCertListNode *node; GladeXML *gui; - GtkWidget *w, *menu; + GtkWidget *w; int n=0, active=0; char *gladefile; @@ -162,7 +162,7 @@ e_cert_selector_new(int type, const char *currentid) gui = glade_xml_new(gladefile, "cert_selector_vbox", NULL); g_free (gladefile); - p->menu = glade_xml_get_widget(gui, "cert_menu"); + p->combobox = glade_xml_get_widget(gui, "cert_combobox"); p->description = glade_xml_get_widget(gui, "cert_description"); w = glade_xml_get_widget(gui, "cert_selector_vbox"); @@ -179,7 +179,7 @@ e_cert_selector_new(int type, const char *currentid) break; } - menu = gtk_menu_new(); + gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (p->combobox)))); certlist = CERT_FindUserCertsByUsage(CERT_GetDefaultCertDB(), usage, FALSE, TRUE, NULL); ecs->priv->certlist = certlist; @@ -187,9 +187,7 @@ e_cert_selector_new(int type, const char *currentid) node = CERT_LIST_HEAD(certlist); while (!CERT_LIST_END(node, certlist)) { if (node->cert->nickname || node->cert->emailAddr) { - w = gtk_menu_item_new_with_label(node->cert->nickname?node->cert->nickname:node->cert->emailAddr); - gtk_menu_shell_append((GtkMenuShell *)menu, w); - gtk_widget_show(w); + gtk_combo_box_append_text (GTK_COMBO_BOX (p->combobox), node->cert->nickname?node->cert->nickname:node->cert->emailAddr); if (currentid != NULL && ((node->cert->nickname != NULL && strcmp(node->cert->nickname, currentid) == 0) @@ -203,14 +201,13 @@ e_cert_selector_new(int type, const char *currentid) } } - gtk_option_menu_set_menu((GtkOptionMenu *)p->menu, menu); - gtk_option_menu_set_history((GtkOptionMenu *)p->menu, active); + gtk_combo_box_set_active (GTK_COMBO_BOX (p->combobox), active); - g_signal_connect(p->menu, "changed", G_CALLBACK(ecs_cert_changed), ecs); + g_signal_connect (p->combobox, "changed", G_CALLBACK(ecs_cert_changed), ecs); g_object_unref(gui); - ecs_cert_changed(p->menu, ecs); + ecs_cert_changed(p->combobox, ecs); return GTK_WIDGET(ecs); } diff --git a/smime/gui/smime-ui.glade b/smime/gui/smime-ui.glade index 41d119f2ce..686cc38d02 100644 --- a/smime/gui/smime-ui.glade +++ b/smime/gui/smime-ui.glade @@ -4,7 +4,7 @@ - dialog1 + dialog1 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER False @@ -15,6 +15,8 @@ False GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST + True + False False @@ -94,6 +96,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -115,6 +121,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -136,6 +146,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -157,6 +171,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -180,6 +198,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -227,6 +249,10 @@ 1 0 3 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -251,6 +277,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -275,6 +305,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -299,6 +333,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -323,6 +361,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -347,6 +389,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -371,6 +417,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -395,6 +445,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -419,6 +473,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -443,6 +501,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -467,6 +529,10 @@ 1 0 3 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -491,6 +557,10 @@ 0.5 0 3 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -515,6 +585,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -539,6 +613,10 @@ 0.5 6 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -564,6 +642,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -589,6 +671,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -614,6 +700,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -639,6 +729,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -664,6 +758,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -689,6 +787,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -714,6 +816,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -739,6 +845,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -764,6 +874,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -789,6 +903,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -814,6 +932,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 1 @@ -838,6 +960,10 @@ 0.5 0 3 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -875,6 +1001,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -913,6 +1043,9 @@ False False True + False + False + False @@ -931,6 +1064,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -969,6 +1106,9 @@ False False True + False + False + False @@ -987,6 +1127,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -1052,6 +1196,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -1084,6 +1232,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -1101,7 +1253,7 @@ - window1 + window1 GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -1112,6 +1264,8 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False @@ -1143,6 +1297,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1174,6 +1332,9 @@ False False True + False + False + False Certificates Table @@ -1263,6 +1424,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1333,6 +1498,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1405,6 +1574,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -1431,6 +1604,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1462,6 +1639,9 @@ False False True + False + False + False Certificates Table @@ -1551,6 +1731,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1623,6 +1807,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -1649,6 +1837,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1680,6 +1872,9 @@ False False True + False + False + False @@ -1766,6 +1961,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1838,6 +2037,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -1859,6 +2062,8 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False False @@ -1939,6 +2144,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2017,6 +2226,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2047,6 +2260,8 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False @@ -2074,6 +2289,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2083,10 +2302,12 @@ - + True - True - -1 + a +b + False + True 0 @@ -2154,6 +2375,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 label_item @@ -2182,6 +2407,8 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False False @@ -2249,6 +2476,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 -- cgit v1.2.3