From d6445f8abfa78c0a9c8680a3ba7422d331391f8f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Nov 2008 22:04:53 +0000 Subject: [PATCH] Merge revisions 36685:36729 from trunk. svn path=/branches/kill-bonobo/; revision=36763 --- COPYING | 358 +- COPYING.OPENLDAP | 47 + ChangeLog | 5 + addressbook/ChangeLog | 8 + addressbook/gui/component/openldap-extract.h | 4 +- addressbook/gui/contact-editor/test-editor.c | 2 +- addressbook/gui/widgets/e-minicard-label.c | 2 +- .../gui/widgets/e-minicard-view-widget.c | 2 +- addressbook/gui/widgets/test-reflow.c | 3 +- calendar/ChangeLog | 43 + calendar/calendar.error.xml | 17 + .../gui/apps_evolution_calendar.schemas.in | 25 + calendar/gui/calendar-commands.c | 8 +- calendar/gui/calendar-component.c | 18 +- calendar/gui/e-calendar-view.c | 9 + calendar/gui/e-itip-control.c | 2 +- calendar/gui/e-week-view-event-item.c | 2 +- calendar/gui/gnome-cal.c | 92 +- calendar/gui/weekday-picker.c | 2 +- composer/ChangeLog | 23 + composer/e-composer-actions.c | 18 +- composer/e-composer-actions.h | 18 +- composer/e-composer-autosave.c | 18 +- composer/e-composer-autosave.h | 18 +- composer/e-composer-header-table.c | 18 +- composer/e-composer-header-table.h | 18 +- composer/e-composer-header.h | 18 +- composer/e-composer-name-header.h | 18 +- composer/e-composer-private.c | 18 +- composer/e-composer-private.h | 18 +- composer/e-composer-text-header.c | 18 +- composer/e-msg-composer.c | 14 +- doc/reference/shell/tmpl/e-shell-content.sgml | 267 - doc/reference/shell/tmpl/e-shell-sidebar.sgml | 45 - doc/reference/shell/tmpl/e-shell-taskbar.sgml | 35 - doc/reference/shell/tmpl/e-shell-window.sgml | 107 - doc/reference/shell/tmpl/eshell-unused.sgml | 404 ++ e-util/Makefile.am | 2 + e-util/e-icon-factory.c | 2 +- e-util/e-non-intrusive-error-dialog.c | 308 + e-util/e-non-intrusive-error-dialog.h | 61 + e-util/e-plugin-ui.c | 18 +- e-util/e-plugin-ui.h | 18 +- e-util/e-util.c | 88 - help/ChangeLog | 4 + help/es/es.po | 724 +- mail/ChangeLog | 38 + mail/em-folder-tree.c | 4 + mail/em-format-html.c | 2 +- mail/em-utils.c | 10 +- mail/mail-component.c | 248 +- mail/mail-config.glade | 2 +- .../google-contacts-source.c | 21 +- .../google-contacts-source.h | 21 +- plugins/mail-to-task/ChangeLog | 7 + plugins/mail-to-task/mail-to-task.c | 2 +- plugins/plugin-manager/ChangeLog | 7 + plugins/plugin-manager/plugin-manager.c | 2 +- po/ChangeLog | 19 + po/da.po | 2862 ++++---- po/et.po | 6086 +---------------- po/hu.po | 6 +- po/pt_BR.po | 2830 ++++---- shell/ChangeLog | 7 + shell/importer/evolution-importer-client.h | 2 +- shell/importer/intelligent.c | 20 +- ui/ChangeLog | 15 + ui/evolution-mail-global.xml | 2 +- ui/evolution-mail-list.xml | 2 +- widgets/ChangeLog | 14 + widgets/misc/ChangeLog | 7 + widgets/misc/e-url-entry.c | 19 +- widgets/misc/e-url-entry.h | 19 +- widgets/table/e-table-config-field.h | 2 +- widgets/text/e-text.c | 2 + 75 files changed, 4589 insertions(+), 10656 deletions(-) create mode 100644 COPYING.OPENLDAP create mode 100644 e-util/e-non-intrusive-error-dialog.c create mode 100644 e-util/e-non-intrusive-error-dialog.h diff --git a/COPYING b/COPYING index 6d43540090..ff4f32b047 100644 --- a/COPYING +++ b/COPYING @@ -1,340 +1,34 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +Code in Evolution is available under a variety of licenses. Each file should have a license header stating the license. In the absence of that code is available under the LGPLv2 or (at your choice) LGPLv3. See COPYING.LGPL2 and COPYING.LGPL3 for the full license texts. - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +There are a few exceptions to this rule that have an impact on overall licensing. At the present, the code seems GPLv2+ clean. - Preamble +OpenLDAP license + addressbook/gui/component/openldap-extract.h - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. +GPLv2+ + widgets/misc/e-spinner.c + plugins/calendar-http/calendar-http.c + plugins/calendar-weather/calendar-weather.c - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +LGPLv2 only + plugins/webdav-account-setup/webdav-contacts-source.c - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +LGPLv2+ + e-util/gconf-bridge.[ch] + widgets/misc/e-icon-entry.[ch] + widgets/misc/e-hsv-utils.[ch] + widgets/text/e-text.[ch] + widgets/table/e-cell-tree.[ch] + widgets/misc/e-dateedit.[ch] - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. +MPL/GPL/LGPLv2+ + smime/lib/e-asn1-object.c + smime/lib/e-cert.c + smime/lib/e-cert-db.c + smime/lib/e-cert-trust.c + smime/lib/e-pkcs12.c - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. +In addition there are a few pieces that lurk in the tree, but are not linked as part of evolution, eg. test code: - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. +GPLv2 only + addressbook/gui/widgets/test-reflow.c diff --git a/COPYING.OPENLDAP b/COPYING.OPENLDAP new file mode 100644 index 0000000000..05ad7571e4 --- /dev/null +++ b/COPYING.OPENLDAP @@ -0,0 +1,47 @@ +The OpenLDAP Public License + Version 2.8, 17 August 2003 + +Redistribution and use of this software and associated documentation +("Software"), with or without modification, are permitted provided +that the following conditions are met: + +1. Redistributions in source form must retain copyright statements + and notices, + +2. Redistributions in binary form must reproduce applicable copyright + statements and notices, this list of conditions, and the following + disclaimer in the documentation and/or other materials provided + with the distribution, and + +3. Redistributions must contain a verbatim copy of this document. + +The OpenLDAP Foundation may revise this license from time to time. +Each revision is distinguished by a version number. You may use +this Software under terms of this license revision or under the +terms of any subsequent revision of the license. + +THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS +CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S) +OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +The names of the authors and copyright holders must not be used in +advertising or otherwise to promote the sale, use or other dealing +in this Software without specific, written prior permission. Title +to copyright in this Software shall at all times remain with copyright +holders. + +OpenLDAP is a registered trademark of the OpenLDAP Foundation. + +Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, +California, USA. All Rights Reserved. Permission to copy and +distribute verbatim copies of this document is granted. diff --git a/ChangeLog b/ChangeLog index 70e7f4fcdb..8422a41733 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-03 Sankar P + + License Changed from GPL to LGPL + Refer COPYING File for more details + 2008-10-22 Matthew Barnes ** Fixes part of bug #549025 diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 46f6de9bd2..f061e55515 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2008-10-30 Matthew Barnes + + * gui/contact-editor/test-editor.c: + * gui/widgets/e-minicard-label.c: + * gui/widgets/e-minicard-view-widget.c: + * gui/widgets/test-reflow.c: + Only include the toplevel GTK+ header. + 2008-10-17 Milan Crha ** Fix for bug #511918 diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h index f11012ec40..010589da1e 100644 --- a/addressbook/gui/component/openldap-extract.h +++ b/addressbook/gui/component/openldap-extract.h @@ -22,8 +22,8 @@ * modification, are permitted only as authorized by the OpenLDAP * Public License. * - * A copy of this license is available in file LICENSE in the - * top-level directory of the distribution or, alternatively, at + * A copy of this license is available in file COPYING.OPENLDAP in + * the top-level directory of the distribution or, alternatively, at * . */ diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 7a7e644238..61c6de7174 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -23,7 +23,7 @@ #include "config.h" #include -#include +#include #include #include #include diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 89107dafbf..696d42dcd9 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -24,7 +24,7 @@ #include "e-minicard-label.h" -#include +#include #include #include #include diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 2d43aca39e..0f9ae7c143 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c index 8853e7f748..f0faf7899c 100644 --- a/addressbook/gui/widgets/test-reflow.c +++ b/addressbook/gui/widgets/test-reflow.c @@ -50,8 +50,7 @@ #include "config.h" -#include -#include +#include #include #include #include diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 343a76a9e0..b335913d39 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,28 @@ +2008-11-04 Matthew Barnes + + * gui/calendar-commands.c: + * gui/calendar-component.h: + * gui/gnome-cal.c: + Fix compiler warnings. + +2008-11-02 Matthew Barnes + + * gui/e-itip-control.c (write_recurrence_piece): + Remove extra space in translated string. + +2008-10-31 Matthew Barnes + + * gui/itip-utils.c (itip_send_comp): + Fix a crash when selecting "Forward as iCalendar". + +2008-10-30 Matthew Barnes + + * gui/control-factory.c: + * gui/e-calendar-table.c: + * gui/e-week-view-event-item.c: + * gui/weekday-picker.c: + Only include the toplevel GTK+ header. + 2008-10-20 Matthew Barnes ** Fixes bug #555958 (patch by Anis Elleuch) @@ -246,6 +271,24 @@ License Changes * gui/e-cal-model.c: (e_cal_view_objects_modified_cb): Use result of g_list_prepend, thus report changes properly. +2008-11-03 Ashish Shrivastava + + ** Most of the errors are now non-intrusive + + * calendar.error.xml: Added a new error message for + non-intrusive backend_died. + * apps_evolution_calendar.schemas.in: + * calendar-commands.c: Added new verb for help debug message + (help_debug): + * gnome-cal.c: Support for non-intrusive error. + (client_cal_opened_cb), Define fash table and accessing errors: + * e-calendar-view.c: (error_response): + (e_calendar_utils_show_error_silent), (e_calendar_utils_show_info_silent): + * e-calendar-view.h: + * calendar-component.c: Added EActivityHandler and ELogger: + (calendar_component_peek_activity_handler), (calendar_component_show_logger): + * calendar-component.h: + 2008-09-08 Chenthill Palanisamy Fixes #544187 diff --git a/calendar/calendar.error.xml b/calendar/calendar.error.xml index d74c27b1fe..996f439a3f 100644 --- a/calendar/calendar.error.xml +++ b/calendar/calendar.error.xml @@ -176,6 +176,23 @@ <_secondary>Your memos will not be available until Evolution is restarted. + + <_primary>The Evolution calendars have quit unexpectedly. + <_secondary>Your calendars will not be available until Evolution is restarted. + + + + <_primary>Unable to load the calendar + <_secondary>Calendar repository is offline. +