1 Return-Path: <tomi.ollila@iki.fi>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 2584F429E27
\r
6 for <notmuch@notmuchmail.org>; Tue, 13 Sep 2011 14:32:26 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id XaubFvPaVBYp for <notmuch@notmuchmail.org>;
\r
16 Tue, 13 Sep 2011 14:32:25 -0700 (PDT)
\r
17 Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 69EFB429E29
\r
21 for <notmuch@notmuchmail.org>; Tue, 13 Sep 2011 14:32:25 -0700 (PDT)
\r
22 Received: from localhost6.localdomain6 (entry3.nixu.fi [193.209.237.21])
\r
23 by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id
\r
24 p8DLW8G3022252; Wed, 14 Sep 2011 00:32:17 +0300
\r
25 From: tomi.ollila@iki.fi
\r
26 To: notmuch@notmuchmail.org
\r
27 Subject: [PATCH 2/3] Made notmuch_config_get_new_tags() use
\r
28 notmuch_talloc_g_key_file_get_string_list().
\r
29 Date: Wed, 14 Sep 2011 00:32:03 +0300
\r
30 Message-Id: <1315949524-4948-3-git-send-email-tomi.ollila@iki.fi>
\r
31 X-Mailer: git-send-email 1.7.3.4
\r
32 In-Reply-To: <1315949524-4948-1-git-send-email-tomi.ollila@iki.fi>
\r
33 References: <1315949524-4948-1-git-send-email-tomi.ollila@iki.fi>
\r
34 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
35 X-BeenThere: notmuch@notmuchmail.org
\r
36 X-Mailman-Version: 2.1.13
\r
38 List-Id: "Use and development of the notmuch mail system."
\r
39 <notmuch.notmuchmail.org>
\r
40 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
41 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
42 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
43 List-Post: <mailto:notmuch@notmuchmail.org>
\r
44 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
45 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
47 X-List-Received-Date: Tue, 13 Sep 2011 21:32:26 -0000
\r
49 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
52 notmuch-config.c | 26 +++++---------------------
\r
53 1 files changed, 5 insertions(+), 21 deletions(-)
\r
55 diff --git a/notmuch-config.c b/notmuch-config.c
\r
56 index 706f481..648639b 100644
\r
57 --- a/notmuch-config.c
\r
58 +++ b/notmuch-config.c
\r
59 @@ -606,29 +606,13 @@ const char **
\r
60 notmuch_config_get_new_tags (notmuch_config_t *config,
\r
64 - size_t tags_length;
\r
67 if (config->new_tags == NULL) {
\r
68 - tags = g_key_file_get_string_list (config->key_file,
\r
70 - &tags_length, NULL);
\r
72 - config->new_tags = talloc_size (config,
\r
74 - (tags_length + 1));
\r
75 - for (i = 0; i < tags_length; i++)
\r
76 - config->new_tags[i] = talloc_strdup (config->new_tags,
\r
78 - config->new_tags[i] = NULL;
\r
80 - g_strfreev (tags);
\r
82 - config->new_tags_length = tags_length;
\r
84 + config->new_tags = notmuch_talloc_g_key_file_get_string_list(
\r
88 + &config->new_tags_length, NULL);
\r
91 *length = config->new_tags_length;
\r
92 return config->new_tags;
\r