summaryrefslogtreecommitdiff
path: root/src/gmutil.h
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2022-02-20 12:53:12 +0200
committerJaakko Keränen <jaakko.keranen@iki.fi>2022-02-20 12:53:12 +0200
commit6d7b6122e68c8d53b6e7533a6e5d5f55e33831e1 (patch)
tree80bc2867510e3c9b7bc43578fc416165dae3876c /src/gmutil.h
parent2d52f13afb15232cc9c834f0aa14284bf9072a31 (diff)
parent41f378c4b46cb5dd3599d44c81fa51d3183eefee (diff)
Merge branch 'work/v1.11' into dev
# Conflicts: # res/lang/es.bin # res/lang/ie.bin # res/lang/ru.bin # res/lang/sr.bin # res/lang/uk.bin
Diffstat (limited to 'src/gmutil.h')
-rw-r--r--src/gmutil.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gmutil.h b/src/gmutil.h
index 1594afc4..e4284cfd 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -120,6 +120,7 @@ uint16_t urlPort_String (const iString *);
120iRangecc urlUser_String (const iString *); 120iRangecc urlUser_String (const iString *);
121iRangecc urlRoot_String (const iString *); 121iRangecc urlRoot_String (const iString *);
122const iBlock * urlThemeSeed_String (const iString *); 122const iBlock * urlThemeSeed_String (const iString *);
123const iBlock * urlPaletteSeed_String (const iString *);
123 124
124const iString * absoluteUrl_String (const iString *, const iString *urlMaybeRelative); 125const iString * absoluteUrl_String (const iString *, const iString *urlMaybeRelative);
125iBool isLikelyUrl_String (const iString *); 126iBool isLikelyUrl_String (const iString *);
@@ -141,6 +142,7 @@ void urlEncodeSpaces_String (iString *);
141const iString * withSpacesEncoded_String(const iString *); 142const iString * withSpacesEncoded_String(const iString *);
142const iString * withScheme_String (const iString *, const char *scheme); /* replace URI scheme */ 143const iString * withScheme_String (const iString *, const char *scheme); /* replace URI scheme */
143const iString * canonicalUrl_String (const iString *); 144const iString * canonicalUrl_String (const iString *);
145const iString * prettyDataUrl_String (const iString *, int contentColor);
144 146
145const char * mediaType_Path (const iString *path); 147const char * mediaType_Path (const iString *path);
146const char * mediaTypeFromFileExtension_String (const iString *); 148const char * mediaTypeFromFileExtension_String (const iString *);
@@ -149,9 +151,4 @@ iRangecc mediaTypeWithoutParameters_Rangecc (iRangecc mime);
149const iString * findContainerArchive_Path (const iString *path); 151const iString * findContainerArchive_Path (const iString *path);
150 152
151 153
152const iString * feedEntryOpenCommand_String (const iString *url, int newTab); /* checks fragment */ 154const iString * feedEntryOpenCommand_String (const iString *url, int newTab, int newWindow); /* checks fragment */
153
154/* TODO: Consider adding this to the_Foundation. */
155int replaceRegExp_String (iString *, const iRegExp *regexp, const char *replacement,
156 void (*matchHandler)(void *, const iRegExpMatch *),
157 void *context);