[evolution-rss] Miscellaneous build fixes (multiple declarations of variables)

[Milan Crha <mcrha src gnome org>]

commit c942e38576a6cb0b4674b9b1648d90a8c6bb9d65
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 29 12:32:15 2020 +0100

    Miscellaneous build fixes (multiple declarations of variables)

 src/parser.c |  6 +++---
 src/rss.c    | 16 +++++++++++++++-
 src/rss.h    |  5 ++---
 3 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/src/parser.c b/src/parser.c
index e8b4fe6..12d5a9b 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -1251,7 +1251,7 @@ parse_channel_line(xmlNode *top, gchar *feed_name, RDF *r, gchar **article_uid)
                d("date:%s\n", d2);
                d("body:%s\n", b);
 
-               ftotal++;
+               rss_inc_ftotal();
                sp =  decode_html_entities (p);
                tmp = decode_utf8_entities (b);
                g_free(b);
@@ -1369,7 +1369,7 @@ display_channel_items_sync(AsyncData *asyncr)
                }
                subj = g_strdup(CF->subj);
 
-               ftotal++;
+               rss_inc_ftotal();
 #if EVOLUTION_VERSION < 30304
                GConfClient *client = gconf_client_get_default();
 #else
@@ -1398,7 +1398,7 @@ display_channel_items_sync(AsyncData *asyncr)
                        CF->feed_fname, CF->feed_uri);
                free_cf(CF);
 
-done:          farticle++;
+done:          rss_inc_farticle();
                d("put success()\n");
                update_status_icon_text(status_msg, chn_name, subj);
                g_free(subj);
diff --git a/src/rss.c b/src/rss.c
index ee78445..4470336 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -208,6 +208,20 @@ typedef struct CFL {
        create_feed *CF;
 } cfl;
 
+static guint farticle;
+static guint ftotal;
+
+void
+rss_inc_farticle (void)
+{
+       farticle++;
+}
+
+void
+rss_inc_ftotal (void)
+{
+       ftotal++;
+}
 
 static volatile int org_gnome_rss_controls_counter_id = 0;
 
@@ -266,7 +280,7 @@ extern EProxy *proxy;
 #endif
 SoupSession *webkit_session = NULL;
 #if LIBSOUP_VERSION > 2024000
-SoupCookieJar *rss_soup_jar;
+extern SoupCookieJar *rss_soup_jar;
 #endif
 extern guint rsserror;
 gboolean single_pending = FALSE;
diff --git a/src/rss.h b/src/rss.h
index 520095d..3c91c16 100644
--- a/src/rss.h
+++ b/src/rss.h
@@ -379,9 +379,6 @@ struct _rfMessage {
 };
 typedef struct _rfMessage rfMessage;
 
-guint ftotal;
-guint farticle;
-
 void compare_enabled(
        gpointer key,
        gpointer value,
@@ -565,6 +562,8 @@ EShellView *rss_get_mail_shell_view (gboolean with_mail_reader);
 #endif
 void rebase_feeds(gchar *old_name, gchar *new_name);
 
+void rss_inc_farticle (void);
+void rss_inc_ftotal (void);
 
 #ifdef _WIN32
 char *strcasestr(const char *a, const char *b);