Attachment 861408 Details for Bug 1063339 – A patch which fixes this bug

[patch] A patch which fixes this bug

fix-loading-of-the-user-list-of-ignored-words.patch (text/plain), 1.99 KB, created by Jakub Filak on 2014-02-10 14:26:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Filak

Created: 2014-02-10 14:26:27 UTC

Size: 1.99 KB

patch

obsolete

>From f689bf3b1dd26fa14bd96a2a5f0b8a6665d7ab19 Mon Sep 17 00:00:00 2001
>From: Jakub Filak <jfilak@redhat.com>
>Date: Thu, 30 Jan 2014 12:49:42 +0100
>Subject: [LIBREPORT PATCH] fix loading of the user list of ignored words
>
>Closes #1063339
>
>Signed-off-by: Jakub Filak <jfilak@redhat.com>
>---
> src/lib/user_settings.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
>diff --git a/src/lib/user_settings.c b/src/lib/user_settings.c
>index e42ebe0..4cd87ff 100644
>--- a/src/lib/user_settings.c
>+++ b/src/lib/user_settings.c
>@@ -18,19 +18,30 @@
> #include "internal_libreport.h"
> #include <augeas.h>
> 
>+#define BASE_DIR_FOR_USER_CONFIG_FILE "abrt/settings/"
>+
> static map_string_t *user_settings;
> static char *conf_path;
> 
>-static char *get_conf_path(const char *name)
>+static char *get_user_config_file_path(const char *name, const char *suffix)
> {
>     char *s, *conf;
> 
>-    s = xasprintf("abrt/settings/%s.conf", name);
>+    if (suffix != NULL)
>+        s = xasprintf(BASE_DIR_FOR_USER_CONFIG_FILE"%s.%s", name, suffix);
>+    else
>+        s = xasprintf(BASE_DIR_FOR_USER_CONFIG_FILE"%s", name);
>+
>     conf = concat_path_file(g_get_user_config_dir(), s);
>     free(s);
>     return conf;
> }
> 
>+static char *get_conf_path(const char *name)
>+{
>+    return get_user_config_file_path(name, "conf");
>+}
>+
> bool save_app_conf_file(const char* application_name, map_string_t *settings)
> {
>     char *app_conf_path = get_conf_path(application_name);
>@@ -103,8 +114,7 @@ GList *load_words_from_file(const char* filename)
>     GList *words_list = NULL;
>     GList *file_list = NULL;
>     file_list = g_list_prepend(file_list, concat_path_file(CONF_DIR, filename));
>-    // get_conf_path adds .conf suffix, so we need to either change it or use it like this:
>-    file_list = g_list_prepend(file_list, get_conf_path("forbidden_words"));
>+    file_list = g_list_prepend(file_list, get_user_config_file_path(filename, /*don't append suffix*/NULL));
>     GList *file_list_cur = file_list;
> 
>     while(file_list_cur)
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1063339: 861408