diff options
Diffstat (limited to 'plugins')
73 files changed, 909 insertions, 451 deletions
diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog index fb8d1de6c6..53db95fe62 100644 --- a/plugins/attachment-reminder/ChangeLog +++ b/plugins/attachment-reminder/ChangeLog @@ -1,3 +1,9 @@ +2008-09-24 Sankar P <psankar@novell.com> + +License Changes + + * attachment-reminder.c: + 2008-08-12 Bharath Acharya <abharath@novell.com> * Makefile.am: Have a check for OS_WIN32 and handle the schema data diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index db629f0459..15bac58080 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -1,21 +1,22 @@ - /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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. * - * Author: Johnny Jacob <jjohnny@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Johnny Jacob <jjohnny@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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog index d7fe8ddffc..5b82ad2fc6 100644 --- a/plugins/audio-inline/ChangeLog +++ b/plugins/audio-inline/ChangeLog @@ -1,3 +1,10 @@ +2008-09-24 Philip Withnall <philip@tecnocode.co.uk> + + ** Fixes bug #553479 + + * org-gnome-audio-inline.eplug.xml: String capitalisation + improvements. + 2008-08-12 Bharath Acharya <abharath@novell.com> * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate diff --git a/plugins/audio-inline/org-gnome-audio-inline.eplug.xml b/plugins/audio-inline/org-gnome-audio-inline.eplug.xml index 7a8a3cc291..16c282a014 100644 --- a/plugins/audio-inline/org-gnome-audio-inline.eplug.xml +++ b/plugins/audio-inline/org-gnome-audio-inline.eplug.xml @@ -6,7 +6,7 @@ location="@PLUGINDIR@/liborg-gnome-audio-inline@SOEXT@" _name="Audio inline plugin"> - <_description>A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution.</_description> + <_description>A formatter plugin which displays audio attachments inline and allows you to play them directly from Evolution.</_description> <author name="Radek Doulík" email="rodo@novell.com"/> <hook class="org.gnome.evolution.mail.format:1.0"> diff --git a/plugins/bbdb/ChangeLog b/plugins/bbdb/ChangeLog index 6c110fd1fc..f7b0b27e30 100644 --- a/plugins/bbdb/ChangeLog +++ b/plugins/bbdb/ChangeLog @@ -1,3 +1,24 @@ +2008-10-01 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #553527 + + * bbdb.c: (struct todo_struct), (free_todo_struct), (bbdb_do_in_thread), + (bbdb_do_thread), (bbdb_handle_reply): Do the EBook work in a separate + thread to have better performance on reply with slow address books. + +2008-09-29 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #497928 + + * bbdb.c: (source_changed_cb), (gaim_source_changed_cb): + Set URI to empty string when user deletes previously selected source. + +2008-09-19 Sankar P <psankar@novell.com> + +License Changes + + * bbdb.c: + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index f5f09274a1..547a779961 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -1,34 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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. * - * An Evolution EPlugin that automatically populates your addressbook - * as you reply to messages. Inspired by an Emacs contact management - * tool called The Insidious Big Brother Database, a jwz joint. + * 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. * - * Nat Friedman - * 22 October 2004 - * Boston + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: + * Authors: + * Nat Friedman <nat@novell.com> * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. */ #ifdef HAVE_CONFIG_H @@ -143,33 +132,120 @@ bbdb_timeout (gpointer data) return TRUE; } -/* Code to populate addressbook when you reply to a mail follows */ +typedef struct +{ + char *name; + char *email; +} todo_struct; -void -bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target) +static void +free_todo_struct (todo_struct *td) { - const CamelInternetAddress *cia; - EBook *book = NULL; - int i; + if (td) { + g_free (td->name); + g_free (td->email); + g_free (td); + } +} + +static GSList *todo = NULL; +G_LOCK_DEFINE_STATIC (todo); + +static gpointer +bbdb_do_in_thread (gpointer data) +{ + EBook *book; /* Open the addressbook */ book = bbdb_open_addressbook (AUTOMATIC_CONTACTS_ADDRESSBOOK); - if (book == NULL) + if (book == NULL) { + G_LOCK (todo); + + g_slist_foreach (todo, (GFunc)free_todo_struct, NULL); + g_slist_free (todo); + todo = NULL; + + G_UNLOCK (todo); + return NULL; + } + + G_LOCK (todo); + while (todo) { + todo_struct *td = todo->data; + + todo = g_slist_remove (todo, td); + + G_UNLOCK (todo); + + if (td) { + bbdb_do_it (book, td->name, td->email); + free_todo_struct (td); + } + + G_LOCK (todo); + } + G_UNLOCK (todo); + + g_object_unref (book); + + return NULL; +} + +static void +bbdb_do_thread (const char *name, const char *email) +{ + todo_struct *td; + + if (!name && !email) return; + td = g_new (todo_struct, 1); + td->name = g_strdup (name); + td->email = g_strdup (email); + + G_LOCK (todo); + if (todo) { + /* the list isn't empty, which means there is a thread taking + care of that, thus just add it to the queue */ + todo = g_slist_append (todo, td); + } else { + GError *error = NULL; + + /* list was empty, add item and create a thread */ + todo = g_slist_append (todo, td); + g_thread_create (bbdb_do_in_thread, NULL, FALSE, &error); + + if (error) { + g_warning ("%s: Creation of the thread failed with error: %s", G_STRFUNC, error->message); + g_error_free (error); + + G_UNLOCK (todo); + bbdb_do_in_thread (NULL); + G_LOCK (todo); + } + } + G_UNLOCK (todo); +} + +/* Code to populate addressbook when you reply to a mail follows */ +void +bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target) +{ + const CamelInternetAddress *cia; + int i; + cia = camel_mime_message_get_from (target->message); if (cia) { for (i = 0; i < camel_address_length (CAMEL_ADDRESS (cia)); i ++) { const char *name=NULL, *email=NULL; if (!(camel_internet_address_get (cia, i, &name, &email))) continue; - bbdb_do_it (book, name, email); + bbdb_do_thread (name, email); } } /* If this is a reply-all event, process To: and Cc: also. */ if (((EEventTarget *) target)->mask & EM_EVENT_MESSAGE_REPLY_ALL) { - g_object_unref (G_OBJECT (book)); return; } @@ -179,7 +255,7 @@ bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target) const char *name=NULL, *email=NULL; if (!(camel_internet_address_get (cia, i, &name, &email))) continue; - bbdb_do_it (book, name, email); + bbdb_do_thread (name, email); } } @@ -189,11 +265,9 @@ bbdb_handle_reply (EPlugin *ep, EMEventTargetMessage *target) const char *name=NULL, *email=NULL; if (!(camel_internet_address_get (cia, i, &name, &email))) continue; - bbdb_do_it (book, name, email); + bbdb_do_thread (name, email); } } - - g_object_unref (G_OBJECT (book)); } static void @@ -446,12 +520,11 @@ source_changed_cb (ESourceComboBox *source_combo_box, GError *error = NULL; source = e_source_combo_box_get_active (source_combo_box); - g_return_if_fail (source != NULL); gconf_client_set_string ( stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, - e_source_get_uri (source), &error); + source ? e_source_get_uri (source) : "", &error); if (error != NULL) { g_warning ("%s", error->message); @@ -467,12 +540,11 @@ gaim_source_changed_cb (ESourceComboBox *source_combo_box, GError *error = NULL; source = e_source_combo_box_get_active (source_combo_box); - g_return_if_fail (source != NULL); gconf_client_set_string ( stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, - e_source_get_uri (source), &error); + source ? e_source_get_uri (source) : "", &error); if (error != NULL) { g_warning ("%s", error->message); diff --git a/plugins/default-mailer/ChangeLog b/plugins/default-mailer/ChangeLog index 8955f0981d..5fe56f0817 100644 --- a/plugins/default-mailer/ChangeLog +++ b/plugins/default-mailer/ChangeLog @@ -1,3 +1,9 @@ +2008-09-25 Sankar P <psankar@novell.com> + +License Changes + + * default-mailer.c: + 2008-08-12 Bharath Acharya <abharath@novell.com> * Makefile.am: Have a check for OS_WIN32 and handle the schema data diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c index 47cddb9db5..7069f46e7b 100644 --- a/plugins/default-mailer/default-mailer.c +++ b/plugins/default-mailer/default-mailer.c @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Author: Jonathan Dieter <jdieter99@gmx.net> + * 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 2005 Jonathan Dieter + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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: + * Jonathan Dieter <jdieter99@gmx.net> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * Copyright 2005 Jonathan Dieter * */ diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog index f69ba35622..44bf5cb76b 100644 --- a/plugins/email-custom-header/ChangeLog +++ b/plugins/email-custom-header/ChangeLog @@ -1,3 +1,10 @@ +2008-09-12 Sankar P <psankar@novell.com> + +License Changes + + * email-custom-header.c: + * email-custom-header.h: + 2008-09-01 Matthew Barnes <mbarnes@redhat.com> * email-custom-header.c: diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 847c56d315..b3feb99de2 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Authors: Ashish Shrivastava <shashish@novell.com> - * - * 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. + * 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 <http://www.gnu.org/licenses/> + * + * + * Authors: + * Ashish Shrivastava <shashish@novell.com> + * + * 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, MA 02110-1301. */ #ifdef HAVE_CONFIG_H diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h index 22a997d2ee..f828a53061 100644 --- a/plugins/email-custom-header/email-custom-header.h +++ b/plugins/email-custom-header/email-custom-header.h @@ -1,20 +1,25 @@ - /* Evolution Email custom header options - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: Ashish <shashish@novell.com> - * +/* + * Evolution Email custom header options + * * 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. + * 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 <http://www.gnu.org/licenses/> + * + * + * Authors: + * Ashish <shashish@novell.com> + * + * 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, MA 02110-1301. */ #ifndef __EMAIL_CUSTOM_HEADEROPTIONS_DIALOG_H__ diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index f7f6927919..b6661445a4 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,22 @@ +2008-09-24 Sankar P <psankar@novell.com> + +License Changes + + * exchange-delegates-user.c: + +2008-09-23 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #553273 + + * exchange-config-listener.c: (exchange_config_listener_authenticate): + Always end e_error_run/e_error_new calls with NULL parameter. + +2008-09-16 Sankar P <psankar@novell.com> + +License Changes + + * exchange-user-dialog.c: + 2008-09-04 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index 913778a1b1..308e73daaf 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -776,7 +776,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, } if (current_quota_usage) { - widget = e_error_new (NULL, error_code, current_quota_usage); + widget = e_error_new (NULL, error_code, current_quota_usage, NULL); g_signal_connect ((GtkDialog *)widget, "response", G_CALLBACK (gtk_widget_destroy), widget); gtk_widget_show (widget); diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c index a719059a5e..2cd3eb1c5a 100644 --- a/plugins/exchange-operations/exchange-delegates-user.c +++ b/plugins/exchange-operations/exchange-delegates-user.c @@ -1,20 +1,22 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - -/* Copyright (C) 2002-2004 Novell, Inc. - * +/* * 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 <http://www.gnu.org/licenses/> + * + * + * Authors: + * + * 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. */ /* ExchangeDelegatesUser: A single delegate */ diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c index 48c9170736..e1de8f4797 100644 --- a/plugins/exchange-operations/exchange-user-dialog.c +++ b/plugins/exchange-operations/exchange-user-dialog.c @@ -1,20 +1,18 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* Copyright (C) 2001-2004 Novell, Inc. - * +/* * 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 <http://www.gnu.org/licenses/> * - * You 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ #ifdef HAVE_CONFIG_H diff --git a/plugins/google-account-setup/ChangeLog b/plugins/google-account-setup/ChangeLog index c8e97a9e6b..84badcf745 100644 --- a/plugins/google-account-setup/ChangeLog +++ b/plugins/google-account-setup/ChangeLog @@ -1,3 +1,10 @@ +2008-09-24 Philip Withnall <philip@tecnocode.co.uk> + + ** Fixes bug #553479 + + * org-gnome-evolution-google.eplug.xml: String capitalisation + improvements. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml index 93a8aeee2d..2b32a5010d 100644 --- a/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml +++ b/plugins/google-account-setup/org-gnome-evolution-google.eplug.xml @@ -4,7 +4,7 @@ location="@PLUGINDIR@/liborg-gnome-evolution-google@SOEXT@" load-on-startup="false" localedir = "@LOCALEDIR@" system_plugin="true"> <author name="Ebby Wiselyn" email="ebbywiselyn@gmail.com"/> <author name="Joergen Scheibengruber" email="joergen.scheibengruber@googlemail.com"/> - <_description>A plugin to setup google calendar and contacts.</_description> + <_description>A plugin to setup Google Calendar and Contacts.</_description> <hook class="org.gnome.evolution.calendar.config:1.0"> <group target="source" id="org.gnome.evolution.calendar.calendarProperties"> diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog index 3eb01e4627..8674762787 100644 --- a/plugins/groupwise-account-setup/ChangeLog +++ b/plugins/groupwise-account-setup/ChangeLog @@ -1,3 +1,10 @@ +2008-09-25 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #553148 + + * org-gnome-gw-account-setup.eplug.xml: Standardise "GroupWise" + usage in translatable strings. + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml index 3174226137..d8f52a49f5 100644 --- a/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml +++ b/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml @@ -1,9 +1,9 @@ <?xml version="1.0"?> <e-plugin-list> - <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="Groupwise Account Setup" + <e-plugin id="org.gnome.evolution.plugin.gw-account-setup" type="shlib" _name="GroupWise Account Setup" location="@PLUGINDIR@/liborg-gnome-gw-account-setup@SOEXT@" load-on-startup="true" system_plugin="true"> <author name="Sivaiah Nallagatla" email="snallagatla@novell.com"/> - <_description>A plugin to setup groupwise calendar and contacts sources.</_description> + <_description>A plugin to setup GroupWise calendar and contacts sources.</_description> <hook class="org.gnome.evolution.mail.config:1.0"> <group target="account" id="org.gnome.evolution.mail.config.accountDruid"> diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 0dfbadb63c..202ce94ffa 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,63 @@ +2008-10-01 Gabor Kelemen <kelemeng@gnome.hu> + + * send-options.c: Mark two forgotten strings for translation. Fixes bug #553070 + +2008-10-01 Gabor Kelemen <kelemeng@gnome.hu> + + * org-gnome-proxy-errors.xml: + * org-gnome-proxy-login-errors.xml: + * proxy.c: + * proxy-listing.glade: + * proxy-login-dialog.glade: + Add translator comment to the occurrences of the Proxy term. Fixes bug #554297 + +2008-10-01 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #511947 + + * proxy-login.c: (proxy_login_get_cnc): + Pass in optional parent for password dialog. + * proxy-login.c: (proxy_soap_login), (proxy_login_update_tree), + (org_gnome_proxy_account_login): Adapt to the above change and check + for NULL values to prevent runtime warnings. + +2008-09-25 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #553148 + + * org-gnome-compose-send-options.xml: + * org-gnome-groupwise-features.eplug.xml: Standardise "GroupWise" + usage in translatable strings. + +2008-09-24 Sankar P <psankar@novell.com> + +License Changes + + * proxy.c: + +2008-09-22 Philip Withnall <philip@tecnocode.co.uk> + + ** Fixes bug #552851 + + * org-gnome-shared-folder.errors.xml: + Add translator comments to the accept/decline strings, and improve + some other strings in the file. + +2008-09-19 Sankar P <psankar@novell.com> + +License Changes + + * install-shared.c: + * junk-settings.c: + * share-folder.c: + * status-track.c: + +2008-09-12 Sankar P <psankar@novell.com> + +License Changes + + * send-options.c: + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index 3d61a10675..35e3ae6c68 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Vivek Jain <jvivek@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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: + * Vivek Jain <jvivek@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index c0fc0c892f..460883a61a 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Author: Vivek Jain <jvivek@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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: + * Vivek Jain <jvivek@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/groupwise-features/org-gnome-compose-send-options.xml b/plugins/groupwise-features/org-gnome-compose-send-options.xml index c5947c6a33..25ff89803e 100644 --- a/plugins/groupwise-features/org-gnome-compose-send-options.xml +++ b/plugins/groupwise-features/org-gnome-compose-send-options.xml @@ -1,7 +1,7 @@ <Root> <commands> <cmd name="EPSOSendOptions" _label="Send Options" - _tip="Add Send Options to groupwise messages"/> + _tip="Add Send Options to GroupWise messages"/> </commands> <menu> diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml index 47f74060ec..7a707fdcc9 100644 --- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml +++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <e-plugin-list> - <e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="Groupwise Features" + <e-plugin id="org.gnome.evolution.groupwise_features" type="shlib" _name="GroupWise Features" location="@PLUGINDIR@/liborg-gnome-groupwise-features@SOEXT@"> <author name="Sivaiah Nallagatla" email="snallagatla@novell.com" /> <author name="Vivek Jain" email="jvivek@novell.com" /> @@ -10,7 +10,7 @@ <author name="Shreyas Srinivasan" email="sshreyas@novell.com"/> <author name="Raghavendran R" email="raghavguru7@gmail.com"/> - <_description>A plugin for the features in Groupwise accounts.</_description> + <_description>A plugin for the features in GroupWise accounts.</_description> <hook class="org.gnome.evolution.mail.config:1.0"> <group id="org.gnome.evolution.mail.folderConfig" target="folder" check= "shared_folder_check" diff --git a/plugins/groupwise-features/org-gnome-proxy-errors.xml b/plugins/groupwise-features/org-gnome-proxy-errors.xml index b32164ccf9..dad6fbe8f1 100644 --- a/plugins/groupwise-features/org-gnome-proxy-errors.xml +++ b/plugins/groupwise-features/org-gnome-proxy-errors.xml @@ -2,6 +2,7 @@ <error-list domain="org.gnome.evolution.proxy"> <error id="invalid-user" type="error"> <_primary>Invalid user</_primary> +<!--To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation --> <_secondary> Proxy access cannot be given to user "{0}" </_secondary> @@ -9,6 +10,7 @@ Proxy access cannot be given to user "{0}" <error id="no-user" type="error"> <_primary>Specify User</_primary> +<!--To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation --> <_secondary> You have to specify a valid user name to give proxy rights. </_secondary> @@ -16,6 +18,7 @@ You have to specify a valid user name to give proxy rights. <error id="user-is-proxy" type="error"> <_primary>Specify User</_primary> +<!--To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation --> <_secondary> You have already given proxy permissions to this user. </_secondary> diff --git a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml index 36d8527e49..fccddfd6c6 100644 --- a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml +++ b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml @@ -3,6 +3,7 @@ <error id="invalid-user" type="error"> <_primary>Invalid user</_primary> <_secondary> +<!--To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation--> Proxy login as "{0}" was unsuccessful. Please check your email address and try again. </_secondary> </error> diff --git a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml index 5e7bfb28e5..ca63ad80aa 100644 --- a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml +++ b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml @@ -4,19 +4,20 @@ <error id="invalid-user" type="error"> <_primary>Invalid user</_primary> <_secondary> -You cannot share folder with specified user "{0}" +You cannot share this folder with the specified user "{0}" </_secondary> </error> <error id="no-user" type="error"> <_primary>Specify User</_primary> <_secondary> - You have to specify a user name whom you want to add to the list + You have to specify a user name which you want to add to the list </_secondary> </error> <error id="recurrence-accept" type="question" default="GTK_RESPONSE_YES"> <_primary>This is a recurring meeting</_primary> +<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") --> <_secondary>Would you like to accept it?</_secondary> <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> <button label="This instance" response="GTK_RESPONSE_NO"/> @@ -25,6 +26,7 @@ You cannot share folder with specified user "{0}" <error id="recurrence-decline" type="question" default="GTK_RESPONSE_YES"> <_primary>This is a recurring meeting</_primary> +<!--Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting") --> <_secondary>Would you like to decline it?</_secondary> <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> <button label="This instance" response="GTK_RESPONSE_NO"/> diff --git a/plugins/groupwise-features/proxy-listing.glade b/plugins/groupwise-features/proxy-listing.glade index dc4fd24820..984227c558 100644 --- a/plugins/groupwise-features/proxy-listing.glade +++ b/plugins/groupwise-features/proxy-listing.glade @@ -169,7 +169,7 @@ <child> <widget class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="label" translatable="yes">Proxy</property> + <property name="label" translatable="yes" comment="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> diff --git a/plugins/groupwise-features/proxy-login-dialog.glade b/plugins/groupwise-features/proxy-login-dialog.glade index 25d6ced7f7..d2e0bc8fb0 100644 --- a/plugins/groupwise-features/proxy-login-dialog.glade +++ b/plugins/groupwise-features/proxy-login-dialog.glade @@ -7,7 +7,7 @@ <widget class="GtkDialog" id="proxy_login_dialog"> <property name="visible">True</property> <property name="height_request">325</property> - <property name="title" translatable="yes">Proxy Login</property> + <property name="title" translatable="yes" comment="To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation">Proxy Login</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">True</property> diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 58a7cbc810..383e940fbe 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -219,7 +219,7 @@ proxy_get_password (EAccount *account, char **user_name, char **password) } static EGwConnection * -proxy_login_get_cnc (EAccount *account) +proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent) { EGwConnection *cnc; CamelURL *url; @@ -254,7 +254,7 @@ proxy_login_get_cnc (EAccount *account) if (!password) password = e_passwords_ask_password (prompt, "Groupwise", key, prompt, - E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, NULL); + E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET, &remember, password_dlg_parrent); g_free (prompt); cnc = e_gw_connection_new (uri, url->user, password); @@ -333,7 +333,7 @@ proxy_soap_login (char *email) } srcAccount = pld->account; - cnc = proxy_login_get_cnc(srcAccount); + cnc = proxy_login_get_cnc (srcAccount, NULL); proxy_get_password (srcAccount, &user_name, &password); proxy_cnc = e_gw_connection_get_proxy_connection (cnc, user_name, password, email, &permissions); @@ -444,10 +444,11 @@ proxy_login_update_tree (void) EGwConnection *cnc; proxyLoginPrivate *priv = pld->priv; gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", 48); - broken_image = gdk_pixbuf_new_from_file (file_name, NULL); + broken_image = file_name ? gdk_pixbuf_new_from_file (file_name, NULL) : NULL; - cnc = proxy_login_get_cnc(pld->account); - e_gw_connection_get_proxy_list (cnc, &proxy_list); + cnc = proxy_login_get_cnc (pld->account, priv->main ? (GTK_WINDOW (gtk_widget_get_toplevel (priv->main))) : NULL); + if (cnc) + e_gw_connection_get_proxy_list (cnc, &proxy_list); gtk_tree_store_clear (priv->store); if (proxy_list != NULL) { @@ -465,7 +466,8 @@ proxy_login_update_tree (void) if (broken_image) g_object_unref (broken_image); - g_object_unref (cnc); + if (cnc) + g_object_unref (cnc); } void @@ -477,8 +479,9 @@ org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data) char *gladefile; /* This pops-up the password dialog in case the User has forgot-passwords explicitly */ - cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri)); - g_object_unref (cnc); + cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri), NULL); + if (cnc) + g_object_unref (cnc); pld = proxy_login_new(); priv = pld->priv; diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index c0d3070f68..a7eed9b963 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: - * Shreyas Srinivasan (sshreyas@novell.com) - * Sankar P ( psankar@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Shreyas Srinivasan <sshreyas@novell.com> + * Sankar P <psankar@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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ @@ -688,15 +688,18 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data) } else if (account->enabled){ GtkWidget *label; priv->tab_dialog = gtk_vbox_new (TRUE, 10); + /*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/ label = gtk_label_new (_("The Proxy tab will be available only when the account is online.")); gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10); } else { GtkWidget *label; priv->tab_dialog = gtk_vbox_new (TRUE, 10); + /*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/ label = gtk_label_new (_("The Proxy tab will be available only when the account is enabled.")); gtk_box_pack_start ((GtkBox *)priv->tab_dialog, label, TRUE, TRUE, 10); } + /*To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation*/ gtk_notebook_append_page ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog, gtk_label_new("Proxy")); g_signal_connect ((GtkNotebook *)(data->parent), "switch-page", G_CALLBACK (proxy_page_changed_cb), account); pag_num = gtk_notebook_page_num ((GtkNotebook *)(data->parent), (GtkWidget *)priv->tab_dialog); diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 86135bbac5..124fffe8f3 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -1,23 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: Chenthill Palanisamy (pchenthill@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Chenthill Palanisamy <pchenthill@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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ + #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -200,15 +202,19 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data) target_account = (EMConfigTargetAccount *)data->config->target; account = target_account->account; + gchar *markup; + if(!g_strrstr (account->source->url, "groupwise://")) return NULL; vbox = gtk_vbox_new (FALSE, 0); frame = gtk_frame_new (""); label = gtk_frame_get_label_widget (GTK_FRAME (frame)); - gtk_label_set_markup (GTK_LABEL (label), "<b>Send Options</b>"); - button = gtk_button_new_with_label ("Advanced send options"); + markup = g_strdup_printf("<b>%s</b>", _("Send Options")); + gtk_label_set_markup (GTK_LABEL (label), markup); + button = gtk_button_new_with_label (_("Advanced send options")); gtk_widget_show (button); + g_free (markup); g_signal_connect(button, "clicked", G_CALLBACK (e_sendoptions_clicked_cb), account); diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 095a65c111..87d6564f0e 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Author: Vivek Jain <jvivek@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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: + * Vivek Jain <jvivek@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 15199ec020..cb9e0d8028 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -1,25 +1,27 @@ /* - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Author(s): Chenthill Palanisamy <pchenthill@novell.com> - * Parthasarathi Susarla <sparthasarathi@novell.com> - * Sankar P <psankar@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. + * 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 <http://www.gnu.org/licenses/> + * + * + * Authors: + * Chenthill Palanisamy <pchenthill@novell.com> + * Parthasarathi Susarla <sparthasarathi@novell.com> + * Sankar P <psankar@novell.com> + * + * 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 "config.h" #endif diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog index c9f0e90046..e2fa79fb9c 100644 --- a/plugins/ipod-sync/ChangeLog +++ b/plugins/ipod-sync/ChangeLog @@ -1,3 +1,22 @@ +2008-09-19 Sankar P <psankar@novell.com> + +License Changes + + * evolution-ipod-sync.c: + +2008-09-16 Sankar P <psankar@novell.com> + +License Changes + + * ical-format.c: + * ipod-sync.c: + +2008-09-12 Sankar P <psankar@novell.com> + +License Changes + + * sync.c: + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c index 63372f5459..e0f4246220 100644 --- a/plugins/ipod-sync/evolution-ipod-sync.c +++ b/plugins/ipod-sync/evolution-ipod-sync.c @@ -1,9 +1,24 @@ /* - * evolution-ipod-sync.c - Evolution->Ipod synchronisation + * Evolution->Ipod synchronisation * - * (C)2004 Justin Wake <jwake@iinet.net.au> + * 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 <http://www.gnu.org/licenses/> * - * Licensed under the GNU GPL v2. See COPYING. + * + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * (C)2004 Justin Wake <jwake@iinet.net.au> * */ diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c index 7647dd6abc..f6f96b1125 100644 --- a/plugins/ipod-sync/ical-format.c +++ b/plugins/ipod-sync/ical-format.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: Rodrigo Moya <rodrigo@novell.com> - * Philip Van Hoof <pvanhoof@gnome.org> + * 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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Rodrigo Moya <rodrigo@novell.com> + * Philip Van Hoof <pvanhoof@gnome.org> * - * You 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c index 4315c1cfe2..f2d597becc 100644 --- a/plugins/ipod-sync/ipod-sync.c +++ b/plugins/ipod-sync/ipod-sync.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: Srinivasa Ragavan <sragavan@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Srinivasa Ragavan <sragavan@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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index fe0fa9af9d..1da7ecd983 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -1,9 +1,20 @@ /* - * sync.c + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * (C)2004 Justin Wake <jwake@iinet.net.au> + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * Licensed under the GNU GPL v2. See COPYING. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * Copyright (C) 2004 Justin Wake <jwake@iinet.net.au> * */ diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index 4fc1bddaa4..b30fd70aaa 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,24 @@ +2008-10-01 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #519491 + + * itip-view.c: (ensure_utf8), (itip_view_set_organizer), + (itip_view_set_organizer_sentby), (itip_view_set_attendee), + (itip_view_set_attendee_sentby), (itip_view_set_proxy), + (itip_view_set_delegator), (itip_view_set_summary), + (itip_view_set_location), (itip_view_set_status), + (itip_view_set_comment), (itip_view_set_description), + (itip_view_add_upper_info_item), (itip_view_add_lower_info_item): + Convert texts to valid UTF-8 texts before passing them to Gtk+ + functions which requires that. + +2008-09-24 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #313225 + + * itip-formatter.c: (format_itip): Set the user flag '$has_cal' + on the message when formatting a calendar attachment. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 3e200ac873..e37c0d162a 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -2243,6 +2243,11 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) classid = g_strdup_printf("itip:///%s", ((EMFormat *) target->format)->part_id->str); + /* mark message as containing calendar, thus it will show the icon in message list now on */ + if (target->format->uid && target->format->folder && + !camel_folder_get_message_user_flag (target->format->folder, target->format->uid, "$has_cal")) + camel_folder_set_message_user_flag (target->format->folder, target->format->uid, "$has_cal", TRUE); + puri = (struct _itip_puri *)em_format_add_puri(target->format, sizeof(struct _itip_puri), classid, target->part, itip_attachment_frame); pobj = em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (EMFormatHTMLPObject), classid, target->part, format_itip_object); diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index e42b338e0f..1e5e41195c 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -1194,6 +1194,24 @@ itip_view_get_item_type (ItipView *view) return priv->type; } +/* ensures the returned text will be valid UTF-8 text, thus gtk functions expecting + only valid UTF-8 texts will not crash. Returned pointer should be freed with g_free. */ +static gchar * +ensure_utf8 (const char *text) +{ + gchar *res = g_strdup (text), *p; + + if (!text) + return res; + + p = res; + while (!g_utf8_validate (p, -1, (const gchar **) &p)) { + /* make all invalid characters appear as question marks */ + *p = '?'; + } + + return res; +} void itip_view_set_organizer (ItipView *view, const char *organizer) @@ -1208,7 +1226,7 @@ itip_view_set_organizer (ItipView *view, const char *organizer) if (priv->organizer) g_free (priv->organizer); - priv->organizer = g_strdup (organizer); + priv->organizer = ensure_utf8 (organizer); set_sender_text (view); } @@ -1239,7 +1257,7 @@ itip_view_set_organizer_sentby (ItipView *view, const char *sentby) if (priv->organizer_sentby) g_free (priv->organizer_sentby); - priv->organizer_sentby = g_strdup (sentby); + priv->organizer_sentby = ensure_utf8 (sentby); set_sender_text (view); } @@ -1270,7 +1288,7 @@ itip_view_set_attendee (ItipView *view, const char *attendee) if (priv->attendee) g_free (priv->attendee); - priv->attendee = g_strdup (attendee); + priv->attendee = ensure_utf8 (attendee); set_sender_text (view); } @@ -1301,7 +1319,7 @@ itip_view_set_attendee_sentby (ItipView *view, const char *sentby) if (priv->attendee_sentby) g_free (priv->attendee_sentby); - priv->attendee_sentby = g_strdup (sentby); + priv->attendee_sentby = ensure_utf8 (sentby); set_sender_text (view); } @@ -1332,7 +1350,7 @@ itip_view_set_proxy (ItipView *view, const char *proxy) if (priv->proxy) g_free (priv->proxy); - priv->proxy = g_strdup (proxy); + priv->proxy = ensure_utf8 (proxy); set_sender_text (view); } @@ -1363,7 +1381,7 @@ itip_view_set_delegator (ItipView *view, const char *delegator) if (priv->delegator) g_free (priv->delegator); - priv->delegator = g_strdup (delegator); + priv->delegator = ensure_utf8 (delegator); set_sender_text (view); } @@ -1394,7 +1412,7 @@ itip_view_set_summary (ItipView *view, const char *summary) if (priv->summary) g_free (priv->summary); - priv->summary = summary ? g_strstrip (g_strdup (summary)) : NULL; + priv->summary = summary ? g_strstrip (ensure_utf8 (summary)) : NULL; set_summary_text (view); } @@ -1425,7 +1443,7 @@ itip_view_set_location (ItipView *view, const char *location) if (priv->location) g_free (priv->location); - priv->location = location ? g_strstrip (g_strdup (location)) : NULL; + priv->location = location ? g_strstrip (ensure_utf8 (location)) : NULL; set_location_text (view); } @@ -1456,7 +1474,7 @@ itip_view_set_status (ItipView *view, const char *status) if (priv->status) g_free (priv->status); - priv->status = status ? g_strstrip (g_strdup (status)) : NULL; + priv->status = status ? g_strstrip (ensure_utf8 (status)) : NULL; set_status_text (view); } @@ -1487,7 +1505,7 @@ itip_view_set_comment (ItipView *view, const char *comment) if (priv->comment) g_free (priv->comment); - priv->comment = comment ? g_strstrip (g_strdup (comment)) : NULL; + priv->comment = comment ? g_strstrip (ensure_utf8 (comment)) : NULL; set_comment_text (view); } @@ -1519,7 +1537,7 @@ itip_view_set_description (ItipView *view, const char *description) if (priv->description) g_free (priv->description); - priv->description = description ? g_strstrip (g_strdup (description)) : NULL; + priv->description = description ? g_strstrip (ensure_utf8 (description)) : NULL; set_description_text (view); } @@ -1624,7 +1642,7 @@ itip_view_add_upper_info_item (ItipView *view, ItipViewInfoItemType type, const item = g_new0 (ItipViewInfoItem, 1); item->type = type; - item->message = g_strdup (message); + item->message = ensure_utf8 (message); item->id = priv->next_info_item_id++; priv->upper_info_items = g_slist_append (priv->upper_info_items, item); @@ -1719,7 +1737,7 @@ itip_view_add_lower_info_item (ItipView *view, ItipViewInfoItemType type, const item = g_new0 (ItipViewInfoItem, 1); item->type = type; - item->message = g_strdup (message); + item->message = ensure_utf8 (message); item->id = priv->next_info_item_id++; priv->lower_info_items = g_slist_append (priv->lower_info_items, item); diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 81039caa5c..3e489aca96 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,16 @@ +2008-09-16 Sankar P <psankar@novell.com> + +License Changes + + * mail-notification.c: + +2008-09-15 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #514299 + + * mail-notification.c: (new_notify_status): + Connect to signals only once, when creating new status icon. + 2008-08-12 Bharath Acharya <abharath@novell.com> * Makefile.am: Have a check for OS_WIN32 and handle the schema data diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 9826f5a06d..f3da922a79 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Author: Miguel Angel Lopez Hernandez <miguel@gulev.org.mx> + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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: + * Miguel Angel Lopez Hernandez <miguel@gulev.org.mx> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ @@ -493,13 +494,15 @@ new_notify_status (EMEventTargetFolder *t) g_free (msg); - #ifdef HAVE_LIBNOTIFY - g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), notify); - #else - g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL); - #endif + if (new_icon) { + #ifdef HAVE_LIBNOTIFY + g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), notify); + #else + g_signal_connect (G_OBJECT (status_icon), "activate", G_CALLBACK (icon_activated), NULL); + #endif - g_signal_connect (G_OBJECT (status_icon), "popup-menu", G_CALLBACK (popup_menu_status), NULL); + g_signal_connect (G_OBJECT (status_icon), "popup-menu", G_CALLBACK (popup_menu_status), NULL); + } } static void diff --git a/plugins/mark-calendar-offline/ChangeLog b/plugins/mark-calendar-offline/ChangeLog index e0c73095d6..a57222d5a6 100644 --- a/plugins/mark-calendar-offline/ChangeLog +++ b/plugins/mark-calendar-offline/ChangeLog @@ -1,3 +1,9 @@ +2008-09-12 Sankar P <psankar@novell.com> + +License Changes + + * mark-calendar-offline.c: + 2008-08-12 Bharath Acharya <abharath@novell.com> * Makefile.am: Use NO_UNDEFINED. Link with more libraries. To generate diff --git a/plugins/mark-calendar-offline/mark-calendar-offline.c b/plugins/mark-calendar-offline/mark-calendar-offline.c index 12e3f6ac18..68bd3f445b 100644 --- a/plugins/mark-calendar-offline/mark-calendar-offline.c +++ b/plugins/mark-calendar-offline/mark-calendar-offline.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: Harish Krishnaswamy (kharish@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Harish Krishnaswamy <kharish@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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog index 7b26673770..52f1d4b2c0 100644 --- a/plugins/publish-calendar/ChangeLog +++ b/plugins/publish-calendar/ChangeLog @@ -1,3 +1,15 @@ +2008-09-26 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #553461 and bug #553389 + + * publish-calendar.c (url_remove_clicked): + * publish-calendar.glade: + * url-editor-dialog.c (create_uri), (check_input), + (publish_service_changed), (set_from_uri): + * url-editor-dialog.h: Rename the "SSH" option to "Secure FTP (SSH)" + and update the code accordingly. Also, change a related string to use + better terminology. + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 28358767ae..a56c25e43d 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -592,7 +592,7 @@ url_remove_clicked (GtkButton *button, PublishUIData *ui) confirm = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, - _("Are you sure you want to remove this URL?")); + _("Are you sure you want to remove this location?")); gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_CANCEL, GTK_RESPONSE_NO); gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_REMOVE, GTK_RESPONSE_YES); gtk_dialog_set_default_response (GTK_DIALOG (confirm), GTK_RESPONSE_CANCEL); diff --git a/plugins/publish-calendar/publish-calendar.glade b/plugins/publish-calendar/publish-calendar.glade index f56eabbc10..6f6ae9dcf2 100644 --- a/plugins/publish-calendar/publish-calendar.glade +++ b/plugins/publish-calendar/publish-calendar.glade @@ -712,7 +712,7 @@ Free/Busy</property> <child> <widget class="GtkComboBox" id="publish_service"> <property name="visible">True</property> - <property name="items" translatable="yes">SSH + <property name="items" translatable="yes">Secure FTP (SSH) Public FTP FTP (with login) Windows share diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index e396372c8a..ddc1653959 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -54,7 +54,7 @@ create_uri (UrlEditorDialog *dialog) method = "smb"; break; - case TYPE_SSH: + case TYPE_SFTP: method = "sftp"; break; @@ -110,7 +110,7 @@ check_input (UrlEditorDialog *dialog) /* This should probably be more complex, since ' ' isn't a valid server name */ switch (uri->service_type) { case TYPE_SMB: - case TYPE_SSH: + case TYPE_SFTP: case TYPE_FTP: case TYPE_DAV: case TYPE_DAVS: @@ -160,7 +160,7 @@ publish_service_changed (GtkComboBox *combo, UrlEditorDialog *dialog) gtk_widget_show (dialog->password_hbox); gtk_widget_show (dialog->remember_pw); break; - case TYPE_SSH: + case TYPE_SFTP: case TYPE_FTP: case TYPE_DAV: case TYPE_DAVS: @@ -275,7 +275,7 @@ set_from_uri (UrlEditorDialog *dialog) if (strcmp ((const char *)method, "smb") == 0) uri->service_type = TYPE_SMB; else if (strcmp ((const char *)method, "sftp") == 0) - uri->service_type = TYPE_SSH; + uri->service_type = TYPE_SFTP; else if (strcmp ((const char *)method, "ftp") == 0) /* we set TYPE_FTP here for now. if we don't find a * username later, we'll change it to TYPE_ANON_FTP */ diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index b464ff2252..2d985e90e5 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -44,7 +44,7 @@ enum { }; enum { - TYPE_SSH, + TYPE_SFTP, TYPE_ANON_FTP, TYPE_FTP, TYPE_SMB, diff --git a/plugins/python/ChangeLog b/plugins/python/ChangeLog index 063418150e..38cd85f29f 100644 --- a/plugins/python/ChangeLog +++ b/plugins/python/ChangeLog @@ -1,3 +1,17 @@ +2008-09-24 Philip Withnall <philip@tecnocode.co.uk> + + ** Fixes bug #553479 + + * org-gnome-evolution-python.eplug.xml: String capitalisation + improvements. + +2008-09-12 Sankar P <psankar@novell.com> + +License Changes + + * python-plugin-loader.c: + * python-plugin-loader.h: + 2008-07-21 Johnny Jacob <jjohnny@novell.com> * Makefile.am (example_sources): More typo fixes. :( diff --git a/plugins/python/org-gnome-evolution-python.eplug.xml b/plugins/python/org-gnome-evolution-python.eplug.xml index c8cfd20f27..5f215f65e5 100644 --- a/plugins/python/org-gnome-evolution-python.eplug.xml +++ b/plugins/python/org-gnome-evolution-python.eplug.xml @@ -3,7 +3,7 @@ <e-plugin type="shlib" id="org.gnome.evolution.plugin.python" location="@PLUGINDIR@/liborg-gnome-evolution-python@SOEXT@" _name="Python Loader" load_level="1"> - <_description>A plugin which loads other plugins written using python.</_description> + <_description>A plugin which loads other plugins written using Python.</_description> <author name="Johnny Jacob" email="jjohnny@novell.com"/> </e-plugin> diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c index 3f0c52618f..5e7a83fb29 100644 --- a/plugins/python/python-plugin-loader.c +++ b/plugins/python/python-plugin-loader.c @@ -1,21 +1,22 @@ - /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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. * - * Author: Johnny Jacob <jjohnny@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Johnny Jacob <jjohnny@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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/python/python-plugin-loader.h b/plugins/python/python-plugin-loader.h index 22ac88fde7..86e94d667b 100644 --- a/plugins/python/python-plugin-loader.h +++ b/plugins/python/python-plugin-loader.h @@ -1,21 +1,22 @@ - /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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. * - * Author: Johnny Jacob <jjohnny@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Johnny Jacob <jjohnny@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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/sa-junk-plugin/ChangeLog b/plugins/sa-junk-plugin/ChangeLog index 890709261a..badfbb83ff 100644 --- a/plugins/sa-junk-plugin/ChangeLog +++ b/plugins/sa-junk-plugin/ChangeLog @@ -1,3 +1,24 @@ +2008-09-29 Sankar P <psankar@novell.com> + +License Changes + + * em-junk-filter.c: + +2008-09-25 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #551121 + + * em-junk-filter.c (pipe_to_sa_full), (em_junk_sa_respawn_spamd): + * org-gnome-sa-junk-plugin.eplug.xml: Standardise use of + "SpamAssassin" vs. "spamassassin" or "Spamassassin". + +2008-09-12 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #505016 + + * em-junk-filter.c: (em_junk_sa_check_junk): + Check for NULL to prevent crash when error occurred. + 2008-04-25 Milan Crha <mcrha@redhat.com> ** Fix for bug #273041 diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 880a7694fb..1a442b42aa 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -1,26 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Author: - * Radek Doulik <rodo@ximian.com> - * - * 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. + * 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 <http://www.gnu.org/licenses/> + * + * + * Authors: + * Radek Doulik <rodo@ximian.com> + * + * 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 <config.h> #endif @@ -138,7 +137,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, if (pipe (fds) == -1) { errnosav = errno; - d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno))); + d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno))); g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav)); errno = errnosav; return rv_err; @@ -146,7 +145,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, if (output_buffer && pipe (out_fds) == -1) { errnosav = errno; - d(printf ("failed to create a pipe (for use with spamassassin: %s\n", strerror (errno))); + d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno))); g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav)); close (fds [0]); close (fds [1]); @@ -243,7 +242,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, result = waitpid (pid, &status, WNOHANG); g_set_error (error, EM_JUNK_ERROR, -2, _("SpamAssassin child process does not respond, killing...")); } else - g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Spamassassin child process interrupted, terminating...")); + g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for SpamAssassin child process interrupted, terminating...")); } if (result != -1 && WIFEXITED (status)) @@ -541,7 +540,7 @@ em_junk_sa_respawn_spamd () em_junk_sa_kill_spamd (); if (em_junk_sa_check_respawn_too_fast ()) { - g_warning ("respawning of spamd too fast => fallback to use spamassassin directly"); + g_warning ("respawning of spamd too fast => fallback to use SpamAssassin directly"); em_junk_sa_use_spamc = em_junk_sa_use_daemon = FALSE; return FALSE; @@ -594,7 +593,7 @@ em_junk_sa_check_junk(EPlugin *ep, EMJunkHookTarget *target) rv = pipe_to_sa_full (msg, NULL, argv, 0, 1, out, &target->error) != 0; - if (!rv && out && !strcmp ((const char *)out->data, "0/0\n")) { + if (!rv && out && out->data && !strcmp ((const char *)out->data, "0/0\n")) { /* an error occurred */ if (em_junk_sa_respawn_spamd ()) { g_byte_array_set_size (out, 0); diff --git a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml index 83215e718c..4277040fa5 100644 --- a/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml +++ b/plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml @@ -18,7 +18,7 @@ <!-- hook into the 'mail properties' menu --> <hook class="org.gnome.evolution.mail.config:1.0"> <group target="prefs" id="org.gnome.evolution.mail.prefs"> - <item type="section_table" path="40.junk/10.options" _label="Spamassassin Options"/> + <item type="section_table" path="40.junk/10.options" _label="SpamAssassin Options"/> <item type="item_table" path="40.junk/20.options" factory="org_gnome_sa_use_remote_tests"/> </group> </hook> diff --git a/plugins/save-attachments/ChangeLog b/plugins/save-attachments/ChangeLog index 6f27566f57..a5dede852e 100644 --- a/plugins/save-attachments/ChangeLog +++ b/plugins/save-attachments/ChangeLog @@ -1,3 +1,9 @@ +2008-09-19 Sankar P <psankar@novell.com> + +License Changes + + * save-attachments.c: + 2007-12-20 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #362638 diff --git a/plugins/save-attachments/save-attachments.c b/plugins/save-attachments/save-attachments.c index 334881dee2..c48711c55a 100644 --- a/plugins/save-attachments/save-attachments.c +++ b/plugins/save-attachments/save-attachments.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: Michael Zucchi <notzed@ximian.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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Michael Zucchi <notzed@ximian.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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog index 5398546088..d8e69aac67 100644 --- a/plugins/save-calendar/ChangeLog +++ b/plugins/save-calendar/ChangeLog @@ -1,3 +1,17 @@ +2008-09-16 Sankar P <psankar@novell.com> + +License Changes + + * csv-format.c: + * ical-format.c: + * rdf-format.c: + +2008-09-12 Sankar P <psankar@novell.com> + +License Changes + + * save-calendar.c: + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 46eaceb122..2762dc5dfe 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: Philip Van Hoof <pvanhoof@gnome.org> + * 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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Philip Van Hoof <pvanhoof@gnome.org> * - * You 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c index de3515d109..1b7ccfb7b1 100644 --- a/plugins/save-calendar/ical-format.c +++ b/plugins/save-calendar/ical-format.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: Rodrigo Moya <rodrigo@novell.com> - * Philip Van Hoof <pvanhoof@gnome.org> + * 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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Rodrigo Moya <rodrigo@novell.com> + * Philip Van Hoof <pvanhoof@gnome.org> * - * You 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index 4b5cad0397..b1c8257a41 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: Philip Van Hoof <pvanhoof@gnome.org> + * 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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Philip Van Hoof <pvanhoof@gnome.org> * - * You 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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index dbd083b9a9..7e21b23f9e 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* + * 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: Rodrigo Moya <rodrigo@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. * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> * - * 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. + * Authors: + * Rodrigo Moya <rodrigo@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. + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/startup-wizard/ChangeLog b/plugins/startup-wizard/ChangeLog index faeebb70f1..4d636b826a 100644 --- a/plugins/startup-wizard/ChangeLog +++ b/plugins/startup-wizard/ChangeLog @@ -1,3 +1,9 @@ +2008-09-19 Sankar P <psankar@novell.com> + +License Changes + + * startup-wizard.c: + 2008-08-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #529460 diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 32cf21a217..f9594364d9 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * JP Rosevear <jpr@novell.com> - * 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 Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + * + * Authors: + * JP Rosevear <jpr@novell.com> + * + * 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. */ #include <gconf/gconf-client.h> diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog index 04e998ef82..f0fc942dc0 100644 --- a/plugins/templates/ChangeLog +++ b/plugins/templates/ChangeLog @@ -1,3 +1,9 @@ +2008-09-15 Sankar P <psankar@novell.com> + +License Changes + + * plugins/templates/templates.c: + 2008-09-01 Matthew Barnes <mbarnes@redhat.com> * templates.c: diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index bb5630fc5d..3c79bbcd01 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -1,27 +1,25 @@ /* - * templates.c - * This file is part of Draft Templates plugin 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. * - * Authors: - * Diego Escalante Urrelo <diegoe@gnome.org> - * Bharath Acharya <abharath@novell.com> - * Copyright (C) 2008 - Diego Escalante Urrelo - * Bharath Acharya + * 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. * - * Draft Templates 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 <http://www.gnu.org/licenses/> * - * Draft Templates 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 Draft Templates; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, - * Boston, MA 02110-1301 USA + * Authors: + * Diego Escalante Urrelo <diegoe@gnome.org> + * Bharath Acharya <abharath@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * Copyright (C) 2008 - Diego Escalante Urrelo + * */ #include <gtk/gtk.h> diff --git a/plugins/tnef-attachments/ChangeLog b/plugins/tnef-attachments/ChangeLog index 669d4373ca..6c2f54a396 100644 --- a/plugins/tnef-attachments/ChangeLog +++ b/plugins/tnef-attachments/ChangeLog @@ -1,3 +1,10 @@ +2008-09-24 Philip Withnall <philip@tecnocode.co.uk> + + ** Fixes bug #553479 + + * org-gnome-tnef-attachments.eplug.xml: String capitalisation + improvements. + 2008-09-03 Sankar P <psankar@novell.com> * plugins/tnef-attachments/tnef-plugin.c: diff --git a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml index 73f94fa2d6..eca319cf5e 100644 --- a/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml +++ b/plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml @@ -5,7 +5,7 @@ id="org.gnome.evolution.mail.tnefattachments" location="@PLUGINDIR@/liborg-gnome-tnef-attachments@SOEXT@" _name="TNEF Attachment decoder"> - <_description>A simple plugin which uses ytnef to decode tnef attachments.</_description> + <_description>A simple plugin which uses yTNEF to decode TNEF attachments.</_description> <author name="Lucky Wankhede" email="wlakke@novell.com"/> <hook class="org.gnome.evolution.mail.format:1.0"> diff --git a/plugins/webdav-account-setup/ChangeLog b/plugins/webdav-account-setup/ChangeLog index 0a512b4dd3..38eabf364e 100644 --- a/plugins/webdav-account-setup/ChangeLog +++ b/plugins/webdav-account-setup/ChangeLog @@ -1,3 +1,10 @@ +2008-09-24 Philip Withnall <philip@tecnocode.co.uk> + + ** Fixes bug #553479 + + * webdav-contacts-source.c (plugin_webdav_contacts): + String capitalisation improvements. + 2008-08-12 Bharath Acharya <abharath@novell.com> * Makefile.am: Added necessary libraries to link to. Build break while diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index 8f944de5ed..d85ffa79b6 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -335,7 +335,7 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) uidata->avoid_ifmatch_toggle = GTK_TOGGLE_BUTTON( gtk_check_button_new_with_mnemonic( - _("_Avoid IfMatch (needed on apache < 2.2.8)"))); + _("_Avoid IfMatch (needed on Apache < 2.2.8)"))); gtk_box_pack_start(hbox, GTK_WIDGET(uidata->avoid_ifmatch_toggle), FALSE, FALSE, 0); |