diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-12-03 04:20:25 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-12-03 04:20:25 +0800 |
| commit | 00bae1514aefb8d92d4931380a3cf053fefddc51 (patch) | |
| tree | 1a8741fb87fccf39a5f2b403e6d407d26f99720a | |
| parent | 1bcdb2c524ef136e173842a13aba04b764fd9752 (diff) | |
| download | gsoc2013-evolution-00bae1514aefb8d92d4931380a3cf053fefddc51.tar gsoc2013-evolution-00bae1514aefb8d92d4931380a3cf053fefddc51.tar.gz gsoc2013-evolution-00bae1514aefb8d92d4931380a3cf053fefddc51.tar.bz2 gsoc2013-evolution-00bae1514aefb8d92d4931380a3cf053fefddc51.tar.lz gsoc2013-evolution-00bae1514aefb8d92d4931380a3cf053fefddc51.tar.xz gsoc2013-evolution-00bae1514aefb8d92d4931380a3cf053fefddc51.tar.zst gsoc2013-evolution-00bae1514aefb8d92d4931380a3cf053fefddc51.zip | |
more fixes
svn path=/trunk/; revision=23587
| -rw-r--r-- | mail/em-folder-selector.c | 3 | ||||
| -rw-r--r-- | mail/em-folder-tree-model.c | 8 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 4a2ac4f2af..b91fc1ce5b 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -282,6 +282,9 @@ em_folder_selector_get_selected_uri (EMFolderSelector *emfs) char *newpath; url = camel_url_new (uri, NULL); + /* FIXME: if we try to create a toplevel folder on a + * store that uses fragments, url->fragment will be + * NULL and so the resultant url will be incorrect */ newpath = g_strdup_printf ("%s/%s", url->fragment ? url->fragment : url->path, gtk_entry_get_text (emfs->name_entry)); if (url->fragment) camel_url_set_fragment (url, newpath); diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 05c92c6297..8efbcce48d 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -435,11 +435,11 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite gtk_tree_store_append ((GtkTreeStore *) model, &sub, iter); gtk_tree_store_set ((GtkTreeStore *) model, &sub, COL_STRING_DISPLAY_NAME, _("Loading..."), - COL_POINTER_CAMEL_STORE, si->store, - COL_STRING_FOLDER_PATH, fi->path, - COL_BOOL_LOAD_SUBDIRS, TRUE, + COL_POINTER_CAMEL_STORE, NULL, + COL_STRING_FOLDER_PATH, NULL, + COL_BOOL_LOAD_SUBDIRS, FALSE, COL_BOOL_IS_STORE, FALSE, - COL_STRING_URI, fi->url, + COL_STRING_URI, NULL, COL_UINT_UNREAD, 0, -1); } diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 82c7d90aba..00692595b1 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1050,7 +1050,6 @@ em_folder_tree_get_folder_info__free (struct _mail_msg *mm) camel_store_free_folder_info (m->store, m->fi); gtk_tree_row_reference_free (m->root); - /*g_object_unref (m->emft);*/ camel_object_unref (m->store); g_free (m->select_uri); g_free (m->top); |