[gnome-applets/wip/muktupavels/werror] tracker-search-bar: fix -Wformat-nonliteral warning



commit 94123ab767c4e692d198e1ff956dc34b5855c9ff
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Apr 4 22:54:51 2020 +0300

    tracker-search-bar: fix -Wformat-nonliteral warning

 .../tracker-search-bar/tracker-results-window.c    | 26 ++++++++++------------
 1 file changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/gnome-applets/tracker-search-bar/tracker-results-window.c 
b/gnome-applets/tracker-search-bar/tracker-results-window.c
index 98d9443ed..fdcd2cc89 100644
--- a/gnome-applets/tracker-search-bar/tracker-results-window.c
+++ b/gnome-applets/tracker-search-bar/tracker-results-window.c
@@ -1331,7 +1331,6 @@ search_get (TrackerResultsWindow *window,
 {
        SearchQuery *sq;
        gchar *sparql;
-       const gchar *format;
 
        if (!window->connection) {
                return;
@@ -1339,52 +1338,51 @@ search_get (TrackerResultsWindow *window,
 
        switch (category) {
        case CATEGORY_IMAGE:
-               format = IMAGE_QUERY;
+               sparql = g_strdup_printf (IMAGE_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_AUDIO:
-               format = MUSIC_QUERY;
+               sparql = g_strdup_printf (MUSIC_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_VIDEO:
-               format = VIDEO_QUERY;
+               sparql = g_strdup_printf (VIDEO_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_DOCUMENT:
-               format = DOCUMENT_QUERY;
+               sparql = g_strdup_printf (DOCUMENT_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_FOLDER:
-               format = FOLDER_QUERY;
+               sparql = g_strdup_printf (FOLDER_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_APPLICATION:
-               format = APP_QUERY;
+               sparql = g_strdup_printf (APP_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_TAG:
-               format = TAGS_QUERY;
+               sparql = g_strdup_printf (TAGS_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_BOOKMARK:
-               format = BOOKMARK_QUERY;
+               sparql = g_strdup_printf (BOOKMARK_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_WEBSITE:
-               format = WEBSITE_QUERY;
+               sparql = g_strdup_printf (WEBSITE_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_CONTACT:
-               format = CONTACT_QUERY;
+               sparql = g_strdup_printf (CONTACT_QUERY, window->query, MAX_ITEMS);
                break;
        case CATEGORY_NONE:
        case CATEGORY_EMAIL_ADDRESS:
        case CATEGORY_FONT:
        case CATEGORY_ARCHIVE:
        default:
-               format = NULL;
+               sparql = NULL;
                break;
        }
 
-       if (!format) {
+       if (sparql == NULL) {
                return;
        }
 
        sq = search_query_new (window->request_id, category, window);
        window->search_queries = g_list_prepend (window->search_queries, sq);
 
-       sparql = g_strdup_printf (format, window->query, MAX_ITEMS);
        tracker_sparql_connection_query_async (window->connection,
                                               sparql,
                                               sq->cancellable,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]