diff options
Diffstat (limited to 'plugins')
33 files changed, 460 insertions, 450 deletions
diff --git a/plugins/audio-inline/ChangeLog b/plugins/audio-inline/ChangeLog index 5b82ad2fc6..7ec5b04a59 100644 --- a/plugins/audio-inline/ChangeLog +++ b/plugins/audio-inline/ChangeLog @@ -1,3 +1,9 @@ +2008-10-03 Sankar P <psankar@novell.com> + +License Changes + + * audio-inline.c: + 2008-09-24 Philip Withnall <philip@tecnocode.co.uk> ** Fixes bug #553479 diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 405c3d87d6..2568117b5a 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -1,11 +1,25 @@ /* - Copyright (C) 2004 Novell, Inc. - Author: Radek Doulik - + * 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/> + * + * + * Authors: + * Radek Doulik <rodo@ximian.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ -/* This file is licensed under the GNU GPL v2 or later */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/plugins/bogo-junk-plugin/ChangeLog b/plugins/bogo-junk-plugin/ChangeLog index 0aec2b9e54..b14a280332 100644 --- a/plugins/bogo-junk-plugin/ChangeLog +++ b/plugins/bogo-junk-plugin/ChangeLog @@ -1,3 +1,9 @@ +2008-10-14 Sankar P <psankar@novell.com> + +License Changes + + * bf-junk-filter.c: + 2008-04-29 Milan Crha <mcrha@redhat.com> * bf-junk-filter.c: (pipe_to_bogofilter): diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index a0d00c44d8..1e5fbbc656 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -1,19 +1,24 @@ /* - * Copyright 2005 Mikhail Zabaluev <mhz@altlinux.org> - * * 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: + * Mikhail Zabaluev <mikhail.zabaluev@gmail.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * Copyright 2005 Mikhail Zabaluev <mikhail.zabaluev@gmail.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 diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index b6661445a4..785857400a 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,28 @@ +2008-10-08 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #530606 + + * exchange-contacts.c: (e_exchange_contacts_get_contacts), + (e_exchange_contacts_pcontacts_on_change), + (e_exchange_contacts_pcontacts), (e_exchange_contacts_check), + (e_exchange_contacts_commit): + * exchange-account-setup.c: (btn_chpass_clicked), (btn_dass_clicked), + (btn_fsize_clicked), (org_gnome_exchange_show_folder_size_factory): + * exchange-calendar.c: (e_exchange_calendar_get_calendars), + (e_exchange_calendar_pcalendar_on_change), + (e_exchange_calendar_pcalendar), (e_exchange_calendar_check), + (e_exchange_calendar_commit): + Check validity of returned pointer before using it. + +2008-10-03 Sankar P <psankar@novell.com> + +License Changes + + * exchange-account-setup.c: + * exchange-contacts.c: + * exchange-operations.c: + * exchange-operations.h: + 2008-09-24 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 3e9e64ea6a..275a214b90 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -1,21 +1,23 @@ -/* -*- Mf (id ode: 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. * - * Sushma Rai <rsushma@novell.com> - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <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: + * Sushma Rai <rsushma@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H @@ -121,6 +123,8 @@ btn_chpass_clicked (GtkButton *button, gpointer data) ExchangeAccountResult result; account = exchange_operations_get_exchange_account (); + if (!account) + return; old_password = exchange_account_get_password (account); if (!old_password) { @@ -147,6 +151,8 @@ btn_dass_clicked (GtkButton *button, gpointer data) { ExchangeAccount *account; account = exchange_operations_get_exchange_account (); + if (!account) + return; exchange_delegates (account, gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_WINDOW)); } @@ -157,6 +163,8 @@ btn_fsize_clicked (GtkButton *button, gpointer data) GtkListStore *model; account = exchange_operations_get_exchange_account (); + if (!account) + return; model = exchange_account_folder_size_get_model (account); if (model) @@ -1048,7 +1056,10 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor if (g_ascii_strcasecmp (provider->protocol, "exchange")) return NULL; - account = exchange_operations_get_exchange_account (); + account = exchange_operations_get_exchange_account (); + if (!account) + return NULL; + exchange_account_is_offline (account, &mode); if (mode == OFFLINE_MODE) return NULL; diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c index c871f68d77..ef0eaaef79 100644 --- a/plugins/exchange-operations/exchange-calendar.c +++ b/plugins/exchange-operations/exchange-calendar.c @@ -81,6 +81,8 @@ e_exchange_calendar_get_calendars (ECalSourceType ftype) } account = exchange_operations_get_exchange_account (); + if (!account) + return NULL; /* FIXME: Reconsider this hardcoding */ uri_prefix = g_strconcat ("exchange://", account->account_filename, "/;", NULL); @@ -121,6 +123,8 @@ e_exchange_calendar_pcalendar_on_change (GtkTreeView *treeview, ESource *source) gchar *es_ruri, *ruri; account = exchange_operations_get_exchange_account (); + if (!account) + return; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); gtk_tree_selection_get_selected(selection, &model, &iter); @@ -249,9 +253,12 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data) callist = e_exchange_calendar_get_calendars (t->source_type); - for (i=0; i<callist->len; ++i) { - ruri = g_ptr_array_index (callist, i); - exchange_operations_cta_add_node_to_tree (ts_pcalendar, NULL, ruri); + if (callist) { + for (i = 0; i < callist->len; i++) { + ruri = g_ptr_array_index (callist, i); + exchange_operations_cta_add_node_to_tree (ts_pcalendar, NULL, ruri); + } + g_ptr_array_free (callist, TRUE); } cr_calendar = gtk_cell_renderer_text_new (); @@ -296,7 +303,6 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data) g_free (sruri); } - g_ptr_array_free (callist, TRUE); g_object_unref (ts_pcalendar); return tv_pcalendar; } @@ -337,6 +343,9 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data) } account = exchange_operations_get_exchange_account (); + if (!account) + return FALSE; + uri_text = e_source_get_uri (t->source); euri = e_uri_new (uri_text); uri_string = e_uri_to_string (euri, FALSE); @@ -392,7 +401,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) } account = exchange_operations_get_exchange_account (); - if (!is_exchange_personal_folder (account, uri_text)) + if (!account || !is_exchange_personal_folder (account, uri_text)) return; windows_domain = exchange_account_get_windows_domain (account); diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c index aee5a1889f..5fe233dec0 100644 --- a/plugins/exchange-operations/exchange-contacts.c +++ b/plugins/exchange-operations/exchange-contacts.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Praveen Kumar <kpraveen@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 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. + * 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/> + * * - * 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: + * Praveen Kumar <kpraveen@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ @@ -69,6 +70,8 @@ e_exchange_contacts_get_contacts (void) gchar *uri_prefix, *ruri; account = exchange_operations_get_exchange_account (); + if (!account) + return NULL; uri_prefix = g_strconcat ("exchange://", account->account_filename, "/;", NULL); prefix_len = strlen (uri_prefix); @@ -107,6 +110,8 @@ e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source) gchar *ruri; account = exchange_operations_get_exchange_account (); + if (!account) + return; selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); gtk_tree_selection_get_selected(selection, &model, &iter); @@ -240,9 +245,12 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data) conlist = e_exchange_contacts_get_contacts (); - for (i=0; i<conlist->len; ++i) { - ruri = g_ptr_array_index (conlist, i); - exchange_operations_cta_add_node_to_tree (ts_pcontacts, NULL, ruri); + if (conlist) { + for (i = 0; i < conlist->len; i++) { + ruri = g_ptr_array_index (conlist, i); + exchange_operations_cta_add_node_to_tree (ts_pcontacts, NULL, ruri); + } + g_ptr_array_free (conlist, TRUE); } cr_contacts = gtk_cell_renderer_text_new (); @@ -292,7 +300,6 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data) g_free (sruri); } - g_ptr_array_free (conlist, TRUE); g_object_unref (ts_pcontacts); return vb_pcontacts; } @@ -328,6 +335,8 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data) } account = exchange_operations_get_exchange_account (); + if (!account) + return FALSE; if (!rel_uri) { GConfClient *client; @@ -423,7 +432,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target) } account = exchange_operations_get_exchange_account (); - if (!is_exchange_personal_folder (account, uri_text)) + if (!account || !is_exchange_personal_folder (account, uri_text)) return; windows_domain = exchange_account_get_windows_domain (account); diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index bbdd26a87f..94240c051a 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Praveen Kumar <kpraveen@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 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. + * 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/> * - * 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: + * Praveen Kumar <kpraveen@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h index 52eec141ef..156339f437 100644 --- a/plugins/exchange-operations/exchange-operations.h +++ b/plugins/exchange-operations/exchange-operations.h @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- - * - * Praveen Kumar <kpraveen@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 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. + * 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/> * - * 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: + * Praveen Kumar <kpraveen@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 202ce94ffa..884301b517 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,3 +1,14 @@ +2008-10-17 Matthew Barnes <mbarnes@redhat.com> + + * send-options.c (org_gnome_send-options): + Don't mix declarations and statements. + +2008-10-03 Sankar P <psankar@novell.com> + +License Changes + + * proxy-login.c: + 2008-10-01 Gabor Kelemen <kelemeng@gnome.hu> * send-options.c: Mark two forgotten strings for translation. Fixes bug #553070 diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 383e940fbe..1dc35e940b 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -1,25 +1,23 @@ - -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: - * Shreyas Srinivasan <sshreyas@novell.com> - * Sankar P <psankar@novell.com> + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * 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 the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * 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) * */ diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 124fffe8f3..8a15d954dc 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -198,12 +198,11 @@ org_gnome_send_options (EPlugin *epl, EConfigHookItemFactoryData *data) { EMConfigTargetAccount *target_account; GtkWidget *frame, *button, *label, *vbox; + gchar *markup; target_account = (EMConfigTargetAccount *)data->config->target; account = target_account->account; - gchar *markup; - if(!g_strrstr (account->source->url, "groupwise://")) return NULL; diff --git a/plugins/imap-features/ChangeLog b/plugins/imap-features/ChangeLog index fb125322e0..647f059f22 100644 --- a/plugins/imap-features/ChangeLog +++ b/plugins/imap-features/ChangeLog @@ -1,3 +1,9 @@ +2008-10-03 Sankar P <psankar@novell.com> + +License Changes + + * imap-headers.c: + 2008-01-18 Srinivasa Ragavan <sragavan@novell.com> * imap-headers.c: (imap_headers_commit), (org_gnome_imap_headers): diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index 3a99b1a341..e3d20334b9 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Author: Sankar P <psankar@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 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/> * - * 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: + * Sankar P <psankar@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog index b30fd70aaa..f408872cdc 100644 --- a/plugins/itip-formatter/ChangeLog +++ b/plugins/itip-formatter/ChangeLog @@ -1,3 +1,50 @@ +2008-10-20 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #514989 + + * itip-view.c: (format_date_and_time_x): + Calculate tomorrow from current time, not from the date to convert. + +2008-10-14 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bug #550441 + + * itip-formatter.c: (view_response_cb): Ignore if summary not there. + +2008-10-13 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #550441 + + * itip-formatter.c: (view_response_cb): + Use the proper functions to traverse messages in a folder's summary. + +2008-10-10 Patrick Ohly <pohly@ecld0pohly> + + ** #541121: improved itip formatter: allow replying to forwarded + and already imported invitations; honor RVSP flag in invitation + + * itip-formatter.c: the whole logic for "reply to organize" was + improved. + + If an organizer exists, replying is enabled. Sending a reply is + enabled by default if the event looks like a meeting (= has + attendees). The wish of the organizer to not get replies is + checked (previous Evolution releases ignored it); in this case the + default is to not send a reply. In all cases the user can override + the default. + +2008-10-08 Sankar P <psankar@novell.com> + +License Changes + + * itip-formatter.c: + +2008-10-03 Sankar P <psankar@novell.com> + +License Changes + + * itip-view.c: + 2008-10-01 Milan Crha <mcrha@redhat.com> ** Fix for bug #519491 diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index e37c0d162a..a2ceffb77b 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: JP Rosevear <jpr@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 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/> * - * 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: + * JP Rosevear <jpr@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ @@ -107,6 +107,32 @@ struct _itip_puri { guint progress_info_id; gboolean delete_message; + /* a reply can only be sent if and only if there is an organizer */ + gboolean has_organizer; + /* + * Usually replies are sent unless the user unchecks that option. + * There are some cases when the default is not to sent a reply + * (but the user can still chose to do so by checking the option): + * - the organizer explicitly set RSVP=FALSE for the current user + * - the event has no ATTENDEEs: that's the case for most non-meeting + * events + * + * The last case is meant for forwarded non-meeting + * events. Traditionally Evolution hasn't offered to send a + * reply, therefore the updated implementation mimics that + * behavior. + * + * Unfortunately some software apparently strips all ATTENDEEs + * when forwarding a meeting; in that case sending a reply is + * also unchecked by default. So the check for ATTENDEEs is a + * tradeoff between sending unwanted replies in cases where + * that wasn't done in the past and not sending a possibly + * wanted reply where that wasn't possible in the past + * (because replies to forwarded events were not + * supported). Overall that should be an improvement, and the + * user can always override the default. + */ + gboolean no_reply_wanted; }; @@ -235,6 +261,12 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet pitip->my_address = g_strdup (account->id->address); + param = icalproperty_get_first_parameter (prop, ICAL_RSVP_PARAMETER); + if (param && + icalparameter_get_rsvp (param) == ICAL_RSVP_FALSE) { + pitip->no_reply_wanted = TRUE; + } + if (status) { param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER); *status = param ? icalparameter_get_partstat (param) : ICAL_PARTSTAT_NEEDSACTION; @@ -285,6 +317,12 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet pitip->my_address = g_strdup (account->id->address); + param = icalproperty_get_first_parameter (prop, ICAL_RSVP_PARAMETER); + if (param && + ICAL_RSVP_FALSE == icalparameter_get_rsvp (param)) { + pitip->no_reply_wanted = TRUE; + } + if (status) { param = icalproperty_get_first_parameter (prop, ICAL_PARTSTAT_PARAMETER); *status = param ? icalparameter_get_partstat (param) : ICAL_PARTSTAT_NEEDSACTION; @@ -641,8 +679,23 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) d(printf ("Decreasing itip formatter search count to %d\n", fd->count)); if (fd->count == 0) { + gboolean rsvp_enabled = FALSE; + itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->progress_info_id); pitip->progress_info_id = 0; + + /* + * Only allow replies if backend doesn't do that automatically. + * Replies only make sense for events with an organizer. + */ + if (!e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_SAVE_SCHEDULES) && + pitip->has_organizer) { + rsvp_enabled = TRUE; + } + itip_view_set_show_rsvp (ITIP_VIEW (pitip->view), rsvp_enabled); + + /* default is chosen in extract_itip_data() based on content of the VEVENT */ + itip_view_set_rsvp (ITIP_VIEW (pitip->view), !pitip->no_reply_wanted); if ((pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) && !pitip->current_ecal) { @@ -677,11 +730,6 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data) itip_view_set_source_list (ITIP_VIEW (pitip->view), pitip->source_lists[pitip->type]); g_signal_connect (pitip->view, "source_selected", G_CALLBACK (source_selected_cb), pitip); - /* The only method that RSVP makes sense for is REQUEST */ - /* FIXME Default to the suggestion for RSVP for my attendee */ - itip_view_set_rsvp (ITIP_VIEW (pitip->view), pitip->method == ICAL_METHOD_REQUEST ? TRUE : FALSE); - itip_view_set_show_rsvp (ITIP_VIEW (pitip->view), pitip->method == ICAL_METHOD_REQUEST ? TRUE : FALSE); - if (source) { itip_view_set_source (ITIP_VIEW (pitip->view), source); @@ -1423,6 +1471,16 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container) switch (icalcomponent_isa (pitip->ical_comp)) { case ICAL_VEVENT_COMPONENT: pitip->type = E_CAL_SOURCE_TYPE_EVENT; + pitip->has_organizer = icalcomponent_get_first_property (pitip->ical_comp, ICAL_ORGANIZER_PROPERTY) != NULL; + if (icalcomponent_get_first_property (pitip->ical_comp, ICAL_ATTENDEE_PROPERTY) == NULL) { + /* no attendees: assume that that this is not a meeting and organizer doesn't want a reply */ + pitip->no_reply_wanted = TRUE; + } else { + /* + * if we have attendees, then find_to_address() will check for our RSVP + * and set no_reply_wanted=TRUE if RSVP=FALSE for the current user + */ + } break; case ICAL_VTODO_COMPONENT: pitip->type = E_CAL_SOURCE_TYPE_TODO; @@ -1652,7 +1710,8 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) } /*FIXME Save schedules is misused here, remove it */ - save_schedules = e_cal_get_save_schedules (pitip->current_ecal); + save_schedules = e_cal_get_static_capability (pitip->current_ecal, + CAL_STATIC_CAPABILITY_SAVE_SCHEDULES); switch (response) { case ITIP_VIEW_RESPONSE_ACCEPT: @@ -1728,12 +1787,13 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) tag = camel_message_info_user_tag (mi, "recurrence-key"); camel_message_info_free (mi); if (tag) { - GPtrArray *summary_array; - int i=0; + int i = 0, count; - summary_array = camel_folder_summary_array (pitip->folder->summary); - for (i=0; i<summary_array->len; i++) { - mi = (CamelMessageInfo *)g_ptr_array_index (summary_array, i); + count = camel_folder_summary_count (pitip->folder->summary); + for (i = 0; i < count; i++) { + mi = camel_folder_summary_index (pitip->folder->summary, i); + if (!mi) + continue; camel_message_info_ref (mi); if ( camel_message_info_user_tag (mi, "recurrence-key") && g_str_equal (camel_message_info_user_tag (mi, "recurrence-key"), tag)) { @@ -1742,7 +1802,6 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) } camel_message_info_free (mi); } - camel_folder_summary_array_free (pitip->folder->summary, summary_array); } } else { /* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */ @@ -1921,10 +1980,18 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject } else { switch (info->method) { case ICAL_METHOD_PUBLISH: - itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_PUBLISH); - break; case ICAL_METHOD_REQUEST: - itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_REQUEST); + /* + * Treat meeting request (sent by organizer directly) and + * published evend (forwarded by organizer or attendee) alike: + * if the event has an organizer, then it can be replied to and + * we show the "accept/tentative/decline" choice. + * Otherwise only show "accept". + */ + itip_view_set_mode (ITIP_VIEW (info->view), + info->has_organizer ? + ITIP_VIEW_MODE_REQUEST : + ITIP_VIEW_MODE_PUBLISH); break; case ICAL_METHOD_REPLY: itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_REPLY); @@ -2254,6 +2321,8 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) gconf = gconf_client_get_default (); puri->delete_message = gconf_client_get_bool (gconf, GCONF_KEY_DELETE, NULL); + puri->has_organizer = FALSE; + puri->no_reply_wanted = FALSE; puri->folder = ((EMFormat *) target->format)->folder; puri->uid = g_strdup (((EMFormat *) target->format)->uid); puri->msg = ((EMFormat *) target->format)->message; diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 1e5e41195c..92a8460e48 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: JP Rosevear <jpr@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 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/> * - * 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: + * JP Rosevear <jpr@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ @@ -152,7 +152,7 @@ format_date_and_time_x (struct tm *date_tm, /* Calculate a normalized "tomorrow" */ tomorrow_tm = *current_tm; /* Don't need this if date is in the past. Also, year assumption won't fail. */ - if (date_tm->tm_year >= current_tm->tm_year && tomorrow_tm.tm_mday == time_days_in_month (date_tm->tm_year + 1900, date_tm->tm_mon)) { + if (date_tm->tm_year >= current_tm->tm_year && tomorrow_tm.tm_mday == time_days_in_month (current_tm->tm_year + 1900, current_tm->tm_mon)) { tomorrow_tm.tm_mday = 1; if (tomorrow_tm.tm_mon == 11) { tomorrow_tm.tm_mon = 1; diff --git a/plugins/mail-account-disable/ChangeLog b/plugins/mail-account-disable/ChangeLog index d40282a91b..86dc9a4897 100644 --- a/plugins/mail-account-disable/ChangeLog +++ b/plugins/mail-account-disable/ChangeLog @@ -1,3 +1,9 @@ +2008-10-03 Sankar P <psankar@novell.com> + +License Changes + + * mail-account-disable.c: + 2007-11-18 Gilles Dartiguelongue <gdartigu@svn.gnome.org> ** Fix bug #495875 diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c index 9996051636..886b66a66f 100644 --- a/plugins/mail-account-disable/mail-account-disable.c +++ b/plugins/mail-account-disable/mail-account-disable.c @@ -1,26 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Shreyas Srinivasan <sshreyas@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 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/> * - * 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: + * Shreyas Srinivasan <sshreyas@novell.com> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ - #ifdef HAVE_CONFIG_H #include <config.h> #endif diff --git a/plugins/mark-calendar-offline/ChangeLog b/plugins/mark-calendar-offline/ChangeLog deleted file mode 100644 index a57222d5a6..0000000000 --- a/plugins/mark-calendar-offline/ChangeLog +++ /dev/null @@ -1,54 +0,0 @@ -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 - dlls on Windows. - -2007-11-11 Gilles Dartiguelongue <gdartigu@svn.gnome.org> - - ** Fix bug #495872 - - * mark-calendar-offline.c: (org_gnome_mark_no_offline), - (org_gnome_mark_offline): - * org-gnome-mark-calendar-offline.eplug.xml: - add tasks and memos support - -2007-04-02 Sankar P <psankar@novell.com> - - * Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr> - - * org-gnome-mark-calendar-offline.eplug.xml: - Cleanup. - Fixes part of #301149 - -2005-12-12 Harish Krishnaswamy <kharish@novell.com> - - * Makefile.am: Fix make-clean issues. - -2005-05-06 Not Zed <NotZed@Ximian.com> - - * Makefile.am: - * org-gnome-mark-calendar-offline.eplug.xml: s/.in/.xml/ & i18n. - -2005-02-24 Björn Torkelsson <torkel@acc.umu.se> - - * org-gnome-mark-calendar-offline.eplug.in: Shortened the - name. - Added author and description. - Added xml tag. - -2004-11-01 JP Rosevear <jpr@novell.com> - - * Makefile.am: dist .eplug.in file - -2004-10-22 Harish Krishnaswamy <kharish@novell.com> - - * mark-calendar-offline.c: implement a plugin that lets the user mark a - calendar to be available for off-line use, if it is not already set to be so - and vice versa - diff --git a/plugins/mark-calendar-offline/Makefile.am b/plugins/mark-calendar-offline/Makefile.am deleted file mode 100644 index c7773ae87b..0000000000 --- a/plugins/mark-calendar-offline/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -INCLUDES = \ - -I$(top_srcdir) \ - $(EVOLUTION_CALENDAR_CFLAGS) - -@EVO_PLUGIN_RULE@ - -plugin_DATA = org-gnome-mark-calendar-offline.eplug -plugin_LTLIBRARIES = liborg-gnome-mark-calendar-offline.la - -liborg_gnome_mark_calendar_offline_la_SOURCES = mark-calendar-offline.c -liborg_gnome_mark_calendar_offline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_mark_calendar_offline_la_LIBADD = \ - $(EVOLUTION_CALENDAR_LIBS) - -EXTRA_DIST = org-gnome-mark-calendar-offline.eplug.xml - -BUILT_SOURCES = $(plugin_DATA) -CLEANFILES = $(BUILT_SOURCES) diff --git a/plugins/mark-calendar-offline/mark-calendar-offline.c b/plugins/mark-calendar-offline/mark-calendar-offline.c deleted file mode 100644 index 68bd3f445b..0000000000 --- a/plugins/mark-calendar-offline/mark-calendar-offline.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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/> - * - * - * Authors: - * Harish Krishnaswamy <kharish@novell.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -/* This is prototype code only, this may, or may not, use undocumented - * unstable or private internal function calls. - * This code has been derived from the source of the sample eplugin - * select_one_source. - */ - -#include <glib.h> -#include <glib/gi18n.h> -#include <libedataserver/e-source.h> -#include <libedataserverui/e-source-selector.h> -#include <calendar/gui/e-cal-popup.h> - -void org_gnome_mark_offline (EPlugin *ep, ECalPopupTargetSource *target); -void org_gnome_mark_no_offline (EPlugin *ep, ECalPopupTargetSource *target); - -void -org_gnome_mark_no_offline (EPlugin *ep, ECalPopupTargetSource *target) -{ - ESource *source; - - source = e_source_selector_peek_primary_selection (target->selector); - e_source_set_property (source, "offline", "0"); -} - -void -org_gnome_mark_offline (EPlugin *ep, ECalPopupTargetSource *target) -{ - ESource *source; - - source = e_source_selector_peek_primary_selection (target->selector); - e_source_set_property (source, "offline", "1"); -} - diff --git a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml b/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml deleted file mode 100644 index bde9805396..0000000000 --- a/plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<e-plugin-list> - <e-plugin id="org.gnome.evolution.mark_calendar_offline" type="shlib" - _name="Mark calendar offline" - location="@PLUGINDIR@/liborg-gnome-mark-calendar-offline@SOEXT@"> - <author name="Harish Krishnaswamy" email="kharish@novell.com"/> - <_description>Marks the selected calendar for offline viewing.</_description> - - <hook class="org.gnome.evolution.calendar.popup:1.0"> - <menu id="org.gnome.evolution.calendar.source.popup" target="source"> - <item type="item" path="38.mark_calendar_offline" _label="_Make available for offline use" icon="stock_disconnect" visible="offline" activate="org_gnome_mark_offline"/> - </menu> - <menu id="org.gnome.evolution.calendar.source.popup" target="source"> - <item type="item" path="38.mark_calendar_no_offline" _label="_Do not make available for offline use" icon="stock_connect" visible="no-offline" activate="org_gnome_mark_no_offline"/> - </menu> - - <menu id="org.gnome.evolution.memos.source.popup" target="source"> - <item type="item" path="38.mark_memos_offline" _label="_Make available for offline use" icon="stock_disconnect" visible="offline" activate="org_gnome_mark_offline"/> - </menu> - <menu id="org.gnome.evolution.memos.source.popup" target="source"> - <item type="item" path="38.mark_memos_no_offline" _label="_Do not make available for offline use" icon="stock_connect" visible="no-offline" activate="org_gnome_mark_no_offline"/> - </menu> - - <menu id="org.gnome.evolution.tasks.source.popup" target="source"> - <item type="item" path="38.mark_tasks_offline" _label="_Make available for offline use" icon="stock_disconnect" visible="offline" activate="org_gnome_mark_offline"/> - </menu> - <menu id="org.gnome.evolution.tasks.source.popup" target="source"> - <item type="item" path="38.mark_tasks_no_offline" _label="_Do not make available for offline use" icon="stock_connect" visible="no-offline" activate="org_gnome_mark_no_offline"/> - </menu> - </hook> - - </e-plugin> -</e-plugin-list> diff --git a/plugins/mono/ChangeLog b/plugins/mono/ChangeLog index a78216273d..ff07e79a0b 100644 --- a/plugins/mono/ChangeLog +++ b/plugins/mono/ChangeLog @@ -1,3 +1,11 @@ +2008-10-22 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #549025 + + * Makefile.am: + Add $(MONO_CFLAGS) and $(MONO_LIBS) explicitly. The mono plugin + is the only module that should be linking against libmono. + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/mono/Makefile.am b/plugins/mono/Makefile.am index 680fd7a096..aa20b100e3 100644 --- a/plugins/mono/Makefile.am +++ b/plugins/mono/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I$(top_srcdir) \ - $(E_UTIL_CFLAGS) + $(E_UTIL_CFLAGS) \ + $(MONO_CFLAGS) @EVO_PLUGIN_RULE@ @@ -10,7 +11,8 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-mono.la liborg_gnome_evolution_mono_la_SOURCES = mono-plugin.c mono-plugin.h liborg_gnome_evolution_mono_la_LDFLAGS = -module -avoid-version liborg_gnome_evolution_mono_la_LIBADD = \ - $(E_UTIL_LIBS) + $(E_UTIL_LIBS) \ + $(MONO_LIBS) EXTRA_DIST = org-gnome-evolution-mono.eplug.xml diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog index 52f1d4b2c0..fa6c292d11 100644 --- a/plugins/publish-calendar/ChangeLog +++ b/plugins/publish-calendar/ChangeLog @@ -1,3 +1,10 @@ +2008-10-03 Sankar P <psankar@novell.com> + +License Changes + + * publish-calendar.c: + * url-editor-dialog.c: + 2008-09-26 Philip Withnall <philip@tecnocode.co.uk> ** Fix for bug #553461 and bug #553389 diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index a56c25e43d..98371345b5 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -1,21 +1,22 @@ /* - * Authors: David Trowbridge <trowbrds@cs.colorado.edu> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * 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/> * - * 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: + * David Trowbridge <trowbrds@cs.colorado.edu> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index ddc1653959..abcd1ede38 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -1,22 +1,22 @@ /* - * Authors: - * David Trowbridge - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * 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/> * - * 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: + * David Trowbridge <trowbrds@cs.colorado.edu> + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/plugins/select-one-source/ChangeLog b/plugins/select-one-source/ChangeLog index de715176df..0534fee906 100644 --- a/plugins/select-one-source/ChangeLog +++ b/plugins/select-one-source/ChangeLog @@ -1,3 +1,10 @@ +2008-10-13 Suman Manjunath <msuman@novell.com> + + ** Fix for bug #424818 (bugzilla.novell.com) + + * mark-calendar-offline.c: Removed this unused PoC file. The + corresponding plugin has also been integrated into the main code. + 2008-08-27 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/select-one-source/mark-calendar-offline.c b/plugins/select-one-source/mark-calendar-offline.c deleted file mode 100644 index 3ef3330f60..0000000000 --- a/plugins/select-one-source/mark-calendar-offline.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * - * 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/> - * - * - * Authors: - * Harish Krishnaswamy <kharish@novell.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -/* This is prototype code only, this may, or may not, use undocumented - * unstable or private internal function calls. - * This code has been derived from the source of the sample eplugin - * select_one_source. - */ - -#include <glib.h> -#include <glib/gi18n.h> -#include <libedataserver/e-source.h> -#include <libedataserverui/e-source-selector.h> -#include <calendar/gui/e-cal-popup.h> - -void org_gnome_mark_calendar_offline (EPlugin *ep, ECalPopupTargetSource *target); -void org_gnome_mark_calendar_no_offline (EPlugin *ep, ECalPopupTargetSource *target); - -void -org_gnome_mark_calendar_no_offline (EPlugin *ep, ECalPopupTargetSource *target) -{ - ESource *source; - - source = e_source_selector_peek_primary_selection (target->selector); - e_source_set_property (source, "offline", "0"); -} - -void -org_gnome_mark_calendar_offline (EPlugin *ep, ECalPopupTargetSource *target) -{ - ESource *source; - - source = e_source_selector_peek_primary_selection (target->selector); - e_source_set_property (source, "offline", "1"); -} - diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog index f0fc942dc0..789f58de0b 100644 --- a/plugins/templates/ChangeLog +++ b/plugins/templates/ChangeLog @@ -1,3 +1,12 @@ +2008-10-15 Bharath Acharya <abharath@novell.com> + + ** Fix for bug #556284 + + * templates.c: (reply_with_template), (org_gnome_templates_popup), + (action_template_cb): Fixes for fetching the store using + mail_component_peek_local_store. Fixes the right-click crash issues + caused on OS_WIN32 by Templates plugin. + 2008-09-15 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 3c79bbcd01..8996c7f8c1 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -31,15 +31,13 @@ #include <e-util/e-config.h> #include <camel/camel-url.h> -#include <camel/camel-folder.h> -#include <camel/camel-mime-message.h> #include <camel/camel-multipart.h> #include <camel/camel-stream-mem.h> -#include <camel/camel-store.h> #include <mail/em-composer-utils.h> #include <mail/em-popup.h> #include <mail/mail-session.h> +#include <mail/mail-component.h> #include <mail/mail-ops.h> #include <e-util/e-error.h> #include <e-util/e-plugin.h> @@ -502,21 +500,13 @@ static void reply_with_template (EPopup *ep, EPopupItem *item, void *data) { CamelMimeMessage *new, *template, *reply_to; - CamelStore *store; CamelFolder *templates_folder; struct _camel_header_raw *header; UserData *userdata = item->user_data; - char *cont, *basedir, *url; + char *cont; /* We get the templates folder and all the uids of the messages in there */ - basedir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", NULL); - url = g_strdup_printf ("mbox://%s", basedir); - g_free (basedir); - - store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, NULL); - g_free (url); - - templates_folder = camel_store_get_folder (store, _("Templates"), CAMEL_STORE_FOLDER_CREATE, NULL); + templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES); /* Get from the currently selected folder, the currently selected message */ reply_to = camel_folder_get_message (userdata->t->folder, @@ -672,21 +662,13 @@ org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t) CamelFolder *templates_folder; CamelFolderInfo *templates_info; CamelStore *store; - char *basedir; - char *url; GSList *list = NULL; /* We get the templates folder and all the uids of the messages in there */ - basedir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", NULL); - url = g_strdup_printf ("mbox://%s", basedir); - - g_free (basedir); - - store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, NULL); - g_free (url); + store = mail_component_peek_local_store (NULL); - templates_folder = camel_store_get_folder (store, _("Templates"), CAMEL_STORE_FOLDER_CREATE, NULL); + templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES); templates_info = camel_store_get_folder_info (store, templates_folder->full_name, @@ -707,22 +689,10 @@ action_template_cb (GtkAction *action, { CamelMessageInfo *info; CamelMimeMessage *msg; - CamelStore *store; CamelFolder *templates_folder; - char *basedir; - char *url; - /* We get the templates folder and all the uids of the messages in there */ - basedir = g_build_filename (g_get_home_dir (), ".evolution", "mail", "local", NULL); - url = g_strdup_printf ("mbox://%s", basedir); - g_free (basedir); - - store = (CamelStore *) camel_session_get_service (session, url, CAMEL_PROVIDER_STORE, NULL); - g_free (url); - - templates_folder = camel_store_get_folder (store, _("Templates"), CAMEL_STORE_FOLDER_CREATE, NULL); - + templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES); msg = e_msg_composer_get_message_draft (composer); info = camel_message_info_new (NULL); |