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 --- widgets/text/e-text-model-repos.c | 32 ++++++++++++++++---------------- widgets/text/e-text-model-test.c | 32 ++++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c index b462fe5f93..0b55930792 100644 --- a/widgets/text/e-text-model-repos.c +++ b/widgets/text/e-text-model-repos.c @@ -1,24 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-text-model-repos.c - Standard ETextModelReposFn definitions - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Jon Trowbridge * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * 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 library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library 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: + * Jon Trowbridge + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #include "e-text-model-repos.h" diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c index 60a13226cf..0f1f216cfb 100644 --- a/widgets/text/e-text-model-test.c +++ b/widgets/text/e-text-model-test.c @@ -1,24 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-text-model-test.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Chris Lahey * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * 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 library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library 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: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #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 --- widgets/text/e-text-model-repos.h | 31 ++++++++++++++++--------------- widgets/text/e-text-model.c | 31 +++++++++++++++---------------- widgets/text/e-text-model.h | 31 +++++++++++++++---------------- 3 files changed, 46 insertions(+), 47 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h index a14c138e38..461a70f59d 100644 --- a/widgets/text/e-text-model-repos.h +++ b/widgets/text/e-text-model-repos.h @@ -1,24 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * e-text-model-repos.h - Standard ETextModelReposFn definitions - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: - * Jon Trowbridge * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * 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 library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library 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: + * Jon Trowbridge + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #ifndef E_TEXT_MODEL_REPOS_H diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index 53c03d0f93..c1704e532c 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-text-model.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 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. * - * Authors: - * Chris Lahey + * 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 library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, 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 library 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 - * Library General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #undef PARANOID_DEBUGGING diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h index 867d48530b..2a484f14b4 100644 --- a/widgets/text/e-text-model.h +++ b/widgets/text/e-text-model.h @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-text-model.h - * 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. * - * Authors: - * Chris Lahey + * 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 library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, 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 library 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 - * Library General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef E_TEXT_MODEL_H -- cgit v1.2.3 From b7fc5caefe4aded8d0ffd7088ecbbf1f370b995e Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 12 Sep 2008 16:19:36 +0000 Subject: License Changes from GPL to LGPL svn path=/trunk/; revision=36313 --- widgets/text/e-text.h | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index cc4833a58d..e3deda4826 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -1,11 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * e-text.h - Text item for evolution. - * 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 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 Lahey - * Jon Trowbridge + * Chris Lahey + * Jon Trowbridge * * A majority of code taken from: * @@ -19,19 +31,8 @@ * * Author: Federico Mena * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. - * - * This library 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 - * Library General Public License for more details. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #ifndef E_TEXT_H -- cgit v1.2.3 From 484f82addc35c7668025e053a5414529f156abdd Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 3 Oct 2008 09:24:07 +0000 Subject: Change licese from GPL to LGPL. svn path=/trunk/; revision=36539 --- widgets/text/e-text-test.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-text-test.c b/widgets/text/e-text-test.c index 01bcdc641e..adba386ad1 100644 --- a/widgets/text/e-text-test.c +++ b/widgets/text/e-text-test.c @@ -1,24 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * e-text-test.c - E-Text item test program - * Copyright 2000: Iain Holmes - * - * Authors: - * Iain Holmes * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * 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 library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 - * Library 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: + * Iain Holmes + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * Copyright 2000: Iain Holmes * - * 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., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. */ #include -- cgit v1.2.3 From d636d0ead7923279e711e65c8cf8ad4061e6c522 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 17 Oct 2008 16:46:27 +0000 Subject: License changes. svn path=/trunk/; revision=36641 --- widgets/text/e-text.c | 5 +++-- widgets/text/e-text.h | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index dca16f0da9..c0fdaa4782 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -20,8 +20,9 @@ * Author: Federico Mena * * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License, version 2, as published by the Free Software Foundation. + * modify it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index e3deda4826..a426b2c64f 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -2,9 +2,9 @@ * e-text.h - Text item for evolution. * * 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. + * modify it under the terms of the GNU Library 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 -- cgit v1.2.3 From c495bcad905e857b01f5d61c160f9897942d3394 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 3 Nov 2008 05:12:29 +0000 Subject: ** Fixes bug #559041 2008-11-03 Matthew Barnes ** Fixes bug #559041 * widgets/text/e-text.c (e_text_class_init): Add translator comment for "im_context" property. svn path=/trunk/; revision=36725 --- widgets/text/e-text.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'widgets/text') diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index c0fdaa4782..6840ffb644 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -3777,7 +3777,9 @@ e_text_class_init (ETextClass *klass) g_object_class_install_property (gobject_class, PROP_IM_CONTEXT, g_param_spec_object ("im_context", + /* Translators: Input Method Context */ _( "IM Context" ), + /* Translators: Input Method Context */ _( "IM Context" ), GTK_TYPE_IM_CONTEXT, G_PARAM_READWRITE)); -- cgit v1.2.3 From de987a7de13f1d158d9fa26b03eb5b9a3d44cec4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 15 Feb 2009 03:35:28 +0000 Subject: ** Fixes bug #571734 2009-02-14 Matthew Barnes ** Fixes bug #571734 * widgets/text/e-text.c: Remove unneeded #include . svn path=/trunk/; revision=37271 --- widgets/text/e-text.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 6840ffb644..a88ecec75d 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -45,9 +45,6 @@ #include #include #include -#include -#include -#include #include "a11y/e-text/gal-a11y-e-text.h" #include "misc/e-canvas.h" -- cgit v1.2.3 From 1c1d81211e14986917817b674c9c4230e84a304b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 25 Mar 2009 11:28:43 +0000 Subject: ** Fixes bug #576694 2009-03-25 Matthew Barnes ** Fixes bug #576694 * widgets/table/e-cell-text.c (build_layout): * widgets/text/e-text.c (reset_layout): Handle absolute font sizes correctly. svn path=/trunk/; revision=37474 --- widgets/text/e-text.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index a88ecec75d..5f3906fc71 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -426,8 +426,12 @@ reset_layout (EText *text) pango_layout_context_changed (text->layout); text->font_desc = pango_font_description_new (); - pango_font_description_set_size (text->font_desc, - pango_font_description_get_size ((GTK_WIDGET (item->canvas))->style->font_desc)); + if (!pango_font_description_get_size_is_absolute ((GTK_WIDGET (item->canvas))->style->font_desc)) + pango_font_description_set_size (text->font_desc, + pango_font_description_get_size ((GTK_WIDGET (item->canvas))->style->font_desc)); + else + pango_font_description_set_absolute_size (text->font_desc, + pango_font_description_get_size ((GTK_WIDGET (item->canvas))->style->font_desc)); pango_font_description_set_family (text->font_desc, pango_font_description_get_family ((GTK_WIDGET (item->canvas))->style->font_desc)); pango_layout_set_font_description (text->layout, text->font_desc); -- 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. --- widgets/text/e-text-model.c | 2 +- widgets/text/e-text.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index c1704e532c..207ac6ce50 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -85,7 +85,7 @@ e_text_model_class_init (ETextModelClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextModelClass, reposition), NULL, NULL, - e_util_marshal_NONE__POINTER_POINTER, + e_marshal_NONE__POINTER_POINTER, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index 5f3906fc71..f15317b01e 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -3536,7 +3536,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, keypress), NULL, NULL, - e_util_marshal_NONE__INT_INT, + e_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT); e_text_signals[E_TEXT_POPULATE_POPUP] = @@ -3545,7 +3545,7 @@ e_text_class_init (ETextClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (ETextClass, populate_popup), NULL, NULL, - e_util_marshal_NONE__POINTER_INT_OBJECT, + e_marshal_NONE__POINTER_INT_OBJECT, G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, GTK_TYPE_MENU); g_object_class_install_property (gobject_class, PROP_MODEL, -- cgit v1.2.3