diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-folder-selector.c | 8 | ||||
| -rw-r--r-- | mail/em-format-html-display.c | 1 |
3 files changed, 11 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index ea2088737c..b3e3f8072f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,6 +1,13 @@ 2004-03-10 Jeffrey Stedfast <fejj@ximian.com> - Partial fix for bug #53862 + * em-format-html-display.c (efhd_xpkcs7mime_validity_clicked): + Removed an unused variable left over from an old attempted fix. + + * em-folder-selector.c (emfs_response): Select the same folder in + the create-folder dialog as is selected in the parent selector + dialog. Fixes the rest of bug #53862. + + Partial fix for bug #53862. * em-folder-selector.c (emfs_response): Connect to the newly added "folder-added" signal and save a created_uri string so that we can diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 754c123141..3a587ddc72 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -138,19 +138,15 @@ folder_created_cb (EMFolderTreeModel *model, const char *path, const char *uri, CamelException ex; CamelStore *store; - printf ("folder_created_cb: uri=%s (we are waiting for %s)\n", uri, emfs->created_uri); - camel_exception_init (&ex); if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex))) return; if (camel_store_folder_uri_equal (store, emfs->created_uri, uri)) { - printf ("we got it!\n"); em_folder_tree_set_selected (emfs->emft, uri); g_signal_handler_disconnect (model, emfs->created_id); emfs->created_id = 0; - } else - printf ("we didn't get it... :(\n"); + } camel_object_unref (store); } @@ -169,6 +165,8 @@ emfs_response (GtkWidget *dialog, int response, EMFolderSelector *emfs) emft = (EMFolderTree *) em_folder_tree_new_with_model (model); dialog = em_folder_selector_create_new (emft, 0, _("Create New Folder"), _("Specify where to create the folder:")); gtk_window_set_transient_for ((GtkWindow *) dialog, (GtkWindow *) emfs); + uri = em_folder_selector_get_selected_uri (emfs); + em_folder_tree_set_selected (emft, uri); if (gtk_dialog_run ((GtkDialog *) dialog) == GTK_RESPONSE_OK) { uri = em_folder_selector_get_selected_uri ((EMFolderSelector *) dialog); diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index b7b432e72c..e1d3f95159 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -752,7 +752,6 @@ static void efhd_xpkcs7mime_validity_clicked(GtkWidget *button, EMFormatHTMLPObject *pobject) { struct _smime_pobject *po = (struct _smime_pobject *)pobject; - const char *alt_desc = NULL; GladeXML *xml; GtkWidget *vbox, *w; |