aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Manjunath <msuman@src.gnome.org>2009-02-02 12:04:19 +0800
committerSuman Manjunath <msuman@src.gnome.org>2009-02-02 12:04:19 +0800
commitd59c9315d8570ec7951f737442c57bff729f58ea (patch)
tree6253cca5669fd998b7810860e5269bd0b34dbc21
parent38c8ce1aac739a3e74448ff5ed7fa2e003a9cc28 (diff)
downloadgsoc2013-evolution-d59c9315d8570ec7951f737442c57bff729f58ea.tar
gsoc2013-evolution-d59c9315d8570ec7951f737442c57bff729f58ea.tar.gz
gsoc2013-evolution-d59c9315d8570ec7951f737442c57bff729f58ea.tar.bz2
gsoc2013-evolution-d59c9315d8570ec7951f737442c57bff729f58ea.tar.lz
gsoc2013-evolution-d59c9315d8570ec7951f737442c57bff729f58ea.tar.xz
gsoc2013-evolution-d59c9315d8570ec7951f737442c57bff729f58ea.tar.zst
gsoc2013-evolution-d59c9315d8570ec7951f737442c57bff729f58ea.zip
Patch from Matt McCutchen 2: Fix for bug #567935 (Don't use an uninitialized variable).
svn path=/trunk/; revision=37208
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-tree.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 969d4a4550..1885c539e3 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-02 Matt McCutchen 2 <matt@mattmccutchen.net>
+
+ ** Fix for bug #567935
+
+ * em-folder-tree.c (emft_popup_uvfolder): Don't use an uninitialized
+ variable.
+
2009-02-01 Matthew Barnes <mbarnes@redhat.com>
* em-event.c:
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index b66c80b31b..54173a5e51 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2099,16 +2099,16 @@ emft_popup_uvfolder (EPopup *ep, EPopupItem *pitem, void *data)
{
EMFolderTree *emft = data;
CamelFolder *folder;
- char *meta = camel_object_meta_get(folder, "vfolder:unread");
if ((folder = em_folder_tree_get_selected_folder (emft)) != NULL) {
+ char *meta = camel_object_meta_get(folder, "vfolder:unread");
if (!meta || strcmp(meta, "false") == 0)
camel_object_meta_set(folder, "vfolder:unread", "true");
else
camel_object_meta_set(folder, "vfolder:unread", "false");
+ camel_object_state_write (folder);
+ g_free (meta);
}
- camel_object_state_write (folder);
- g_free (meta);
}
static EPopupItem emft_popup_items[] = {