From 6c12d74cb15df7c26e79b19ac66ce7a89b76f71c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Sun, 20 Jul 2008 19:23:41 +0000 Subject: Committing on behalf of Milan Crha 2008-07-09 Milan Crha ** Fix for bug #228725 * gui/widgets/e-minicard-view.h: (struct _EMinicardView): * gui/widgets/e-minicard-view.c: (set_empty_message), (stop_state_changed), (e_minicard_view_set_property), (e_minicard_view_dispose), (e_minicard_view_init): Show different message in a view when searching. svn path=/trunk/; revision=35783 --- addressbook/gui/widgets/e-minicard-view.c | 40 ++++++++++++++++++++++++------- addressbook/gui/widgets/e-minicard-view.h | 1 + 2 files changed, 33 insertions(+), 8 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index daa41b1e2f..30a384091d 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -155,28 +155,34 @@ static void set_empty_message (EMinicardView *view) { char *empty_message; - gboolean editable = FALSE, perform_initial_query = FALSE; + gboolean editable = FALSE, perform_initial_query = FALSE, searching = FALSE; EBook *book; if (view->adapter) { + EABModel *model = NULL; + g_object_get (view->adapter, "editable", &editable, + "model", &model, NULL); g_object_get (view->adapter, "book", &book, NULL); if (!e_book_check_static_capability (book, "do-initial-query")) perform_initial_query = TRUE; + + searching = model && eab_model_can_stop (model); } - if (editable) { + if (searching) { + empty_message = _("\n\nSearching for the Contacts..."); + } else if (editable) { if (perform_initial_query) empty_message = _("\n\nSearch for the Contact\n\n" "or double-click here to create a new Contact."); else empty_message = _("\n\nThere are no items to show in this view.\n\n" "Double-click here to create a new Contact."); - } - else { + } else { if (perform_initial_query) empty_message = _("\n\nSearch for the Contact."); else @@ -194,6 +200,12 @@ writable_status_change (EABModel *model, gboolean writable, EMinicardView *view) set_empty_message (view); } +static void +stop_state_changed (EABModel *model, EMinicardView *view) +{ + set_empty_message (view); +} + static void adapter_changed (EMinicardView *view) { @@ -216,19 +228,23 @@ e_minicard_view_set_property (GObject *object, switch (prop_id){ case PROP_ADAPTER: if (view->adapter) { - if (view->writable_status_id) { + if (view->writable_status_id || view->stop_state_id) { EABModel *model; g_object_get (view->adapter, "model", &model, NULL); if (model) { - g_signal_handler_disconnect (model, view->writable_status_id); + if (view->writable_status_id) + g_signal_handler_disconnect (model, view->writable_status_id); + if (view->stop_state_id) + g_signal_handler_disconnect (model, view->stop_state_id); } } g_object_unref (view->adapter); } view->writable_status_id = 0; + view->stop_state_id = 0; view->adapter = g_value_get_object (value); g_object_ref (view->adapter); adapter_changed (view); @@ -244,6 +260,9 @@ e_minicard_view_set_property (GObject *object, view->writable_status_id = g_signal_connect (model, "writable_status", G_CALLBACK (writable_status_change), view); + view->stop_state_id = + g_signal_connect (model, "stop_state_changed", + G_CALLBACK (stop_state_changed), view); } } @@ -317,19 +336,23 @@ e_minicard_view_dispose (GObject *object) } if (view->adapter) { - if (view->writable_status_id) { + if (view->writable_status_id || view->stop_state_id) { EABModel *model; g_object_get (view->adapter, "model", &model, NULL); if (model) { - g_signal_handler_disconnect (model, view->writable_status_id); + if (view->writable_status_id) + g_signal_handler_disconnect (model, view->writable_status_id); + if (view->stop_state_id) + g_signal_handler_disconnect (model, view->stop_state_id); } } g_object_unref (view->adapter); } view->writable_status_id = 0; + view->stop_state_id = 0; view->adapter = NULL; if (G_OBJECT_CLASS(parent_class)->dispose) @@ -548,6 +571,7 @@ e_minicard_view_init (EMinicardView *view) view->adapter = NULL; view->canvas_drag_data_get_id = 0; view->writable_status_id = 0; + view->stop_state_id = 0; set_empty_message (view); } diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index 1d8eef963c..eb6d07f034 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -70,6 +70,7 @@ struct _EMinicardView guint canvas_drag_data_get_id; guint writable_status_id; + guint stop_state_id; }; struct _EMinicardViewClass -- cgit From 854d9775036bf6b77ea1b8902fce114ba85fea59 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 6 Aug 2008 08:30:24 +0000 Subject: ** Fix for bug #546263 2008-08-06 Milan Crha ** Fix for bug #546263 * gui/widgets/e-minicard.c: (add_field), (add_email_field), (remodel): Add 'width' property as the last one for 'new' item, thus it will know all the information to properly calculate column widths. Also don't set field names for the contact-lists. Both changes prevents messing of minicard painting for changed contact-lists. svn path=/trunk/; revision=35913 --- addressbook/gui/widgets/e-minicard.c | 48 ++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 21 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index b617292a0f..a4bda1ac4a 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -780,21 +780,21 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width) new_item = e_minicard_label_new(group); if (e_minicard->contact && e_contact_get (e_minicard->contact, E_CONTACT_IS_LIST)) - gnome_canvas_item_set( new_item, - "width", e_minicard->width - 4.0, - "fieldname", is_rtl ? "" : string, - "field", is_rtl ? string : "", - "max_field_name_length", left_width, - "editable", FALSE /* e_minicard->editable */, - NULL ); + gnome_canvas_item_set (new_item, + "fieldname", is_rtl ? "" : string, + "field", is_rtl ? string : "", + "max_field_name_length", left_width, + "editable", FALSE /* e_minicard->editable */, + "width", e_minicard->width - 4.0, + NULL ); else - gnome_canvas_item_set( new_item, - "width", e_minicard->width - 4.0, - "fieldname", is_rtl ? string : name, - "field", is_rtl ? name : string, - "max_field_name_length", left_width, - "editable", FALSE /* e_minicard->editable */, - NULL ); + gnome_canvas_item_set (new_item, + "fieldname", is_rtl ? string : name, + "field", is_rtl ? name : string, + "max_field_name_length", left_width, + "editable", FALSE /* e_minicard->editable */, + "width", e_minicard->width - 4.0, + NULL ); #ifdef notyet @@ -831,7 +831,7 @@ get_email_location (EVCardAttribute *attr) } static void -add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, int limit) +add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, int limit, gboolean is_list) { GnomeCanvasItem *new_item; GnomeCanvasGroup *group; @@ -850,8 +850,13 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i char *parsed_name = NULL; gboolean parser_check; - tmp = get_email_location ((EVCardAttribute *) l->data); - name = g_strdup_printf ("%s:", tmp); + /* do not use name for fields in the contact list */ + if (is_list) { + name = (char *)""; + } else { + tmp = get_email_location ((EVCardAttribute *) l->data); + name = g_strdup_printf ("%s:", tmp); + } parser_check = eab_parse_qp_email ((const gchar *) le->data, &parsed_name, &email); if (parser_check) { @@ -864,12 +869,12 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i new_item = e_minicard_label_new(group); - gnome_canvas_item_set( new_item, - "width", e_minicard->width - 4.0, + gnome_canvas_item_set (new_item, "fieldname", is_rtl ? string : name, "field", is_rtl ? name : string, "max_field_name_length", left_width, "editable", FALSE /* e_minicard->editable */, + "width", e_minicard->width - 4.0, NULL ); #ifdef notyet @@ -888,7 +893,8 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i e_minicard->fields = g_list_append( e_minicard->fields, minicard_field); e_canvas_item_move_absolute(new_item, 2, e_minicard->height); count++; - g_free (name); + if (!is_list) + g_free (name); g_free (string); g_free (parsed_name); g_free (email); @@ -1005,7 +1011,7 @@ remodel( EMinicard *e_minicard ) limit = 5 - count; email = e_contact_get_attributes (e_minicard->contact, E_CONTACT_EMAIL); - add_email_field (e_minicard, email, left_width, limit); + add_email_field (e_minicard, email, left_width, limit, is_list); if (count+limit >5) count = 5; else -- cgit From 434bc25ed6b3f458f3bf119e76bd8b2bcffe5178 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 11 Aug 2008 17:04:32 +0000 Subject: ** Fixes bug #546892 2008-08-11 Matthew Barnes ** Fixes bug #546892 * e-util/e-icon-factory.c (e_icon_factory_get_image): Kill this function. Use gtk_image_new_from_icon_name(). * e-util/e-icon-factory.c (e_icon_factory_get_icon_list): Kill this function. Use gtk_window_set_icon_name(). * widgets/misc/e-activity-handler.c: * widgets/misc/e-task-widget.c: Purge the GdkPixbuf arguments from the API. We've been ignoring them since the spinner icon was added. * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/contact-editor/e-contact-editor-address.c: * calendar/gui/alarm-notify/alarm-notify-dialog.c: * calendar/gui/dialogs/alarm-dialog.c: * calendar/gui/dialogs/alarm-list-dialog.c: * calendar/gui/dialogs/cal-attachment-select-file.c: * calendar/gui/dialogs/changed-comp.c: * calendar/gui/dialogs/delete-error.c: * calendar/gui/dialogs/select-source-dialog.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: * widgets/misc/e-combo-button.c: * widgets/misc/e-info-label.c: * widgets/misc/e-url-entry.c: * widgets/misc/e-task-widget.c: Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list(). * addressbook/gui/contact-editor/e-contact-editor-im.c: * calendar/gui/dialogs/event-page.c: * calendar/gui/e-timezone-entry.c: * e-util/e-gui-utils.c: * e-util/e-popup.c: * plugins/import-ics-attachments/icsimporter.c: * plugins/itip-formatter/itip-view.c: * mail/em-folder-browser.c: * mail/em-format-html-display.c: * mail/mail-send-recv.c: * mail/message-tag-followup.c: Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). * calendar/gui/alarm-notify/alarm-queue.c: * plugins/mail-notification/mail-notification.c: Prefer gtk_status_icon_set_from_icon_name() over gtk_status_icon_set_from_pixbuf(). * addressbook/gui/component/addressbook-view.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-calendar-view.c: * calendar/gui/e-memo-table.c: * mail/mail-mt.c: e_activity_handler_operation_started() no longer takes a GdkPixbuf. It was ignoring the pixbuf anyway ever since we added a spinner icon. svn path=/trunk/; revision=35958 --- addressbook/gui/widgets/e-addressbook-view.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index b30ece1581..ecae7ed8c3 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include "addressbook/printing/e-contact-print.h" @@ -1476,8 +1475,16 @@ generate_viewoption_menu (EABSearchBarItem *subitems) char *str = NULL; str = e_str_without_underscores (subitems[i].search.text); menu_item = gtk_image_menu_item_new_with_label (str); -/* if (subitems[i].image) - gtk_image_menu_item_set_image (menu_item, e_icon_factory_get_image (subitems[i].image, E_ICON_SIZE_MENU)); */ + if (subitems[i].image) { + GtkWidget *image; + + image = gtk_image_new_from_icon_name ( + subitems[i].image, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + image); + } g_free (str); } else { menu_item = gtk_menu_item_new (); -- cgit From 2d265825401de6bc45b00a75bf20a870fc46ad53 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 12 Aug 2008 08:44:09 +0000 Subject: ** Fix for bug #547308 2008-08-12 Milan Crha ** Fix for bug #547308 * gui/component/addressbook.c: (load_source_auth_cb): Do not try to authenticate to the server more than twice when knows the password and it didn't fail because of wrong user name/password. * gui/widgets/eab-gui-util.c: (const char *status_to_string[]): New string for new status code. * gui/widgets/eab-gui-util.c: (eab_load_error_dialog): Include detailed error in generic failure error, if available and is not a repository offline error. svn path=/trunk/; revision=35964 --- addressbook/gui/widgets/eab-gui-util.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 1b59371935..42ce9cd8f2 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -75,7 +75,8 @@ static const char *status_to_string[] = { /* E_BOOK_ERROR_NO_SUCH_SOURCE */ N_("No such source"), /* E_BOOK_ERROR_OFFLINE_UNAVAILABLE */ N_("Not available in offline mode"), /* E_BOOK_ERROR_OTHER_ERROR */ N_("Other error"), - /* E_BOOK_ERROR_INVALID_SERVER_VERSION */ N_("Invalid server version") + /* E_BOOK_ERROR_INVALID_SERVER_VERSION */ N_("Invalid server version"), + /* E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD */ N_("Unsupported authentication method") }; void @@ -131,6 +132,12 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) _("We were unable to open this addressbook. This either " "means you have entered an incorrect URI, or the server " "is unreachable."); + + /* do not show repository offline message, it's kind of generic error */ + if (status != E_BOOK_ERROR_REPOSITORY_OFFLINE && status > 0 && status < G_N_ELEMENTS (status_to_string) && status_to_string [status]) { + label = g_strconcat (label_string, "\n\n", _("Detailed error:"), " ", _(status_to_string [status]), NULL); + label_string = label; + } } dialog = e_error_new ((GtkWindow *) parent, "addressbook:load-error", label_string, NULL); -- cgit From 1bad915150e2d5e97cbbf1a77f7a85e338c07f28 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 27 Aug 2008 10:33:22 +0000 Subject: License Changes svn path=/trunk/; revision=36116 --- addressbook/gui/widgets/e-addressbook-model.h | 21 +++++++++++++- .../gui/widgets/e-addressbook-reflow-adapter.h | 21 +++++++++++++- .../gui/widgets/e-addressbook-table-adapter.h | 21 +++++++++++++- addressbook/gui/widgets/e-minicard-view.h | 28 ++++++++++-------- addressbook/gui/widgets/eab-config.h | 24 ++++++++-------- addressbook/gui/widgets/eab-gui-util.h | 28 ++++++++++-------- addressbook/gui/widgets/eab-menu.h | 29 ++++++++++--------- addressbook/gui/widgets/eab-popup-control.h | 33 ++++++++++------------ addressbook/gui/widgets/eab-popup.h | 28 +++++++++--------- addressbook/gui/widgets/eab-vcard-control.h | 20 +++++++++++++ .../gui/widgets/gal-view-factory-minicard.h | 22 +++++++++++++-- addressbook/gui/widgets/gal-view-minicard.c | 22 +++++++++++++-- 12 files changed, 208 insertions(+), 89 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h index 8ccc4f0693..6558d94812 100644 --- a/addressbook/gui/widgets/e-addressbook-model.h +++ b/addressbook/gui/widgets/e-addressbook-model.h @@ -1,4 +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. + * + * 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 + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + #ifndef _EAB_MODEL_H_ #define _EAB_MODEL_H_ diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h index b237b2fbb8..fd7842684f 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h @@ -1,4 +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. + * + * 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 + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + #ifndef _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ #define _E_ADDRESSBOOK_REFLOW_ADAPTER_H_ diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h index 8af5a95950..c4182d2d2b 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.h +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h @@ -1,4 +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. + * + * 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 + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + #ifndef _EAB_TABLE_ADAPTER_H_ #define _EAB_TABLE_ADAPTER_H_ diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index eb6d07f034..7d0a5b1842 100644 --- a/addressbook/gui/widgets/e-minicard-view.h +++ b/addressbook/gui/widgets/e-minicard-view.h @@ -1,22 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-minicard-view.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey +/* * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ + #ifndef __E_MINICARD_VIEW_H__ #define __E_MINICARD_VIEW_H__ diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 215e526190..59b1705764 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -1,21 +1,23 @@ /* - * 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 * - * 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 + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 263b8f3e38..79dbe5493a 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -1,22 +1,26 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* eab-gui-util.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Toshok +/* * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ + #ifndef __E_ADDRESSBOOK_UTIL_H__ #define __E_ADDRESSBOOK_UTIL_H__ diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h index 0da2cbcfa9..7da05c133b 100644 --- a/addressbook/gui/widgets/eab-menu.h +++ b/addressbook/gui/widgets/eab-menu.h @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- +/* * - * Authors: Michel Zucchi + * 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 * - * 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: + * Michel Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/addressbook/gui/widgets/eab-popup-control.h b/addressbook/gui/widgets/eab-popup-control.h index 75fff81471..e8031a7fec 100644 --- a/addressbook/gui/widgets/eab-popup-control.h +++ b/addressbook/gui/widgets/eab-popup-control.h @@ -1,28 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - /* - * eab-popup-control.h - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * Authors: Jon Trowbridge - * Chris Toshok - */ - -/* * 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 + * + * + * Authors: + * Jon Trowbridge + * Chris Toshok + * + * 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. */ #ifndef __EAB_POPUP_CONTROL_H__ diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h index 457959ff96..933c815af8 100644 --- a/addressbook/gui/widgets/eab-popup.h +++ b/addressbook/gui/widgets/eab-popup.h @@ -1,21 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * - * This program is 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; version 2 of the License. + * 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 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 Lesser General Public + * License along with the program; if not, see * - * 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: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/addressbook/gui/widgets/eab-vcard-control.h b/addressbook/gui/widgets/eab-vcard-control.h index 5f6643c1ca..06ca62727a 100644 --- a/addressbook/gui/widgets/eab-vcard-control.h +++ b/addressbook/gui/widgets/eab-vcard-control.h @@ -1,3 +1,23 @@ +/* + * + * 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 + * + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ + #ifndef __EAB_VCARD_CONTROL_H__ #define __EAB_VCARD_CONTROL_H__ diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h index 1a9b1d4c51..d1cf2de444 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.h +++ b/addressbook/gui/widgets/gal-view-factory-minicard.h @@ -1,12 +1,28 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* + * * gal-view-factory-minicard.c: A View Factory * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * * Authors: - * Chris Lahey + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * (C) 2000, 2001 Ximian, Inc. */ + #ifndef _GAL_VIEW_FACTORY_MINICARD_H_ #define _GAL_VIEW_FACTORY_MINICARD_H_ diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index 764c0edfe0..02276a6960 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -1,12 +1,28 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* + * * gal-view-minicard.c: An Minicard View * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * * Authors: - * Chris Lahey + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * (C) 2000, 2001 Ximian, Inc. */ + #include #include -- cgit From 0368e5866b2e700a7b7642775c6fb81ab1aef18e Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 27 Aug 2008 10:37:32 +0000 Subject: ** Fix for bug #534762 2008-08-27 Philip Withnall ** Fix for bug #534762 Change "addressbook" to "address book" in translatable strings. svn path=/trunk/; revision=36117 --- addressbook/gui/widgets/eab-gui-util.c | 20 ++++++++++---------- addressbook/gui/widgets/eab-vcard-control.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 42ce9cd8f2..5f21e4da29 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -99,16 +99,16 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) uri = e_source_get_uri (source); if (status == E_BOOK_ERROR_OFFLINE_UNAVAILABLE) { - label_string = _("We were unable to open this addressbook. This either means " + label_string = _("We were unable to open this address book. This either means " "this book is not marked for offline usage or not yet downloaded " - "for offline usage. Please load the addressbook once in online mode " + "for offline usage. Please load the address book once in online mode " "to download its contents"); } else if (!strncmp (uri, "file:", 5)) { char *path = g_filename_from_uri (uri, NULL, NULL); label = g_strdup_printf ( - _("We were unable to open this addressbook. Please check that the " + _("We were unable to open this address book. Please check that the " "path %s exists and that you have permission to access it."), path); g_free (path); label_string = label; @@ -117,7 +117,7 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) /* special case for ldap: contact folders so we can tell the user about openldap */ #ifdef HAVE_LDAP label_string = - _("We were unable to open this addressbook. This either " + _("We were unable to open this address book. This either " "means you have entered an incorrect URI, or the LDAP server " "is unreachable."); #else @@ -129,7 +129,7 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) } else { /* other network folders */ label_string = - _("We were unable to open this addressbook. This either " + _("We were unable to open this address book. This either " "means you have entered an incorrect URI, or the server " "is unreachable."); @@ -161,19 +161,19 @@ eab_search_result_dialog (GtkWidget *parent, str = _("More cards matched this query than either the server is \n" "configured to return or Evolution is configured to display.\n" "Please make your search more specific or raise the result limit in\n" - "the directory server preferences for this addressbook."); + "the directory server preferences for this address book."); break; case E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED: str = _("The time to execute this query exceeded the server limit or the limit\n" - "you have configured for this addressbook. Please make your search\n" + "you have configured for this address book. Please make your search\n" "more specific or raise the time limit in the directory server\n" - "preferences for this addressbook."); + "preferences for this address book."); break; case E_BOOK_VIEW_ERROR_INVALID_QUERY: - str = _("The backend for this addressbook was unable to parse this query."); + str = _("The backend for this address book was unable to parse this query."); break; case E_BOOK_VIEW_ERROR_QUERY_REFUSED: - str = _("The backend for this addressbook refused to perform this query."); + str = _("The backend for this address book refused to perform this query."); break; case E_BOOK_VIEW_ERROR_OTHER_ERROR: str = _("This query did not complete successfully."); diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c index 7b81ec64a7..2379559e3d 100644 --- a/addressbook/gui/widgets/eab-vcard-control.c +++ b/addressbook/gui/widgets/eab-vcard-control.c @@ -281,7 +281,7 @@ eab_vcard_control_new (void) G_CALLBACK (toggle_full_vcard), vcard_control); gtk_box_pack_start (GTK_BOX (bbox), button1, FALSE, FALSE, 0); - button2 = gtk_button_new_with_label(_("Save in addressbook")); + button2 = gtk_button_new_with_label(_("Save in address book")); g_signal_connect (button2, "clicked", G_CALLBACK (save_in_addressbook), vcard_control); gtk_box_pack_start (GTK_BOX (bbox), button2, FALSE, FALSE, 0); -- cgit From 07f20eb8fb34789ca0ff9d418545f87bec443b85 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 1 Sep 2008 04:00:00 +0000 Subject: Milan Crha ** Part of fix for bug #548827 (Check bounds of the string array before accessing elements, show more detailed error message if available). svn path=/trunk/; revision=36237 --- addressbook/gui/widgets/e-addressbook-view.c | 2 +- addressbook/gui/widgets/eab-gui-util.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index ecae7ed8c3..142ed3550f 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1731,7 +1731,7 @@ static void delete_contacts_cb (EBook *book, EBookStatus status, gpointer clos break; default : /* Unknown error */ - e_error_run (NULL, "addressbook:generic-error", _("Failed to delete contact"), _("Other error"), NULL); + eab_error_dialog (_("Failed to delete contact"), status); break; } } diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 5f21e4da29..ba236da919 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -82,7 +82,12 @@ static const char *status_to_string[] = { void eab_error_dialog (const char *msg, EBookStatus status) { - const char *status_str = status_to_string [status]; + const char *status_str; + + if (status < 0 || status >= G_N_ELEMENTS (status_to_string)) + status_str = "Other error"; + else + status_str = status_to_string [status]; if (status_str) e_error_run (NULL, "addressbook:generic-error", msg, _(status_str), NULL); -- cgit From 14fa5c8a8cf736e3207b9d9e414586d9ff3a623f Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Tue, 2 Sep 2008 16:25:53 +0000 Subject: Change License from GPL to LGPL. 2nd batch. More changes to come. svn path=/trunk/; revision=36247 --- .../gui/widgets/e-addressbook-reflow-adapter.c | 20 +++++++++++++++ .../gui/widgets/e-addressbook-table-adapter.c | 21 +++++++++++++++- addressbook/gui/widgets/e-addressbook-view.h | 29 ++++++++++++---------- addressbook/gui/widgets/e-minicard-label.h | 29 ++++++++++++---------- addressbook/gui/widgets/e-minicard-view-widget.c | 27 ++++++++++---------- addressbook/gui/widgets/e-minicard-view-widget.h | 29 ++++++++++++---------- addressbook/gui/widgets/e-minicard.h | 29 ++++++++++++---------- addressbook/gui/widgets/eab-config.c | 25 ++++++++++--------- addressbook/gui/widgets/eab-contact-display.h | 28 ++++++++++----------- addressbook/gui/widgets/eab-menu.c | 28 ++++++++++----------- addressbook/gui/widgets/eab-popup.c | 27 ++++++++++---------- .../gui/widgets/gal-view-factory-minicard.c | 20 ++++++++++++--- addressbook/gui/widgets/gal-view-minicard.h | 21 +++++++++++++--- 13 files changed, 207 insertions(+), 126 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 345a4e9c8b..7ce1bee3a7 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -1,3 +1,23 @@ +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index c2eec4a6fa..a4440155d9 100644 --- a/addressbook/gui/widgets/e-addressbook-table-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c @@ -1,4 +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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ #include #include diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index 2303d6b06f..c9ac35d2fa 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -1,22 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-addressbook-view.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ + #ifndef __EAB_VIEW_H__ #define __EAB_VIEW_H__ diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h index cd5ef33fa2..3d41e4cb87 100644 --- a/addressbook/gui/widgets/e-minicard-label.h +++ b/addressbook/gui/widgets/e-minicard-label.h @@ -1,22 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-minicard-label.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ + #ifndef __E_MINICARD_LABEL_H__ #define __E_MINICARD_LABEL_H__ diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 1e6b103192..2796bfe433 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-minicard-view-widget.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #include diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h index f55e998d19..1c4323523f 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.h +++ b/addressbook/gui/widgets/e-minicard-view-widget.h @@ -1,22 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-minicard-view-widget.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ + #ifndef __E_MINICARD_VIEW_WIDGET_H__ #define __E_MINICARD_VIEW_WIDGET_H__ diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h index b7ed9711e6..71c976745f 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -1,22 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* e-minicard.h - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ + #ifndef __E_MINICARD_H__ #define __E_MINICARD_H__ diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c index f057daf52d..bb8eb63dd0 100644 --- a/addressbook/gui/widgets/eab-config.c +++ b/addressbook/gui/widgets/eab-config.c @@ -1,21 +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 * - * 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 + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h index 36b4bb64f0..c7b7f1a476 100644 --- a/addressbook/gui/widgets/eab-contact-display.h +++ b/addressbook/gui/widgets/eab-contact-display.h @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok + * 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 * - * 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/addressbook/gui/widgets/eab-menu.c b/addressbook/gui/widgets/eab-menu.c index 5190e5fa22..603e93893c 100644 --- a/addressbook/gui/widgets/eab-menu.c +++ b/addressbook/gui/widgets/eab-menu.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * 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 * - * 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: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c index 73075543a4..17f979734b 100644 --- a/addressbook/gui/widgets/eab-popup.c +++ b/addressbook/gui/widgets/eab-popup.c @@ -1,21 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Michael Zucchi + * 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; version 2 of the License. + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see * - * 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: + * Michael Zucchi + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c index 9fb1e5b0f6..ccec1bf092 100644 --- a/addressbook/gui/widgets/gal-view-factory-minicard.c +++ b/addressbook/gui/widgets/gal-view-factory-minicard.c @@ -1,11 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * gal-view-factory-minicard.c: A View Factory + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * * * Authors: - * Chris Lahey + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * (C) 2000, 2001 Ximian, Inc. */ #ifdef HAVE_CONFIG_H diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h index e6f8c415b4..bb22cf8a57 100644 --- a/addressbook/gui/widgets/gal-view-minicard.h +++ b/addressbook/gui/widgets/gal-view-minicard.h @@ -1,12 +1,27 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * gal-view-minicard.h: An Minicard View * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * * Authors: - * Chris Lahey + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * (C) 2000, 2001 Ximian, Inc. */ + #ifndef _GAL_VIEW_MINICARD_H_ #define _GAL_VIEW_MINICARD_H_ -- cgit From 76dbf9df1f0126d695925c3c012387976951452d Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Thu, 4 Sep 2008 14:56:39 +0000 Subject: License changes. Changed license from GPL to LGPL. More to come. svn path=/trunk/; revision=36255 --- addressbook/gui/widgets/e-minicard-view.c | 27 ++++++++++++----------- addressbook/gui/widgets/eab-popup-control.c | 34 +++++++++++++---------------- 2 files changed, 29 insertions(+), 32 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 30a384091d..803df061a2 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-minicard-view.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #include diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index 03e9886149..460c6ef3f5 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -1,28 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * eab-popup-control.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * Authors: Jon Trowbridge - * Chris Toshok - */ - /* * 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 + * + * + * Authors: + * Jon Trowbridge + * Chris Toshok + * + * 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. */ /* -- cgit From 9b2f1c77d223c99b86b564d51902a3ff20da6a3f Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Sat, 6 Sep 2008 15:32:10 +0000 Subject: esthetic license header cleans, and fix e-pkcs12 svn path=/trunk/; revision=36264 --- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 7 +------ addressbook/gui/widgets/eab-popup-control.c | 8 ++------ 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 7ce1bee3a7..1630161878 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -1,3 +1,4 @@ +/* -*- 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 @@ -12,14 +13,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with the program; if not, see * - * - * Authors: - * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * */ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - #include #include diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index 460c6ef3f5..de3d21b7d6 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -1,4 +1,6 @@ /* + * This file is too big and this widget is too complicated. Forgive me. + * * 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 @@ -12,17 +14,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with the program; if not, see * - * * Authors: * Jon Trowbridge * Chris Toshok * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -/* - * This file is too big and this widget is too complicated. Forgive me. */ #include -- cgit From c61bef657d2e6c8ab82573f6366761000881db9e Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 8 Sep 2008 04:00:37 +0000 Subject: Milan Crha ** Part of fix for bug #361413 (Print detailed error also for LDAP backends). svn path=/trunk/; revision=36275 --- addressbook/gui/widgets/eab-gui-util.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index ba236da919..12d6e9cb76 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -98,12 +98,14 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) { char *label_string, *label = NULL, *uri; GtkWidget *dialog; + gboolean can_detail_error = TRUE; g_return_if_fail (source != NULL); uri = e_source_get_uri (source); if (status == E_BOOK_ERROR_OFFLINE_UNAVAILABLE) { + can_detail_error = FALSE; label_string = _("We were unable to open this address book. This either means " "this book is not marked for offline usage or not yet downloaded " "for offline usage. Please load the address book once in online mode " @@ -126,6 +128,7 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) "means you have entered an incorrect URI, or the LDAP server " "is unreachable."); #else + can_detail_error = FALSE; label_string = _("This version of Evolution does not have LDAP support " "compiled in to it. If you want to use LDAP in Evolution, " @@ -137,7 +140,9 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) _("We were unable to open this address book. This either " "means you have entered an incorrect URI, or the server " "is unreachable."); + } + if (can_detail_error) { /* do not show repository offline message, it's kind of generic error */ if (status != E_BOOK_ERROR_REPOSITORY_OFFLINE && status > 0 && status < G_N_ELEMENTS (status_to_string) && status_to_string [status]) { label = g_strconcat (label_string, "\n\n", _("Detailed error:"), " ", _(status_to_string [status]), NULL); -- cgit From f9f3b671620286dac01b80d28ad2c47aa700b054 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 19 Sep 2008 06:02:55 +0000 Subject: Change license from GPL to LGPL svn path=/trunk/; revision=36381 --- addressbook/gui/widgets/e-minicard-label.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index c820ded1a5..7cc835cae4 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-minicard-label.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #include -- cgit From ac1a2a03176315bf55a9c840c3dd7b808757a5ab Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 23 Sep 2008 11:26:07 +0000 Subject: ** Fix for bug #552575 2008-09-23 Milan Crha ** Fix for bug #552575 * gui/widgets/eab-gui-util.c: (eab_send_contact_list_as_attachment): Register default callbacks to composer to be able to send/save draft. svn path=/trunk/; revision=36432 --- addressbook/gui/widgets/eab-gui-util.c | 1 + 1 file changed, 1 insertion(+) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 12d6e9cb76..ac6f89c582 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -888,6 +888,7 @@ eab_send_contact_list_as_attachment (GList *contacts) composer = e_msg_composer_new (); table = e_msg_composer_get_header_table (composer); + em_composer_utils_setup_default_callbacks (composer); attachment = camel_mime_part_new (); data = eab_contact_list_to_string (contacts); -- cgit From dd797d23c8de2d4971ea395b59b239b13866e8e4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 23 Sep 2008 11:42:18 +0000 Subject: ** Fix for bug #553273 2008-09-23 Milan Crha ** Fix for bug #553273 * addressbook/gui/component/addressbook-view.c: (delete_addressbook_folder), (delete_addressbook_cb): * addressbook/gui/widgets/eab-gui-util.c: (save_it): * addressbook/gui/contact-list-editor/e-contact-list-model.c: (e_contact_list_model_add_email): * addressbook/gui/contact-list-editor/e-contact-list-editor.c: (contact_list_editor_contact_exists): * plugins/exchange-operations/exchange-config-listener.c: (exchange_config_listener_authenticate): * mail/em-composer-utils.c: (em_utils_handle_receipt): * mail/em-folder-view.c: (emfv_delete_msg_response): * composer/e-composer-actions.c: (action_save_cb): * calendar/gui/alarm-notify/alarm-queue.c: (edit_component): * calendar/gui/tasks-component.c: (delete_task_list_cb): * calendar/gui/calendar-component.c: (delete_calendar_cb): * calendar/gui/memos-component.c: (delete_memo_list_cb): Always end e_error_run/e_error_new calls with NULL parameter. svn path=/trunk/; revision=36434 --- addressbook/gui/widgets/eab-gui-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index ac6f89c582..d6a6b3ca71 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -404,7 +404,7 @@ save_it(GtkWidget *widget, SaveAsInfo *info) * {0}, {1} and {2}, respectively in the error message formed */ e_error_run (GTK_WINDOW (info->filesel), "addressbook:save-error", - err_str_ext, filename, g_strerror (errno)); + err_str_ext, filename, g_strerror (errno), NULL); gtk_widget_destroy(GTK_WIDGET(info->filesel)); return; } -- cgit From 044925165fcc12e33d7c67df79021679aefb5dc4 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 24 Sep 2008 09:12:38 +0000 Subject: License changes from GPL to LGPL svn path=/trunk/; revision=36440 --- addressbook/gui/widgets/e-addressbook-model.c | 21 +++++++++++++++++---- addressbook/gui/widgets/eab-gui-util.c | 27 ++++++++++++++------------- addressbook/gui/widgets/eab-vcard-control.c | 26 ++++++++++++-------------- 3 files changed, 43 insertions(+), 31 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index aa5c53ae1b..7599a85abd 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -1,10 +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. * - * Author: - * Christopher James Lahey + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Christopher James Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * (C) 1999 Ximian, Inc. */ #include diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index d6a6b3ca71..b220f7670e 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-table-field-chooser.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Toshok - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #include diff --git a/addressbook/gui/widgets/eab-vcard-control.c b/addressbook/gui/widgets/eab-vcard-control.c index 2379559e3d..1e890167f6 100644 --- a/addressbook/gui/widgets/eab-vcard-control.c +++ b/addressbook/gui/widgets/eab-vcard-control.c @@ -1,26 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * eab-vcard-control.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * * This program is free software; you can redistribute it and/or - * modify it under the terms of 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 * - * 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: - * Chris Lahey - * Chris Toshok + * Chris Lahey + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include -- cgit From 762ac32d75dc9ad72e66969afda09766592fd42f Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 24 Sep 2008 11:02:48 +0000 Subject: Change License from GPL to LGPL svn path=/trunk/; revision=36443 --- addressbook/gui/widgets/e-addressbook-view.c | 29 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 142ed3550f..b85b2324b9 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1,23 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-addressbook-view.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * Chris Toshok - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #include -- cgit From 3b318d5cbf08f6a42088df23db27fcfa55502591 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Wed, 1 Oct 2008 09:24:41 +0000 Subject: Change License from GPL to LGPL. svn path=/trunk/; revision=36520 --- addressbook/gui/widgets/e-minicard.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index a4bda1ac4a..83e3692921 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * e-minicard.c - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Author: Chris Lahey - * - * This library 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 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 - * General Public License for more details. + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see + * + * + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. */ #include -- cgit From 484f82addc35c7668025e053a5414529f156abdd Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 3 Oct 2008 09:24:07 +0000 Subject: Change licese from GPL to LGPL. svn path=/trunk/; revision=36539 --- addressbook/gui/widgets/eab-contact-display.c | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index bc2e32c338..6ee38d41c9 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -1,22 +1,22 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * Authors: Chris Toshok + * 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 * - * 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: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * */ -- cgit From 9b9fc60f585b27e2256dd54399a1cac6a37c70e6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 9 Oct 2008 13:01:18 +0000 Subject: ** Fixes bug #555494 2008-10-09 Matthew Barnes ** Fixes bug #555494 * addressbook/gui/widgets/e-addressbook-view.c (generate_viewoption_menu): * calendar/gui/cal-search-bar.c (generate_viewoption_menu): Category icons are not themed. Load by file, not by icon name. svn path=/trunk/; revision=36581 --- addressbook/gui/widgets/e-addressbook-view.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index b85b2324b9..cda3922a87 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1479,9 +1479,8 @@ generate_viewoption_menu (EABSearchBarItem *subitems) if (subitems[i].image) { GtkWidget *image; - image = gtk_image_new_from_icon_name ( - subitems[i].image, - GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_file ( + subitems[i].image); gtk_image_menu_item_set_image ( GTK_IMAGE_MENU_ITEM (menu_item), image); -- cgit From 585ed6226b62b7fe152557c81d8f8332de97be69 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 30 Oct 2008 16:52:23 +0000 Subject: Only include the toplevel GTK+ header. 2008-10-30 Matthew Barnes * addressbook/gui/contact-editor/test-editor.c: * addressbook/gui/widgets/e-minicard-label.c: * addressbook/gui/widgets/e-minicard-view-widget.c: * addressbook/gui/widgets/test-reflow.c: * calendar/gui/control-factory.c: * calendar/gui/e-calendar-table.c: * calendar/gui/e-week-view-event-item.c: * calendar/gui/weekday-picker.c: * e-util/e-icon-factory.c: * shell/importer/evolution-importer-client.h: * shell/importer/intelligent.c: * shell/test/evolution-test-component.c: * widgets/menus/gal-view-menus.c: * widgets/misc/e-activity-handler.c: * widgets/table/e-table-config-field.h: Only include the toplevel GTK+ header. svn path=/trunk/; revision=36699 --- addressbook/gui/widgets/e-minicard-label.c | 2 +- addressbook/gui/widgets/e-minicard-view-widget.c | 2 +- addressbook/gui/widgets/test-reflow.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 7cc835cae4..85f2c5fd28 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -25,7 +25,7 @@ #include "e-minicard-label.h" #include "eab-marshal.h" -#include +#include #include #include #include diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index 2796bfe433..d416da2015 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c index 8853e7f748..f0faf7899c 100644 --- a/addressbook/gui/widgets/test-reflow.c +++ b/addressbook/gui/widgets/test-reflow.c @@ -50,8 +50,7 @@ #include "config.h" -#include -#include +#include #include #include #include -- cgit From a3b8881d09c0a6854b12551dcee89c87c28739fe Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 4 Dec 2008 11:06:37 +0000 Subject: ** Fix for bug #263268 2008-12-04 Milan Crha ** Fix for bug #263268 * gui/widgets/e-addressbook-view.c: (search_activated), (make_suboptions): Be able to search for contacts without category. svn path=/trunk/; revision=36830 --- addressbook/gui/widgets/e-addressbook-view.c | 32 +++++++++++++++++++--------- 1 file changed, 22 insertions(+), 10 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index cda3922a87..cc5558324e 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1403,8 +1403,12 @@ search_activated (ESearchBar *esb, EABView *v) if (subid) { master_list = get_master_list (FALSE); - category_name = g_list_nth_data (master_list, subid-1); - view_sexp = g_strdup_printf ("(is \"category_list\" \"%s\")", category_name); + if (subid < 3) { + view_sexp = g_strdup ("(not (and (exists \"CATEGORIES\") (not (is \"CATEGORIES\" \"\"))))"); + } else { + category_name = g_list_nth_data (master_list, subid-3); + view_sexp = g_strdup_printf ("(is \"category_list\" \"%s\")", category_name); + } search_query = g_strconcat ("(and ", view_sexp, search_query, ")", NULL); g_free (view_sexp); } @@ -1518,24 +1522,32 @@ make_suboptions (EABView *view) master_list = get_master_list (FALSE); N = g_list_length (master_list); - subitems = g_new (EABSearchBarItem, N+2); + subitems = g_new (EABSearchBarItem, N+4); subitems[0].search.id = 0; subitems[0].search.text = g_strdup (_("Any Category")); subitems[0].image = NULL; + subitems[1].search.text = g_strdup (_("Unmatched")); + subitems[1].search.id = 1; + subitems[1].image = NULL; + + subitems[2].search.text = NULL; + subitems[2].search.id = 0; + subitems[2].image = NULL; + for (i=0; isearch, menu); -- cgit From 7b221ebc07a7867c3528b113e82f25a01816a015 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Dec 2008 19:20:28 +0000 Subject: ** Fix for bug #332629 2008-12-05 Milan Crha ** Fix for bug #332629 * filter/filter-option.h: (struct _filter_option), (struct _FilterOption), (filter_option_add): * filter/filter-option.c: (filter_option_init), (filter_option_finalise), (filter_option_add), (xml_create), (get_widget), (clone): Be able to define optionlist with dynamically created list of options. * filter/filter-label.c: (fill_options): Adapt. * addressbook/gui/widgets/addresstypes.xml: * calendar/gui/caltypes.xml: * calendar/gui/memotypes.xml: * calendar/gui/tasktypes.xml: Use dynamically created list of categories in the option's widget. svn path=/trunk/; revision=36836 --- addressbook/gui/widgets/addresstypes.xml | 67 +------------------------------- 1 file changed, 1 insertion(+), 66 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/addresstypes.xml b/addressbook/gui/widgets/addresstypes.xml index 813bf1c0ac..c93f9cac19 100644 --- a/addressbook/gui/widgets/addresstypes.xml +++ b/addressbook/gui/widgets/addresstypes.xml @@ -74,72 +74,7 @@ - - - - - - - - - - - - - - - - - - - - - - + -- cgit From d6adb922d354cb7f46bb7eb52ce1d9034a5de0c3 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 8 Dec 2008 08:31:08 +0000 Subject: Patch from Jennifer Newman : Fix for bug #549964 (Fix for a few erroneous strings). svn path=/trunk/; revision=36845 --- addressbook/gui/widgets/eab-gui-util.c | 37 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index b220f7670e..168c0bb7fa 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -107,46 +107,45 @@ eab_load_error_dialog (GtkWidget *parent, ESource *source, EBookStatus status) if (status == E_BOOK_ERROR_OFFLINE_UNAVAILABLE) { can_detail_error = FALSE; - label_string = _("We were unable to open this address book. This either means " - "this book is not marked for offline usage or not yet downloaded " + label_string = _("This address book cannot be opened. This either means this " + "book is not marked for offline usage or not yet downloaded " "for offline usage. Please load the address book once in online mode " - "to download its contents"); + "to download its contents."); } else if (!strncmp (uri, "file:", 5)) { char *path = g_filename_from_uri (uri, NULL, NULL); label = g_strdup_printf ( - _("We were unable to open this address book. Please check that the " - "path %s exists and that you have permission to access it."), path); + _("This address book cannot be opened. Please check that the " + "path %s exists and that permissions are set to access it."), path); g_free (path); label_string = label; } + +#ifndef HAVE_LDAP else if (!strncmp (uri, "ldap:", 5)) { /* special case for ldap: contact folders so we can tell the user about openldap */ -#ifdef HAVE_LDAP - label_string = - _("We were unable to open this address book. This either " - "means you have entered an incorrect URI, or the LDAP server " - "is unreachable."); -#else + can_detail_error = FALSE; label_string = _("This version of Evolution does not have LDAP support " - "compiled in to it. If you want to use LDAP in Evolution, " - "you must install an LDAP-enabled Evolution package."); + "compiled in to it. To use LDAP in Evolution " + "an LDAP-enabled Evolution package must be installed."); + + } #endif - } else { - /* other network folders */ + else { + /* other network folders (or if ldap is enabled and server is unreachable) */ label_string = - _("We were unable to open this address book. This either " - "means you have entered an incorrect URI, or the server " + _("This address book cannot be opened. This either " + "means that an incorrect URI was entered, or the server " "is unreachable."); } if (can_detail_error) { /* do not show repository offline message, it's kind of generic error */ if (status != E_BOOK_ERROR_REPOSITORY_OFFLINE && status > 0 && status < G_N_ELEMENTS (status_to_string) && status_to_string [status]) { - label = g_strconcat (label_string, "\n\n", _("Detailed error:"), " ", _(status_to_string [status]), NULL); + label = g_strconcat (label_string, "\n\n", _("Detailed error message:"), " ", _(status_to_string [status]), NULL); label_string = label; } } @@ -176,7 +175,7 @@ eab_search_result_dialog (GtkWidget *parent, break; case E_BOOK_VIEW_STATUS_TIME_LIMIT_EXCEEDED: str = _("The time to execute this query exceeded the server limit or the limit\n" - "you have configured for this address book. Please make your search\n" + "configured for this address book. Please make your search\n" "more specific or raise the time limit in the directory server\n" "preferences for this address book."); break; -- cgit From 4eed8ee19e71b199239dc12e936e9b3e650eb2fc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 8 Dec 2008 11:01:38 +0000 Subject: ** Fix for bug #270376 2008-12-08 Milan Crha ** Fix for bug #270376 * gui/contact-editor/e-contact-editor.c: (im_service []), (non_string_fields[]): * gui/widgets/eab-contact-display.c: (render_contact): Support Skype field in a contact. * gui/contact-editor/e-contact-editor-im.c: Changes here too, but file doesn't seem to be used. svn path=/trunk/; revision=36849 --- addressbook/gui/widgets/eab-contact-display.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 6ee38d41c9..f8a15a06fa 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -72,6 +72,7 @@ common_location [] = #define MSN_ICON "im-msn" #define YAHOO_ICON "im-yahoo" #define GADUGADU_ICON "im-gadugadu" +#define SKYPE_ICON "stock_people" #define VIDEOCONF_ICON "stock_video-conferencing" #define MAX_COMPACT_IMAGE_DIMENSION 48 @@ -618,6 +619,7 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact) accum_multival_attribute (accum, contact, _("MSN"), E_CONTACT_IM_MSN, MSN_ICON, 0); accum_multival_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0); accum_multival_attribute (accum, contact, _("Gadu-Gadu"), E_CONTACT_IM_GADUGADU, GADUGADU_ICON, 0); + accum_multival_attribute (accum, contact, _("Skype"), E_CONTACT_IM_SKYPE, SKYPE_ICON, 0); if (accum->len > 0) gtk_html_stream_printf (html_stream, "%s", accum->str); -- cgit From 37362c7b255ab1b932db1c9e41da146dd43abfa7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 8 Jan 2009 11:09:02 +0000 Subject: ** Fix for bug #339879 2009-01-08 Milan Crha ** Fix for bug #339879 * filter/filter-code.h: (filter_code_new): * filter/filter-code.c: (filter_code_new), (build_code): * filter/rule-context.c: (new_element): Have two types of code expression, one "code", which adds also a "match-all" into the expression, and a "rawcode" without it. * addressbook/gui/widgets/addresstypes.xml: Use "rawcode" instead of "code" to have not added a "match-all" into the expression. svn path=/trunk/; revision=37014 --- addressbook/gui/widgets/addresstypes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/addresstypes.xml b/addressbook/gui/widgets/addresstypes.xml index c93f9cac19..cef8000cc4 100644 --- a/addressbook/gui/widgets/addresstypes.xml +++ b/addressbook/gui/widgets/addresstypes.xml @@ -79,7 +79,7 @@ Expression - + -- cgit From 97e48e352419d360934a46a05c944d604fd968e9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 10 Jan 2009 23:41:27 +0000 Subject: ** Fixes bug #567276 2009-01-10 Matthew Barnes ** Fixes bug #567276 * addressbook/gui/widgets/e-addressbook-view.c: * addressbook/printing/test-print.c: * calendar/gui/calendar-commands.c: * calendar/gui/control-factory.c: * calendar/gui/e-itip-control.c: * calendar/gui/gnome-cal.c: * calendar/gui/goto.c: * calendar/gui/memos-control.c: * calendar/gui/print.c: * calendar/gui/tasks-control.c: * calendar/gui/alarm-notify/alarm-queue.c: * calendar/gui/dialogs/schedule-page.c: * widgets/menus/gal-view-menus.c: Remove unneeded #include . * calendar/gui/calendar-config.c: * calendar/gui/calendar-config.h: Removed unused function calendar_config_check_timezone_set(). * widgets/misc/test-color.c: We don't ship this. Remove it. svn path=/trunk/; revision=37030 --- addressbook/gui/widgets/e-addressbook-view.c | 1 - 1 file changed, 1 deletion(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index cc5558324e..dc0b234745 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -32,7 +32,6 @@ #include #include #include -#include #include "addressbook/printing/e-contact-print.h" #include "addressbook/gui/widgets/eab-popup.h" -- cgit From 577f9fdffbbb9e57b44b0290f1aea8088c6f0976 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Jan 2009 04:52:38 +0000 Subject: Remove unneeded #include . 2009-01-10 Matthew Barnes * addressbook/gui/contact-editor/e-contact-editor-address.c: * addressbook/gui/contact-editor/e-contact-editor-fullname.c: * addressbook/gui/contact-editor/e-contact-editor-im.c: * addressbook/gui/widgets/e-addressbook-view.c: * addressbook/printing/e-contact-print.c: * calendar/gui/calendar-commands.c: * calendar/gui/e-cal-list-view.c: * calendar/gui/e-day-view.c: * calendar/gui/e-itip-control.c: * calendar/gui/e-meeting-list-view.c: * calendar/gui/e-meeting-store.c: * calendar/gui/e-week-view.c: * calendar/gui/gnome-cal.c: * calendar/gui/memos-control.c: * calendar/gui/tasks-control.c: * e-util/e-dialog-utils.c: * mail/em-folder-view.c: * mail/importers/mail-importer.c: * shell/e-shell.c: * shell/evolution-shell-component-utils.c: * shell/importer/intelligent.c: * shell/main.c: * widgets/menus/gal-view-collection.c: * widgets/menus/gal-view-instance.c: Remove unneeded #include . svn path=/trunk/; revision=37036 --- addressbook/gui/widgets/e-addressbook-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index dc0b234745..3b1fd8191c 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -24,7 +24,6 @@ #include #include -#include #include #include
#include @@ -554,7 +553,8 @@ init_collection (void) gal_view_collection_set_title (collection, _("Address Book")); - galview = gnome_util_prepend_user_home("/.evolution/addressbook/views"); + galview = g_build_filename ( + e_get_user_data_dir (), "addressbook", "views", NULL); addressbookdir = g_build_filename (EVOLUTION_GALVIEWSDIR, "addressbook", NULL); -- cgit From 2b820fc4e2d6404ca281e279761cd5f877fdbf54 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Jan 2009 13:55:04 +0000 Subject: New convenience function calls gtk_show_uri() and displays an error dialog 2009-01-11 Matthew Barnes * e-util/e-util.c (e_show_uri): New convenience function calls gtk_show_uri() and displays an error dialog if the URI cannot be shown. * addressbook/gui/widgets/eab-contact-display.c (eab_uri_popup_link_open), (on_link_clicked): * calendar/gui/e-cal-component-preview (on_link_clicked): * calendar/gui/e-cal-component-memo-preview (on_link_clicked): * calendar/gui/e-memo-table.c (open_url_cb): * calendar/gui/dialogs/comp-editor.c (open_attachment): * composer/e-msg-composer.c (msg_composer_link_clicked): * mail/em-folder-view.c (emfv_format_link_clicked): * mail/em-popup.c (emp_uri_popup_link_open): * plugins/mailing-list-actions/mailing-list-actions.c (emla_list_action_do): * shell/e-shell-window-commands.c (command_open_faq): * widgets/misc/e-attachment-bar.c (eab_icon_clicked_cb): * widgets/misc/e-url-entry.c (button_clicked_cb): Call e_show_uri() instead of gnome_url_show(). * e-util/e-error.c (ee_response): Call e_display_help() instead of gnome_url_show(). * mail/em-config.c: * mail/em-menu.c: Remove unneeded #include svn path=/trunk/; revision=37037 --- addressbook/gui/widgets/eab-contact-display.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index f8a15a06fa..4e7418dc5c 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -28,12 +28,12 @@ #include "eab-popup.h" #include "eab-gui-util.h" +#include "e-util/e-util.h" #include "e-util/e-html-utils.h" #include "e-util/e-icon-factory.h" #include #include -#include #include #include @@ -81,13 +81,9 @@ static void eab_uri_popup_link_open(EPopup *ep, EPopupItem *item, void *data) { EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target; - GError *err = NULL; - gnome_url_show(t->uri, &err); - if (err) { - g_warning("gnome_url_show: %s", err->message); - g_error_free(err); - } + /* FIXME Pass a parent window. */ + e_show_uri (NULL, t->uri); } static void @@ -258,13 +254,11 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle, } static void -on_link_clicked (GtkHTML *html, const char *url, EABContactDisplay *display) +on_link_clicked (GtkHTML *html, const char *uri, EABContactDisplay *display) { - GError *err = NULL; - #ifdef HANDLE_MAILTO_INTERNALLY - if (!strncmp (url, "internal-mailto:", strlen ("internal-mailto:"))) { - int mail_num = atoi (url + strlen ("internal-mailto:")); + if (!strncmp (uri, "internal-mailto:", strlen ("internal-mailto:"))) { + int mail_num = atoi (uri + strlen ("internal-mailto:")); if (mail_num == -1) return; @@ -275,12 +269,8 @@ on_link_clicked (GtkHTML *html, const char *url, EABContactDisplay *display) } #endif - gnome_url_show (url, &err); - - if (err) { - g_warning ("gnome_url_show: %s", err->message); - g_error_free (err); - } + /* FIXME Pass a parent window. */ + e_show_uri (NULL, uri); } #if 0 -- cgit From 51dba6bd0c19773ba8b631efbf51c07d548fc75c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 1 Feb 2009 01:18:42 +0000 Subject: ** Disable debug macros (#define d(x) x) throughout. (#569638) 2009-01-31 Matthew Barnes ** Disable debug macros (#define d(x) x) throughout. (#569638) svn path=/trunk/; revision=37202 --- addressbook/gui/widgets/gal-view-minicard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c index 02276a6960..4645517bfc 100644 --- a/addressbook/gui/widgets/gal-view-minicard.c +++ b/addressbook/gui/widgets/gal-view-minicard.c @@ -34,7 +34,7 @@ #include "gal-view-minicard.h" #define PARENT_TYPE gal_view_get_type () -#define d(x) x +#define d(x) static GalViewClass *gal_view_minicard_parent_class; -- cgit From 547e40879a899197ca6cc97fd3ff61df8e6b2758 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 12 Feb 2009 11:09:31 +0000 Subject: ** Fix for bug #404232 2009-02-12 Milan Crha ** Fix for bug #404232 * addressbook/gui/widgets/e-addressbook-view.c: (search_activated): Rebuild view immediately for an advanced search too. * widgets/misc/e-filter-bar.c: (rule_advanced_response): Emit signal after search bar text is set, thus the text will not be empty, which is considered as "no search" these days. svn path=/trunk/; revision=37253 --- addressbook/gui/widgets/e-addressbook-view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 3b1fd8191c..c138df8ff2 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1369,7 +1369,8 @@ search_activated (ESearchBar *esb, EABView *v) NULL); if (search_type == E_FILTERBAR_ADVANCED_ID) { - // gtk_widget_show(eab_search_dialog_new(v)); + /* rebuild view immediately */ + query_changed (esb, v); } else { if ((search_word && strlen (search_word))) { -- cgit From e42f27652709397453431b75c32601a4f4effd48 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Apr 2009 10:02:07 -0400 Subject: Bug 577929 – Consolidate marshallers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate all marshalling specifications to e-util/e-marshal.list. This reduces code duplication and makes it slightly easier to locate unused marshallers. --- addressbook/gui/widgets/Makefile.am | 8 -------- addressbook/gui/widgets/e-addressbook-model.c | 4 ++-- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 4 ++-- addressbook/gui/widgets/e-addressbook-view.c | 1 - addressbook/gui/widgets/e-minicard-label.c | 1 - addressbook/gui/widgets/e-minicard-view-widget.c | 4 ++-- addressbook/gui/widgets/e-minicard-view.c | 4 ++-- addressbook/gui/widgets/e-minicard.c | 5 ++--- addressbook/gui/widgets/eab-marshal.list | 2 -- 9 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 addressbook/gui/widgets/eab-marshal.list (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 88c7f07011..e14f274f4e 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -27,7 +27,6 @@ eabinclude_HEADERS = \ eab-popup.h libeabwidgets_la_SOURCES = \ - $(MARSHAL_GENERATED) \ eab-config.c \ eab-contact-display.c \ eab-contact-display.h \ @@ -61,12 +60,6 @@ libeabwidgets_la_SOURCES = \ gal-view-factory-minicard.c \ gal-view-factory-minicard.h -MARSHAL_GENERATED = eab-marshal.c eab-marshal.h -@EVO_MARSHAL_RULE@ - -BUILT_SOURCES = $(MARSHAL_GENERATED) -CLEANFILES = $(BUILT_SOURCES) - dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) @@ -74,5 +67,4 @@ etspec_DATA= e-addressbook-view.etspec EXTRA_DIST = \ $(etspec_DATA) \ - eab-marshal.list \ addresstypes.xml diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 7599a85abd..7273689fd1 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -24,7 +24,7 @@ #include #include #include -#include "eab-marshal.h" +#include "e-util/e-util.h" #include "e-addressbook-model.h" #include #include @@ -380,7 +380,7 @@ eab_model_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EABModelClass, contact_added), NULL, NULL, - eab_marshal_NONE__INT_INT, + e_marshal_NONE__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT); eab_model_signals [CONTACTS_REMOVED] = diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 1630161878..1f2b1aad7a 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -20,7 +20,7 @@ #include #include -#include "eab-marshal.h" +#include "e-util/e-util.h" #include "e-addressbook-reflow-adapter.h" #include "e-addressbook-model.h" #include "e-addressbook-view.h" @@ -434,7 +434,7 @@ e_addressbook_reflow_adapter_class_init (GObjectClass *object_class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EAddressbookReflowAdapterClass, drag_begin), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); model_class->set_width = addressbook_set_width; diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index c138df8ff2..3c0c28f6ad 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -45,7 +45,6 @@ #include "gal-view-minicard.h" #include "gal-view-factory-minicard.h" -#include "eab-marshal.h" #include "e-addressbook-view.h" #include "e-addressbook-model.h" #include "eab-gui-util.h" diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c index 85f2c5fd28..696d42dcd9 100644 --- a/addressbook/gui/widgets/e-minicard-label.c +++ b/addressbook/gui/widgets/e-minicard-label.c @@ -23,7 +23,6 @@ #include #include "e-minicard-label.h" -#include "eab-marshal.h" #include #include diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c index d416da2015..0f9ae7c143 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -27,7 +27,7 @@ #include #include -#include "eab-marshal.h" +#include "e-util/e-util.h" #include "e-minicard-view-widget.h" static void e_minicard_view_widget_init (EMinicardViewWidget *widget); @@ -164,7 +164,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardViewWidgetClass, right_click), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); } diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c index 803df061a2..ccf3ecc6f9 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -25,8 +25,8 @@ #include "e-minicard-view.h" #include "eab-gui-util.h" -#include "eab-marshal.h" #include "util/eab-book-util.h" +#include "e-util/e-util.h" #include #include @@ -553,7 +553,7 @@ e_minicard_view_class_init (EMinicardViewClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardViewClass, right_click), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); item_class->event = e_minicard_view_event; diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c index 83e3692921..cbbcc80d5c 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -31,7 +31,6 @@ #include #include #include -#include "eab-marshal.h" #include "eab-gui-util.h" #include "e-minicard.h" #include "e-minicard-label.h" @@ -207,7 +206,7 @@ e_minicard_class_init (EMinicardClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardClass, selected), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); e_minicard_signals [DRAG_BEGIN] = @@ -216,7 +215,7 @@ e_minicard_class_init (EMinicardClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EMinicardClass, drag_begin), NULL, NULL, - eab_marshal_INT__POINTER, + e_marshal_INT__POINTER, G_TYPE_INT, 1, G_TYPE_POINTER); e_minicard_signals [STYLE_SET] = diff --git a/addressbook/gui/widgets/eab-marshal.list b/addressbook/gui/widgets/eab-marshal.list deleted file mode 100644 index 867355e96e..0000000000 --- a/addressbook/gui/widgets/eab-marshal.list +++ /dev/null @@ -1,2 +0,0 @@ -INT:POINTER -NONE:INT,INT -- cgit