diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 100 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 6 | ||||
| -rw-r--r-- | addressbook/gui/widgets/e-addressbook-view.c | 24 | ||||
| -rw-r--r-- | addressbook/gui/widgets/eab-gui-util.c | 29 |
4 files changed, 15 insertions, 144 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 3d76917669..e958c42b4f 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,86 +1,13 @@ -2005-05-16 Not Zed <NotZed@Ximian.com> - - * moved e-error to e-util - - * Makefile.am: renamed error xml file & u18n stuff. - -2005-05-16 Srinivasa Ragavan <sragavan@novell.com> - - * gui/components/GNOME_Evolution_Addressbook.server.in.in: Added tooltips - -2005-05-12 Ulrich Neumann <uli@myuli.com> - - * gui/contact-editor/contact-editor.glade: - Fixed wrong xalign of Zip/Postal Code. This - was very ugly in languages like german, dutch etc. - -2005-05-11 Srinivasa Ragavan <sragavan@novell.com> - * gui/widgets//e-minicard.c: (add_field), (remodel): - Fixed the bug 209416. It shows a different view for contact lists - - -2005-05-09 Sushma Rai <rsushma@novell.com> - - * gui/widgets/eab-gui-util.c (eab_contact_save)(eab_contact_list_save): - Finding if multiple contacts or a single contact has been selected for - saving, and storing it in SaveAsInfo structure. - (save_it): Depending on selected contacts, forming a part of error - message. - - * addressbook-errors.xml: Changed the save-error message, to read - string contact/contacts. - Fixes #261969. - -2005-05-09 Sushma Rai <rsushma@novell.com> - - * gui/widgets/e-addressbook-view.c (eab_view_delete_selection): Checking - if single or multiple contacts/contact lists are being deleted. Also - finding the name, if the single contact/contact list is being deleted. - - * gui/contact-editor/eab-editor.c (eab_editor_confirm_delete): Forming - the display messages based on the contact/contact list and number of - contacts/contact lists being deleted. - Fixes #222599 - -2005-05-06 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #301459 - * gui/contact-list-editor/contact-list-editor.glade: Corrected - the spelling for addresses and address. - -2005-05-06 Chenthill Palanisamy <pchenthill@novell.com> - - Fixes #272464 - * addressbook-errors.xml: - * addressbook-errors.xml.h: Changed the primary and secondary - to make it more clear. - 2005-04-28 Ross Burton <ross@burtonini.com> * gui/widgets/e-addressbook-view.c: * gui/widgets/eab-contact-display.c: Fix some memory leaks. -2005-04-21 Mengjie Yu <meng-jie.yu@sun.com> - - * gui/widgets/e-minicard-view-widget.c: - (e_minicard_view_widget_class_init), - (e_minicard_view_widget_real_focus_in_event): - Add focus_in_event function. - - Fixes #300968 (gnome bugzilla bugID) - -2005-04-17 Mengjie Yu <meng-jie.yu@sun.com> - - * gui/widgets/e-minicard.c: (e_minicard_event): - We should incarnate the reflow item if it doesn't exist. - - Fixes #300970 (gnome bugzilla bugID) - 2005-04-04 Sivaiah Nallagatla <snallagatla@novell.com> * gui/component/addressbook.c (load_source_auth_cb) - (addressbook_authenticate) : get the uri from Ebook + (addressbook_authenticate) : get the uri from Ebook instead of Esource. e_source_get_uri returns NULL when it does not have a reference to source group with it which happens when the source list from which this source @@ -90,26 +17,11 @@ 2005-04-03 Sivaiah Nallagatla <snallagatla@novell.com> - * gui/widgets/eab-gui-util.c (do_copy) : - use eab_merging_book_add_contact instead of - e_book_async_add_contact to take care of duplicate - checking - Fixes #74255 - -2005-03-16 Li Yuan <li.yuan@sun.com> - - * gui/widgets/gal-view-minicard.c: (gal_view_minicard_class_init): - remove the edit function. - - Fixes #40762 - -2005-03-16 Mengjie Yu <meng-jie.yu@sun.com> - - * gui/widgets/e-addressbook-view.c: (search_menu_activated): - make the search field consistent with the Search Dialog. - - Fixes #73270 - + * gui/widgets/eab-gui-util.c (do_copy) : + use eab_merging_book_add_contact instead of + e_book_async_add_contact to take care of duplicate + checking + Fixes #74255 2005-03-03 Sivaiah Nallagatla <snallagatla@novell.com> diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index aa70808942..5f2a604e3b 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -29,14 +29,13 @@ #include <libebook/e-book.h> #include <libedataserverui/e-passwords.h> -#include "e-util/e-error.h" +#include "widgets/misc/e-error.h" #include "addressbook.h" #define d(x) static void addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *source, EBookCallback cb, gpointer closure); -static void auth_required_cb (EBook *book, gpointer data); typedef struct { EBookCallback cb; @@ -221,7 +220,8 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc } else { /* they hit cancel */ - cb (book, E_BOOK_ERROR_CANCELLED, closure); + + cb (book, E_BOOK_ERROR_CANCELLED, closure); } g_free (uri); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 7ca110adad..25cd02bba4 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -69,7 +69,7 @@ #endif #include "eab-contact-merging.h" -#include "e-util/e-error.h" +#include "widgets/misc/e-error.h" #include "e-contact-editor.h" #include <gdk/gdkkeysyms.h> @@ -1500,7 +1500,7 @@ static void search_menu_activated (ESearchBar *esb, int id, EABView *view) { if (id == ESB_ADVANCED) - e_search_bar_set_item_id (esb, id); + gtk_widget_show(eab_search_dialog_new(view)); } static void @@ -1854,27 +1854,11 @@ void eab_view_delete_selection(EABView *view) { GList *list, *l; - gboolean plural = FALSE, is_list = FALSE; - EContact *contact; - char *name = NULL; - list = get_selected_contacts (view); - contact = list->data; - - if (g_list_next(list)) - plural = TRUE; - else - name = e_contact_get (contact, E_CONTACT_FILE_AS); - - if (e_contact_get (contact, E_CONTACT_IS_LIST)) - is_list = TRUE; - - if (!eab_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(view->widget)), - plural, is_list, name)) { - g_free (name); + if (!eab_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(view->widget)))) return; - } + list = get_selected_contacts(view); if (e_book_check_static_capability (view->book, "bulk-remove")) { GList *ids = NULL; diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 460168797e..a6c4517cb1 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -31,7 +31,7 @@ #include "eab-gui-util.h" #include "util/eab-book-util.h" #include <libebook/e-destination.h> -#include "e-util/e-error.h" +#include "widgets/misc/e-error.h" #include "widgets/misc/e-image-chooser.h" #include <e-util/e-icon-factory.h> #include "eab-contact-merging.h" @@ -323,7 +323,6 @@ file_exists(GtkWindow *window, const char *filename) typedef struct { GtkWidget *filesel; char *vcard; - gboolean has_multiple_contacts; } SaveAsInfo; static void @@ -352,23 +351,7 @@ save_it(GtkWidget *widget, SaveAsInfo *info) return; } } else if (error != 0) { - char *err_str_ext; - if (info->has_multiple_contacts) { - /* more than one, finding the total number of contacts might - * hit performance while saving large number of contacts - */ - err_str_ext = ngettext ("contact", "contacts", 2); - } - else { - err_str_ext = ngettext ("contact", "contacts", 1); - } - - /* translators: Arguments, err_str_ext (item to be saved: "contact"/"contacts"), - * destination file name, and error code will fill the placeholders - * {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)); + e_error_run (GTK_WINDOW (info->filesel), "addressbook:save-error", filename, g_strerror (errno)); return; } @@ -496,8 +479,6 @@ eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window) name = e_contact_get (contact, E_CONTACT_FILE_AS); file = make_safe_filename (name); - info->has_multiple_contacts = FALSE; - #ifdef USE_GTKFILECHOOSER filesel = gtk_file_chooser_dialog_new (title, parent_window, @@ -562,12 +543,6 @@ eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window) filesel = gtk_file_selection_new(title); #endif - /* Check if the list has more than one contact */ - if (g_list_next (list)) - info->has_multiple_contacts = TRUE; - else - info->has_multiple_contacts = FALSE; - /* This is a filename. Translators take note. */ if (list && list->data && list->next == NULL) { char *name; |