diff options
Diffstat (limited to 'plugins/groupwise-features')
| -rw-r--r-- | plugins/groupwise-features/ChangeLog | 60 | ||||
| -rw-r--r-- | plugins/groupwise-features/install-shared.c | 27 | ||||
| -rw-r--r-- | plugins/groupwise-features/junk-settings.c | 27 | ||||
| -rw-r--r-- | plugins/groupwise-features/org-gnome-compose-send-options.xml | 2 | ||||
| -rw-r--r-- | plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml | 4 | ||||
| -rw-r--r-- | plugins/groupwise-features/org-gnome-proxy-errors.xml | 3 | ||||
| -rw-r--r-- | plugins/groupwise-features/org-gnome-proxy-login-errors.xml | 1 | ||||
| -rw-r--r-- | plugins/groupwise-features/org-gnome-shared-folder.errors.xml | 6 | ||||
| -rw-r--r-- | plugins/groupwise-features/proxy-listing.glade | 2 | ||||
| -rw-r--r-- | plugins/groupwise-features/proxy-login-dialog.glade | 2 | ||||
| -rw-r--r-- | plugins/groupwise-features/proxy-login.c | 21 | ||||
| -rw-r--r-- | plugins/groupwise-features/proxy.c | 33 | ||||
| -rw-r--r-- | plugins/groupwise-features/send-options.c | 36 | ||||
| -rw-r--r-- | plugins/groupwise-features/share-folder.c | 27 | ||||
| -rw-r--r-- | plugins/groupwise-features/status-track.c | 30 |
15 files changed, 182 insertions, 99 deletions
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 |