diff options
| -rw-r--r-- | shell/ChangeLog | 7 | ||||
| -rw-r--r-- | shell/e-shell.c | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 135774af8e..783edc1152 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,10 @@ +2002-07-14 Chris Toshok <toshok@ximian.com> + + * e-shell.c (folder_selection_dialog_folder_selected_cb): set + corba_folder.customIconName so we don't crash. + (impl_Shell_selectUserFolder): remove the default_type parameter + to fix a compiler warning. + 2002-07-12 Dan Winship <danw@ximian.com> * evolution-storage.c (impl_Storage_asyncDiscoverSharedFolder): diff --git a/shell/e-shell.c b/shell/e-shell.c index ebe6086a66..5e5ca4e008 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -268,6 +268,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_ corba_folder.physicalUri = ""; corba_folder.evolutionUri = ""; corba_folder.unreadCount = -1; + corba_folder.customIconName = ""; } else { corba_folder.type = (CORBA_char *)e_folder_get_type_string (folder); corba_folder.description = (CORBA_char *)e_folder_get_description (folder); @@ -279,6 +280,9 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_ corba_folder.physicalUri = ""; corba_folder.evolutionUri = (CORBA_char *)g_strconcat (E_SHELL_URI_PREFIX, path, NULL); corba_folder.unreadCount = e_folder_get_unread_count (folder); + corba_folder.customIconName = (CORBA_char *)e_folder_get_custom_icon_name (folder); + if (corba_folder.customIconName == NULL) + corba_folder.customIconName = ""; } GNOME_Evolution_FolderSelectionListener_notifySelected (listener, &corba_folder, &ev); @@ -543,7 +547,6 @@ impl_Shell_selectUserFolder (PortableServer_Servant servant, const CORBA_char *title, const CORBA_char *default_folder, const GNOME_Evolution_Shell_FolderTypeNameList *corba_allowed_type_names, - const CORBA_char *default_type, CORBA_Environment *ev) { GtkWidget *folder_selection_dialog; |