From e3627ebef641dfb700b1bbc713c0855a771aa384 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 3 Aug 2008 03:12:49 +0000 Subject: ** Fixes bug #546057 2008-08-02 Matthew Barnes ** Fixes bug #546057 * gui/component/GNOME_Evolution_Addressbook.server.in.in: * gui/contact-list-editor/contact-list-editor.glade: Use "x-office-address-book" icon name instead of "stock_addressbook". * gui/GNOME_Evolution_Calendar.server.in.in: * gui/calendar-component.c: * gui/e-calendar-view.c: * gui/dialogs/alarm-dialog.c: * gui/dialogs/alarm-list-dialog.c: * gui/dialogs/changed-comp.c: * gui/dialogs/comp-editor.c: * gui/dialogs/delete-error.c: * gui/dialogs/select-source-dialog.c: Use "x-office-calendar" icon name instead of "stock_calendar". svn path=/trunk/; revision=35892 --- addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in index feef3bdfc9..4fe2ce7a6a 100644 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in @@ -50,7 +50,7 @@ - + -- cgit v1.2.3 From 6dd3a55a40a84a8666069d5122f715f93fc03251 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 4 Aug 2008 03:40:06 +0000 Subject: Matthew Barnes ** Fixes bug #249844 (Use C_() macro instead of Q_() macro, Use fully qualified names for New submenu entries). svn path=/trunk/; revision=35897 --- addressbook/gui/component/addressbook-component.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index b55cb9bd16..cc109fb0a3 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -226,7 +226,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[0].id = "contact"; list->_buffer[0].description = _("New Contact"); - list->_buffer[0].menuDescription = _("_Contact"); + list->_buffer[0].menuDescription = C_("New", "_Contact"); list->_buffer[0].tooltip = _("Create a new contact"); list->_buffer[0].menuShortcut = 'c'; list->_buffer[0].iconName = "contact-new"; @@ -234,7 +234,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[1].id = "contact_list"; list->_buffer[1].description = _("New Contact List"); - list->_buffer[1].menuDescription = _("Contact _List"); + list->_buffer[1].menuDescription = C_("New", "Contact _List"); list->_buffer[1].tooltip = _("Create a new contact list"); list->_buffer[1].menuShortcut = 'l'; list->_buffer[1].iconName = "stock_contact-list"; @@ -242,7 +242,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[2].id = "address_book"; list->_buffer[2].description = _("New Address Book"); - list->_buffer[2].menuDescription = _("Address _Book"); + list->_buffer[2].menuDescription = C_("New", "Address _Book"); list->_buffer[2].tooltip = _("Create a new address book"); list->_buffer[2].menuShortcut = '\0'; list->_buffer[2].iconName = "address-book-new"; -- cgit v1.2.3 From 6bf36561f19fede5232329407dbdbd1dec82f33c Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Wed, 6 Aug 2008 09:32:08 +0000 Subject: ** Fix for bug #467115 2008-08-06 Michael Monreal ** Fix for bug #467115 * addressbook/gui/component/addressbook-view.c: (addressbook_view_init): * calendar/gui/GNOME_Evolution_Calendar.server.in.in: * calendar/gui/memos-component.c: (create_component_view): * calendar/gui/tasks-component.c: (create_component_view): * data/icons/Makefile.am: * mail/GNOME_Evolution_Mail.server.in.in: * mail/mail-component.c: (impl_createView): Ship and use tango icons for the mail, tasks and memos components. svn path=/trunk/; revision=35915 --- addressbook/gui/component/addressbook-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index cb66508eac..3db5bbdf36 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -1330,7 +1330,7 @@ addressbook_view_init (AddressbookView *view) e_activity_handler_attach_task_bar (priv->activity_handler, E_TASK_BAR (priv->statusbar_widget)); - priv->info_widget = e_info_label_new("contact-new"); + priv->info_widget = e_info_label_new("x-office-address-book"); e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), ""); gtk_widget_show (priv->info_widget); -- cgit v1.2.3 From 670e6d167863d4c8d8dde107e7d8ac7a288e0b52 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 6 Aug 2008 15:44:47 +0000 Subject: ** Fix for bug #249844 2008-08-06 Milan Crha ** Fix for bug #249844 * addressbook/gui/component/addressbook-component.c: * calendar/gui/tasks-component.c: (impl__get_userCreatableItems): * calendar/gui/memos-component.c: (impl__get_userCreatableItems): * mail/mail-component.c: (impl__get_userCreatableItems): * shell/test/evolution-test-component.c: (impl__get_userCreatableItems): (impl__get_userCreatableItems): Do not let compiler claim. * mail/em-event.h: (struct _EMEventTargetCustomIcon): Declare 'folder_name' as const char * to let compiler happy; no copy of the pointer anyway. * calendar/gui/calendar-component.c: (impl__get_userCreatableItems): Use C_() macro instead of Q_() macro. Use fully qualified names for "New" submenu entries. svn path=/trunk/; revision=35916 --- addressbook/gui/component/addressbook-component.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index cc109fb0a3..82f00f00c3 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -226,7 +226,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[0].id = "contact"; list->_buffer[0].description = _("New Contact"); - list->_buffer[0].menuDescription = C_("New", "_Contact"); + list->_buffer[0].menuDescription = (char *) C_("New", "_Contact"); list->_buffer[0].tooltip = _("Create a new contact"); list->_buffer[0].menuShortcut = 'c'; list->_buffer[0].iconName = "contact-new"; @@ -234,7 +234,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[1].id = "contact_list"; list->_buffer[1].description = _("New Contact List"); - list->_buffer[1].menuDescription = C_("New", "Contact _List"); + list->_buffer[1].menuDescription = (char *) C_("New", "Contact _List"); list->_buffer[1].tooltip = _("Create a new contact list"); list->_buffer[1].menuShortcut = 'l'; list->_buffer[1].iconName = "stock_contact-list"; @@ -242,7 +242,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, list->_buffer[2].id = "address_book"; list->_buffer[2].description = _("New Address Book"); - list->_buffer[2].menuDescription = C_("New", "Address _Book"); + list->_buffer[2].menuDescription = (char *) C_("New", "Address _Book"); list->_buffer[2].tooltip = _("Create a new address book"); list->_buffer[2].menuShortcut = '\0'; list->_buffer[2].iconName = "address-book-new"; -- cgit v1.2.3 From 1614f363635a13644c54a6459a018303327e7c02 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 7 Aug 2008 12:08:44 +0000 Subject: ** Fix for bug #324203 2008-08-07 Milan Crha ** Fix for bug #324203 * gui/component/ldap-config.glade: * gui/component/addressbook-config.c: (canbrowse_toggled_cb), (eabc_details_limit): New check box to be able to set LDAP address books browseable until reaches given limits. Note: To let this really works, one should have eds of revision 9295 or better. svn path=/trunk/; revision=35922 --- addressbook/gui/component/addressbook-config.c | 14 ++++++++ addressbook/gui/component/ldap-config.glade | 48 ++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 76b5dca5c1..2b749a6dd8 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -111,6 +111,7 @@ struct _AddressbookSourceDialog { GtkWidget *search_filter; GtkWidget *timeout_scale; GtkWidget *limit_spinbutton; + GtkWidget *canbrowsecheck; /* display name page fields */ GtkWidget *display_name; @@ -925,6 +926,15 @@ limit_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) e_source_set_property(sdialog->source, "limit", limit); } +static void +canbrowse_toggled_cb (GtkWidget *toggle_button, ESource *source) +{ + if (!source || !toggle_button) + return; + + e_source_set_property (source, "can-browse", gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (toggle_button)) ? "1" : NULL); +} + static GtkWidget * eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) { @@ -956,6 +966,10 @@ eabc_details_limit(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, st gtk_spin_button_set_value((GtkSpinButton *)sdialog->limit_spinbutton, tmp?g_strtod(tmp, NULL):100.0); g_signal_connect (sdialog->limit_spinbutton, "value_changed", G_CALLBACK (limit_changed_cb), sdialog); + sdialog->canbrowsecheck = glade_xml_get_widget (gui, "canbrowsecheck"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sdialog->canbrowsecheck), e_source_get_property (sdialog->source, "can-browse") && strcmp (e_source_get_property (sdialog->source, "can-browse"), "1") == 0); + g_signal_connect (sdialog->canbrowsecheck, "toggled", G_CALLBACK (canbrowse_toggled_cb), sdialog->source); + g_object_unref(gui); return w; diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index 1641741075..1e1c4d5fea 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -1179,7 +1179,7 @@ True - 2 + 3 3 False 6 @@ -1405,6 +1405,28 @@ shrink|fill + + + + True + True + B_rowse this book until limit reached + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 3 + 2 + 3 + fill + + + 0 @@ -2707,7 +2729,7 @@ 12 True - 2 + 3 3 False 6 @@ -2930,6 +2952,28 @@ + + + + True + True + B_rowse this book until limit reached + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 3 + 2 + 3 + fill + + + -- cgit v1.2.3 From 9071747fdb0ca659f1d0118ed69615a4f623e163 Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Fri, 8 Aug 2008 12:51:05 +0000 Subject: ** Fix for bug #546744 2008-08-08 Michael Monreal ** Fix for bug #546744 * addressbook/gui/component/addressbook-view.c: Use address-book-new icon instead of contacts-new. svn path=/trunk/; revision=35936 --- addressbook/gui/component/addressbook-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 3db5bbdf36..435e803223 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -947,7 +947,7 @@ primary_source_selection_changed_callback (ESourceSelector *selector, } static EPopupItem abv_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "contact-new", 0, 0 }, + { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "address-book-new", 0, 0 }, { E_POPUP_ITEM, "20.saveasvcard", N_("Save As vCard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, { E_POPUP_BAR, "30.bar" }, -- cgit v1.2.3 From a0f103a834199fc92a4f21343ecdf3d13c8ad7f4 Mon Sep 17 00:00:00 2001 From: Michael Monreal Date: Fri, 8 Aug 2008 19:15:18 +0000 Subject: ** Fix for bug #546748 2008-08-08 Michael Monreal ** Fix for bug #546748 * addressbook/gui/component/addressbook-view.c: Change "_Properties..." to "_Properties" to match HIG and other components. svn path=/trunk/; revision=35941 --- addressbook/gui/component/addressbook-view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 435e803223..7fa76e7fdc 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -954,7 +954,7 @@ static EPopupItem abv_source_popups[] = { { E_POPUP_ITEM, "30.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, { E_POPUP_BAR, "99.bar" }, - { E_POPUP_ITEM, "99.properties", N_("_Properties..."), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_addressbook_cb, NULL,"document-properties", 0, EAB_POPUP_SOURCE_PRIMARY }, }; static void -- cgit v1.2.3 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/component/addressbook-view.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 7fa76e7fdc..cc8f195c98 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -43,7 +43,6 @@ #include "misc/e-task-bar.h" #include "misc/e-info-label.h" - #include "e-util/e-icon-factory.h" #include "e-util/e-util-private.h" #include "shell/e-user-creatable-items-handler.h" @@ -66,10 +65,6 @@ #define PARENT_TYPE G_TYPE_OBJECT static GObjectClass *parent_class = NULL; -/* This is used for the addressbook status bar */ -#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "contact-new" -static GdkPixbuf *progress_icon = NULL; - #define d(x) struct _AddressbookViewPrivate { @@ -489,11 +484,8 @@ set_status_message (EABView *eav, const char *message, AddressbookView *view) } else if (priv->activity_id == 0) { char *clientid = g_strdup_printf ("%p", view); - if (progress_icon == NULL) - progress_icon = e_icon_factory_get_icon (EVOLUTION_CONTACTS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS); - - priv->activity_id = e_activity_handler_operation_started (activity_handler, clientid, - progress_icon, message, TRUE); + priv->activity_id = e_activity_handler_operation_started ( + activity_handler, clientid, message, TRUE); g_free (clientid); } else { -- cgit v1.2.3 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/component/addressbook.c | 41 +++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 17 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index ac135a0be0..132ad51cea 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -73,6 +73,9 @@ static void load_source_auth_cb (EBook *book, EBookStatus status, gpointer closure) { LoadSourceData *data = closure; + gboolean was_in = g_object_get_data (G_OBJECT (book), "authenticated") != NULL; + + g_object_set_data (G_OBJECT (book), "authenticated", NULL); if (data->cancelled) { free_load_source_data (data); @@ -99,38 +102,42 @@ load_source_auth_cb (EBook *book, EBookStatus status, gpointer closure) "%s", _("Accessing LDAP Server anonymously")); g_signal_connect (dialog, "response", G_CALLBACK(gtk_widget_destroy), NULL); gtk_widget_show (dialog); - if (data->cb) - data->cb (book, E_BOOK_ERROR_OK, data->closure); - free_load_source_data (data); - return; + status = E_BOOK_ERROR_OK; + + goto done; } } else if (status == E_BOOK_ERROR_INVALID_SERVER_VERSION) { e_error_run (NULL, "addressbook:server-version", NULL); status = E_BOOK_ERROR_OK; - if (data->cb) - data->cb (book, status, data->closure); - free_load_source_data (data); - return; - + goto done; + } else if (status == E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD) { + goto done; } else { - const gchar *uri = e_book_get_uri (book); - gchar *stripped_uri = remove_parameters_from_uri (uri); - const gchar *auth_domain = e_source_get_property (data->source, "auth-domain"); - const gchar *component_name; + if (status == E_BOOK_ERROR_AUTHENTICATION_FAILED) { + const gchar *uri = e_book_get_uri (book); + gchar *stripped_uri = remove_parameters_from_uri (uri); + const gchar *auth_domain = e_source_get_property (data->source, "auth-domain"); + const gchar *component_name; - component_name = auth_domain ? auth_domain : "Addressbook"; + component_name = auth_domain ? auth_domain : "Addressbook"; - if (status == E_BOOK_ERROR_AUTHENTICATION_FAILED) { e_passwords_forget_password (component_name, stripped_uri); + + g_free (stripped_uri); + } else if (was_in) { + /* We already tried to authenticate to the server, and it failed with + other reason than with E_BOOK_ERROR_AUTHENTICATION_FAILED, thus stop + poking with the server and report error to the user. */ + goto done; } + g_object_set_data (G_OBJECT (book), "authenticated", GINT_TO_POINTER (1)); addressbook_authenticate (book, TRUE, data->source, load_source_auth_cb, closure); - - g_free (stripped_uri); return; } } +done: if (data->cb) data->cb (book, status, data->closure); -- cgit v1.2.3 From 02e06ac617b2c205be9552e0d121800f4f98e86c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 12 Aug 2008 10:37:12 +0000 Subject: Fix a typo. (#547369) 2008-08-12 Matthew Barnes * addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in: Fix a typo. (#547369) * addressbook/gui/component/addressbook-migrate.c: * calendar/gui/migration.c: Fix TeX-style quotes. (#547372) svn path=/trunk/; revision=35967 --- addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in | 2 +- addressbook/gui/component/addressbook-migrate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in index 4fe2ce7a6a..823d5bd89f 100644 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in @@ -102,7 +102,7 @@ + _value="Evolution S/MIME Certificate Management Control"/> diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 5b73f7ae1e..e6d5616e13 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -122,7 +122,7 @@ dialog_set_folder_name (MigrationContext *context, const char *folder_name) { char *text; - text = g_strdup_printf (_("Migrating `%s':"), folder_name); + text = g_strdup_printf (_("Migrating '%s':"), folder_name); gtk_label_set_text (GTK_LABEL (context->folder_label), text); g_free (text); -- cgit v1.2.3 From f19618ac7f06b7f9e4bb2d7ce2e75de6e8554737 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 18 Aug 2008 04:37:15 +0000 Subject: ** Fixes bug #508732 2008-08-18 Matthew Barnes ** Fixes bug #508732 * shell/e-shell.c: Add a "crash_recovery" flag, with accessor functions for it. * shell/e-shell-window (init_view): Check and reset the "crash_recovery" flag before creating a new shell view. The components can use this flag to take steps to recover from the previous crash. * shell/apps_evolution_shell.schemas.in: Remove the "skip_recovery_dialog" and "recovery" keys. * shell/Evolution-Component.idl (createView): Add a "select_item" boolean parameter. * shell/main.c: Kill the crash recovery dialog. Instead just set the crash recovery flag in e-shell appropriately. * mail/mail-component.c (impl_createView): Add a "select_item" argument for crash recovery, which we forward to EMFolderBrowser as a "suppress_message_selection" flag. * mail/em-folder-browser.c (emfb_set_folder): Suppress automatic message selection if we are recovering from a crash. * addressbook/gui/component/addressbook-component.c (impl_createView): * calendar/gui/calendar-component.c (impl_createView): * calendar/gui/memos-component.c (impl_createView): * calendar/gui/tasks-component.c (impl_createView): Add a "select_item" argument for crash recovery, which these components do not use. * help/C/evolution.xml: Remove the bit about crash recovery. svn path=/trunk/; revision=36009 --- addressbook/gui/component/addressbook-component.c | 1 + 1 file changed, 1 insertion(+) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 82f00f00c3..cc4d2d9ffa 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -193,6 +193,7 @@ view_destroyed_cb (gpointer data, GObject *where_the_object_was) static GNOME_Evolution_ComponentView impl_createView (PortableServer_Servant servant, GNOME_Evolution_ShellView parent, + CORBA_boolean select_item, CORBA_Environment *ev) { AddressbookComponent *addressbook_component = ADDRESSBOOK_COMPONENT (bonobo_object_from_servant (servant)); -- cgit v1.2.3 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/component/addressbook-component.h | 25 ++++++++++++----------- addressbook/gui/component/addressbook-migrate.h | 22 +++++++++++--------- addressbook/gui/component/addressbook-view.h | 25 ++++++++++++----------- addressbook/gui/component/openldap-extract.h | 21 +++++++++++++++++++ 4 files changed, 59 insertions(+), 34 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h index 171fefa9e4..83fbdf87ee 100644 --- a/addressbook/gui/component/addressbook-component.h +++ b/addressbook/gui/component/addressbook-component.h @@ -1,23 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* addressbook-component.h - * - * 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. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _ADDRESSBOOK_COMPONENT_H_ diff --git a/addressbook/gui/component/addressbook-migrate.h b/addressbook/gui/component/addressbook-migrate.h index e30b2381da..ad3df6b26a 100644 --- a/addressbook/gui/component/addressbook-migrate.h +++ b/addressbook/gui/component/addressbook-migrate.h @@ -1,22 +1,24 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * 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 Toshok (toshok@ximian.com) + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) * - * Author: Chris Toshok (toshok@ximian.com) */ #ifndef _ADDRESSBOOK_MIGRATE_H_ diff --git a/addressbook/gui/component/addressbook-view.h b/addressbook/gui/component/addressbook-view.h index f5eb6c8af5..f86ce46005 100644 --- a/addressbook/gui/component/addressbook-view.h +++ b/addressbook/gui/component/addressbook-view.h @@ -1,23 +1,24 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* addressbook-view.h - * - * 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. * - * Author: Chris Toshok + * Authors: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _ADDRESSBOOK_VIEW_H_ diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h index f11012ec40..9cf407324a 100644 --- a/addressbook/gui/component/openldap-extract.h +++ b/addressbook/gui/component/openldap-extract.h @@ -1,3 +1,24 @@ +/* + * + * 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) + * + */ /* This is extracted from the OpenLDAP sources. * * Stuff that isn't used in e-book-backend-ldap.c was dropped, like -- cgit v1.2.3 From 42eec28fb010f2c24c94a69f7cb0e56f7f74ff16 Mon Sep 17 00:00:00 2001 From: Suman Manjunath Date: Mon, 1 Sep 2008 04:16:05 +0000 Subject: Milan Crha ** Fix for bug #448435 (Keep UI consistent, disable SSL method for 636 port). svn path=/trunk/; revision=36238 --- addressbook/gui/component/addressbook-config.c | 1 + 1 file changed, 1 insertion(+) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 2b749a6dd8..978fdb21e1 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -736,6 +736,7 @@ eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str tmp = e_source_get_property (sdialog->source, "ssl"); sdialog->ssl = tmp ? ldap_parse_ssl (tmp) : ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE; gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->ssl_optionmenu), sdialog->ssl); + gtk_widget_set_sensitive (sdialog->ssl_optionmenu, strcmp (port, LDAPS_PORT_STRING) != 0); g_signal_connect(sdialog->ssl_optionmenu, "changed", G_CALLBACK(ssl_optionmenu_changed_cb), sdialog); g_object_unref(gui); -- cgit v1.2.3 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 --- addressbook/gui/component/addressbook-config.h | 29 +++++++++++------------ addressbook/gui/component/addressbook.h | 21 ++++++++++++++++ addressbook/gui/component/autocompletion-config.c | 26 ++++++++++---------- addressbook/gui/component/autocompletion-config.h | 26 ++++++++++---------- addressbook/gui/component/component-factory.c | 26 ++++++++++---------- 5 files changed, 77 insertions(+), 51 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index ef38e150bb..04b44cd872 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -1,26 +1,25 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* addressbook-storage.h - * - * 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 Toshok - * Chris Lahey - **/ + * Chris Toshok + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ #ifndef __ADDRESSBOOK_CONFIG_H__ #define __ADDRESSBOOK_CONFIG_H__ diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h index a2a475951a..a56f088f7d 100644 --- a/addressbook/gui/component/addressbook.h +++ b/addressbook/gui/component/addressbook.h @@ -1,3 +1,24 @@ +/* + * 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) + * + */ + #ifndef __ADDRESSBOOK_H__ #define __ADDRESSBOOK_H__ diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c index b410d74634..786a3613e3 100644 --- a/addressbook/gui/component/autocompletion-config.c +++ b/addressbook/gui/component/autocompletion-config.c @@ -1,23 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion. - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* + * e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion. * * 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 Toshok + * Authors: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifdef HAVE_CONFIG_H diff --git a/addressbook/gui/component/autocompletion-config.h b/addressbook/gui/component/autocompletion-config.h index d55ef2cd79..2f4f0184c4 100644 --- a/addressbook/gui/component/autocompletion-config.h +++ b/addressbook/gui/component/autocompletion-config.h @@ -1,23 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion. - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* + * e-shell-config-autocompletion.h - Configuration page for addressbook autocompletion. * * 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 Toshok + * Authors: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #ifndef _AUTOCOMPLETION_CONFIG_H diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c index e7336fa804..feea79d88f 100644 --- a/addressbook/gui/component/component-factory.c +++ b/addressbook/gui/component/component-factory.c @@ -1,23 +1,25 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* component-factory.c - Factory for Evolution's Addressbook component. - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) +/* + * component-factory.c - Factory for Evolution's Addressbook component. * * 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. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include -- cgit v1.2.3 From e3f3503c975d4efab4ca1fc4901fba0bc16f0fb6 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Sat, 6 Sep 2008 14:45:00 +0000 Subject: fix licensing snafus. svn path=/trunk/; revision=36263 --- addressbook/gui/component/openldap-extract.h | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h index 9cf407324a..f11012ec40 100644 --- a/addressbook/gui/component/openldap-extract.h +++ b/addressbook/gui/component/openldap-extract.h @@ -1,24 +1,3 @@ -/* - * - * 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) - * - */ /* This is extracted from the OpenLDAP sources. * * Stuff that isn't used in e-book-backend-ldap.c was dropped, like -- cgit v1.2.3 From b7fc5caefe4aded8d0ffd7088ecbbf1f370b995e Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Fri, 12 Sep 2008 16:19:36 +0000 Subject: License Changes from GPL to LGPL svn path=/trunk/; revision=36313 --- addressbook/gui/component/addressbook-migrate.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index e6d5616e13..237b4cb80a 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -1,22 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* - * 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. * - * Author: Chris Toshok (toshok@ximian.com) + * Authors: + * Chris Toshok + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include -- cgit v1.2.3 From 79d878670a311644f188f671cbc4e60193100558 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Tue, 16 Sep 2008 10:52:29 +0000 Subject: License changes from GPL to LGPL svn path=/trunk/; revision=36344 --- addressbook/gui/component/addressbook-component.c | 27 +++++++++++------------ 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index cc4d2d9ffa..d61338314d 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -1,28 +1,27 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* addressbook-component.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. * - * Author: Ettore Perazzoli + * Authors: + * Ettore Perazzoli + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ /* EPFIXME: Add autocompletion setting. */ - #include #include "addressbook-component.h" -- cgit v1.2.3 From 635f62d060ad48770ddc2a53aa7a2a6b4be86492 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 23 Sep 2008 11:02:55 +0000 Subject: ** Part of fix for bug #272391 2008-09-23 Milan Crha ** Part of fix for bug #272391 * gui/component/apps_evolution_addressbook.schemas.in: * gui/component/autocompletion-config.c: (struct AutocompletionConfig), (config_control_destroy_notify), (add_section), (show_address_check_toggled_cb), (autocompletion_config_control_new): New UI for Edit->Preferences->Autocompletion, with the checkbox for the key "/apps/evolution/addressbook/completion/show_address" to be able to setup whether show mail address for the autocompleted contact. svn path=/trunk/; revision=36431 --- .../apps_evolution_addressbook.schemas.in | 12 ++++ addressbook/gui/component/autocompletion-config.c | 69 +++++++++++++++++++++- 2 files changed, 79 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/apps_evolution_addressbook.schemas.in b/addressbook/gui/component/apps_evolution_addressbook.schemas.in index 010073331e..4a336409df 100644 --- a/addressbook/gui/component/apps_evolution_addressbook.schemas.in +++ b/addressbook/gui/component/apps_evolution_addressbook.schemas.in @@ -27,6 +27,18 @@ + + /schemas/apps/evolution/addressbook/completion/show_address + /apps/evolution/addressbook/completion/show_address + evolution-addressbook + bool + false + + Show autocompleted name with an address + Whether force showing the mail address with the name of the autocompleted contact in the entry. + + + diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c index 786a3613e3..8c259c6a7a 100644 --- a/addressbook/gui/component/autocompletion-config.c +++ b/addressbook/gui/component/autocompletion-config.c @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -45,6 +46,7 @@ typedef struct { GtkWidget *control_widget; ESourceList *source_list; + GConfClient *gconf; } AutocompletionConfig; static void @@ -84,6 +86,7 @@ config_control_destroy_notify (void *data, AutocompletionConfig *ac = (AutocompletionConfig *) data; g_object_unref (ac->source_list); + g_object_unref (ac->gconf); g_free (ac); } @@ -106,17 +109,76 @@ initialize_selection (AutocompletionConfig *ac) } } +static GtkWidget * +add_section (GtkWidget *vbox, const gchar *caption, gboolean expand) +{ + GtkWidget *label, *hbox, *itembox; + gchar *txt; + + g_return_val_if_fail (vbox != NULL, NULL); + g_return_val_if_fail (caption != NULL, NULL); + + txt = g_strconcat ("", caption, "", NULL); + + label = gtk_label_new (NULL); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_markup (GTK_LABEL (label), txt); + + g_free (txt); + + /* bold caption of the section */ + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); + + hbox = gtk_hbox_new (FALSE, 12); + + /* space on the left for the items in the section */ + gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (""), FALSE, FALSE, 0); + + /* itembox, here will all section items go */ + itembox = gtk_vbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (hbox), itembox, TRUE, TRUE, 0); + + gtk_box_pack_start (GTK_BOX (vbox), hbox, expand, expand, 0); + + return itembox; +} + +static void +show_address_check_toggled_cb (GtkToggleButton *check, AutocompletionConfig *ac) +{ + g_return_if_fail (check != NULL); + g_return_if_fail (ac != NULL); + g_return_if_fail (ac->gconf != NULL); + + gconf_client_set_bool (ac->gconf, FORCE_SHOW_ADDRESS, gtk_toggle_button_get_active (check), NULL); +} + EvolutionConfigControl* autocompletion_config_control_new (void) { AutocompletionConfig *ac; CORBA_Environment ev; - GtkWidget *scrolledwin; + GtkWidget *scrolledwin, *vbox, *itembox, *w; ac = g_new0 (AutocompletionConfig, 1); CORBA_exception_init (&ev); + ac->gconf = gconf_client_get_default (); + + vbox = gtk_vbox_new (FALSE, 6); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); + + itembox = add_section (vbox, _("Autocompletion"), FALSE); + + w = gtk_check_button_new_with_mnemonic (_("Always _show address of the autocompleted contact")); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), gconf_client_get_bool (ac->gconf, FORCE_SHOW_ADDRESS, NULL)); + g_signal_connect (w, "toggled", (GCallback)show_address_check_toggled_cb, ac); + gtk_box_pack_start (GTK_BOX (itembox), w, FALSE, FALSE, 0); + + itembox = add_section (vbox, _("Look up in address books"), TRUE); + ac->source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources"); /* XXX should we watch for the source list to change and update it in the control? what about our local changes? */ @@ -139,7 +201,10 @@ autocompletion_config_control_new (void) gtk_widget_show (ac->control_widget); gtk_widget_show (scrolledwin); - ac->config_control = evolution_config_control_new (scrolledwin); + gtk_widget_show_all (vbox); + gtk_box_pack_start (GTK_BOX (itembox), scrolledwin, TRUE, TRUE, 0); + + ac->config_control = evolution_config_control_new (vbox); g_signal_connect (ac->control_widget, "selection_changed", G_CALLBACK (source_selection_changed), ac); -- cgit v1.2.3 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/component/addressbook-view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index cc8f195c98..d89565027b 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -331,7 +331,7 @@ delete_addressbook_folder (AddressbookView *view) toplevel = (GtkWindow *) gtk_widget_get_toplevel (priv->notebook); if (e_error_run (toplevel, "addressbook:ask-delete-addressbook", - e_source_peek_name(selected_source)) != GTK_RESPONSE_YES) + e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES) return; /* Remove local data */ @@ -885,7 +885,7 @@ delete_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) toplevel = (GtkWindow *)gtk_widget_get_toplevel(ep->target->widget); - if (e_error_run(toplevel, "addressbook:ask-delete-addressbook", e_source_peek_name(selected_source)) != GTK_RESPONSE_YES) + if (e_error_run (toplevel, "addressbook:ask-delete-addressbook", e_source_peek_name(selected_source), NULL) != GTK_RESPONSE_YES) return; /* Remove local data */ -- cgit v1.2.3 From 2ecb4c7dc0ac2ba4f900325ef7809dead96ba7c3 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 24 Sep 2008 06:28:25 +0000 Subject: ** Fixes bug #553479 2008-09-24 Philip Withnall ** Fixes bug #553479 * shell/shell.error.xml: * plugins/webdav-account-setup/webdav-contacts-source.c (plugin_webdav_contacts): * plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml: * plugins/python/org-gnome-evolution-python.eplug.xml: * plugins/google-account-setup/org-gnome-evolution-google.eplug.xml: * plugins/audio-inline/org-gnome-audio-inline.eplug.xml: * mail/em-migrate.c (migrate_to_db): * mail/evolution-mail.schemas.in: * addressbook/gui/component/ldap-config.glade: String capitalisation improvements. svn path=/trunk/; revision=36439 --- addressbook/gui/component/ldap-config.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index 1e1c4d5fea..58ffba43bf 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -475,7 +475,7 @@ True - This is the full name of your ldap server. For example, "ldap.mycompany.com". + This is the full name of your LDAP server. For example, "ldap.mycompany.com". True True True @@ -635,7 +635,7 @@ True - This is the method Evolution will use to authenticate you. Note that setting this to "Email Address" requires anonymous access to your ldap server. + This is the method Evolution will use to authenticate you. Note that setting this to "Email Address" requires anonymous access to your LDAP server. True 0 -- cgit v1.2.3 From bfc8b8784d22d4eb4e7286cc6ef35dd5be5419a4 Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Mon, 29 Sep 2008 08:36:04 +0000 Subject: License changes from GPL to LGPL svn path=/trunk/; revision=36465 --- addressbook/gui/component/addressbook-view.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index d89565027b..909a9d14ca 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -1,24 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* addressbook-view.c - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * +/* * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU 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. + * 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) * - * Author: Chris Toshok (toshok@ximian.com) */ #ifdef HAVE_CONFIG_H -- cgit v1.2.3 From 1f8187e8da5ebfc67730e3f9a82487a0a44239fb Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Tue, 30 Sep 2008 15:19:23 +0000 Subject: Change License from GPL to LGPL. svn path=/trunk/; revision=36502 --- addressbook/gui/component/addressbook.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 132ad51cea..c8285d8171 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -1,23 +1,23 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* addressbook.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. * - * Author: Chris Lahey (clahey@ximian.com) + * Authors: + * Chris Lahey + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * */ #include -- cgit v1.2.3 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/component/addressbook-config.c | 28 ++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 978fdb21e1..b8f2e3f6d9 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -1,11 +1,27 @@ -/* -*- 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: - * Chris Toshok - * Chris Lahey - * Michael Zucchi - * And no doubt others ... - **/ + * Chris Toshok + * Chris Lahey + * Michael Zucchi + * And no doubt others ... + * + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + * + */ /*#define STANDALONE*/ -- cgit v1.2.3 From ccfa75064ae18b52bf74bfad084540081e5b469c Mon Sep 17 00:00:00 2001 From: Sankarasivasubramanian Pasupathilingam Date: Mon, 3 Nov 2008 15:49:29 +0000 Subject: License Change from GPL to LGPL svn path=/trunk/; revision=36728 --- addressbook/gui/component/openldap-extract.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h index f11012ec40..010589da1e 100644 --- a/addressbook/gui/component/openldap-extract.h +++ b/addressbook/gui/component/openldap-extract.h @@ -22,8 +22,8 @@ * modification, are permitted only as authorized by the OpenLDAP * Public License. * - * A copy of this license is available in file LICENSE in the - * top-level directory of the distribution or, alternatively, at + * A copy of this license is available in file COPYING.OPENLDAP in + * the top-level directory of the distribution or, alternatively, at * . */ -- cgit v1.2.3 From 1a04fd272634d22277979c705ae854bea580905a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 17 Nov 2008 19:30:33 +0000 Subject: ** Fixes bug #558322 2008-11-17 Matthew Barnes ** Fixes bug #558322 * addressbook/gui/component/addressbook-view.c (rename_addressbook_cb): * calendar/gui/calendar-component.c (rename_calendar_cb): * calendar/gui/memos-component.c (rename_memo_list_cb): * calendar/gui/tasks-component.c (rename_task_list_cb): New "Rename" item in the source selector pop-up menu calls the recently added e_source_selector_edit_primary_selection(). Still need to bind the "F2" key to this action, but I'm not sure how whether EPopup supports that. svn path=/trunk/; revision=36791 --- addressbook/gui/component/addressbook-view.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 909a9d14ca..417cb02dd4 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -910,6 +910,16 @@ new_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) addressbook_config_create_new_source (gtk_widget_get_toplevel(ep->target->widget)); } +static void +rename_addressbook_cb (EPopup *ep, EPopupItem *pitem, void *data) +{ + AddressbookView *view = data; + ESourceSelector *selector; + + selector = E_SOURCE_SELECTOR (view->priv->selector); + e_source_selector_edit_primary_selection (selector); +} + static void save_addressbook_cb(EPopup *ep, EPopupItem *pitem, void *data) { @@ -940,6 +950,7 @@ primary_source_selection_changed_callback (ESourceSelector *selector, static EPopupItem abv_source_popups[] = { { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "address-book-new", 0, 0 }, { E_POPUP_ITEM, "20.saveasvcard", N_("Save As vCard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, + { E_POPUP_ITEM, "25.rename", N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY }, { E_POPUP_BAR, "30.bar" }, { E_POPUP_ITEM, "30.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, -- cgit v1.2.3 From 8425d8bbe6359a1baae04f569864f72d34144b5c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 17 Nov 2008 21:09:36 +0000 Subject: ** Fixes bug #557818 2008-11-17 Matthew Barnes ** Fixes bug #557818 * addressbook/gui/component/addressbook-view.c: * calendar/gui/calendar-component.c: * calendar/gui/memos-component.c: * calendar/gui/tasks-component.c: ESourceSelector now handles most of the drag-and-drop signals. We just have to listen for the new "data-dropped" signal and deal with it. Gets rid of a lot of duplicate logic. svn path=/trunk/; revision=36793 --- addressbook/gui/component/addressbook-view.c | 146 +++------------------------ 1 file changed, 12 insertions(+), 134 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 417cb02dd4..7918770df5 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -997,88 +997,6 @@ popup_event_callback(ESourceSelector *selector, ESource *source, GdkEventButton return TRUE; } -static gboolean -selector_tree_drag_drop (GtkWidget *widget, - GdkDragContext *context, - int x, - int y, - guint time, - AddressbookView *view) -{ - GtkTreeViewColumn *column; - int cell_x; - int cell_y; - GtkTreePath *path; - GtkTreeModel *model; - GtkTreeIter iter; - gpointer data; - - if (!gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget), x, y, &path, &column, &cell_x, &cell_y)) - return FALSE; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); - - if (!gtk_tree_model_get_iter (model, &iter, path)) { - gtk_tree_path_free (path); - return FALSE; - } - - gtk_tree_model_get (model, &iter, 0, &data, -1); - - if (E_IS_SOURCE_GROUP (data)) { - g_object_unref (data); - gtk_tree_path_free (path); - return FALSE; - } - - gtk_tree_path_free (path); - return TRUE; -} - -static gboolean -selector_tree_drag_motion (GtkWidget *widget, - GdkDragContext *context, - int x, - int y) -{ - GtkTreePath *path = NULL; - gpointer data = NULL; - GtkTreeViewDropPosition pos; - GtkTreeModel *model; - GtkTreeIter iter; - GdkDragAction action = { 0, }; - - if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget), - x, y, &path, &pos)) - goto finish; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); - - if (!gtk_tree_model_get_iter (model, &iter, path)) - goto finish; - - gtk_tree_model_get (model, &iter, 0, &data, -1); - - if (E_IS_SOURCE_GROUP (data) || e_source_get_readonly (data)) - goto finish; - - gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), path, GTK_TREE_VIEW_DROP_INTO_OR_BEFORE); - /* Make default action move, not copy */ - if (context->actions & GDK_ACTION_MOVE) - action = GDK_ACTION_MOVE; - else - action = context->suggested_action; - - finish: - if (path) - gtk_tree_path_free (path); - if (data) - g_object_unref (data); - - gdk_drag_status (context, action, GDK_CURRENT_TIME); - return TRUE; -} - typedef struct { guint remove_from_source : 1; @@ -1153,42 +1071,19 @@ merged_contact_cb (EBook *book, EBookStatus status, const char *id, gpointer clo } static gboolean -selector_tree_drag_data_received (GtkWidget *widget, - GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *data, - guint info, - guint time, - gpointer user_data) -{ - GtkTreePath *path = NULL; - GtkTreeViewDropPosition pos; - gpointer target = NULL; - GtkTreeModel *model; - GtkTreeIter iter; - gboolean success = FALSE; +selector_tree_data_dropped (ESourceSelector *selector, + GtkSelectionData *data, + ESource *destination, + GdkDragAction action, + guint info, + AddressbookView *view) +{ EBook *source_book, *target_book; MergeContext *merge_context = NULL; GList *contactlist; - AddressbookView *view; EABView *v; - if (!gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (widget), - x, y, &path, &pos)) - goto finish; - - model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); - - if (!gtk_tree_model_get_iter (model, &iter, path)) - goto finish; - - gtk_tree_model_get (model, &iter, 0, &target, -1); - - if (E_IS_SOURCE_GROUP (target) || e_source_get_readonly (target)) - goto finish; - - target_book = e_book_new (target, NULL); + target_book = e_book_new (destination, NULL); if (!target_book) { g_message (G_STRLOC ":Couldn't create EBook."); return FALSE; @@ -1197,7 +1092,6 @@ selector_tree_drag_data_received (GtkWidget *widget, eab_book_and_contact_list_from_string ((char *)data->data, &source_book, &contactlist); - view = (AddressbookView *) user_data; v = get_current_view (view); g_object_get (v->model, "book",&source_book, NULL); @@ -1211,31 +1105,16 @@ selector_tree_drag_data_received (GtkWidget *widget, merge_context->current_contact = contactlist->data; merge_context->remaining_contacts = g_list_delete_link (contactlist, contactlist); - merge_context->remove_from_source = context->action == GDK_ACTION_MOVE ? TRUE : FALSE; + merge_context->remove_from_source = action == GDK_ACTION_MOVE ? TRUE : FALSE; /* Start merge */ eab_merging_book_add_contact (target_book, merge_context->current_contact, merged_contact_cb, merge_context); - finish: - if (path) - gtk_tree_path_free (path); - if (target) - g_object_unref (target); - - gtk_drag_finish (context, success, merge_context->remove_from_source, time); - return TRUE; } -static void -selector_tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, gpointer data) -{ - gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), NULL, GTK_TREE_VIEW_DROP_BEFORE); -} - - static void destroy_callback(gpointer data, GObject *where_object_was) { @@ -1338,10 +1217,9 @@ addressbook_view_init (AddressbookView *view) priv->selector = e_source_selector_new (priv->source_list); - g_signal_connect (priv->selector, "drag-motion", G_CALLBACK (selector_tree_drag_motion), view); - g_signal_connect (priv->selector, "drag-leave", G_CALLBACK (selector_tree_drag_leave), view); - g_signal_connect (priv->selector, "drag-drop", G_CALLBACK (selector_tree_drag_drop), view); - g_signal_connect (priv->selector, "drag-data-received", G_CALLBACK (selector_tree_drag_data_received), view); + g_signal_connect ( + priv->selector, "data-dropped", + G_CALLBACK (selector_tree_data_dropped), view); gtk_drag_dest_set (priv->selector, GTK_DEST_DEFAULT_ALL, drag_types, num_drag_types, GDK_ACTION_COPY | GDK_ACTION_MOVE); a11y = gtk_widget_get_accessible (GTK_WIDGET (priv->selector)); atk_object_set_name (a11y, _("Contact Source Selector")); -- cgit v1.2.3 From 14ed95aaafdf590495c951a46234894acfd14157 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 9 Dec 2008 12:53:32 +0000 Subject: ** Fix for bug #563669 2008-12-09 Milan Crha ** Fix for bug #563669 * addressbook/gui/component/ldap-config.glade: * addressbook/printing/e-contact-print.glade: * mail/mail-config.glade: * filter/filter.glade: * widgets/misc/e-send-options.glade: * calendar/gui/dialogs/recurrence-page.glade: * calendar/gui/dialogs/alarm-dialog.glade: * calendar/gui/dialogs/event-page.glade: * calendar/gui/dialogs/task-details-page.glade: * calendar/gui/dialogs/cal-prefs-dialog.glade: * calendar/gui/alarm-notify/alarm-notify.glade: * calendar/gui/goto-dialog.glade: Use zero GtkSpinButton's PageSize, as Gtk+ requires. svn path=/trunk/; revision=36855 --- addressbook/gui/component/ldap-config.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index 58ffba43bf..2cf886b914 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -1394,7 +1394,7 @@ GTK_UPDATE_ALWAYS False False - 0 0 1000 1 10 10 + 0 0 1000 1 10 0 1 @@ -2942,7 +2942,7 @@ GTK_UPDATE_ALWAYS False False - 0 0 1000 1 10 10 + 0 0 1000 1 10 0 1 -- cgit v1.2.3 From e650afea025a34dd179f4743c25558a5c50e9dfd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 1 Jan 2009 21:22:45 +0000 Subject: Use the correct macro when marking strings for translation. 2009-01-01 Matthew Barnes * ui/component/addressbook-config.c (eabc_general_offline): Use the correct macro when marking strings for translation. svn path=/trunk/; revision=36956 --- addressbook/gui/component/addressbook-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index b8f2e3f6d9..bfa91cea47 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -632,7 +632,7 @@ eabc_general_offline(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, if (old) return old; else { - offline_setting = gtk_check_button_new_with_mnemonic (N_("Copy _book content locally for offline operation")); + offline_setting = gtk_check_button_new_with_mnemonic (_("Copy _book content locally for offline operation")); gtk_widget_show (offline_setting); gtk_container_add (GTK_CONTAINER (parent), offline_setting); g_signal_connect (offline_setting, "toggled", G_CALLBACK (offline_status_changed_cb), sdialog); -- cgit v1.2.3 From 607ce3802eabee692e55d89aacefd06390819e07 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 9 Jan 2009 07:36:29 +0000 Subject: Reviewed by Matthew Barnes 2009-01-09 Takao Fujiwara Reviewed by Matthew Barnes * Fix for bug #566011 * addressbook/gui/component/Makefile.am: * addressbook/gui/component/addressbook-component.c (addressbook_component_class_init): Include instead of and add bindtextdomain(). * calendar/gui/Makefile.am: * calendar/gui/calendar-component.c (calendar_component_class_init): * calendar/gui/dialogs/comp-editor.c: * calendar/gui/memos-component.c (memos_component_class_init): * calendar/gui/tasks-component.c (tasks_component_class_init): Include instead of and add bindtextdomain(). * composer/e-composer-header-table.c: * composer/e-composer-private.h: Include instead of . * mail/mail-component.c (mail_component_class_init): Include instead of and add bindtextdomain(). * shell/e-user-creatable-items-handler.c (e_user_creatable_items_handler_class_ini): Include instead of and add bindtextdomain(). * widgets/misc/e-charset-picker.c: * widgets/misc/e-signature-combo-box.c: Include instead of . svn path=/trunk/; revision=37021 --- addressbook/gui/component/Makefile.am | 1 + addressbook/gui/component/addressbook-component.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 9eec272a0d..5ebdac4eb4 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -15,6 +15,7 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/gui/widgets \ -I$(top_srcdir)/a11y/addressbook \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ -DPREFIX=\""$(prefix)"\" \ $(LDAP_CFLAGS) \ diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index d61338314d..bd522b97d3 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include @@ -462,6 +462,9 @@ addressbook_component_class_init (AddressbookComponentClass *class) POA_GNOME_Evolution_Component__epv *epv = &class->epv; GObjectClass *object_class = G_OBJECT_CLASS (class); + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + epv->createView = impl_createView; epv->_get_userCreatableItems = impl__get_userCreatableItems; epv->requestCreateItem = impl_requestCreateItem; -- cgit v1.2.3 From 72a2b9942852dd77bba2bd21e9af5d1ba0fc496e Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Sat, 10 Jan 2009 19:05:39 +0000 Subject: Fix for bug #567282 2009-01-10 Andre Klapper * Fix for bug #567282 * /gui/component/addressbook-view.c: Remove unrequired #include of . svn path=/trunk/; revision=37026 --- addressbook/gui/component/addressbook-view.c | 1 - 1 file changed, 1 deletion(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 7918770df5..0f41fb81fa 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3 From b20c8370f1d894f4f971c0da9cdd132843f50934 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 11 Jan 2009 03:34:52 +0000 Subject: Remove unneeded #include . Remove unneeded 2009-01-10 Matthew Barnes * addressbook/gui/component/addressbook-view.c: * addressbook/gui/contact-editor/e-contact-editor.h: * addressbook/gui/contact-editor/e-contact-quick-add.c: * addressbook/gui/contact-editor/eab-editor.h: * addressbook/gui/contact-list-editor/e-contact-list-editor.h: * mail/mail-autofilter.c: Remove unneeded #include . Remove unneeded #include * calendar/gui/calendar-commands.c: * calendar/gui/e-cell-date-edit-text.c: * calendar/gui/e-itip-control.c: * calendar/gui/memos-control.c: * calendar/gui/print.c: * calendar/gui/tasks-control.c: * widgets/misc/test-dropdown-button.c: Remove unneeded #include . * calendar/gui/alarm-notify/alarm-queue.c: * calendar/gui/dialogs/cal-attachment-select-file.c: * calendar/gui/dialogs/cancel-comp.c: * calendar/gui/dialogs/changed-comp.c: * calendar/gui/dialogs/delete-error.c: * calendar/gui/dialogs/recur-comp.c: * calendar/gui/e-itip-control.c: * calendar/gui/print.c: Remove unneeded #include . svn path=/trunk/; revision=37035 --- addressbook/gui/component/addressbook-view.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 0f41fb81fa..53560e87d9 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -27,8 +27,7 @@ #include #include #include -#include -#include +#include #include #include #include -- cgit v1.2.3 From 4b2e8a5ec5ac91f0209a83587c8b81787fff9875 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 21 Jan 2009 19:30:36 +0000 Subject: ** Fix for bug #362754 2009-01-21 Milan Crha ** Fix for bug #362754 * addressbook/gui/component/addressbook-component.c: (ensure_sources): * calendar/gui/tasks-component.c: (ensure_sources): * calendar/gui/memos-component.c: (ensure_sources): * calendar/gui/calendar-component.c: (ensure_sources): Ensure to show default groups and sources with actual localized name, not the one it was stored last time. svn path=/trunk/; revision=37117 --- addressbook/gui/component/addressbook-component.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index bd522b97d3..13c386fbba 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -137,6 +137,9 @@ ensure_sources (AddressbookComponent *component) and too late to prevent user seeing "Can not Open ... because of invalid uri" error.*/ e_source_list_sync (source_list,NULL); } + + /* ensure the group name is in current locale, not read from configuration */ + e_source_group_set_name (on_this_computer, _("On This Computer")); } else { /* create the local source group */ @@ -146,7 +149,10 @@ ensure_sources (AddressbookComponent *component) on_this_computer = group; } - if (!personal_source) { + if (personal_source) { + /* ensure the source name is in current locale, not read from configuration */ + e_source_set_name (personal_source, _("Personal")); + } else { /* Create the default Person addressbook */ ESource *source = e_source_new (_("Personal"), PERSONAL_RELATIVE_URI); e_source_group_add_source (on_this_computer, source, -1); @@ -157,7 +163,10 @@ ensure_sources (AddressbookComponent *component) personal_source = source; } - if (!on_ldap_servers) { + if (on_ldap_servers) { + /* ensure the group name is in current locale, not read from configuration */ + e_source_group_set_name (on_ldap_servers, _("On LDAP Servers")); + } else { /* Create the LDAP source group */ group = e_source_group_new (_("On LDAP Servers"), LDAP_BASE_URI); e_source_list_add_group (source_list, group, -1); -- cgit v1.2.3 From 9cc64a2009458355ed1e404ca4e15ede10acd920 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Wed, 11 Feb 2009 16:06:24 +0000 Subject: Substitute some deprecated gtk+ functions. 2009-02-11 Andre Klapper * addressbook/gui/component/addressbook-migrate.c: * calendar/gui/migration.c: * calendar/gui/dialogs/alarm-dialog.c: * mail/em-folder-browser.c: * mail/em-migrate.c: * plugins/audio-inline/audio-inline.c: Substitute some deprecated gtk+ functions. svn path=/trunk/; revision=37249 --- addressbook/gui/component/addressbook-migrate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 237b4cb80a..09d1a1af9f 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -82,19 +82,19 @@ setup_progress_dialog (MigrationContext *context) context->label = gtk_label_new (""); gtk_label_set_line_wrap (GTK_LABEL (context->label), TRUE); gtk_widget_show (context->label); - gtk_box_pack_start_defaults (GTK_BOX (vbox), context->label); + gtk_box_pack_start (GTK_BOX (vbox), context->label, TRUE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 6); gtk_widget_show (hbox); - gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); context->folder_label = gtk_label_new (""); gtk_widget_show (context->folder_label); - gtk_box_pack_start_defaults (GTK_BOX (hbox), context->folder_label); + gtk_box_pack_start (GTK_BOX (hbox), context->folder_label, TRUE, TRUE, 0); context->progress = gtk_progress_bar_new (); gtk_widget_show (context->progress); - gtk_box_pack_start_defaults (GTK_BOX (hbox), context->progress); + gtk_box_pack_start (GTK_BOX (hbox), context->progress, TRUE, TRUE, 0); gtk_widget_show (context->window); } -- cgit v1.2.3 From 8a072ffc7c0ddcde472877a51ace0bb14f86fb0a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 24 Apr 2009 11:45:21 +0200 Subject: GN-bug #572348 - Removed deprecated Gtk+ symbols Some still left, because those gone in kill-bonobo branch. --- addressbook/gui/component/addressbook-config.c | 80 +- addressbook/gui/component/ldap-config.glade | 1731 +----------------------- 2 files changed, 120 insertions(+), 1691 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index bfa91cea47..1f0fa57847 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -99,7 +99,6 @@ struct _AddressbookSourceDialog { /* Source selection (druid only) */ ESourceList *source_list; GSList *menu_source_groups; - GtkWidget *group_optionmenu; /* ESource we're currently editing */ ESource *source; @@ -111,19 +110,19 @@ struct _AddressbookSourceDialog { /* info page fields */ GtkWidget *host; - GtkWidget *auth_optionmenu; + GtkWidget *auth_combobox; AddressbookLDAPAuthType auth; GtkWidget *auth_principal; /* connecting page fields */ - GtkWidget *port_combo; - GtkWidget *ssl_optionmenu; + GtkWidget *port_comboentry; + GtkWidget *ssl_combobox; AddressbookLDAPSSLType ssl; /* searching page fields */ GtkWidget *rootdn; AddressbookLDAPScopeType scope; - GtkWidget *scope_optionmenu; + GtkWidget *scope_combobox; GtkWidget *search_filter; GtkWidget *timeout_scale; GtkWidget *limit_spinbutton; @@ -210,6 +209,21 @@ ldap_parse_ssl (const char *ssl) return ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE; } +static const char * +ldap_get_ssl_tooltip (AddressbookLDAPSSLType ssl_type) +{ + switch (ssl_type) { + case ADDRESSBOOK_LDAP_SSL_ALWAYS: + return _("Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL."); + case ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE: + return _("Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS."); + case ADDRESSBOOK_LDAP_SSL_NEVER: + return _("Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits."); + } + + return NULL; +} + static gboolean source_to_uri_parts (ESource *source, gchar **host, gchar **rootdn, AddressbookLDAPScopeType *scope, gchar **search_filter, gint *port) { @@ -669,7 +683,7 @@ url_changed(AddressbookSourceDialog *sdialog) search_filter = form_ldap_search_filter (sdialog->search_filter); str = g_strdup_printf ("%s:%s/%s?" /* trigraph prevention */ "?%s?%s", gtk_entry_get_text (GTK_ENTRY (sdialog->host)), - gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (sdialog->port_combo)->entry)), + gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (sdialog->port_comboentry)))), gtk_entry_get_text (GTK_ENTRY (sdialog->rootdn)), ldap_unparse_scope (sdialog->scope), search_filter); @@ -691,20 +705,22 @@ port_entry_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) if (!strcmp (port, LDAPS_PORT_STRING)) { sdialog->ssl = ADDRESSBOOK_LDAP_SSL_ALWAYS; - gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->ssl_optionmenu), sdialog->ssl); - gtk_widget_set_sensitive (sdialog->ssl_optionmenu, FALSE); + gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->ssl_combobox), sdialog->ssl); + gtk_widget_set_sensitive (sdialog->ssl_combobox, FALSE); } else { - gtk_widget_set_sensitive (sdialog->ssl_optionmenu, TRUE); + gtk_widget_set_sensitive (sdialog->ssl_combobox, TRUE); } url_changed(sdialog); } static void -ssl_optionmenu_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) +ssl_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) { - sdialog->ssl = gtk_option_menu_get_history((GtkOptionMenu *)w); + sdialog->ssl = gtk_combo_box_get_active (GTK_COMBO_BOX (w)); e_source_set_property (sdialog->source, "ssl", ldap_unparse_ssl (sdialog->ssl)); + + gtk_widget_set_tooltip_text (sdialog->ssl_combobox, ldap_get_ssl_tooltip (sdialog->ssl)); } @@ -740,20 +756,24 @@ eabc_general_host(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str gtk_entry_set_text((GtkEntry *)sdialog->host, lud && lud->lud_host ? lud->lud_host : ""); g_signal_connect (sdialog->host, "changed", G_CALLBACK (host_changed_cb), sdialog); - sdialog->port_combo = glade_xml_get_widget (gui, "port-combo"); + sdialog->port_comboentry = glade_xml_get_widget (gui, "port-comboentry"); + gtk_widget_set_has_tooltip (sdialog->port_comboentry, TRUE); + gtk_widget_set_tooltip_text (sdialog->port_comboentry, _("This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify.")); sprintf(port, "%u", lud && lud->lud_port? lud->lud_port : LDAP_PORT); - gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (sdialog->port_combo)->entry), port); - g_signal_connect (GTK_COMBO(sdialog->port_combo)->entry, "changed", G_CALLBACK (port_entry_changed_cb), sdialog); + gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (sdialog->port_comboentry))), port); + g_signal_connect (gtk_bin_get_child (GTK_BIN (sdialog->port_comboentry)), "changed", G_CALLBACK (port_entry_changed_cb), sdialog); if (lud) ldap_free_urldesc (lud); - sdialog->ssl_optionmenu = glade_xml_get_widget (gui, "ssl-optionmenu"); + sdialog->ssl_combobox = glade_xml_get_widget (gui, "ssl-combobox"); + gtk_widget_set_has_tooltip (sdialog->ssl_combobox, TRUE); tmp = e_source_get_property (sdialog->source, "ssl"); sdialog->ssl = tmp ? ldap_parse_ssl (tmp) : ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE; - gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->ssl_optionmenu), sdialog->ssl); - gtk_widget_set_sensitive (sdialog->ssl_optionmenu, strcmp (port, LDAPS_PORT_STRING) != 0); - g_signal_connect(sdialog->ssl_optionmenu, "changed", G_CALLBACK(ssl_optionmenu_changed_cb), sdialog); + gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->ssl_combobox), sdialog->ssl); + gtk_widget_set_tooltip_text (sdialog->ssl_combobox, ldap_get_ssl_tooltip (sdialog->ssl)); + gtk_widget_set_sensitive (sdialog->ssl_combobox, strcmp (port, LDAPS_PORT_STRING) != 0); + g_signal_connect (sdialog->ssl_combobox, "changed", G_CALLBACK (ssl_combobox_changed_cb), sdialog); g_object_unref(gui); @@ -784,9 +804,9 @@ auth_entry_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) } static void -auth_optionmenu_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) +auth_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) { - sdialog->auth = gtk_option_menu_get_history((GtkOptionMenu *)w); + sdialog->auth = gtk_combo_box_get_active (GTK_COMBO_BOX (w)); e_source_set_property (sdialog->source, "auth", ldap_unparse_auth (sdialog->auth)); /* make sure the right property is set for the auth - ugh, funny api */ @@ -814,11 +834,13 @@ eabc_general_auth(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, str w = glade_xml_get_widget(gui, item->label); gtk_box_pack_start((GtkBox *)parent, w, FALSE, FALSE, 0); - sdialog->auth_optionmenu = glade_xml_get_widget (gui, "auth-optionmenu"); + sdialog->auth_combobox = glade_xml_get_widget (gui, "auth-combobox"); + gtk_widget_set_has_tooltip (sdialog->auth_combobox, TRUE); + gtk_widget_set_tooltip_text (sdialog->auth_combobox, _("This is the method Evolution will use to authenticate you. Note that setting this to \"Email Address\" requires anonymous access to your LDAP server.")); tmp = e_source_get_property(sdialog->source, "auth"); sdialog->auth = tmp ? ldap_parse_auth(tmp) : ADDRESSBOOK_LDAP_AUTH_NONE; - gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->auth_optionmenu), sdialog->auth); - g_signal_connect(sdialog->auth_optionmenu, "changed", G_CALLBACK(auth_optionmenu_changed_cb), sdialog); + gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->auth_combobox), sdialog->auth); + g_signal_connect (sdialog->auth_combobox, "changed", G_CALLBACK(auth_combobox_changed_cb), sdialog); sdialog->auth_principal = glade_xml_get_widget (gui, "auth-entry"); switch (sdialog->auth) { @@ -854,9 +876,9 @@ search_filter_changed_cb (GtkWidget *w, AddressbookSourceDialog *sdialog) } static void -scope_optionmenu_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) +scope_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog) { - sdialog->scope = gtk_option_menu_get_history((GtkOptionMenu *)w); + sdialog->scope = gtk_combo_box_get_active (GTK_COMBO_BOX (w)); url_changed(sdialog); } @@ -891,7 +913,9 @@ eabc_details_search(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, s gtk_entry_set_text((GtkEntry *)sdialog->rootdn, lud && lud->lud_dn ? lud->lud_dn : ""); g_signal_connect (sdialog->rootdn, "changed", G_CALLBACK (rootdn_changed_cb), sdialog); - sdialog->scope_optionmenu = glade_xml_get_widget (gui, "scope-optionmenu"); + sdialog->scope_combobox = glade_xml_get_widget (gui, "scope-combobox"); + gtk_widget_set_has_tooltip (sdialog->scope_combobox, TRUE); + gtk_widget_set_tooltip_text (sdialog->scope_combobox, _("The search scope defines how deep you would like the search to extend down the directory tree. A search scope of \"sub\" will include all entries below your search base. A search scope of \"one\" will only include the entries one level beneath your base.")); if (lud) { switch (lud->lud_scope) { case LDAP_SCOPE_BASE: @@ -906,8 +930,8 @@ eabc_details_search(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, s break; } } - gtk_option_menu_set_history (GTK_OPTION_MENU(sdialog->scope_optionmenu), sdialog->scope); - g_signal_connect(sdialog->scope_optionmenu, "changed", G_CALLBACK(scope_optionmenu_changed_cb), sdialog); + gtk_combo_box_set_active (GTK_COMBO_BOX (sdialog->scope_combobox), sdialog->scope); + g_signal_connect (sdialog->scope_combobox, "changed", G_CALLBACK(scope_combobox_changed_cb), sdialog); sdialog->search_filter = glade_xml_get_widget (gui, "search-filter-entry"); gtk_entry_set_text((GtkEntry *)sdialog->search_filter, lud && lud->lud_filter ? lud->lud_filter : ""); diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade index 2cf886b914..cc1fbd0174 100644 --- a/addressbook/gui/component/ldap-config.glade +++ b/addressbook/gui/component/ldap-config.glade @@ -17,6 +17,7 @@ GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST True + False False @@ -85,7 +86,7 @@ True - Display + Display False True GTK_JUSTIFY_LEFT @@ -199,7 +200,7 @@ True - Server Information + Server Information False True GTK_JUSTIFY_LEFT @@ -274,7 +275,6 @@ 0.5 0 0 - entry27 PANGO_ELLIPSIZE_NONE -1 False @@ -338,7 +338,7 @@ 0.5 0 0 - ssl-optionmenu + ssl-combobox PANGO_ELLIPSIZE_NONE -1 False @@ -352,43 +352,13 @@ - + True - True - 0 - - - - True - - - - True - Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL. - SSL encryption - True - - - - - - True - Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports TLS. - TLS encryption - True - - - - - - True - Selecting this option means that your server does not support either SSL or TLS. This means that your connection will be insecure, and that you will be vulnerable to security exploits. - No encryption - True - - - - + SSL encryption +TLS encryption +No encryption + False + True 0 @@ -407,71 +377,6 @@ - - - True - False - True - False - True - False - - - - True - This is the port on the LDAP server that Evolution will try to connect to. A list of standard ports has been provided. Ask your system administrator what port you should specify. - True - True - True - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - True - True - 389 - - - - - - True - True - 636 - - - - - - True - True - 3268 - - - - - - - 1 - 2 - 1 - 2 - - - - True @@ -494,6 +399,26 @@ + + + + True + 389 +636 +3268 + False + True + True + + + 1 + 2 + 1 + 2 + fill + fill + + 0 @@ -587,7 +512,6 @@ 0.5 0 0 - auth-optionmenu PANGO_ELLIPSIZE_NONE -1 False @@ -632,53 +556,6 @@ - - - True - This is the method Evolution will use to authenticate you. Note that setting this to "Email Address" requires anonymous access to your LDAP server. - True - 0 - - - - True - - - - True - Anonymously - True - - - - - - True - Using email address - True - - - - - - True - Using distinguished name (DN) - True - - - - - - - 1 - 2 - 0 - 1 - expand|shrink|fill - shrink - - - True @@ -700,6 +577,25 @@ + + + + True + Anonymously +Using email address +Using distinguished name (DN) + False + True + + + 1 + 2 + 0 + 1 + shrink|fill + shrink|fill + + 0 @@ -892,7 +788,6 @@ 0.5 0 0 - scope-optionmenu PANGO_ELLIPSIZE_NONE -1 False @@ -908,44 +803,6 @@ - - - True - The search scope defines how deep you would like the search to extend down the directory tree. A search scope of "sub" will include all entries below your search base. A search scope of "one" will only include the entries one level beneath your base. - True - 0 - - - - - - - True - One - True - - - - - - True - Sub - True - - - - - - - 1 - 3 - 2 - 3 - expand|shrink|fill - shrink|fill - - - True @@ -1105,6 +962,24 @@ shrink|fill + + + + True + One +Sub + False + True + + + 1 + 3 + 2 + 3 + shrink|fill + shrink|fill + + 0 @@ -1496,6 +1371,7 @@ GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST True + False False @@ -1575,1475 +1451,4 @@ - - True - Add Address Book - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - 0 - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Add Address Book - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 12 - True - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 12 - - - - 6 - True - False - 6 - - - - True - <b>Type:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - -1 - - - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 12 - True - 1 - 2 - False - 6 - 6 - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - _Name: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - display-name-entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - - - True - Display - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 12 - True - 3 - 2 - False - 6 - 6 - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - _Port: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - port-entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - False - True - False - True - False - - - - True - True - True - True - 0 - - True - * - False - - - - - - True - GTK_SELECTION_BROWSE - - - - True - True - 389 - - - - - - True - True - 636 - - - - - - True - True - 3268 - - - - - - - 1 - 2 - 1 - 2 - - - - - - - True - False - 6 - - - - True - _Use secure connection: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - ssl-optionmenu - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - 0 - - - - - - - True - Always - True - - - - - - - True - Whenever Possible - True - - - - - - - True - Never - True - - - - - - - - 0 - False - False - - - - - 0 - 2 - 2 - 3 - fill - - - - - - True - _Server: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - server-name-entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - - - True - Server Information - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 12 - True - 2 - 2 - False - 6 - 6 - - - - True - _Login method: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - auth-optionmenu - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Lo_gin: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - auth-entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - 0 - - - - - - - True - Anonymously - True - - - - - - - True - Email address - True - - - - - - - True - Distinguished name - True - - - - - - - - 1 - 2 - 0 - 1 - fill - - - - - - - - - True - <b>Authentication</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - False - True - - - - - - True - Basic - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 12 - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 12 - True - 4 - 3 - False - 6 - 6 - - - - True - Search _base: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - rootdn-entry - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - _Search scope: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - scope-optionmenu - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 3 - 0 - 1 - - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-find - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Find Possible Search Bases - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - True - 0 - - - - - - - True - One - True - - - - - - True - Sub - True - - - - - - - 1 - 3 - 2 - 3 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - Search _filter: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - entry30 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - expand|shrink|fill - shrink|fill - - - - - - True - True - True - True - 0 - - True - * - False - - Search filter - Search filter is the type of the objects searched for, while performing the search. If this is not modified, by default search will be performed on objectclass of the type "person". - - - - 1 - 3 - 3 - 4 - expand|shrink|fill - shrink|fill - - - - - - - - True - <b>Searching</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 12 - True - 3 - 3 - False - 6 - 6 - - - - True - _Timeout: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - timeout-scale - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - minutes - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - False - 6 - - - - True - 1 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - False - GTK_POS_TOP - 1 - GTK_UPDATE_CONTINUOUS - False - 3 1 5 0.5 1 0 - - - 0 - True - True - - - - - - True - 5 - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 1 - 2 - 0 - 1 - fill - - - - - - True - _Download limit: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - download-limit-spinbutton - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - cards - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 1000 1 10 0 - - - 1 - 2 - 1 - 2 - - - - - - - True - True - B_rowse this book until limit reached - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 3 - 2 - 3 - fill - - - - - - - - - True - <b>Downloading</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - False - True - - - - - - True - Details - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - - -- cgit v1.2.3