merge

6 files changed, 6 insertions, 9 deletions

diff --git a/src/cache.c b/src/cache.c
index 5652ae4f..3341388c 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -88,7 +88,7 @@ static uint_t DelayedQueueIdleId = 0;
 static CacheEntry_t *Cache_process_queue(CacheEntry_t *entry);
 static void Cache_delayed_process_queue(CacheEntry_t *entry);
 static void Cache_auth_entry(CacheEntry_t *entry, BrowserWindow *bw);
-
+static void Cache_entry_inject(const DilloUrl *Url, Dstr *data_ds);
 
 /*
  * Determine if two cache entries are equal (used by CachedURLs)
@@ -124,7 +124,7 @@ void a_Cache_init(void)
    {
       DilloUrl *url = a_Url_new("about:splash", NULL);
       Dstr *ds = dStr_new(AboutSplash);
-      a_Cache_entry_inject(url, ds);
+      Cache_entry_inject(url, ds);
       dStr_free(ds, 1);
       a_Url_free(url);
    }
@@ -267,7 +267,7 @@ static CacheEntry_t *Cache_entry_add(const DilloUrl *Url)
  * Inject full page content directly into the cache.
  * Used for "about:splash". May be used for "about:cache" too.
  */
-void a_Cache_entry_inject(const DilloUrl *Url, Dstr *data_ds)
+static void Cache_entry_inject(const DilloUrl *Url, Dstr *data_ds)
 {
    CacheEntry_t *entry;
 
diff --git a/src/cache.h b/src/cache.h
index cdea361b..c01bec55 100644
--- a/src/cache.h
+++ b/src/cache.h
@@ -69,7 +69,6 @@ uint_t a_Cache_get_flags_with_redirection(const DilloUrl *url);
 void a_Cache_process_dbuf(int Op, const char *buf, size_t buf_size,
                           const DilloUrl *Url);
 int a_Cache_download_enabled(const DilloUrl *url);
-void a_Cache_entry_inject(const DilloUrl *Url, Dstr *data_ds);
 void a_Cache_entry_remove_by_url(DilloUrl *url);
 void a_Cache_freeall(void);
 CacheClient_t *a_Cache_client_get_if_unique(int Key);
diff --git a/src/cookies.c b/src/cookies.c
index 8c482cbc..a25138cd 100644
--- a/src/cookies.c
+++ b/src/cookies.c
@@ -42,7 +42,6 @@ void a_Cookies_init(void)
 #include "list.h"
 #include "cookies.h"
 #include "capi.h"
-#include "dpiapi.h"
 #include "../dpip/dpip.h"
 
 
diff --git a/src/dicache.c b/src/dicache.c
index e74db248..43285ba5 100644
--- a/src/dicache.c
+++ b/src/dicache.c
@@ -107,7 +107,7 @@ static DICacheEntry *Dicache_entry_new(void)
  * Add a new entry in the dicache
  * (a single node (URL) may have several entries)
  */
-DICacheEntry *a_Dicache_add_entry(const DilloUrl *Url)
+static DICacheEntry *Dicache_add_entry(const DilloUrl *Url)
 {
    DICacheEntry *entry;
    DICacheNode *node;
@@ -409,7 +409,7 @@ static void *Dicache_image(int ImgType, const char *MimeType, void *Ptr,
    DicEntry = a_Dicache_get_entry(web->url, DIC_Last);
    if (!DicEntry) {
       /* Let's create an entry for this image... */
-      DicEntry = a_Dicache_add_entry(web->url);
+      DicEntry = Dicache_add_entry(web->url);
       DicEntry->DecoderData =
          (ImgType == DIC_Png) ?
             a_Png_new(web->Image, DicEntry->url, DicEntry->version) :
diff --git a/src/dicache.h b/src/dicache.h
index b7bbb61c..70adb6c0 100644
--- a/src/dicache.h
+++ b/src/dicache.h
@@ -51,7 +51,6 @@ struct _DICacheEntry {
 void a_Dicache_init (void);
 
 DICacheEntry *a_Dicache_get_entry(const DilloUrl *Url, int version);
-DICacheEntry *a_Dicache_add_entry(const DilloUrl *Url);
 
 void *a_Dicache_png_image(const char *Type, void *Ptr, CA_Callback_t *Call,
                           void **Data);
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 5308ffb3..ed0dc1a7 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -266,7 +266,7 @@ public:
       } else if (e == FOCUS_CHANGE) {
          // Update the window title
          BrowserWindow *bw = a_UIcmd_get_bw_by_widget(selected_child());
-         const char *title = a_History_get_title(a_Nav_get_top_uidx(bw), 1);
+         const char *title = a_History_get_title(NAV_TOP_UIDX(bw), 1);
          a_UIcmd_set_page_title(bw, title ? title : "");
       } else if (e == MOVE) {
          CustShrinkTabPager *cstp = (CustShrinkTabPager *) pager();