diff options
| -rw-r--r-- | my-evolution/ChangeLog | 7 | ||||
| -rw-r--r-- | my-evolution/e-summary-preferences.c | 7 | ||||
| -rw-r--r-- | shell/ChangeLog | 4 | ||||
| -rw-r--r-- | shell/evolution-storage-set-view.c | 14 |
4 files changed, 18 insertions, 14 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 07f1791545..bec38d6958 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,5 +1,12 @@ 2002-07-11 Ettore Perazzoli <ettore@ximian.com> + * e-summary-preferences.c (set_selected_folders): Actually pass + the evolution URI, not the path, in Folder.evolutionUri (since now + the shell StorageSetView implementation has been fixed to handle + this field properly). + +2002-07-11 Ettore Perazzoli <ettore@ximian.com> + * e-summary-preferences.c (set_selected_folders): Set the customIconName part to the empty string. [#27616] Also, set_release on the sequence to TRUE. diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c index 46ca5f6bfd..406955ea92 100644 --- a/my-evolution/e-summary-preferences.c +++ b/my-evolution/e-summary-preferences.c @@ -1333,12 +1333,7 @@ set_selected_folders (GNOME_Evolution_StorageSetView view) list->_buffer[i].type = CORBA_string_dup (""); list->_buffer[i].description = CORBA_string_dup (""); list->_buffer[i].displayName = CORBA_string_dup (""); - - if (strncmp (folder->evolution_uri, "evolution:", 10) == 0) - list->_buffer[i].evolutionUri = CORBA_string_dup (folder->evolution_uri + 10); - else - list->_buffer[i].evolutionUri = CORBA_string_dup (folder->evolution_uri); - + list->_buffer[i].evolutionUri = CORBA_string_dup (folder->evolution_uri); list->_buffer[i].physicalUri = CORBA_string_dup (folder->physical_uri); list->_buffer[i].unreadCount = 0; list->_buffer[i].canSyncOffline = TRUE; diff --git a/shell/ChangeLog b/shell/ChangeLog index d4cf410a3f..cb1478b7c2 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,7 +1,9 @@ 2002-07-11 Ettore Perazzoli <ettore@ximian.com> * evolution-storage-set-view.c - (impl_StorageSetView__set_checkedFolders): Remove extra braces. + (impl_StorageSetView__set_checkedFolders): Handle + Folder.evolutionUri as a URI, not as a path. Also use + e_free_string_list(). 2002-07-11 Ettore Perazzoli <ettore@ximian.com> diff --git a/shell/evolution-storage-set-view.c b/shell/evolution-storage-set-view.c index 4253ea3158..0e0c4c16f7 100644 --- a/shell/evolution-storage-set-view.c +++ b/shell/evolution-storage-set-view.c @@ -314,16 +314,16 @@ impl_StorageSetView__set_checkedFolders (PortableServer_Servant servant, priv = storage_set_view->priv; for (i = 0; i < list->_length; i++) { - path_list = g_list_append (path_list, g_strdup (list->_buffer[i].evolutionUri)); - } - - e_storage_set_view_set_checkboxes_list (E_STORAGE_SET_VIEW (priv->storage_set_view_widget), path_list); + if (strncmp (list->_buffer[i].evolutionUri, "evolution:", 10) != 0) + continue; - for (p = path_list; p; p = p->next) { - g_free (p->data); + path_list = g_list_append (path_list, g_strdup (list->_buffer[i].evolutionUri + 10)); } - g_list_free (path_list); + e_storage_set_view_set_checkboxes_list (E_STORAGE_SET_VIEW (priv->storage_set_view_widget), + path_list); + + e_free_string_list (path_list); } static GNOME_Evolution_FolderList * |