diff options
26 files changed, 1308 insertions, 1594 deletions
diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c index e2a0ca5db..49aed73e0 100644 --- a/content/handlers/image/gif.c +++ b/content/handlers/image/gif.c @@ -34,8 +34,10 @@ #include <string.h> #include <stdbool.h> #include <stdlib.h> -#include <libnsgif.h> +#include <nsgif.h> + +#include "utils/log.h" #include "utils/utils.h" #include "utils/messages.h" #include "utils/nsoption.h" @@ -51,13 +53,31 @@ #include "image/image.h" #include "image/gif.h" -typedef struct nsgif_content { +typedef struct gif_content { struct content base; - struct gif_animation *gif; /**< GIF animation data */ - int current_frame; /**< current frame to display [0...(max-1)] */ -} nsgif_content; + nsgif_t *gif; /**< GIF animation data */ + uint32_t current_frame; /**< current frame to display [0...(max-1)] */ +} gif_content; + +static inline nserror gif__nsgif_error_to_ns(nsgif_error gif_res) +{ + nserror err; + + switch (gif_res) { + case NSGIF_OK: + err = NSERROR_OK; + break; + case NSGIF_ERR_OOM: + err = NSERROR_NOMEM; + break; + default: + err = NSERROR_GIF_ERROR; + break; + } + return err; +} /** * Callback for libnsgif; forwards the call to bitmap_create() @@ -66,44 +86,42 @@ typedef struct nsgif_content { * \param height width of image in pixels * \return an opaque struct bitmap, or NULL on memory exhaustion */ -static void *nsgif_bitmap_create(int width, int height) +static void *gif_bitmap_create(int width, int height) { return guit->bitmap->create(width, height, BITMAP_NEW); } - -static nserror nsgif_create_gif_data(nsgif_content *c) +static nserror gif_create_gif_data(gif_content *c) { - gif_bitmap_callback_vt gif_bitmap_callbacks = { - .bitmap_create = nsgif_bitmap_create, - .bitmap_destroy = guit->bitmap->destroy, - .bitmap_get_buffer = guit->bitmap->get_buffer, - .bitmap_set_opaque = guit->bitmap->set_opaque, - .bitmap_test_opaque = guit->bitmap->test_opaque, - .bitmap_modified = guit->bitmap->modified + nsgif_error gif_res; + const nsgif_bitmap_cb_vt gif_bitmap_callbacks = { + .create = gif_bitmap_create, + .destroy = guit->bitmap->destroy, + .get_buffer = guit->bitmap->get_buffer, + .set_opaque = guit->bitmap->set_opaque, + .test_opaque = guit->bitmap->test_opaque, + .modified = guit->bitmap->modified }; - /* Initialise our data structure */ - c->gif = calloc(sizeof(gif_animation), 1); - if (c->gif == NULL) { - content_broadcast_error(&c->base, NSERROR_NOMEM, NULL); - return NSERROR_NOMEM; + gif_res = nsgif_create(&gif_bitmap_callbacks, &c->gif); + if (gif_res != NSGIF_OK) { + nserror err = gif__nsgif_error_to_ns(gif_res); + content_broadcast_error(&c->base, err, NULL); + return err; } - gif_create(c->gif, &gif_bitmap_callbacks); + return NSERROR_OK; } - - -static nserror nsgif_create(const content_handler *handler, - lwc_string *imime_type, const struct http_parameter *params, +static nserror gif_create(const content_handler *handler, + lwc_string *imime_type, const struct http_parameter *params, llcache_handle *llcache, const char *fallback_charset, bool quirks, struct content **c) { - nsgif_content *result; + gif_content *result; nserror error; - result = calloc(1, sizeof(nsgif_content)); + result = calloc(1, sizeof(gif_content)); if (result == NULL) return NSERROR_NOMEM; @@ -114,7 +132,7 @@ static nserror nsgif_create(const content_handler *handler, return error; } - error = nsgif_create_gif_data(result); + error = gif_create_gif_data(result); if (error != NSERROR_OK) { free(result); return error; @@ -126,99 +144,65 @@ static nserror nsgif_create(const content_handler *handler, } /** + * Scheduler callback. Performs any necessary animation. + * + * \param p The content to animate +*/ +static void gif_animate_cb(void *p); + +/** * Performs any necessary animation. * * \param p The content to animate */ -static void nsgif_animate(void *p) +static nserror gif__animate(gif_content *gif, bool redraw) { - nsgif_content *gif = p; - union content_msg_data data; - int delay; - int f; - - /* Advance by a frame, updating the loop count accordingly */ - gif->current_frame++; - if (gif->current_frame == (int)gif->gif->frame_count_partial) { - gif->current_frame = 0; - - /* A loop count of 0 has a special meaning of infinite */ - if (gif->gif->loop_count != 0) { - gif->gif->loop_count--; - if (gif->gif->loop_count == 0) { - gif->current_frame = - gif->gif->frame_count_partial - 1; - gif->gif->loop_count = -1; - } - } + nsgif_error gif_res; + nsgif_rect_t rect; + uint32_t delay; + uint32_t f; + + gif_res = nsgif_frame_prepare(gif->gif, &rect, &delay, &f); + if (gif_res != NSGIF_OK) { + return gif__nsgif_error_to_ns(gif_res); } + gif->current_frame = f; + /* Continue animating if we should */ - if (gif->gif->loop_count >= 0) { - delay = gif->gif->frames[gif->current_frame].frame_delay; - if (delay <= 1) { - /* Assuming too fast to be intended, set default. */ - delay = 10; - } - guit->misc->schedule(delay * 10, nsgif_animate, gif); + if (nsoption_bool(animate_images) && delay != NSGIF_INFINITE) { + guit->misc->schedule(delay * 10, gif_animate_cb, gif); } - if ((!nsoption_bool(animate_images)) || - (!gif->gif->frames[gif->current_frame].display)) { - return; - } + if (redraw) { + union content_msg_data data; - /* area within gif to redraw */ - f = gif->current_frame; - data.redraw.x = gif->gif->frames[f].redraw_x; - data.redraw.y = gif->gif->frames[f].redraw_y; - data.redraw.width = gif->gif->frames[f].redraw_width; - data.redraw.height = gif->gif->frames[f].redraw_height; - - /* redraw background (true) or plot on top (false) */ - if (gif->current_frame > 0) { - /* previous frame needed clearing: expand the redraw area to - * cover it */ - if (gif->gif->frames[f - 1].redraw_required) { - if (data.redraw.x > - (int)(gif->gif->frames[f - 1].redraw_x)) { - data.redraw.width += data.redraw.x - - gif->gif->frames[f - 1].redraw_x; - data.redraw.x = - gif->gif->frames[f - 1].redraw_x; - } - if (data.redraw.y > - (int)(gif->gif->frames[f - 1].redraw_y)) { - data.redraw.height += (data.redraw.y - - gif->gif->frames[f - 1].redraw_y); - data.redraw.y = - gif->gif->frames[f - 1].redraw_y; - } - if ((int)(gif->gif->frames[f - 1].redraw_x + - gif->gif->frames[f - 1].redraw_width) > - (data.redraw.x + data.redraw.width)) - data.redraw.width = - gif->gif->frames[f - 1].redraw_x - - data.redraw.x + - gif->gif->frames[f - 1].redraw_width; - if ((int)(gif->gif->frames[f - 1].redraw_y + - gif->gif->frames[f - 1].redraw_height) > - (data.redraw.y + data.redraw.height)) - data.redraw.height = - gif->gif->frames[f - 1].redraw_y - - data.redraw.y + - gif->gif->frames[f - 1].redraw_height; - } + /* area within gif to redraw */ + data.redraw.x = rect.x0; + data.redraw.y = rect.y0; + data.redraw.width = rect.x1 - rect.x0; + data.redraw.height = rect.y1 - rect.y0; + + content_broadcast(&gif->base, CONTENT_MSG_REDRAW, &data); } - content_broadcast(&gif->base, CONTENT_MSG_REDRAW, &data); + return NSERROR_OK; +} + +static void gif_animate_cb(void *p) +{ + gif_content *gif = p; + + gif__animate(gif, true); } -static bool nsgif_convert(struct content *c) +static bool gif_convert(struct content *c) { - nsgif_content *gif = (nsgif_content *) c; - int res; + gif_content *gif = (gif_content *) c; + const nsgif_info_t *gif_info; const uint8_t *data; + nsgif_error gif_err; + nserror err; size_t size; char *title; @@ -226,37 +210,30 @@ static bool nsgif_convert(struct content *c) data = content__get_source_data(c, &size); /* Initialise the GIF */ - do { - res = gif_initialise(gif->gif, size, (unsigned char *) data); - if (res != GIF_OK && res != GIF_WORKING && - res != GIF_INSUFFICIENT_FRAME_DATA) { - nserror error = NSERROR_UNKNOWN; - switch (res) { - case GIF_FRAME_DATA_ERROR: - case GIF_INSUFFICIENT_DATA: - case GIF_DATA_ERROR: - error = NSERROR_GIF_ERROR; - break; - case GIF_INSUFFICIENT_MEMORY: - error = NSERROR_NOMEM; - break; - } - content_broadcast_error(c, error, NULL); - return false; - } - } while (res != GIF_OK && res != GIF_INSUFFICIENT_FRAME_DATA); + gif_err = nsgif_data_scan(gif->gif, size, data); + if (gif_err != NSGIF_OK) { + NSLOG(netsurf, DEBUG, "%s", nsgif_strerror(gif_err)); + /* Not fatal unless er have no frames. */ + } + + gif_info = nsgif_get_info(gif->gif); + assert(gif_info != NULL); /* Abort on bad GIFs */ - if ((gif->gif->frame_count_partial == 0) || (gif->gif->width == 0) || - (gif->gif->height == 0)) { - content_broadcast_error(c, NSERROR_GIF_ERROR, NULL); + if (gif_info->frame_count == 0) { + err = gif__nsgif_error_to_ns(gif_err); + content_broadcast_error(c, err, "GIF with no frames."); + return false; + } else if (gif_info->width == 0 || gif_info->height == 0) { + err = gif__nsgif_error_to_ns(gif_err); + content_broadcast_error(c, err, "Zero size image."); return false; } /* Store our content width, height and calculate size */ - c->width = gif->gif->width; - c->height = gif->gif->height; - c->size += (gif->gif->width * gif->gif->height * 4) + 16 + 44; + c->width = gif_info->width; + c->height = gif_info->height; + c->size += (gif_info->width * gif_info->height * 4) + 16 + 44; /* set title text */ title = messages_get_buff("GIFTitle", @@ -267,12 +244,11 @@ static bool nsgif_convert(struct content *c) free(title); } - /* Schedule the animation if we have one */ - gif->current_frame = 0; - if (gif->gif->frame_count_partial > 1) - guit->misc->schedule(gif->gif->frames[0].frame_delay * 10, - nsgif_animate, - c); + err = gif__animate(gif, false); + if (err != NSERROR_OK) { + content_broadcast_error(c, NSERROR_GIF_ERROR, NULL); + return false; + } /* Exit as a success */ content_set_ready(c); @@ -283,68 +259,51 @@ static bool nsgif_convert(struct content *c) return true; } - /** * Updates the GIF bitmap to display the current frame * * \param gif The gif context to update. - * \return GIF_OK on success else apropriate error code. + * \return NSGIF_OK on success else apropriate error code. */ -static gif_result nsgif_get_frame(nsgif_content *gif) +static nsgif_error gif_get_frame(gif_content *gif, + nsgif_bitmap_t **bitmap) { - int previous_frame, current_frame, frame; - gif_result res = GIF_OK; - - current_frame = gif->current_frame; + uint32_t current_frame = gif->current_frame; if (!nsoption_bool(animate_images)) { current_frame = 0; } - if (current_frame < gif->gif->decoded_frame) { - previous_frame = 0; - } else { - previous_frame = gif->gif->decoded_frame + 1; - } - - for (frame = previous_frame; frame <= current_frame; frame++) { - res = gif_decode_frame(gif->gif, frame); - } - - return res; + return nsgif_frame_decode(gif->gif, current_frame, bitmap); } -static bool nsgif_redraw(struct content *c, struct content_redraw_data *data, +static bool gif_redraw(struct content *c, struct content_redraw_data *data, const struct rect *clip, const struct redraw_context *ctx) { - nsgif_content *gif = (nsgif_content *) c; + gif_content *gif = (gif_content *) c; + nsgif_bitmap_t *bitmap; - if (gif->current_frame != gif->gif->decoded_frame) { - if (nsgif_get_frame(gif) != GIF_OK) { - return false; - } + if (gif_get_frame(gif, &bitmap) != NSGIF_OK) { + return false; } - return image_bitmap_plot(gif->gif->frame_image, data, clip, ctx); + return image_bitmap_plot(bitmap, data, clip, ctx); } - -static void nsgif_destroy(struct content *c) +static void gif_destroy(struct content *c) { - nsgif_content *gif = (nsgif_content *) c; + gif_content *gif = (gif_content *) c; /* Free all the associated memory buffers */ - guit->misc->schedule(-1, nsgif_animate, c); - gif_finalise(gif->gif); - free(gif->gif); + guit->misc->schedule(-1, gif_animate_cb, c); + nsgif_destroy(gif->gif); } - -static nserror nsgif_clone(const struct content *old, struct content **newc) +static nserror gif_clone(const struct content *old, struct content **newc) { - nsgif_content *gif; + gif_content *gif; nserror error; - gif = calloc(1, sizeof(nsgif_content)); + gif = calloc(1, sizeof(gif_content)); if (gif == NULL) return NSERROR_NOMEM; @@ -355,7 +314,7 @@ static nserror nsgif_clone(const struct content *old, struct content **newc) } /* Simply replay creation and conversion of content */ - error = nsgif_create_gif_data(gif); + error = gif_create_gif_data(gif); if (error != NSERROR_OK) { content_destroy(&gif->base); return error; @@ -363,7 +322,7 @@ static nserror nsgif_clone(const struct content *old, struct content **newc) if (old->status == CONTENT_STATUS_READY || old->status == CONTENT_STATUS_DONE) { - if (nsgif_convert(&gif->base) == false) { + if (gif_convert(&gif->base) == false) { content_destroy(&gif->base); return NSERROR_CLONE_FAILED; } @@ -374,9 +333,9 @@ static nserror nsgif_clone(const struct content *old, struct content **newc) return NSERROR_OK; } -static void nsgif_add_user(struct content *c) +static void gif_add_user(struct content *c) { - nsgif_content *gif = (nsgif_content *) c; + gif_content *gif = (gif_content *) c; /* Ensure this content has already been converted. * If it hasn't, the animation will start at the conversion phase instead. */ @@ -384,67 +343,66 @@ static void nsgif_add_user(struct content *c) if (content_count_users(c) == 1) { /* First user, and content already converted, so start the animation. */ - if (gif->gif->frame_count_partial > 1) { - guit->misc->schedule(gif->gif->frames[0].frame_delay * 10, - nsgif_animate, c); + if (nsgif_reset(gif->gif) == NSGIF_OK) { + gif__animate(gif, true); } } } -static void nsgif_remove_user(struct content *c) +static void gif_remove_user(struct content *c) { if (content_count_users(c) == 1) { /* Last user is about to be removed from this content, so stop the animation. */ - guit->misc->schedule(-1, nsgif_animate, c); + guit->misc->schedule(-1, gif_animate_cb, c); } } -static void *nsgif_get_internal(const struct content *c, void *context) +static nsgif_bitmap_t *gif_get_bitmap( + const struct content *c, void *context) { - nsgif_content *gif = (nsgif_content *) c; + gif_content *gif = (gif_content *) c; + nsgif_bitmap_t *bitmap; - if (gif->current_frame != gif->gif->decoded_frame) { - if (nsgif_get_frame(gif) != GIF_OK) - return NULL; + if (gif_get_frame(gif, &bitmap) != NSGIF_OK) { + return NULL; } - return gif->gif->frame_image; + return bitmap; } -static content_type nsgif_content_type(void) +static content_type gif_content_type(void) { return CONTENT_IMAGE; } -static bool nsgif_content_is_opaque(struct content *c) +static bool gif_content_is_opaque(struct content *c) { - nsgif_content *gif = (nsgif_content *) c; + gif_content *gif = (gif_content *) c; + nsgif_bitmap_t *bitmap; - if (gif->current_frame != gif->gif->decoded_frame) { - if (nsgif_get_frame(gif) != GIF_OK) { - return false; - } + if (gif_get_frame(gif, &bitmap) != NSGIF_OK) { + return false; } - return guit->bitmap->get_opaque(gif->gif->frame_image); + return guit->bitmap->get_opaque(bitmap); } -static const content_handler nsgif_content_handler = { - .create = nsgif_create, - .data_complete = nsgif_convert, - .destroy = nsgif_destroy, - .redraw = nsgif_redraw, - .clone = nsgif_clone, - .add_user = nsgif_add_user, - .remove_user = nsgif_remove_user, - .get_internal = nsgif_get_internal, - .type = nsgif_content_type, - .is_opaque = nsgif_content_is_opaque, +static const content_handler gif_content_handler = { + .create = gif_create, + .data_complete = gif_convert, + .destroy = gif_destroy, + .redraw = gif_redraw, + .clone = gif_clone, + .add_user = gif_add_user, + .remove_user = gif_remove_user, + .get_internal = gif_get_bitmap, + .type = gif_content_type, + .is_opaque = gif_content_is_opaque, .no_share = false, }; -static const char *nsgif_types[] = { +static const char *gif_types[] = { "image/gif" }; -CONTENT_FACTORY_REGISTER_TYPES(nsgif, nsgif_types, nsgif_content_handler); +CONTENT_FACTORY_REGISTER_TYPES(nsgif, gif_types, gif_content_handler); diff --git a/desktop/textarea.c b/desktop/textarea.c index 5bae27a5c..e0e87444c 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -58,7 +58,7 @@ struct line_info { struct textarea_drag { textarea_drag_type type; union { - struct scrollbar* scrollbar; + struct scrollbar *scrollbar; } data; }; @@ -625,7 +625,7 @@ static bool textarea_select(struct textarea *ta, int b_start, int b_end, * \param ta Text area * \return True on success, false otherwise */ -static bool textarea_select_fragment(struct textarea * ta) +static bool textarea_select_fragment(struct textarea *ta) { int caret_pos; size_t sel_start, sel_end; @@ -676,7 +676,7 @@ static bool textarea_select_fragment(struct textarea * ta) * \param ta textarea widget * \return True on success, false otherwise */ -static bool textarea_select_paragraph(struct textarea * ta) +static bool textarea_select_paragraph(struct textarea *ta) { int caret_pos; size_t sel_start, sel_end; @@ -1607,7 +1607,7 @@ static bool textarea_copy_to_undo_buffer(struct textarea *ta, * \param b_end End byte index of replaced section (exclusive) * \param rep Replacement UTF-8 text to insert * \param rep_len Byte length of replacement UTF-8 text - * \param add_to_clipboard True iff replaced text to be added to clipboard + * \param add_to_clipboard True if replaced text to be added to clipboard * \param byte_delta Updated to change in byte count in textarea (ta->show) * \param r Updated to area where redraw is required * \return false on memory exhaustion, true otherwise @@ -2452,7 +2452,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) struct textarea_msg msg; struct rect r; /**< Redraw rectangle */ char utf8[6]; - unsigned int caret, length, b_off, b_len; + unsigned int caret, caret_copy, length, b_off, b_len; int h_extent = ta->h_extent; int v_extent = ta->v_extent; int line; @@ -2466,7 +2466,7 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) /* Word separators */ static const char *sep = " .\n"; - caret = textarea_get_caret(ta); + caret = caret_copy = textarea_get_caret(ta); line = ta->caret_pos.line; readonly = (ta->flags & TEXTAREA_READONLY ? true : false); @@ -2743,6 +2743,9 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) case NS_KEY_WORD_LEFT: if (readonly) break; + if (ta->sel_start != -1) { + textarea_clear_selection(ta); + } if (caret == 0) break; caret--; @@ -2756,13 +2759,59 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) break; } } + break; + case NS_KEY_DELETE_WORD_LEFT: + if (readonly) + break; + + /* If there is a selection, remove the selected + * characters */ if (ta->sel_start != -1) { + if (!textarea_replace_text(ta, ta->sel_start, + ta->sel_end, "", 0, false, + &byte_delta, &r)) + return false; + caret = ta->sel_start; textarea_clear_selection(ta); + redraw = true; + break; + } + + if (caret == 0) + break; + + /* caret goes left until a non-separator is + * encountered */ + caret--; + while (strchr(sep, ta->show->data[caret]) != NULL && + caret > 0) + caret--; + + /* caret goes left until a separator is encountered */ + for (; caret > 0; caret--) { + if (strchr(sep, ta->show->data[caret]) != + NULL) { + caret++; + break; + } } + + /* Remove the characters from new caret position to + * original caret position */ + if (!textarea_replace_text(ta, caret, caret_copy, + "", 0, false, &byte_delta, &r)) + return false; + + redraw = true; break; case NS_KEY_WORD_RIGHT: if (readonly) break; + if (ta->sel_start != -1) { + textarea_clear_selection(ta); + } + if (caret == ta->show->len - 1) + break; if (strchr(sep, ta->show->data[caret]) != NULL && caret < ta->show->len - 1) { while (strchr(sep, ta->show->data[caret]) != @@ -2779,9 +2828,49 @@ bool textarea_keypress(struct textarea *ta, uint32_t key) while (strchr(sep, ta->show->data[caret]) != NULL && caret < ta->show->len - 1) caret++; + break; + case NS_KEY_DELETE_WORD_RIGHT: + if (readonly) + break; + + /* If there is a selection, remove the selected + * characters */ if (ta->sel_start != -1) { + if (!textarea_replace_text(ta, ta->sel_start, + ta->sel_end, "", 0, false, + &byte_delta, &r)) + return false; + caret = ta->sel_start; textarea_clear_selection(ta); + redraw = true; + break; } + + if (caret == ta->show->len - 1) + break; + + /* caret_copy goes right until a non-separator is + * encountered */ + while (strchr(sep, ta->show->data[caret_copy]) != NULL + && caret_copy < ta->show->len - 1) + caret_copy++; + + /* caret_copy goes right until a separator is + * encountered */ + for (; caret_copy < ta->show->len - 1; caret_copy++) { + if (strchr(sep, ta->show->data[caret_copy]) != + NULL) { + break; + } + } + + /* Remove all the characters from original caret + * position to caret_copy */ + if (!textarea_replace_text(ta, caret, caret_copy, + "", 0, false, &byte_delta, &r)) + return false; + + redraw = true; break; case NS_KEY_DELETE_LINE: if (readonly) diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index 99745c90e..80b6f8312 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -7,7 +7,7 @@ CFLAGS += -std=c99 -Dnsamiga ifneq ($(SUBTARGET),os3) CFLAGS += -O2 -mstrict-align -finline-functions -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__ else - CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020 + CFLAGS += -O2 -DPATH_MAX=1024 -D__m68k__ -m68020 -Dmc68000 endif $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon)) diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c index f937fdb17..8089857a9 100644 --- a/frontends/amiga/arexx.c +++ b/frontends/amiga/arexx.c @@ -126,14 +126,13 @@ STATIC struct ARexxCmd Commands[] = bool ami_arexx_init(ULONG *rxsig) { - if((arexx_obj = ARexxObj, + if((arexx_obj = (ARexxObj, AREXX_HostName,"NETSURF", AREXX_Commands,Commands, AREXX_NoSlot,TRUE, AREXX_ReplyHook,NULL, AREXX_DefExtension,"nsrx", - End)) - { + End))) { GetAttr(AREXX_SigMask, arexx_obj, rxsig); return true; } @@ -141,13 +140,13 @@ bool ami_arexx_init(ULONG *rxsig) { /* Create a temporary ARexx port so we can send commands to the NetSurf which * is already running */ - arexx_obj = ARexxObj, + arexx_obj = (ARexxObj, AREXX_HostName,"NETSURF", AREXX_Commands,Commands, AREXX_NoSlot,FALSE, AREXX_ReplyHook,NULL, AREXX_DefExtension,"nsrx", - End; + End); return false; } diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c index 3cd32f37e..86aa24214 100644 --- a/frontends/amiga/cookies.c +++ b/frontends/amiga/cookies.c @@ -297,7 +297,7 @@ ami_cookies_create_window(struct ami_cookie_window *cookie_win) refresh_mode = WA_SimpleRefresh; } - ami_cw->objects[GID_CW_WIN] = WindowObj, + ami_cw->objects[GID_CW_WIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, ami_cw->wintitle, WA_Activate, TRUE, @@ -327,15 +327,15 @@ ami_cookies_create_window(struct ami_cookie_window *cookie_win) WINDOW_MenuUserData, WGUD_HOOK, WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj, - LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj, + WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj, GA_ID, GID_CW_DRAW, SPACE_Transparent, TRUE, SPACE_BevelStyle, BVS_DISPLAY, GA_RelVerify, TRUE, - SpaceEnd, - EndGroup, - EndWindow; + SpaceEnd), + EndGroup), + EndWindow); if(ami_cw->objects[GID_CW_WIN] == NULL) { return NSERROR_NOMEM; diff --git a/frontends/amiga/dist/Rexx/YT_download_page.nsrx b/frontends/amiga/dist/Rexx/YT_download_page.nsrx new file mode 100644 index 000000000..fdc06923d --- /dev/null +++ b/frontends/amiga/dist/Rexx/YT_download_page.nsrx @@ -0,0 +1,21 @@ +/* YT play.nsrx by Chris Handley + This script shows download links for a YouTube video using YT (OS4Depot:video/misc/yt.lha) +*/ + +options results + +if ~open('yt','AppDir:YT','R') then do + GETSCREENNAME + address command 'requestchoice >NIL: "NetSurf" "YT must be installed for this script to function.*n*nIt can be downloaded from OS4Depot:video/misc/yt" "OK" PubScreen='||result + OPEN 'http://os4depot.net/?function=showfile&file=video/misc/yt.lha' NEWTAB ACTIVE /* This doesn't work due to a NetSurf(?) bug */ + exit +end +close('yt') + +GETURL +/*address command 'requestchoice >NIL: "TEST" "'||result||'" "OK"'*/ +address command 'AppDir:YT <>CON:0/30/640/256/YT/AUTO/CLOSE "'||result||'" html silent' + +/* Hack to activate the newest tab */ +OPEN 'file:///RAM:' NEWTAB ACTIVE +CLOSE diff --git a/frontends/amiga/dist/Rexx/YT_open.nsrx b/frontends/amiga/dist/Rexx/YT_open.nsrx new file mode 100644 index 000000000..4454f0c29 --- /dev/null +++ b/frontends/amiga/dist/Rexx/YT_open.nsrx @@ -0,0 +1,21 @@ +/* YT play.nsrx by Chris Handley + This script opens a YouTube video using YT (OS4Depot:video/misc/yt.lha) +*/ + +options results + +if ~open('yt','AppDir:YT','R') then do + GETSCREENNAME + address command 'requestchoice >NIL: "NetSurf" "YT must be installed for this script to function.*n*nIt can be downloaded from OS4Depot:video/misc/yt" "OK" PubScreen='||result + OPEN 'http://os4depot.net/?function=showfile&file=video/misc/yt.lha' NEWTAB ACTIVE /* This doesn't work due to a NetSurf(?) bug */ + exit +end +close('yt') + +address COMMAND 'Run >NIL: RequestChoice Title="NetSurf" BODY="When finished with YT, click OK to return to NetSurf" GADGETS="OK" INACTIVE >NIL:' /* Hack to get Workbench to front */ + +GETURL +/*address command 'requestchoice >NIL: "TEST" "'||result||'" "OK"'*/ +address command 'AppDir:YT <>CON:0/30/640/256/YT/AUTO/CLOSE "'||result||'"' + +/*TOBACK*/ /* ideally we'd bring Workbench to front */ diff --git a/frontends/amiga/dist/Rexx/YT_play.nsrx b/frontends/amiga/dist/Rexx/YT_play.nsrx new file mode 100644 index 000000000..a8e29162f --- /dev/null +++ b/frontends/amiga/dist/Rexx/YT_play.nsrx @@ -0,0 +1,19 @@ +/* YT play.nsrx by Chris Handley + This script auto-plays a YouTube video using YT (OS4Depot:video/misc/yt.lha) +*/ + +options results + +if ~open('yt','AppDir:YT','R') then do + GETSCREENNAME + address command 'requestchoice >NIL: "NetSurf" "YT must be installed for this script to function.*n*nIt can be downloaded from OS4Depot:video/misc/yt" "OK" PubScreen='||result + OPEN 'http://os4depot.net/?function=showfile&file=video/misc/yt.lha' NEWTAB ACTIVE /* This doesn't work due to a NetSurf(?) bug */ + exit +end +close('yt') + +GETURL +/*address command 'requestchoice >NIL: "TEST" "'||result||'" "OK"'*/ +address command 'AppDir:YT <>CON:0/30/640/256/YT/AUTO/CLOSE "'||result||'" AutoPlay' + +/*TOBACK*/ /* ideally we'd bring Workbench to front */ diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c index cb9e99785..5bf430165 100644 --- a/frontends/amiga/download.c +++ b/frontends/amiga/download.c @@ -191,7 +191,7 @@ static struct gui_download_window *gui_download_window_create(download_context * APPNOTIFY_StopBackMsg, bkm, TAG_DONE); } else { - dw->objects[OID_D_MAIN] = WindowObj, + dw->objects[OID_D_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, dw->url, WA_Activate, TRUE, @@ -205,8 +205,8 @@ static struct gui_download_window *gui_download_window_create(download_context * WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, dw->objects[GID_D_MAIN] = LayoutVObj, - LAYOUT_AddChild, dw->objects[GID_D_STATUS] = FuelGaugeObj, + WINDOW_ParentGroup, dw->objects[GID_D_MAIN] = (LayoutVObj, + LAYOUT_AddChild, dw->objects[GID_D_STATUS] = (FuelGaugeObj, GA_ID,GID_D_STATUS, GA_Text,messages_get("amiDownload"), FUELGAUGE_Min,0, @@ -217,17 +217,17 @@ static struct gui_download_window *gui_download_window_create(download_context * FUELGAUGE_VarArgs,va, FUELGAUGE_Percent,FALSE, FUELGAUGE_Justification,FGJ_CENTER, - FuelGaugeEnd, + FuelGaugeEnd), CHILD_NominalSize,TRUE, CHILD_WeightedHeight,0, - LAYOUT_AddChild, dw->objects[GID_D_CANCEL] = ButtonObj, + LAYOUT_AddChild, dw->objects[GID_D_CANCEL] = (ButtonObj, GA_ID,GID_D_CANCEL, GA_RelVerify,TRUE, GA_Text,messages_get("Abort"), GA_TabCycle,TRUE, - ButtonEnd, - EndGroup, - EndWindow; + ButtonEnd), + EndGroup), + EndWindow); dw->win = (struct Window *)RA_OpenWindow(dw->objects[OID_D_MAIN]); } diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c index d7f970be1..5e8707cef 100644 --- a/frontends/amiga/font_scan.c +++ b/frontends/amiga/font_scan.c @@ -106,7 +106,7 @@ static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts) fsw->title = ami_utf8_easy(messages_get("FontScanning")); fsw->glyphtext = ami_utf8_easy(messages_get("FontGlyphs")); - fsw->objects[FS_OID_MAIN] = WindowObj, + fsw->objects[FS_OID_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, fsw->title, WA_Activate, TRUE, @@ -121,8 +121,8 @@ static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts) WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, WINDOW_LockHeight, TRUE, - WINDOW_ParentGroup, fsw->objects[FS_GID_MAIN] = LayoutVObj, - LAYOUT_AddChild, fsw->objects[FS_GID_FONTS] = FuelGaugeObj, + WINDOW_ParentGroup, fsw->objects[FS_GID_MAIN] = (LayoutVObj, + LAYOUT_AddChild, fsw->objects[FS_GID_FONTS] = (FuelGaugeObj, GA_ID, FS_GID_FONTS, GA_Text, fsw->title, FUELGAUGE_Min, 0, @@ -132,10 +132,10 @@ static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts) FUELGAUGE_ShortTicks, TRUE, FUELGAUGE_Percent, FALSE, FUELGAUGE_Justification, FGJ_CENTER, - FuelGaugeEnd, + FuelGaugeEnd), CHILD_NominalSize, TRUE, CHILD_WeightedHeight, 0, - LAYOUT_AddChild, fsw->objects[FS_GID_GLYPHS] = FuelGaugeObj, + LAYOUT_AddChild, fsw->objects[FS_GID_GLYPHS] = (FuelGaugeObj, GA_ID, FS_GID_GLYPHS, //GA_Text, "Glyphs", FUELGAUGE_Min, 0x0000, @@ -145,11 +145,11 @@ static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts) FUELGAUGE_ShortTicks, TRUE, FUELGAUGE_Percent, FALSE, FUELGAUGE_Justification, FGJ_CENTER, - FuelGaugeEnd, + FuelGaugeEnd), CHILD_NominalSize, TRUE, CHILD_WeightedHeight, 0, - EndGroup, - EndWindow; + EndGroup), + EndWindow); fsw->win = (struct Window *)RA_OpenWindow(fsw->objects[FS_OID_MAIN]); diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 8eb34fb92..2c4b31511 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -2119,12 +2119,12 @@ static bool ami_gui_hscroll_add(struct gui_window_2 *gwin) attrs[1].ti_Tag = TAG_DONE; attrs[1].ti_Data = 0; - gwin->objects[GID_HSCROLL] = ScrollerObj, + gwin->objects[GID_HSCROLL] = (ScrollerObj, GA_ID, GID_HSCROLL, GA_RelVerify, TRUE, SCROLLER_Orientation, SORIENT_HORIZ, ICA_TARGET, ICTARGET_IDCMP, - ScrollerEnd; + ScrollerEnd); #ifdef __amigaos4__ IDoMethod(gwin->objects[GID_HSCROLLLAYOUT], LM_ADDCHILD, gwin->win, gwin->objects[GID_HSCROLL], attrs); @@ -2165,11 +2165,11 @@ static bool ami_gui_vscroll_add(struct gui_window_2 *gwin) attrs[1].ti_Tag = TAG_DONE; attrs[1].ti_Data = 0; - gwin->objects[GID_VSCROLL] = ScrollerObj, + gwin->objects[GID_VSCROLL] = (ScrollerObj, GA_ID, GID_VSCROLL, GA_RelVerify, TRUE, ICA_TARGET, ICTARGET_IDCMP, - ScrollerEnd; + ScrollerEnd); #ifdef __amigaos4__ IDoMethod(gwin->objects[GID_VSCROLLLAYOUT], LM_ADDCHILD, gwin->win, gwin->objects[GID_VSCROLL], attrs); @@ -2277,13 +2277,13 @@ static void ami_gui_console_log_add(struct gui_window *g) attrs[1].ti_Tag = TAG_DONE; attrs[1].ti_Data = 0; - g->shared->objects[GID_LOG] = ListBrowserObj, + g->shared->objects[GID_LOG] = (ListBrowserObj, GA_ID, GID_LOG, LISTBROWSER_ColumnInfo, g->logcolumns, LISTBROWSER_ColumnTitles, TRUE, LISTBROWSER_Labels, &g->loglist, LISTBROWSER_Striping, LBS_ROWS, - ListBrowserEnd; + ListBrowserEnd); #ifdef __amigaos4__ IDoMethod(g->shared->objects[GID_LOGLAYOUT], LM_ADDCHILD, @@ -4023,12 +4023,12 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, if (iconname == NULL) iconname = ASPrintf("icons/content.png"); ami_locate_resource(menu_icon, iconname); - tb_userdata->gw->hotlist_toolbar_lab[item] = BitMapObj, + tb_userdata->gw->hotlist_toolbar_lab[item] = (BitMapObj, IA_Scalable, TRUE, BITMAP_Screen, scrn, BITMAP_SourceFile, menu_icon, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); /* \todo make this scale the bitmap to these dimensions */ SetAttrs(tb_userdata->gw->hotlist_toolbar_lab[item], @@ -4036,13 +4036,13 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, BITMAP_Height, 16, TAG_DONE); - Object *lab_item = LabelObj, + Object *lab_item = (LabelObj, // LABEL_DrawInfo, dri, LABEL_DisposeImage, TRUE, LABEL_Image, tb_userdata->gw->hotlist_toolbar_lab[item], LABEL_Text, " ", LABEL_Text, utf8title, - LabelEnd; + LabelEnd); free(utf8title); @@ -4082,18 +4082,18 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) if(ami_gui_hotlist_scan(&gwin->hotlist_toolbar_list, gwin) > 0) { gwin->objects[GID_HOTLIST] = - SpeedBarObj, + (SpeedBarObj, GA_ID, GID_HOTLIST, GA_RelVerify, TRUE, ICA_TARGET, ICTARGET_IDCMP, SPEEDBAR_BevelStyle, BVS_NONE, SPEEDBAR_Buttons, &gwin->hotlist_toolbar_list, - SpeedBarEnd; + SpeedBarEnd); gwin->objects[GID_HOTLISTSEPBAR] = - BevelObj, + (BevelObj, BEVEL_Style, BVS_SBAR_VERT, - BevelEnd; + BevelEnd); #ifdef __amigaos4__ IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDCHILD, gwin->win, gwin->objects[GID_HOTLIST], attrs); @@ -4228,7 +4228,7 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show) attrs[2].ti_Tag = TAG_DONE; attrs[2].ti_Data = 0; - gwin->objects[GID_TABS] = ClickTabObj, + gwin->objects[GID_TABS] = (ClickTabObj, GA_ID, GID_TABS, GA_RelVerify, TRUE, GA_Underscore, 13, // disable kb shortcuts @@ -4237,15 +4237,15 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show) CLICKTAB_LabelTruncate, TRUE, CLICKTAB_CloseImage, gwin->objects[GID_CLOSETAB_BM], CLICKTAB_FlagImage, gwin->objects[GID_TABS_FLAG], - ClickTabEnd; + ClickTabEnd); - gwin->objects[GID_ADDTAB] = ButtonObj, + gwin->objects[GID_ADDTAB] = (ButtonObj, GA_ID, GID_ADDTAB, GA_RelVerify, TRUE, GA_HintInfo, gwin->helphints[GID_ADDTAB], GA_Text, "+", BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM], - ButtonEnd; + ButtonEnd); #ifdef __amigaos4__ IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD, gwin->win, gwin->objects[GID_TABS], NULL); @@ -4970,101 +4970,101 @@ gui_window_create(struct browser_window *bw, ami_get_theme_filename(pi_secure, "theme_pageinfo_secure", false); ami_get_theme_filename(pi_warning, "theme_pageinfo_warning", false); - g->shared->objects[GID_FAVE_ADD] = BitMapObj, + g->shared->objects[GID_FAVE_ADD] = (BitMapObj, BITMAP_SourceFile, fave, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_FAVE_RMV] = BitMapObj, + g->shared->objects[GID_FAVE_RMV] = (BitMapObj, BITMAP_SourceFile, unfave, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_ADDTAB_BM] = BitMapObj, + g->shared->objects[GID_ADDTAB_BM] = (BitMapObj, BITMAP_SourceFile, addtab, BITMAP_SelectSourceFile, addtab_s, BITMAP_DisabledSourceFile, addtab_g, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_CLOSETAB_BM] = BitMapObj, + g->shared->objects[GID_CLOSETAB_BM] = (BitMapObj, BITMAP_SourceFile, closetab, BITMAP_SelectSourceFile, closetab_s, BITMAP_DisabledSourceFile, closetab_g, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_INSECURE_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_INSECURE_BM] = (BitMapObj, BITMAP_SourceFile, pi_insecure, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_INTERNAL_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_INTERNAL_BM] = (BitMapObj, BITMAP_SourceFile, pi_internal, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_LOCAL_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_LOCAL_BM] = (BitMapObj, BITMAP_SourceFile, pi_local, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_SECURE_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_SECURE_BM] = (BitMapObj, BITMAP_SourceFile, pi_secure, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); - g->shared->objects[GID_PAGEINFO_WARNING_BM] = BitMapObj, + g->shared->objects[GID_PAGEINFO_WARNING_BM] = (BitMapObj, BITMAP_SourceFile, pi_warning, BITMAP_Screen, scrn, BITMAP_Masking, TRUE, - BitMapEnd; + BitMapEnd); if(ClickTabBase->lib_Version < 53) { addtabclosegadget = LAYOUT_AddChild; - g->shared->objects[GID_CLOSETAB] = ButtonObj, + g->shared->objects[GID_CLOSETAB] = (ButtonObj, GA_ID, GID_CLOSETAB, GA_RelVerify, TRUE, BUTTON_RenderImage, g->shared->objects[GID_CLOSETAB_BM], - ButtonEnd; + ButtonEnd); - g->shared->objects[GID_TABS] = ClickTabObj, + g->shared->objects[GID_TABS] = (ClickTabObj, GA_ID,GID_TABS, GA_RelVerify,TRUE, GA_Underscore,13, // disable kb shortcuts CLICKTAB_Labels,&g->shared->tab_list, CLICKTAB_LabelTruncate,TRUE, - ClickTabEnd; + ClickTabEnd); - g->shared->objects[GID_ADDTAB] = ButtonObj, + g->shared->objects[GID_ADDTAB] = (ButtonObj, GA_ID, GID_ADDTAB, GA_RelVerify, TRUE, GA_Text, "+", BUTTON_RenderImage, g->shared->objects[GID_ADDTAB_BM], - ButtonEnd; + ButtonEnd); } else { - g->shared->objects[GID_TABS_FLAG] = BitMapObj, + g->shared->objects[GID_TABS_FLAG] = (BitMapObj, BITMAP_SourceFile, tabthrobber, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd; + BitMapEnd); } NSLOG(netsurf, INFO, "Creating window object"); - g->shared->objects[OID_MAIN] = WindowObj, + g->shared->objects[OID_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Activate, TRUE, WA_DepthGadget, TRUE, @@ -5097,109 +5097,109 @@ gui_window_create(struct browser_window *bw, WINDOW_BuiltInScroll, TRUE, WINDOW_GadgetHelp, TRUE, WINDOW_UserData, g->shared, - WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = LayoutVObj, + WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = (LayoutVObj, LAYOUT_DeferLayout, defer_layout, LAYOUT_SpaceOuter, TRUE, - LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = LayoutHObj, + LAYOUT_AddChild, g->shared->objects[GID_TOOLBARLAYOUT] = (LayoutHObj, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_BACK] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_BACK] = (ButtonObj, GA_ID, GID_BACK, GA_RelVerify, TRUE, GA_Disabled, TRUE, GA_ContextMenu, ami_ctxmenu_history_create(AMI_CTXMENU_HISTORY_BACK, g->shared), GA_HintInfo, g->shared->helphints[GID_BACK], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,nav_west, BITMAP_SelectSourceFile,nav_west_s, BITMAP_DisabledSourceFile,nav_west_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_FORWARD] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_FORWARD] = (ButtonObj, GA_ID, GID_FORWARD, GA_RelVerify, TRUE, GA_Disabled, TRUE, GA_ContextMenu, ami_ctxmenu_history_create(AMI_CTXMENU_HISTORY_FORWARD, g->shared), GA_HintInfo, g->shared->helphints[GID_FORWARD], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,nav_east, BITMAP_SelectSourceFile,nav_east_s, BITMAP_DisabledSourceFile,nav_east_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_STOP] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_STOP] = (ButtonObj, GA_ID,GID_STOP, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_STOP], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,stop, BITMAP_SelectSourceFile,stop_s, BITMAP_DisabledSourceFile,stop_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_RELOAD] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_RELOAD] = (ButtonObj, GA_ID,GID_RELOAD, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_RELOAD], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,reload, BITMAP_SelectSourceFile,reload_s, BITMAP_DisabledSourceFile,reload_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_HOME] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_HOME] = (ButtonObj, GA_ID,GID_HOME, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_HOME], - BUTTON_RenderImage,BitMapObj, + BUTTON_RenderImage,(BitMapObj, BITMAP_SourceFile,home, BITMAP_SelectSourceFile,home_s, BITMAP_DisabledSourceFile,home_g, BITMAP_Screen,scrn, BITMAP_Masking,TRUE, - BitMapEnd, - ButtonEnd, + BitMapEnd), + ButtonEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, LayoutHObj, // FavIcon, URL bar and hotlist star + LAYOUT_AddChild, (LayoutHObj, // FavIcon, URL bar and hotlist star LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_ICON] = SpaceObj, + LAYOUT_AddChild, g->shared->objects[GID_ICON] = (SpaceObj, GA_ID, GID_ICON, SPACE_MinWidth, 16, SPACE_MinHeight, 16, SPACE_Transparent, TRUE, // SPACE_RenderHook, &g->shared->favicon_hook, - SpaceEnd, + SpaceEnd), CHILD_WeightedWidth, 0, CHILD_WeightedHeight, 0, - LAYOUT_AddChild, g->shared->objects[GID_PAGEINFO] = ButtonObj, + LAYOUT_AddChild, g->shared->objects[GID_PAGEINFO] = (ButtonObj, GA_ID, GID_PAGEINFO, GA_RelVerify, TRUE, GA_ReadOnly, FALSE, BUTTON_RenderImage, g->shared->objects[GID_PAGEINFO_INTERNAL_BM], - ButtonEnd, + ButtonEnd), CHILD_WeightedWidth, 0, CHILD_WeightedHeight, 0, LAYOUT_AddChild, g->shared->objects[GID_URL] = #ifdef __amigaos4__ NewObject(urlStringClass, NULL, #else - StringObj, + (StringObj, #endif STRINGA_MaxChars, 2000, GA_ID, GID_URL, @@ -5210,59 +5210,59 @@ gui_window_create(struct browser_window *bw, #ifdef __amigaos4__ STRINGVIEW_Header, URLHistory_GetList(), #endif - TAG_DONE), - LAYOUT_AddChild, g->shared->objects[GID_FAVE] = ButtonObj, + TAG_DONE)), + LAYOUT_AddChild, g->shared->objects[GID_FAVE] = (ButtonObj, GA_ID, GID_FAVE, GA_RelVerify, TRUE, // GA_HintInfo, g->shared->helphints[GID_FAVE], BUTTON_RenderImage, g->shared->objects[GID_FAVE_ADD], - ButtonEnd, + ButtonEnd), CHILD_WeightedWidth, 0, CHILD_WeightedHeight, 0, - LayoutEnd, + LayoutEnd), // GA_ID, GID_TOOLBARLAYOUT, // GA_RelVerify, TRUE, // LAYOUT_RelVerify, TRUE, LAYOUT_WeightBar, TRUE, - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_VertAlignment, LALIGN_CENTER, - LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = ChooserObj, + LAYOUT_AddChild, g->shared->objects[GID_SEARCH_ICON] = (ChooserObj, GA_ID, GID_SEARCH_ICON, GA_RelVerify, TRUE, CHOOSER_DropDown, TRUE, CHOOSER_Labels, g->shared->web_search_list, CHOOSER_MaxLabels, 40, /* Same as options GUI */ - ChooserEnd, + ChooserEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] = StringObj, + LAYOUT_AddChild, g->shared->objects[GID_SEARCHSTRING] = (StringObj, GA_ID,GID_SEARCHSTRING, STRINGA_TextVal, NULL, GA_RelVerify,TRUE, GA_HintInfo, g->shared->helphints[GID_SEARCHSTRING], - StringEnd, - LayoutEnd, + StringEnd), + LayoutEnd), CHILD_WeightedWidth, nsoption_int(web_search_width), - LAYOUT_AddChild, g->shared->objects[GID_THROBBER] = SpaceObj, + LAYOUT_AddChild, g->shared->objects[GID_THROBBER] = (SpaceObj, GA_ID,GID_THROBBER, SPACE_MinWidth, ami_theme_throbber_get_width(), SPACE_MinHeight, ami_theme_throbber_get_height(), SPACE_Transparent,TRUE, // SPACE_RenderHook, &g->shared->throbber_hook, - SpaceEnd, + SpaceEnd), CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LayoutEnd, + LayoutEnd), CHILD_WeightedHeight,0, - LAYOUT_AddImage, BevelObj, + LAYOUT_AddImage, (BevelObj, BEVEL_Style, BVS_SBAR_VERT, - BevelEnd, + BevelEnd), CHILD_WeightedHeight, 0, - LAYOUT_AddChild, g->shared->objects[GID_HOTLISTLAYOUT] = LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_HOTLISTLAYOUT] = (LayoutVObj, LAYOUT_SpaceInner, FALSE, - LayoutEnd, + LayoutEnd), CHILD_WeightedHeight,0, - LAYOUT_AddChild, g->shared->objects[GID_TABLAYOUT] = LayoutHObj, + LAYOUT_AddChild, g->shared->objects[GID_TABLAYOUT] = (LayoutHObj, LAYOUT_SpaceInner,FALSE, addtabclosegadget, g->shared->objects[GID_CLOSETAB], CHILD_WeightedWidth,0, @@ -5274,35 +5274,35 @@ gui_window_create(struct browser_window *bw, addtabclosegadget, g->shared->objects[GID_ADDTAB], CHILD_WeightedWidth,0, CHILD_WeightedHeight,0, - LayoutEnd, + LayoutEnd), CHILD_WeightedHeight,0, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = LayoutHObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = LayoutVObj, - LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = (LayoutHObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = (LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = (SpaceObj, GA_ID,GID_BROWSER, SPACE_Transparent,TRUE, SPACE_RenderHook, &g->shared->browser_hook, - SpaceEnd, - EndGroup, - EndGroup, - EndGroup, + SpaceEnd), + EndGroup), + EndGroup), + EndGroup), // LAYOUT_WeightBar, TRUE, - LAYOUT_AddChild, g->shared->objects[GID_LOGLAYOUT] = LayoutVObj, - EndGroup, + LAYOUT_AddChild, g->shared->objects[GID_LOGLAYOUT] = (LayoutVObj, + EndGroup), CHILD_WeightedHeight, 0, #ifndef __amigaos4__ - LAYOUT_AddChild, g->shared->objects[GID_STATUS] = StringObj, + LAYOUT_AddChild, g->shared->objects[GID_STATUS] = (StringObj, GA_ID, GID_STATUS, GA_ReadOnly, TRUE, STRINGA_TextVal, NULL, GA_RelVerify, TRUE, - StringEnd, + StringEnd), #endif - EndGroup, - EndGroup, - EndWindow; + EndGroup), + EndGroup), + EndWindow); } else { @@ -5311,7 +5311,7 @@ gui_window_create(struct browser_window *bw, g->shared->tabs = 0; g->tab_node = NULL; - g->shared->objects[OID_MAIN] = WindowObj, + g->shared->objects[OID_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Activate, TRUE, WA_DepthGadget, FALSE, @@ -5338,19 +5338,19 @@ gui_window_create(struct browser_window *bw, WINDOW_SharedPort,sport, WINDOW_UserData,g->shared, WINDOW_BuiltInScroll,TRUE, - WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = LayoutHObj, + WINDOW_ParentGroup, g->shared->objects[GID_MAIN] = (LayoutHObj, LAYOUT_DeferLayout, defer_layout, LAYOUT_SpaceOuter, TRUE, - LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = LayoutHObj, - LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = LayoutVObj, - LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = SpaceObj, + LAYOUT_AddChild, g->shared->objects[GID_VSCROLLLAYOUT] = (LayoutHObj, + LAYOUT_AddChild, g->shared->objects[GID_HSCROLLLAYOUT] = (LayoutVObj, + LAYOUT_AddChild, g->shared->objects[GID_BROWSER] = (SpaceObj, GA_ID,GID_BROWSER, SPACE_Transparent,TRUE, - SpaceEnd, - EndGroup, - EndGroup, - EndGroup, - EndWindow; + SpaceEnd), + EndGroup), + EndGroup), + EndGroup), + EndWindow); } NSLOG(netsurf, INFO, "Opening window"); @@ -6032,14 +6032,14 @@ static nserror gui_search_web_provider_update(const char *provider_name, bm_masking_tag = BITMAP_Masking; } - gwin->search_bm = BitMapObj, + gwin->search_bm = (BitMapObj, BITMAP_Screen, scrn, BITMAP_Width, 16, BITMAP_Height, 16, BITMAP_BitMap, bm, BITMAP_HasAlpha, TRUE, bm_masking_tag, TRUE, - BitMapEnd; + BitMapEnd); RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_SEARCH_ICON], gwin->win, NULL, @@ -6228,7 +6228,7 @@ static Object *ami_gui_splash_open(void) struct TextAttr tattr; struct TextFont *tfont; - win_obj = WindowObj, + win_obj = (WindowObj, #ifdef __amigaos4__ WA_ToolBox, TRUE, #endif @@ -6237,14 +6237,14 @@ static Object *ami_gui_splash_open(void) WINDOW_Position, WPOS_CENTERSCREEN, WINDOW_LockWidth, TRUE, WINDOW_LockHeight, TRUE, - WINDOW_ParentGroup, LayoutVObj, - LAYOUT_AddImage, bm_obj = BitMapObj, + WINDOW_ParentGroup, (LayoutVObj, + LAYOUT_AddImage, bm_obj = (BitMapObj, BITMAP_SourceFile, "PROGDIR:Resources/splash.png", BITMAP_Screen, wbscreen, BITMAP_Precision, PRECISION_IMAGE, - BitMapEnd, - LayoutEnd, - EndWindow; + BitMapEnd), + LayoutEnd), + EndWindow); if(win_obj == NULL) { NSLOG(netsurf, INFO, "Splash window object not created"); diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index fa8cdee35..1bd1015fd 100755 --- a/frontends/amiga/gui_options.c +++ b/frontends/amiga/gui_options.c @@ -641,7 +641,7 @@ void ami_gui_opts_open(void) ami_gui_opts_setup(gow); - gow->objects[OID_MAIN] = WindowObj, + gow->objects[OID_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, gadlab[LAB_OPTS_WINTITLE], WA_Activate, TRUE, @@ -655,154 +655,154 @@ void ami_gui_opts_open(void) WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, WA_IDCMP, IDCMP_GADGETUP | IDCMP_CLOSEWINDOW, - WINDOW_ParentGroup, gow->objects[GID_OPTS_MAIN] = LayoutVObj, - LAYOUT_AddChild, ClickTabObj, + WINDOW_ParentGroup, gow->objects[GID_OPTS_MAIN] = (LayoutVObj, + LAYOUT_AddChild, (ClickTabObj, GA_RelVerify, TRUE, #ifdef __amigaos4__ GA_Text, tabs, #else CLICKTAB_Labels, &gow->clicktablist, #endif - CLICKTAB_PageGroup, PageObj, + CLICKTAB_PageGroup, (PageObj, /* ** General */ - PAGE_Add, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, + PAGE_Add, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_HOMEPAGE], - LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE] = StringObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE] = (StringObj, GA_ID, GID_OPTS_HOMEPAGE, GA_RelVerify, TRUE, STRINGA_TextVal, homepage_url_lc, STRINGA_BufferPos,0, - StringEnd, - CHILD_Label, LabelObj, + StringEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_HOMEPAGE], - LabelEnd, - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_DEFAULT] = ButtonObj, + LabelEnd), + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_DEFAULT] = (ButtonObj, GA_ID,GID_OPTS_HOMEPAGE_DEFAULT, GA_Text,gadlab[GID_OPTS_HOMEPAGE_DEFAULT], GA_RelVerify,TRUE, - ButtonEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_CURRENT] = ButtonObj, + ButtonEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_CURRENT] = (ButtonObj, GA_ID,GID_OPTS_HOMEPAGE_CURRENT, GA_Text,gadlab[GID_OPTS_HOMEPAGE_CURRENT], GA_RelVerify,TRUE, - ButtonEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_BLANK] = ButtonObj, + ButtonEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_BLANK] = (ButtonObj, GA_ID,GID_OPTS_HOMEPAGE_BLANK, GA_Text,gadlab[GID_OPTS_HOMEPAGE_BLANK], GA_RelVerify,TRUE, - ButtonEnd, - LayoutEnd, - LayoutEnd, //homepage + ButtonEnd), + LayoutEnd), + LayoutEnd), //homepage CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CONTENTBLOCKING], - LAYOUT_AddChild, gow->objects[GID_OPTS_HIDEADS] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_HIDEADS] = (CheckBoxObj, GA_ID, GID_OPTS_HIDEADS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_HIDEADS], GA_Selected, nsoption_bool(block_advertisements), - CheckBoxEnd, - LayoutEnd, // content blocking - LAYOUT_AddChild, LayoutVObj, + CheckBoxEnd), + LayoutEnd), // content blocking + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CONTENTLANGUAGE], - LAYOUT_AddChild, gow->objects[GID_OPTS_CONTENTLANG] = StringObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_CONTENTLANG] = (StringObj, GA_ID, GID_OPTS_CONTENTLANG, GA_RelVerify, TRUE, GA_Disabled, acceptlangdisabled, STRINGA_TextVal, nsoption_charp(accept_language), STRINGA_BufferPos,0, - StringEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FROMLOCALE] = CheckBoxObj, + StringEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_FROMLOCALE] = (CheckBoxObj, GA_ID, GID_OPTS_FROMLOCALE, GA_Text, gadlab[GID_OPTS_FROMLOCALE], GA_RelVerify, TRUE, GA_Selected, nsoption_bool(accept_lang_locale), - ButtonEnd, + CheckBoxEnd), // CHILD_WeightedWidth, 0, - LayoutEnd, // content language - LayoutEnd, // content - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, LayoutVObj, + LayoutEnd), // content language + LayoutEnd), // content + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_HISTORY], - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_HISTORY] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_HISTORY] = (IntegerObj, GA_ID, GID_OPTS_HISTORY, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(expire_url), INTEGER_Minimum, 0, INTEGER_Maximum, 366, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_DAYS], - LabelEnd, - LayoutEnd, + LabelEnd), + LayoutEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_HISTORY], - LabelEnd, - LayoutEnd, // history - LAYOUT_AddChild, LayoutVObj, + LabelEnd), + LayoutEnd), // history + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SCRIPTING], - LAYOUT_AddChild, gow->objects[GID_OPTS_JAVASCRIPT] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_JAVASCRIPT] = (CheckBoxObj, GA_ID, GID_OPTS_JAVASCRIPT, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_JAVASCRIPT], GA_Selected, nsoption_bool(enable_javascript), - CheckBoxEnd, - LayoutEnd, // scripting - LayoutEnd, + CheckBoxEnd), + LayoutEnd), // scripting + LayoutEnd), CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_PRIVACY], - LAYOUT_AddChild, gow->objects[GID_OPTS_REFERRAL] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_REFERRAL] = (CheckBoxObj, GA_ID, GID_OPTS_REFERRAL, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_REFERRAL], GA_Selected, nsoption_bool(send_referer), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_DONOTTRACK] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_DONOTTRACK] = (CheckBoxObj, GA_ID, GID_OPTS_DONOTTRACK, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_DONOTTRACK], GA_Selected, nsoption_bool(do_not_track), - CheckBoxEnd, - LayoutEnd, // misc + CheckBoxEnd), + LayoutEnd), // misc CHILD_WeightedHeight, 0, - LayoutEnd, // page vgroup + LayoutEnd), // page vgroup CHILD_WeightedHeight, 0, - PageEnd, // pageadd + PageEnd), // pageadd /* ** Display */ - PAGE_Add, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, + PAGE_Add, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SCREEN], - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, gow->objects[GID_OPTS_SCREEN] = RadioButtonObj, + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCREEN] = (RadioButtonObj, GA_ID, GID_OPTS_SCREEN, GA_RelVerify, TRUE, #ifdef __amigaos4__ @@ -811,91 +811,91 @@ void ami_gui_opts_open(void) RADIOBUTTON_Labels, &gow->screenoptslist, #endif RADIOBUTTON_Selected, screenoptsselected, - RadioButtonEnd, + RadioButtonEnd), CHILD_WeightedWidth,0, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENMODE] = GetScreenModeObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENMODE] = (GetScreenModeObj, GA_ID, GID_OPTS_SCREENMODE, GA_RelVerify, TRUE, GA_Disabled,screenmodedisabled, GETSCREENMODE_DisplayID,screenmodeid, GETSCREENMODE_MinDepth, 0, GETSCREENMODE_MaxDepth, 32, - GetScreenModeEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = StringObj, + GetScreenModeEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_SCREENNAME] = (StringObj, GA_ID, GID_OPTS_SCREENNAME, GA_RelVerify, TRUE, GA_Disabled,screennamedisabled, STRINGA_TextVal, nsoption_charp(pubscreen_name), STRINGA_BufferPos,0, - StringEnd, - LayoutEnd, + StringEnd), + LayoutEnd), CHILD_WeightedHeight,0, - LayoutEnd, - LayoutEnd, // screen + LayoutEnd), + LayoutEnd), // screen CHILD_WeightedHeight,0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_WINDOW], - LAYOUT_AddChild, gow->objects[GID_OPTS_WIN_SIMPLE] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_WIN_SIMPLE] = (CheckBoxObj, GA_ID, GID_OPTS_WIN_SIMPLE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_WIN_SIMPLE], GA_Selected, nsoption_bool(window_simple_refresh), - CheckBoxEnd, - LayoutEnd, // window + CheckBoxEnd), + LayoutEnd), // window CHILD_WeightedHeight,0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_THEME], - LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = GetFileObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = (GetFileObj, GA_ID, GID_OPTS_THEME, GA_RelVerify, TRUE, GETFILE_Drawer, nsoption_charp(theme), GETFILE_DrawersOnly, TRUE, GETFILE_ReadOnly, TRUE, GETFILE_FullFileExpand, FALSE, - GetFileEnd, - LayoutEnd, // theme + GetFileEnd), + LayoutEnd), // theme CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MOUSE], - LAYOUT_AddChild, gow->objects[GID_OPTS_PTRTRUE] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_PTRTRUE] = (CheckBoxObj, GA_ID, GID_OPTS_PTRTRUE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_PTRTRUE], GA_Selected, nsoption_bool(truecolour_mouse_pointers), GA_Disabled, ptr_disable, - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = (CheckBoxObj, GA_ID, GID_OPTS_PTROS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_PTROS], GA_Selected, nsoption_bool(os_mouse_pointers), GA_Disabled, ptr_disable, - CheckBoxEnd, - LayoutEnd, // mouse + CheckBoxEnd), + LayoutEnd), // mouse CHILD_WeightedHeight,0, - LAYOUT_AddImage, LabelObj, + LAYOUT_AddImage, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_RESTART], - LabelEnd, - LayoutEnd, // page vgroup + LabelEnd), + LayoutEnd), // page vgroup CHILD_WeightedHeight, 0, - PageEnd, // pageadd + PageEnd), // pageadd /* ** Network */ - PAGE_Add, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, + PAGE_Add, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_PROXY], - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY] = ChooserObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY] = (ChooserObj, GA_ID, GID_OPTS_PROXY, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, @@ -905,19 +905,19 @@ void ami_gui_opts_open(void) CHOOSER_Labels, &gow->proxyoptslist, #endif CHOOSER_Selected, proxytype, - ChooserEnd, - CHILD_Label, LabelObj, + ChooserEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY], - LabelEnd, - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_HOST] = StringObj, + LabelEnd), + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_HOST] = (StringObj, GA_ID, GID_OPTS_PROXY_HOST, GA_RelVerify, TRUE, GA_Disabled, proxyhostdisabled, STRINGA_TextVal, nsoption_charp(http_proxy_host), STRINGA_BufferPos,0, - StringEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PORT] = IntegerObj, + StringEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PORT] = (IntegerObj, GA_ID, GID_OPTS_PROXY_PORT, GA_RelVerify, TRUE, GA_Disabled, proxyhostdisabled, @@ -925,103 +925,103 @@ void ami_gui_opts_open(void) INTEGER_Minimum, 1, INTEGER_Maximum, 65535, INTEGER_Arrows, FALSE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, ":", - LabelEnd, - LayoutEnd, //host:port group + LabelEnd), + LayoutEnd), //host:port group CHILD_WeightedHeight, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY_HOST], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_USER] = StringObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_USER] = (StringObj, GA_ID, GID_OPTS_PROXY_USER, GA_RelVerify, TRUE, GA_Disabled, proxyauthdisabled, STRINGA_TextVal, nsoption_charp(http_proxy_auth_user), STRINGA_BufferPos,0, - StringEnd, - CHILD_Label, LabelObj, + StringEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY_USER], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PASS] = StringObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_PASS] = (StringObj, GA_ID, GID_OPTS_PROXY_PASS, GA_RelVerify, TRUE, GA_Disabled, proxyauthdisabled, STRINGA_TextVal, nsoption_charp(http_proxy_auth_pass), STRINGA_BufferPos,0, - StringEnd, - CHILD_Label, LabelObj, + StringEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY_PASS], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_BYPASS] = StringObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_PROXY_BYPASS] = (StringObj, GA_ID, GID_OPTS_PROXY_BYPASS, GA_RelVerify, TRUE, GA_Disabled, proxybypassdisabled, STRINGA_TextVal, nsoption_charp(http_proxy_noproxy), STRINGA_BufferPos, 0, - StringEnd, - CHILD_Label, LabelObj, + StringEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_PROXY_BYPASS], - LabelEnd, - LayoutEnd, // proxy + LabelEnd), + LayoutEnd), // proxy CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_FETCHING], - LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHMAX] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHMAX] = (IntegerObj, GA_ID, GID_OPTS_FETCHMAX, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(max_fetchers), INTEGER_Minimum, 1, INTEGER_Maximum, 99, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FETCHMAX], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHHOST] = IntegerObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHHOST] = (IntegerObj, GA_ID, GID_OPTS_FETCHHOST, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(max_fetchers_per_host), INTEGER_Minimum, 1, INTEGER_Maximum, 99, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FETCHHOST], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHCACHE] = IntegerObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_FETCHCACHE] = (IntegerObj, GA_ID, GID_OPTS_FETCHCACHE, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(max_cached_fetch_handles), INTEGER_Minimum, 1, INTEGER_Maximum, 99, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FETCHCACHE], - LabelEnd, - LayoutEnd, + LabelEnd), + LayoutEnd), CHILD_WeightedHeight, 0, - LayoutEnd, // page vgroup + LayoutEnd), // page vgroup CHILD_WeightedHeight, 0, - PageEnd, // page object + PageEnd), // page object /* ** Rendering */ - PAGE_Add, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, + PAGE_Add, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_IMAGES], - LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = ChooserObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_NATIVEBM] = (ChooserObj, GA_ID, GID_OPTS_NATIVEBM, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, @@ -1031,11 +1031,11 @@ void ami_gui_opts_open(void) CHOOSER_Labels, &gow->nativebmoptslist, #endif CHOOSER_Selected, nsoption_int(cache_bitmaps), - ChooserEnd, - CHILD_Label, LabelObj, + ChooserEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_NATIVEBM], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = ChooserObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = (ChooserObj, GA_ID, GID_OPTS_DITHERQ, GA_RelVerify, TRUE, GA_Disabled, ditherdisable, @@ -1046,38 +1046,38 @@ void ami_gui_opts_open(void) CHOOSER_Labels, &gow->ditheroptslist, #endif CHOOSER_Selected, nsoption_int(dither_quality), - ChooserEnd, - CHILD_Label, LabelObj, + ChooserEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_DITHERQ], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = CheckBoxObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = (CheckBoxObj, GA_ID, GID_OPTS_SCALEQ, GA_Disabled, scaledisabled, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_SCALEQ], GA_Selected, scaleselected, - CheckBoxEnd, - LayoutEnd, // images + CheckBoxEnd), + LayoutEnd), // images CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_ANIMS], - LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMDISABLE] = (CheckBoxObj, GA_ID, GID_OPTS_ANIMDISABLE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_ANIMDISABLE], GA_Selected, disableanims, - CheckBoxEnd, - LayoutEnd, //animations + CheckBoxEnd), + LayoutEnd), //animations CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_DPI], - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_DPI_Y] = (IntegerObj, GA_ID, GID_OPTS_DPI_Y, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(screen_ydpi), @@ -1085,81 +1085,81 @@ void ami_gui_opts_open(void) INTEGER_Maximum, 200, INTEGER_Arrows, TRUE, GA_Disabled, nsoption_bool(bitmap_fonts), - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_DPI], - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_DPI_Y], - LabelEnd, - LayoutEnd, //animations + LabelEnd), + LayoutEnd), //animations CHILD_WeightedHeight, 0, - LayoutEnd, // page vgroup + LayoutEnd), // page vgroup CHILD_WeightedHeight, 0, - PageEnd, // page object + PageEnd), // page object /* ** Fonts */ - PAGE_Add, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, + PAGE_Add, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_FONTFACES], - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SANS] = GetFontObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SANS] = (GetFontObj, GA_ID, GID_OPTS_FONT_SANS, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontsans, GETFONT_OTagOnly, TRUE, GETFONT_ScalableOnly, TRUE, - GetFontEnd, - CHILD_Label, LabelObj, + GetFontEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_SANS], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SERIF] = GetFontObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SERIF] = (GetFontObj, GA_ID, GID_OPTS_FONT_SERIF, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontserif, GETFONT_OTagOnly, TRUE, GETFONT_ScalableOnly, TRUE, - GetFontEnd, - CHILD_Label, LabelObj, + GetFontEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_SERIF], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MONO] = GetFontObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MONO] = (GetFontObj, GA_ID, GID_OPTS_FONT_MONO, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontmono, GETFONT_OTagOnly, TRUE, GETFONT_ScalableOnly, TRUE, GETFONT_FixedWidthOnly, TRUE, - GetFontEnd, - CHILD_Label, LabelObj, + GetFontEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_MONO], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_CURSIVE] = GetFontObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_CURSIVE] = (GetFontObj, GA_ID, GID_OPTS_FONT_CURSIVE, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontcursive, GETFONT_OTagOnly, TRUE, GETFONT_ScalableOnly, TRUE, - GetFontEnd, - CHILD_Label, LabelObj, + GetFontEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_CURSIVE], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_FANTASY] = GetFontObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_FANTASY] = (GetFontObj, GA_ID, GID_OPTS_FONT_FANTASY, GA_RelVerify, TRUE, GETFONT_TextAttr, &fontfantasy, GETFONT_OTagOnly, TRUE, GETFONT_ScalableOnly, TRUE, - GetFontEnd, - CHILD_Label, LabelObj, + GetFontEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_FANTASY], - LabelEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = ChooserObj, + LabelEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = (ChooserObj, GA_ID, GID_OPTS_FONT_DEFAULT, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, @@ -1169,59 +1169,59 @@ void ami_gui_opts_open(void) CHOOSER_Labels, &gow->fontoptslist, #endif CHOOSER_Selected, nsoption_int(font_default) - PLOT_FONT_FAMILY_SANS_SERIF, - ChooserEnd, - CHILD_Label, LabelObj, + ChooserEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_DEFAULT], - LabelEnd, - LayoutEnd, // font faces + LabelEnd), + LayoutEnd), // font faces CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_FONTSIZE], - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = (IntegerObj, GA_ID, GID_OPTS_FONT_SIZE, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(font_size) / 10, INTEGER_Minimum, 1, INTEGER_Maximum, 99, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_PT], - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_SIZE], - LabelEnd, - LAYOUT_AddChild, LayoutHObj, + LabelEnd), + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = (IntegerObj, GA_ID, GID_OPTS_FONT_MINSIZE, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(font_min_size) / 10, INTEGER_Minimum, 1, INTEGER_Maximum, 99, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_PT], - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_FONT_MINSIZE], - LabelEnd, - LayoutEnd, - LAYOUT_AddChild, LayoutVObj, + LabelEnd), + LayoutEnd), + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MISC], - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_ANTIALIASING] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_ANTIALIASING] = (CheckBoxObj, GA_ID, GID_OPTS_FONT_ANTIALIASING, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_FONT_ANTIALIASING], @@ -1229,141 +1229,141 @@ void ami_gui_opts_open(void) #ifndef __amigaos4__ GA_Disabled, TRUE, #endif - CheckBoxEnd, + CheckBoxEnd), #ifndef __amigaos4__ - LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_BITMAP] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_BITMAP] = (CheckBoxObj, GA_ID, GID_OPTS_FONT_BITMAP, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_FONT_BITMAP], GA_Selected, nsoption_bool(bitmap_fonts), - CheckBoxEnd, + CheckBoxEnd), #endif - LayoutEnd, - LayoutEnd, + LayoutEnd), + LayoutEnd), CHILD_WeightedHeight, 0, - LayoutEnd, // page vgroup + LayoutEnd), // page vgroup CHILD_WeightedHeight, 0, - PageEnd, // page object + PageEnd), // page object /* ** Cache */ - PAGE_Add, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, + PAGE_Add, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MEMCACHE], - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_MEM] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_MEM] = (IntegerObj, GA_ID, GID_OPTS_CACHE_MEM, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(memory_cache_size) / 1048576, INTEGER_Minimum, 0, INTEGER_Maximum, 2048, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_MB], - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_CACHE_MEM], - LabelEnd, - LayoutEnd, // memory cache + LabelEnd), + LayoutEnd), // memory cache CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_DISCCACHE], - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_DISC] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_CACHE_DISC] = (IntegerObj, GA_ID, GID_OPTS_CACHE_DISC, GA_RelVerify, TRUE, INTEGER_Number, nsoption_uint(disc_cache_size) / 1048576, INTEGER_Minimum, 0, INTEGER_Maximum, 4096, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_MB], - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_CACHE_DISC], - LabelEnd, - LayoutEnd, // disc cache + LabelEnd), + LayoutEnd), // disc cache CHILD_WeightedHeight, 0, - LayoutEnd, // page vgroup + LayoutEnd), // page vgroup CHILD_WeightedHeight, 0, - PageEnd, // page object + PageEnd), // page object /* ** Tabs */ - PAGE_Add, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, LayoutVObj, + PAGE_Add, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_TABS], - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ACTIVE] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ACTIVE] = (CheckBoxObj, GA_ID, GID_OPTS_TAB_ACTIVE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_ACTIVE], GA_Selected, !nsoption_bool(new_tab_is_active), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_LAST] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_LAST] = (CheckBoxObj, GA_ID, GID_OPTS_TAB_LAST, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_LAST], GA_Selected, nsoption_bool(new_tab_last), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_2] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_2] = (CheckBoxObj, GA_ID, GID_OPTS_TAB_2, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_2], GA_Selected, nsoption_bool(button_2_tab), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ALWAYS] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_ALWAYS] = (CheckBoxObj, GA_ID, GID_OPTS_TAB_ALWAYS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_ALWAYS], GA_Selected, nsoption_bool(tab_always_show), GA_Disabled, tab_always_show_disabled, - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = (CheckBoxObj, GA_ID, GID_OPTS_TAB_CLOSE, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_CLOSE], GA_Selected, nsoption_bool(tab_close_warn), - CheckBoxEnd, - LayoutEnd, // tabbed browsing - LayoutEnd, - LayoutEnd, // page vgroup + CheckBoxEnd), + LayoutEnd), // tabbed browsing + LayoutEnd), + LayoutEnd), // page vgroup CHILD_WeightedHeight, 0, - PageEnd, // page object + PageEnd), // page object /* ** Advanced */ - PAGE_Add, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, + PAGE_Add, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_DOWNLOADS], - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, gow->objects[GID_OPTS_OVERWRITE] = CheckBoxObj, + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_OVERWRITE] = (CheckBoxObj, GA_ID, GID_OPTS_OVERWRITE, GA_RelVerify, TRUE, GA_Disabled, FALSE, GA_Text, gadlab[GID_OPTS_OVERWRITE], GA_Selected, nsoption_bool(ask_overwrite), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = (CheckBoxObj, GA_ID, GID_OPTS_NOTIFY, GA_RelVerify, TRUE, GA_Disabled, download_notify_disabled, @@ -1372,39 +1372,39 @@ void ami_gui_opts_open(void) #ifndef __amigaos4__ GA_Disabled, TRUE, #endif - CheckBoxEnd, - LayoutEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_DLDIR] = GetFileObj, + CheckBoxEnd), + LayoutEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_DLDIR] = (GetFileObj, GA_ID, GID_OPTS_DLDIR, GA_RelVerify, TRUE, GETFILE_Drawer, nsoption_charp(download_dir), GETFILE_DrawersOnly, TRUE, GETFILE_ReadOnly, TRUE, GETFILE_FullFileExpand, FALSE, - GetFileEnd, - CHILD_Label, LabelObj, + GetFileEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_DLDIR], - LabelEnd, - LayoutEnd, // downloads + LabelEnd), + LayoutEnd), // downloads CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_BEHAVIOUR], - LAYOUT_AddChild, gow->objects[GID_OPTS_STARTUP_NO_WIN] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_STARTUP_NO_WIN] = (CheckBoxObj, GA_ID, GID_OPTS_STARTUP_NO_WIN, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_STARTUP_NO_WIN], GA_Selected, nsoption_bool(startup_no_window), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_CLOSE_NO_QUIT] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_CLOSE_NO_QUIT] = (CheckBoxObj, GA_ID, GID_OPTS_CLOSE_NO_QUIT, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_CLOSE_NO_QUIT], GA_Selected, nsoption_bool(close_no_quit), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_DOCKY] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_DOCKY] = (CheckBoxObj, GA_ID, GID_OPTS_DOCKY, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_DOCKY], @@ -1412,242 +1412,242 @@ void ami_gui_opts_open(void) #ifndef __amigaos4__ GA_Disabled, TRUE, #endif - CheckBoxEnd, - LayoutEnd, // behaviour + CheckBoxEnd), + LayoutEnd), // behaviour CHILD_WeightedHeight, 0, - LayoutEnd, // hgroup + LayoutEnd), // hgroup CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_CLIPBOARD], - LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = (CheckBoxObj, GA_ID, GID_OPTS_CLIPBOARD, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_CLIPBOARD], GA_Selected, nsoption_bool(clipboard_write_utf8), - CheckBoxEnd, - LayoutEnd, // clipboard + CheckBoxEnd), + LayoutEnd), // clipboard CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SEARCH], - LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = ChooserObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = (ChooserObj, GA_ID, GID_OPTS_SEARCH_PROV, GA_RelVerify, TRUE, CHOOSER_PopUp, TRUE, CHOOSER_Labels, websearch_list, CHOOSER_Selected, nsoption_int(search_provider), CHOOSER_MaxLabels, 40, - ChooserEnd, - CHILD_Label, LabelObj, + ChooserEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_SEARCH_PROV], - LabelEnd, - LayoutEnd, // search + LabelEnd), + LayoutEnd), // search CHILD_WeightedHeight, 0, - LayoutEnd, // hgroup + LayoutEnd), // hgroup CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MISC], LAYOUT_SpaceOuter, TRUE, - LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = (CheckBoxObj, GA_ID, GID_OPTS_FASTSCROLL, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_FASTSCROLL], GA_Selected, nsoption_bool(faster_scroll), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_SELECTMENU] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_SELECTMENU] = (CheckBoxObj, GA_ID, GID_OPTS_SELECTMENU, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_SELECTMENU], GA_Selected, !nsoption_bool(core_select_menu), GA_Disabled, !ami_selectmenu_is_safe(), - CheckBoxEnd, - LayoutEnd, // misc + CheckBoxEnd), + LayoutEnd), // misc CHILD_WeightedHeight, 0, - LayoutEnd, // page vgroup + LayoutEnd), // page vgroup CHILD_WeightedHeight, 0, - PageEnd, // page object + PageEnd), // page object /* ** Export */ #ifdef WITH_PDF_EXPORT - PAGE_Add, LayoutVObj, - LAYOUT_AddChild, LayoutVObj, - LAYOUT_AddChild, LayoutHObj, + PAGE_Add, (LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MARGINS], - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_TOP] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_TOP] = (IntegerObj, GA_ID, GID_OPTS_MARGIN_TOP, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(margin_top), INTEGER_Minimum, 0, INTEGER_Maximum, 99, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_MM], - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_MARGIN_TOP], - LabelEnd, - LAYOUT_AddChild, LayoutHObj, + LabelEnd), + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_LEFT] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_LEFT] = (IntegerObj, GA_ID, GID_OPTS_MARGIN_LEFT, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(margin_left), INTEGER_Minimum, 0, INTEGER_Maximum, 99, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_MM], - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_MARGIN_LEFT], - LabelEnd, - LAYOUT_AddChild, LayoutHObj, + LabelEnd), + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_BOTTOM] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_BOTTOM] = (IntegerObj, GA_ID, GID_OPTS_MARGIN_BOTTOM, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(margin_bottom), INTEGER_Minimum, 0, INTEGER_Maximum, 99, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_MM], - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_MARGIN_BOTTOM], - LabelEnd, - LAYOUT_AddChild, LayoutHObj, + LabelEnd), + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_RIGHT] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_MARGIN_RIGHT] = (IntegerObj, GA_ID, GID_OPTS_MARGIN_RIGHT, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(margin_right), INTEGER_Minimum, 0, INTEGER_Maximum, 99, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, gadlab[LAB_OPTS_MM], - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_MARGIN_RIGHT], - LabelEnd, - LayoutEnd, // margins + LabelEnd), + LayoutEnd), // margins CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_SCALING], - LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, (LayoutHObj, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_SCALE] = IntegerObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_SCALE] = (IntegerObj, GA_ID, GID_OPTS_EXPORT_SCALE, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(export_scale), INTEGER_Minimum, 0, INTEGER_Maximum, 100, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObj, + CHILD_Label, (LabelObj, LABEL_Text, "%", - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObj, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObj, LABEL_Text, gadlab[GID_OPTS_EXPORT_SCALE], - LabelEnd, - LayoutEnd, // scaling + LabelEnd), + LayoutEnd), // scaling CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_APPEARANCE], - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOIMAGES] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOIMAGES] = (CheckBoxObj, GA_ID, GID_OPTS_EXPORT_NOIMAGES, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_NOIMAGES], GA_Selected, nsoption_bool(suppress_images), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOBKG] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_NOBKG] = (CheckBoxObj, GA_ID, GID_OPTS_EXPORT_NOBKG, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_NOBKG], GA_Selected, nsoption_bool(remove_backgrounds), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_LOOSEN] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_LOOSEN] = (CheckBoxObj, GA_ID, GID_OPTS_EXPORT_LOOSEN, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_LOOSEN], GA_Selected, nsoption_bool(enable_loosening), - CheckBoxEnd, - LayoutEnd, // appearance + CheckBoxEnd), + LayoutEnd), // appearance CHILD_WeightedHeight, 0, - LAYOUT_AddChild, LayoutVObj, + LAYOUT_AddChild, (LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_ADVANCED], - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_COMPRESS] = CheckBoxObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_COMPRESS] = (CheckBoxObj, GA_ID, GID_OPTS_EXPORT_COMPRESS, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_COMPRESS], GA_Selected, nsoption_bool(enable_PDF_compression), - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_PASSWORD] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_EXPORT_PASSWORD] = (CheckBoxObj, GA_ID, GID_OPTS_EXPORT_PASSWORD, GA_RelVerify, TRUE, GA_Disabled, TRUE, GA_Text, gadlab[GID_OPTS_EXPORT_PASSWORD], GA_Selected, nsoption_bool(enable_PDF_password), - CheckBoxEnd, - LayoutEnd, // export + CheckBoxEnd), + LayoutEnd), // export CHILD_WeightedHeight, 0, - LayoutEnd, // page vgroup + LayoutEnd), // page vgroup CHILD_WeightedHeight, 0, - PageEnd, // page object + PageEnd), // page object #endif - End, // pagegroup - ClickTabEnd, - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, gow->objects[GID_OPTS_SAVE] = ButtonObj, + End), // pagegroup + ClickTabEnd), + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, gow->objects[GID_OPTS_SAVE] = (ButtonObj, GA_ID,GID_OPTS_SAVE, GA_Text,gadlab[GID_OPTS_SAVE], GA_RelVerify,TRUE, - ButtonEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_USE] = ButtonObj, + ButtonEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_USE] = (ButtonObj, GA_ID,GID_OPTS_USE, GA_Text,gadlab[GID_OPTS_USE], GA_RelVerify,TRUE, - ButtonEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_CANCEL] = ButtonObj, + ButtonEnd), + LAYOUT_AddChild, gow->objects[GID_OPTS_CANCEL] = (ButtonObj, GA_ID,GID_OPTS_CANCEL, GA_Text,gadlab[GID_OPTS_CANCEL], GA_RelVerify,TRUE, - ButtonEnd, - EndGroup, // save/use/cancel - EndGroup, // main - EndWindow; + ButtonEnd), + EndGroup), // save/use/cancel + EndGroup), // main + EndWindow); gow->win = (struct Window *)RA_OpenWindow(gow->objects[OID_MAIN]); ami_gui_win_list_add(gow, AMINS_GUIOPTSWINDOW, &ami_guiopts_table); diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c index fd33a67f3..72349ea35 100644 --- a/frontends/amiga/history.c +++ b/frontends/amiga/history.c @@ -371,7 +371,7 @@ ami_history_global_create_window(struct ami_history_global_window *history_win) refresh_mode = WA_SimpleRefresh; } - ami_cw->objects[GID_CW_WIN] = WindowObj, + ami_cw->objects[GID_CW_WIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, ami_cw->wintitle, WA_Activate, TRUE, @@ -401,15 +401,15 @@ ami_history_global_create_window(struct ami_history_global_window *history_win) WINDOW_MenuUserData, WGUD_HOOK, WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj, - LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj, + WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj, GA_ID, GID_CW_DRAW, SPACE_Transparent, TRUE, SPACE_BevelStyle, BVS_DISPLAY, GA_RelVerify, TRUE, - SpaceEnd, - EndGroup, - EndWindow; + SpaceEnd), + EndGroup), + EndWindow); if(ami_cw->objects[GID_CW_WIN] == NULL) { return NSERROR_NOMEM; diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c index 5ad77ead7..24f7ba1f0 100644 --- a/frontends/amiga/history_local.c +++ b/frontends/amiga/history_local.c @@ -198,7 +198,7 @@ ami_history_local_create_window(struct ami_history_local_window *history_local_w refresh_mode = WA_SimpleRefresh; } - ami_cw->objects[GID_CW_WIN] = WindowObj, + ami_cw->objects[GID_CW_WIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, ami_cw->wintitle, WA_Activate, TRUE, @@ -226,15 +226,15 @@ ami_history_local_create_window(struct ami_history_local_window *history_local_w WINDOW_MenuUserData, WGUD_HOOK, WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj, - LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj, + WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj, GA_ID, GID_CW_DRAW, SPACE_Transparent, TRUE, SPACE_BevelStyle, BVS_DISPLAY, GA_RelVerify, TRUE, - SpaceEnd, - EndGroup, - EndWindow; + SpaceEnd), + EndGroup), + EndWindow); if(ami_cw->objects[GID_CW_WIN] == NULL) { return NSERROR_NOMEM; diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c index 9a1d423bc..aaca4dc36 100644 --- a/frontends/amiga/hotlist.c +++ b/frontends/amiga/hotlist.c @@ -474,7 +474,7 @@ ami_hotlist_create_window(struct ami_hotlist_window *hotlist_win) refresh_mode = WA_SimpleRefresh; } - ami_cw->objects[GID_CW_WIN] = WindowObj, + ami_cw->objects[GID_CW_WIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, ami_cw->wintitle, WA_Activate, TRUE, @@ -504,15 +504,15 @@ ami_hotlist_create_window(struct ami_hotlist_window *hotlist_win) WINDOW_MenuUserData, WGUD_HOOK, WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj, - LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj, + WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj, GA_ID, GID_CW_DRAW, SPACE_Transparent, TRUE, SPACE_BevelStyle, BVS_DISPLAY, GA_RelVerify, TRUE, - SpaceEnd, - EndGroup, - EndWindow; + SpaceEnd), + EndGroup), + EndWindow); if(ami_cw->objects[GID_CW_WIN] == NULL) { return NSERROR_NOMEM; diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c index fe94eb25c..76181a71c 100644 --- a/frontends/amiga/libs.c +++ b/frontends/amiga/libs.c @@ -172,6 +172,8 @@ #ifdef __amigaos4__ AMINS_LIB_STRUCT(Application); +#else +struct Library *UtilityBase = NULL; #endif AMINS_LIB_STRUCT(Asl); AMINS_LIB_STRUCT(DataTypes); @@ -221,15 +223,15 @@ bool ami_libs_open(void) #ifdef __amigaos4__ /* Libraries only needed on OS4 */ AMINS_LIB_OPEN("application.library", 53, Application, "application", 2, false) + AMINS_LIB_OPEN("dos.library", 37, DOS, "main", 1, true) #else /* Libraries we get automatically on OS4 but not OS3 */ - AMINS_LIB_OPEN("utility.library", 37, Utility, "main", 1, true) + AMINS_LIB_OPEN("utility.library", 47, Utility, "main", 1, true) #endif /* Standard libraries for both versions */ AMINS_LIB_OPEN("asl.library", 37, Asl, "main", 1, true) AMINS_LIB_OPEN("datatypes.library", 39, DataTypes, "main", 1, true) AMINS_LIB_OPEN("diskfont.library", 40, Diskfont, "main", 1, true) - AMINS_LIB_OPEN("dos.library", 37, DOS, "main", 1, true) AMINS_LIB_OPEN("gadtools.library", 37, GadTools, "main", 1, true) AMINS_LIB_OPEN("graphics.library", 40, Graphics, "main", 1, true) AMINS_LIB_OPEN("icon.library", 44, Icon, "main", 1, true) @@ -330,7 +332,6 @@ void ami_libs_close(void) AMINS_LIB_CLOSE(Asl) AMINS_LIB_CLOSE(DataTypes) AMINS_LIB_CLOSE(Diskfont) - AMINS_LIB_CLOSE(DOS) AMINS_LIB_CLOSE(GadTools) AMINS_LIB_CLOSE(Graphics) AMINS_LIB_CLOSE(Icon) @@ -343,6 +344,7 @@ void ami_libs_close(void) AMINS_LIB_CLOSE(Workbench) #ifdef __amigaos4__ AMINS_LIB_CLOSE(Application) + AMINS_LIB_CLOSE(DOS) #else AMINS_LIB_CLOSE(Utility) #endif diff --git a/frontends/amiga/libs.h b/frontends/amiga/libs.h index db5b65c75..dd8295001 100644 --- a/frontends/amiga/libs.h +++ b/frontends/amiga/libs.h @@ -76,6 +76,8 @@ extern Class *WindowClass; #define StringObj NewObject(StringClass, NULL #define WindowObj NewObject(WindowClass, NULL +#define EndObj TAG_DONE) + /* Functions */ bool ami_libs_open(void); void ami_libs_close(void); diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c index 23e922a41..8060a5d49 100644 --- a/frontends/amiga/os3support.c +++ b/frontends/amiga/os3support.c @@ -53,89 +53,6 @@ struct FormatContext BOOL Overflow; }; -STATIC VOID ASM -StuffChar( - REG(a3, struct FormatContext * Context), - REG(d0, UBYTE Char)) -{ - /* Is there still room? */ - if(Context->Size > 0) - { - (*Context->Index) = Char; - - Context->Index++; - Context->Size--; - - /* Is there only a single character left? */ - if(Context->Size == 1) - { - /* Provide null-termination. */ - (*Context->Index) = '\0'; - - /* Don't store any further characters. */ - Context->Size = 0; - } - } - else - { - Context->Overflow = TRUE; - } -} - -BOOL -VSPrintfN( - LONG MaxLen, - STRPTR Buffer, - const STRPTR FormatString, - const va_list VarArgs) -{ - BOOL result = FAILURE; - - /* format a text, but place only up to MaxLen - * characters in the output buffer (including - * the terminating NUL) - */ - - if (Buffer == NULL || FormatString == NULL) return(result); - - if(MaxLen > 1) - { - struct FormatContext Context; - - Context.Index = Buffer; - Context.Size = MaxLen; - Context.Overflow = FALSE; - - RawDoFmt(FormatString,(APTR)VarArgs,(VOID (*)())StuffChar,(APTR)&Context); - - if(NO Context.Overflow) - result = SUCCESS; - } - - return(result); -} - -BOOL -SPrintfN( - LONG MaxLen, - STRPTR Buffer, - const STRPTR FormatString, - ...) -{ - va_list VarArgs; - BOOL result = FAILURE; - - /* format a text, varargs version */ - - if (Buffer == NULL && FormatString == NULL) return result; - - va_start(VarArgs,FormatString); - result = VSPrintfN(MaxLen,Buffer,FormatString,VarArgs); - va_end(VarArgs); - - return(result); -} - char *ASPrintf(const char *fmt, ...) { int r; @@ -144,7 +61,7 @@ char *ASPrintf(const char *fmt, ...) char *rbuf; va_start(ap, fmt); - r = VSPrintfN(2048, buffer, (const STRPTR)fmt, ap); + r = VSNPrintf(buffer, 2048, (const STRPTR)fmt, ap); va_end(ap); r = strlen(buffer); @@ -299,5 +216,7 @@ ULONG RefreshSetGadgetAttrs(struct Gadget *g, struct Window *w, struct Requester return RefreshSetGadgetAttrsA(g,w,r,(struct TagItem *) &tag1); } + + #endif diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h index 2df014117..22c74da2f 100644 --- a/frontends/amiga/os3support.h +++ b/frontends/amiga/os3support.h @@ -65,27 +65,17 @@ /* Ignore unsupported tags */ #define ASO_NoTrack TAG_IGNORE -#define BITMAP_DisabledSourceFile TAG_IGNORE -#define BITMAP_HasAlpha TAG_IGNORE #define BLITA_UseSrcAlpha TAG_IGNORE #define BLITA_MaskPlane TAG_IGNORE -#define CLICKTAB_FlagImage TAG_IGNORE -#define CLICKTAB_LabelTruncate TAG_IGNORE #define PDTA_PromoteMask TAG_IGNORE #define RPTAG_APenColor TAG_IGNORE #define GA_ContextMenu TAG_IGNORE #define GA_HintInfo TAG_IGNORE #define GAUGEIA_Level TAG_IGNORE #define IA_InBorder TAG_IGNORE -#define LBNCA_SoftStyle TAG_IGNORE -#define LISTBROWSER_Striping TAG_IGNORE #define SA_Compositing TAG_IGNORE -#define SBNA_HintInfo TAG_IGNORE -#define TNA_HintInfo TAG_IGNORE #define WA_ContextMenuHook TAG_IGNORE #define WA_ToolBox TAG_IGNORE -#define WINDOW_BuiltInScroll TAG_IGNORE -#define WINDOW_NewPrefsHook TAG_IGNORE /* raw keycodes */ #define RAWKEY_BACKSPACE 0x41 @@ -115,16 +105,10 @@ #define DN_FULLPATH 0 #define BGBACKFILL JAM1 #define ML_SEPARATOR NM_BARLABEL -#define LBS_ROWS 0 /* Renamed structures */ #define AnchorPathOld AnchorPath -/* ReAction (ClassAct) macros */ -#define GetFileEnd End -#define GetFontEnd End -#define GetScreenModeEnd End - /* MinTerm stuff */ #define MINTERM_SRCMASK (ABC|ABNC|ANBC) diff --git a/frontends/amiga/pageinfo.c b/frontends/amiga/pageinfo.c index 54de0d008..6e83958af 100644 --- a/frontends/amiga/pageinfo.c +++ b/frontends/amiga/pageinfo.c @@ -181,7 +181,7 @@ ami_pageinfo_create_window(struct ami_pageinfo_window *pageinfo_win, ULONG left, refresh_mode = WA_SimpleRefresh; } - ami_cw->objects[GID_CW_WIN] = WindowObj, + ami_cw->objects[GID_CW_WIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Activate, TRUE, WA_DepthGadget, FALSE, @@ -203,15 +203,15 @@ ami_pageinfo_create_window(struct ami_pageinfo_window *pageinfo_win, ULONG left, WINDOW_SharedPort, ami_gui_get_shared_msgport(), WINDOW_UserData, pageinfo_win, WINDOW_IconifyGadget, FALSE, - WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj, - LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj, + WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = (LayoutVObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = (SpaceObj, GA_ID, GID_CW_DRAW, SPACE_Transparent, TRUE, SPACE_BevelStyle, BVS_BOX, GA_RelVerify, TRUE, - SpaceEnd, - EndGroup, - EndWindow; + SpaceEnd), + EndGroup), + EndWindow); if(ami_cw->objects[GID_CW_WIN] == NULL) { return NSERROR_NOMEM; diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c index 97c70b96c..5040c8aeb 100644 --- a/frontends/amiga/print.c +++ b/frontends/amiga/print.c @@ -268,7 +268,7 @@ void ami_print_ui(struct hlcache_handle *c) ami_print_ui_setup(); - pw->objects[POID_MAIN] = WindowObj, + pw->objects[POID_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, gadlab[PGID_PRINT], WA_Activate, TRUE, @@ -281,18 +281,18 @@ void ami_print_ui(struct hlcache_handle *c) WINDOW_UserData, pw, WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, pw->gadgets[PGID_MAIN] = LayoutVObj, - LAYOUT_AddChild, ChooserObject, + WINDOW_ParentGroup, pw->gadgets[PGID_MAIN] = (LayoutVObj, + LAYOUT_AddChild, (ChooserObject, GA_ID, PGID_PRINTER, GA_RelVerify, TRUE, GA_TabCycle, TRUE, CHOOSER_LabelArray, printers, CHOOSER_Selected, nsoption_int(printer_unit), - ChooserEnd, - CHILD_Label, LabelObject, + ChooserEnd), + CHILD_Label, (LabelObject, LABEL_Text, gadlab[PGID_PRINTER], - LabelEnd, - LAYOUT_AddChild, IntegerObject, + LabelEnd), + LAYOUT_AddChild, (IntegerObject, GA_ID, PGID_COPIES, GA_RelVerify, TRUE, GA_TabCycle, TRUE, @@ -300,13 +300,13 @@ void ami_print_ui(struct hlcache_handle *c) INTEGER_Minimum, 1, INTEGER_Maximum, 100, INTEGER_Arrows, TRUE, - IntegerEnd, - CHILD_Label, LabelObject, + IntegerEnd), + CHILD_Label, (LabelObject, LABEL_Text, gadlab[PGID_COPIES], - LabelEnd, - LAYOUT_AddChild, HGroupObject, + LabelEnd), + LAYOUT_AddChild, (HGroupObject, LAYOUT_LabelColumn, PLACETEXT_RIGHT, - LAYOUT_AddChild, pw->gadgets[PGID_SCALE] = IntegerObj, + LAYOUT_AddChild, pw->gadgets[PGID_SCALE] = (IntegerObj, GA_ID, PGID_SCALE, GA_RelVerify, TRUE, GA_TabCycle, TRUE, @@ -314,33 +314,33 @@ void ami_print_ui(struct hlcache_handle *c) INTEGER_Minimum, 0, INTEGER_Maximum, 100, INTEGER_Arrows, TRUE, - IntegerEnd, + IntegerEnd), CHILD_WeightedWidth, 0, - CHILD_Label, LabelObject, + CHILD_Label, (LabelObject, LABEL_Text, "%", - LabelEnd, - LayoutEnd, - CHILD_Label, LabelObject, + LabelEnd), + LayoutEnd), + CHILD_Label, (LabelObject, LABEL_Text, gadlab[PGID_SCALE], - LabelEnd, - LAYOUT_AddChild, HGroupObject, - LAYOUT_AddChild, pw->gadgets[PGID_PRINT] = ButtonObj, + LabelEnd), + LAYOUT_AddChild, (HGroupObject, + LAYOUT_AddChild, pw->gadgets[PGID_PRINT] = (ButtonObj, GA_ID, PGID_PRINT, GA_RelVerify,TRUE, GA_Text, gadlab[PGID_PRINT], GA_TabCycle,TRUE, - ButtonEnd, + ButtonEnd), CHILD_WeightedHeight,0, - LAYOUT_AddChild, pw->gadgets[PGID_CANCEL] = ButtonObj, + LAYOUT_AddChild, pw->gadgets[PGID_CANCEL] = (ButtonObj, GA_ID, PGID_CANCEL, GA_RelVerify, TRUE, GA_Text, gadlab[PGID_CANCEL], GA_TabCycle,TRUE, - ButtonEnd, - LayoutEnd, + ButtonEnd), + LayoutEnd), CHILD_WeightedHeight,0, - EndGroup, - EndWindow; + EndGroup), + EndWindow); pw->win = (struct Window *)RA_OpenWindow(pw->objects[POID_MAIN]); ami_gui_win_list_add(pw, AMINS_PRINTWINDOW, &ami_print_table); @@ -557,7 +557,7 @@ bool ami_print_dump(void) void ami_print_progress(void) { - ami_print_info.objects[POID_MAIN] = WindowObj, + ami_print_info.objects[POID_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, messages_get("Printing"), WA_Activate, TRUE, @@ -571,8 +571,8 @@ void ami_print_progress(void) WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight,TRUE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, ami_print_info.gadgets[PGID_MAIN] = LayoutVObj, - LAYOUT_AddChild, ami_print_info.gadgets[PGID_STATUS] = FuelGaugeObj, + WINDOW_ParentGroup, ami_print_info.gadgets[PGID_MAIN] = (LayoutVObj, + LAYOUT_AddChild, ami_print_info.gadgets[PGID_STATUS] = (FuelGaugeObj, GA_ID,PGID_STATUS, FUELGAUGE_Min,0, FUELGAUGE_Max,ami_print_info.pages, @@ -581,7 +581,7 @@ void ami_print_progress(void) FUELGAUGE_ShortTicks,TRUE, FUELGAUGE_Percent,TRUE, FUELGAUGE_Justification,FGJ_CENTER, - FuelGaugeEnd, + FuelGaugeEnd), CHILD_NominalSize,TRUE, CHILD_WeightedHeight,0, /* @@ -593,8 +593,8 @@ void ami_print_progress(void) GA_TabCycle,TRUE, ButtonEnd, */ - EndGroup, - EndWindow; + EndGroup), + EndWindow); ami_print_info.win = (struct Window *)RA_OpenWindow(ami_print_info.objects[POID_MAIN]); } diff --git a/frontends/amiga/rtg.c b/frontends/amiga/rtg.c index 8618c0a33..9963ed038 100644 --- a/frontends/amiga/rtg.c +++ b/frontends/amiga/rtg.c @@ -20,6 +20,8 @@ * Abstract RTG functions for newer/older/non-P96 systems */ +#include <proto/graphics.h> + #include "amiga/rtg.h" struct BitMap *ami_rtg_allocbitmap(ULONG width, ULONG height, ULONG depth, diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c index 853c06fef..26a04ad22 100755 --- a/frontends/amiga/search.c +++ b/frontends/amiga/search.c @@ -161,7 +161,7 @@ void ami_search_open(struct gui_window *gwin) fwin->message[SSTR_PREV] = ami_utf8_easy(messages_get("Prev")); fwin->message[SSTR_NEXT] = ami_utf8_easy(messages_get("Next")); - fwin->objects[OID_S_MAIN] = WindowObj, + fwin->objects[OID_S_MAIN] = (WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), WA_Title, fwin->message[SSTR_TITLE], WA_Activate, TRUE, @@ -175,47 +175,47 @@ void ami_search_open(struct gui_window *gwin) WINDOW_IconifyGadget, FALSE, WINDOW_LockHeight, TRUE, WINDOW_Position, WPOS_CENTERSCREEN, - WINDOW_ParentGroup, fwin->objects[GID_S_MAIN] = LayoutVObj, - LAYOUT_AddChild, fwin->objects[GID_S_SEARCHSTRING] = StringObj, + WINDOW_ParentGroup, fwin->objects[GID_S_MAIN] = (LayoutVObj, + LAYOUT_AddChild, fwin->objects[GID_S_SEARCHSTRING] = (StringObj, GA_ID, GID_S_SEARCHSTRING, GA_TabCycle, TRUE, GA_RelVerify, TRUE, - StringEnd, + StringEnd), CHILD_WeightedHeight, 0, - LAYOUT_AddChild, fwin->objects[GID_S_CASE] = CheckBoxObj, + LAYOUT_AddChild, fwin->objects[GID_S_CASE] = (CheckBoxObj, GA_ID, GID_S_CASE, GA_Text, fwin->message[SSTR_CASE], GA_Selected, FALSE, GA_TabCycle, TRUE, GA_RelVerify, TRUE, - CheckBoxEnd, - LAYOUT_AddChild, fwin->objects[GID_S_SHOWALL] = CheckBoxObj, + CheckBoxEnd), + LAYOUT_AddChild, fwin->objects[GID_S_SHOWALL] = (CheckBoxObj, GA_ID,GID_S_SHOWALL, GA_Text, fwin->message[SSTR_SHOWALL], GA_Selected, FALSE, GA_TabCycle, TRUE, GA_RelVerify, TRUE, - CheckBoxEnd, - LAYOUT_AddChild, LayoutHObj, - LAYOUT_AddChild, fwin->objects[GID_S_PREV] = ButtonObj, + CheckBoxEnd), + LAYOUT_AddChild, (LayoutHObj, + LAYOUT_AddChild, fwin->objects[GID_S_PREV] = (ButtonObj, GA_ID, GID_S_PREV, GA_RelVerify, TRUE, GA_Text, fwin->message[SSTR_PREV], GA_TabCycle, TRUE, GA_Disabled, TRUE, - ButtonEnd, + ButtonEnd), CHILD_WeightedHeight, 0, - LAYOUT_AddChild, fwin->objects[GID_S_NEXT] = ButtonObj, + LAYOUT_AddChild, fwin->objects[GID_S_NEXT] = (ButtonObj, GA_ID, GID_S_NEXT, GA_RelVerify, TRUE, GA_Text, fwin->message[SSTR_NEXT], GA_TabCycle, TRUE, GA_Disabled, TRUE, - ButtonEnd, - LayoutEnd, + ButtonEnd), + LayoutEnd), CHILD_WeightedHeight,0, - EndGroup, - EndWindow; + EndGroup), + EndWindow); fwin->win = (struct Window *)RA_OpenWindow(fwin->objects[OID_S_MAIN]); fwin->gwin = gwin; diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c index a826b053a..fa9c9cf2c 100644 --- a/frontends/gtk/gui.c +++ b/frontends/gtk/gui.c @@ -131,12 +131,16 @@ uint32_t gtk_gui_gdkkey_to_nskey(GdkEventKey *key) case GDK_KEY(BackSpace): if (key->state & GDK_SHIFT_MASK) return NS_KEY_DELETE_LINE_START; + else if (key->state & GDK_CONTROL_MASK) + return NS_KEY_DELETE_WORD_LEFT; else return NS_KEY_DELETE_LEFT; case GDK_KEY(Delete): if (key->state & GDK_SHIFT_MASK) return NS_KEY_DELETE_LINE_END; + else if (key->state & GDK_CONTROL_MASK) + return NS_KEY_DELETE_WORD_RIGHT; else return NS_KEY_DELETE_RIGHT; @@ -148,10 +152,14 @@ uint32_t gtk_gui_gdkkey_to_nskey(GdkEventKey *key) case GDK_KEY(Left): case GDK_KEY(KP_Left): + if (key->state & GDK_CONTROL_MASK) + return NS_KEY_WORD_LEFT; return NS_KEY_LEFT; case GDK_KEY(Right): case GDK_KEY(KP_Right): + if (key->state & GDK_CONTROL_MASK) + return NS_KEY_WORD_RIGHT; return NS_KEY_RIGHT; case GDK_KEY(Up): diff --git a/include/netsurf/keypress.h b/include/netsurf/keypress.h index 604d2dd9b..84d9d41c8 100644 --- a/include/netsurf/keypress.h +++ b/include/netsurf/keypress.h @@ -59,7 +59,9 @@ enum input_key { NS_KEY_TEXT_START, NS_KEY_TEXT_END, NS_KEY_WORD_LEFT, + NS_KEY_DELETE_WORD_LEFT, NS_KEY_WORD_RIGHT, + NS_KEY_DELETE_WORD_RIGHT, NS_KEY_PAGE_UP, NS_KEY_PAGE_DOWN, NS_KEY_DELETE_LINE_END, diff --git a/resources/ca-bundle b/resources/ca-bundle index 651694e8a..a1dc575dd 100644 --- a/resources/ca-bundle +++ b/resources/ca-bundle @@ -1,7 +1,7 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed Jan 1 04:12:10 2020 GMT +## Certificate data from Mozilla as of: Thu Sep 30 03:12:05 2021 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -13,8 +13,8 @@ ## an Apache+mod_ssl webserver for SSL client authentication. ## Just configure this file as the SSLCACertificateFile. ## -## Conversion done with mk-ca-bundle.pl version 1.27. -## SHA256: f3bdcd74612952da8476a9d4147f50b29ad0710b7dd95b4c8690500209986d70 +## Conversion done with mk-ca-bundle.pl version 1.28. +## SHA256: c8f6733d1ff4e6a4769c182971a1234f95ae079247a9c439a13423fe8ba5c24f ## @@ -61,30 +61,6 @@ BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== -----END CERTIFICATE----- -Verisign Class 3 Public Primary Certification Authority - G3 -============================================================ ------BEGIN CERTIFICATE----- -MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV -UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv -cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl -IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh -dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw -CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy -dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv -cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg -Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1 -EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc -cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw -EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj -055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA -ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f -j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC -/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0 -xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa -t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ== ------END CERTIFICATE----- - Entrust.net Premium 2048 Secure Server CA ========================================= -----BEGIN CERTIFICATE----- @@ -130,30 +106,6 @@ Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp -----END CERTIFICATE----- -AddTrust External Root -====================== ------BEGIN CERTIFICATE----- -MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML -QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD -VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw -NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU -cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg -Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821 -+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw -Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo -aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy -2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7 -7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P -BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL -VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk -VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB -IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl -j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 -6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355 -e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u -G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= ------END CERTIFICATE----- - Entrust Root Certification Authority ==================================== -----BEGIN CERTIFICATE----- @@ -180,87 +132,6 @@ W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0 tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8 -----END CERTIFICATE----- -GeoTrust Global CA -================== ------BEGIN CERTIFICATE----- -MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK -Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw -MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j -LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo -BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet -8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc -T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU -vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD -AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk -DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q -zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4 -d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2 -mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p -XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm -Mw== ------END CERTIFICATE----- - -GeoTrust Universal CA -===================== ------BEGIN CERTIFICATE----- -MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN -R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1 -MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu -Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP -ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t -JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e -RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs -7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d -8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V -qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga -Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB -Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu -KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08 -ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0 -XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB -hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc -aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2 -qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL -oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK -xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF -KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2 -DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK -xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU -p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI -P/rmMuGNG2+k5o7Y+SlIis5z/iw= ------END CERTIFICATE----- - -GeoTrust Universal CA 2 -======================= ------BEGIN CERTIFICATE----- -MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN -R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0 -MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg -SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA -A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0 -DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17 -j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q -JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a -QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2 -WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP -20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn -ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC -SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG -8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2 -+/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E -BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z -dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ -4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+ -mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq -A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg -Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP -pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d -FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp -gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm -X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS ------END CERTIFICATE----- - Comodo AAA Services root ======================== -----BEGIN CERTIFICATE----- @@ -285,38 +156,6 @@ Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z 12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== -----END CERTIFICATE----- -QuoVadis Root CA -================ ------BEGIN CERTIFICATE----- -MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE -ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0 -eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz -MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp -cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD -EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk -J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL -F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL -YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen -AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w -PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y -ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7 -MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj -YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs -ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh -Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW -Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu -BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw -FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6 -tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo -fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul -LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x -gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi -5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi -5nrQNiOKSnQ2+Q== ------END CERTIFICATE----- - QuoVadis Root CA 2 ================== -----BEGIN CERTIFICATE----- @@ -404,26 +243,6 @@ s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ FL39vmwLAw== -----END CERTIFICATE----- -Sonera Class 2 Root CA -====================== ------BEGIN CERTIFICATE----- -MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG -U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw -NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh -IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3 -/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT -dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG -f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P -tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH -nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT -XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt -0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI -cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph -Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx -EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH -llpwrN9M ------END CERTIFICATE----- - XRamp Global CA Root ==================== -----BEGIN CERTIFICATE----- @@ -496,36 +315,6 @@ KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3 QBFGmh95DmK/D5fs4C8fF5Q= -----END CERTIFICATE----- -Taiwan GRCA -=========== ------BEGIN CERTIFICATE----- -MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG -EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X -DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv -dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD -ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN -w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5 -BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O -1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO -htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov -J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7 -Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t -B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB -O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8 -lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV -HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2 -09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ -TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj -Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2 -Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU -D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz -DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk -Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk -7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ -CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy -+fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS ------END CERTIFICATE----- - DigiCert Assured ID Root CA =========================== -----BEGIN CERTIFICATE----- @@ -592,26 +381,6 @@ mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K -----END CERTIFICATE----- -DST Root CA X3 -============== ------BEGIN CERTIFICATE----- -MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK -ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X -DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1 -cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD -ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT -rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9 -UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy -xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d -utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T -AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ -MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug -dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE -GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw -RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS -fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ ------END CERTIFICATE----- - SwissSign Gold CA - G2 ====================== -----BEGIN CERTIFICATE----- @@ -674,78 +443,6 @@ DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u -----END CERTIFICATE----- -GeoTrust Primary Certification Authority -======================================== ------BEGIN CERTIFICATE----- -MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG -EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD -ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx -CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ -cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN -b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9 -nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge -RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt -tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD -AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI -hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K -Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN -NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa -Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG -1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk= ------END CERTIFICATE----- - -thawte Primary Root CA -====================== ------BEGIN CERTIFICATE----- -MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE -BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2 -aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv -cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3 -MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg -SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv -KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT -FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs -oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ -1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc -q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K -aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p -afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD -VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF -AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE -uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX -xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89 -jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH -z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA== ------END CERTIFICATE----- - -VeriSign Class 3 Public Primary Certification Authority - G5 -============================================================ ------BEGIN CERTIFICATE----- -MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE -BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO -ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk -IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp -ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB -yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln -biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh -dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt -YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz -j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD -Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/ -Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r -fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/ -BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv -Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy -aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG -SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+ -X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE -KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC -Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE -ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq ------END CERTIFICATE----- - SecureTrust CA ============== -----BEGIN CERTIFICATE----- @@ -854,29 +551,6 @@ FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY= -----END CERTIFICATE----- -OISTE WISeKey Global Root GA CA -=============================== ------BEGIN CERTIFICATE----- -MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE -BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG -A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH -bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD -VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw -IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5 -IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9 -Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg -Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD -d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ -/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R -LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw -AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ -KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm -MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4 -+vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa -hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY -okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0= ------END CERTIFICATE----- - Certigna ======== -----BEGIN CERTIFICATE----- @@ -972,136 +646,6 @@ vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD -----END CERTIFICATE----- -GeoTrust Primary Certification Authority - G3 -============================================= ------BEGIN CERTIFICATE----- -MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE -BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0 -IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy -eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz -NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo -YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT -LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j -K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE -c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C -IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu -dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC -MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr -2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9 -cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE -Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD -AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s -t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt ------END CERTIFICATE----- - -thawte Primary Root CA - G2 -=========================== ------BEGIN CERTIFICATE----- -MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC -VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu -IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg -Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV -MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG -b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt -IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS -LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5 -8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU -mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN -G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K -rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg== ------END CERTIFICATE----- - -thawte Primary Root CA - G3 -=========================== ------BEGIN CERTIFICATE----- -MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE -BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2 -aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv -cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w -ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh -d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD -VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG -A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A -MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At -P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC -+BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY -7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW -vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E -BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ -KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK -A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu -t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC -8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm -er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A= ------END CERTIFICATE----- - -GeoTrust Primary Certification Authority - G2 -============================================= ------BEGIN CERTIFICATE----- -MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC -VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu -Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD -ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1 -OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg -MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl -b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG -BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc -KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD -VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+ -EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m -ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2 -npaqBA+K ------END CERTIFICATE----- - -VeriSign Universal Root Certification Authority -=============================================== ------BEGIN CERTIFICATE----- -MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE -BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO -ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk -IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u -IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV -UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv -cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl -IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0 -aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj -1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP -MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72 -9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I -AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR -tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G -CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O -a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud -DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3 -Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx -Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx -P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P -wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4 -mJO37M2CYfE45k+XmCpajQ== ------END CERTIFICATE----- - -VeriSign Class 3 Public Primary Certification Authority - G4 -============================================================ ------BEGIN CERTIFICATE----- -MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC -VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3 -b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz -ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj -YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL -MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU -cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo -b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5 -IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8 -Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz -rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB -/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw -HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u -Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD -A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx -AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA== ------END CERTIFICATE----- - NetLock Arany (Class Gold) Főtanúsítvány ======================================== -----BEGIN CERTIFICATE----- @@ -1126,38 +670,6 @@ NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E= -----END CERTIFICATE----- -Staat der Nederlanden Root CA - G2 -================================== ------BEGIN CERTIFICATE----- -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 -66+KAQ== ------END CERTIFICATE----- - Hongkong Post Root CA 1 ======================= -----BEGIN CERTIFICATE----- @@ -1309,82 +821,6 @@ Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw== -----END CERTIFICATE----- -Chambers of Commerce Root - 2008 -================================ ------BEGIN CERTIFICATE----- -MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD -MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv -bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu -QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy -Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl -ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF -EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl -cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC -AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA -XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj -h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/ -ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk -NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g -D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331 -lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ -0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj -ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2 -EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI -G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ -BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh -bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh -bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC -CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH -AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1 -wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH -3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU -RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6 -M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1 -YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF -9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK -zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG -nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg -OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ ------END CERTIFICATE----- - -Global Chambersign Root - 2008 -============================== ------BEGIN CERTIFICATE----- -MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD -MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv -bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu -QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx -NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg -Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ -QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD -aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf -VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf -XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0 -ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB -/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA -TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M -H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe -Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF -HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh -wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB -AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT -BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE -BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm -aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm -aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp -1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0 -dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG -/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6 -ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s -dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg -9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH -foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du -qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr -P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq -c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z -09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B ------END CERTIFICATE----- - Go Daddy Root Certificate Authority - G2 ======================================== -----BEGIN CERTIFICATE----- @@ -1686,27 +1122,6 @@ OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9 vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg== -----END CERTIFICATE----- -Trustis FPS Root CA -=================== ------BEGIN CERTIFICATE----- -MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG -EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290 -IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV -BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ -KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ -RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk -H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa -cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt -o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA -AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd -BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c -GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC -yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P -8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV -l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl -iB6XzCGcKQENZetX2fNXlrtIzYE= ------END CERTIFICATE----- - Buypass Class 2 Root CA ======================= -----BEGIN CERTIFICATE----- @@ -1789,30 +1204,6 @@ P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw== -----END CERTIFICATE----- -EE Certification Centre Root CA -=============================== ------BEGIN CERTIFICATE----- -MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG -EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy -dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw -MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB -UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy -ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB -DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM -TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2 -rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw -93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN -P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T -AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ -MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF -BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj -xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM -lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u -uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU -3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM -dcGWxZ0= ------END CERTIFICATE----- - D-TRUST Root Class 3 CA 2 2009 ============================== -----BEGIN CERTIFICATE----- @@ -2375,36 +1766,6 @@ uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7 yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3 -----END CERTIFICATE----- -Staat der Nederlanden Root CA - G3 -================================== ------BEGIN CERTIFICATE----- -MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE -CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g -Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC -TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l -ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y -olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t -x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy -EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K -Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur -mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5 -1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp -07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo -FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE -41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB -AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu -yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD -U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq -KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1 -v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA -8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b -8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r -mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq -1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI -JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV -tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk= ------END CERTIFICATE----- - Staat der Nederlanden EV Root CA ================================ -----BEGIN CERTIFICATE----- @@ -2831,37 +2192,6 @@ MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1 AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA== -----END CERTIFICATE----- -LuxTrust Global Root 2 -====================== ------BEGIN CERTIFICATE----- -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 ------END CERTIFICATE----- - TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1 ============================================= -----BEGIN CERTIFICATE----- @@ -3464,3 +2794,361 @@ JOgc47OlIQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk5F6G +TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuYn/PIjhs4ViFqUZPT kcpG2om3PVODLAgfi49T3f+sHw== -----END CERTIFICATE----- + +Microsoft ECC Root Certificate Authority 2017 +============================================= +-----BEGIN CERTIFICATE----- +MIICWTCCAd+gAwIBAgIQZvI9r4fei7FK6gxXMQHC7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV +UzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNyb3NvZnQgRUND +IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwHhcNMTkxMjE4MjMwNjQ1WhcNNDIwNzE4 +MjMxNjA0WjBlMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYw +NAYDVQQDEy1NaWNyb3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwdjAQ +BgcqhkjOPQIBBgUrgQQAIgNiAATUvD0CQnVBEyPNgASGAlEvaqiBYgtlzPbKnR5vSmZRogPZnZH6 +thaxjG7efM3beaYvzrvOcS/lpaso7GMEZpn4+vKTEAXhgShC48Zo9OYbhGBKia/teQ87zvH2RPUB +eMCjVDBSMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTIy5lycFIM ++Oa+sgRXKSrPQhDtNTAQBgkrBgEEAYI3FQEEAwIBADAKBggqhkjOPQQDAwNoADBlAjBY8k3qDPlf +Xu5gKcs68tvWMoQZP3zVL8KxzJOuULsJMsbG7X7JNpQS5GiFBqIb0C8CMQCZ6Ra0DvpWSNSkMBaR +eNtUjGUBiudQZsIxtzm6uBoiB078a1QWIP8rtedMDE2mT3M= +-----END CERTIFICATE----- + +Microsoft RSA Root Certificate Authority 2017 +============================================= +-----BEGIN CERTIFICATE----- +MIIFqDCCA5CgAwIBAgIQHtOXCV/YtLNHcB6qvn9FszANBgkqhkiG9w0BAQwFADBlMQswCQYDVQQG +EwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNyb3NvZnQg +UlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwHhcNMTkxMjE4MjI1MTIyWhcNNDIw +NzE4MjMwMDIzWjBlMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9u +MTYwNAYDVQQDEy1NaWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcw +ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKW76UM4wplZEWCpW9R2LBifOZNt9GkMml +7Xhqb0eRaPgnZ1AzHaGm++DlQ6OEAlcBXZxIQIJTELy/xztokLaCLeX0ZdDMbRnMlfl7rEqUrQ7e +S0MdhweSE5CAg2Q1OQT85elss7YfUJQ4ZVBcF0a5toW1HLUX6NZFndiyJrDKxHBKrmCk3bPZ7Pw7 +1VdyvD/IybLeS2v4I2wDwAW9lcfNcztmgGTjGqwu+UcF8ga2m3P1eDNbx6H7JyqhtJqRjJHTOoI+ +dkC0zVJhUXAoP8XFWvLJjEm7FFtNyP9nTUwSlq31/niol4fX/V4ggNyhSyL71Imtus5Hl0dVe49F +yGcohJUcaDDv70ngNXtk55iwlNpNhTs+VcQor1fznhPbRiefHqJeRIOkpcrVE7NLP8TjwuaGYaRS +MLl6IE9vDzhTyzMMEyuP1pq9KsgtsRx9S1HKR9FIJ3Jdh+vVReZIZZ2vUpC6W6IYZVcSn2i51BVr +lMRpIpj0M+Dt+VGOQVDJNE92kKz8OMHY4Xu54+OU4UZpyw4KUGsTuqwPN1q3ErWQgR5WrlcihtnJ +0tHXUeOrO8ZV/R4O03QK0dqq6mm4lyiPSMQH+FJDOvTKVTUssKZqwJz58oHhEmrARdlns87/I6KJ +ClTUFLkqqNfs+avNJVgyeY+QW5g5xAgGwax/Dj0ApQIDAQABo1QwUjAOBgNVHQ8BAf8EBAMCAYYw +DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUCctZf4aycI8awznjwNnpv7tNsiMwEAYJKwYBBAGC +NxUBBAMCAQAwDQYJKoZIhvcNAQEMBQADggIBAKyvPl3CEZaJjqPnktaXFbgToqZCLgLNFgVZJ8og +6Lq46BrsTaiXVq5lQ7GPAJtSzVXNUzltYkyLDVt8LkS/gxCP81OCgMNPOsduET/m4xaRhPtthH80 +dK2Jp86519efhGSSvpWhrQlTM93uCupKUY5vVau6tZRGrox/2KJQJWVggEbbMwSubLWYdFQl3JPk ++ONVFT24bcMKpBLBaYVu32TxU5nhSnUgnZUP5NbcA/FZGOhHibJXWpS2qdgXKxdJ5XbLwVaZOjex +/2kskZGT4d9Mozd2TaGf+G0eHdP67Pv0RR0Tbc/3WeUiJ3IrhvNXuzDtJE3cfVa7o7P4NHmJweDy +AmH3pvwPuxwXC65B2Xy9J6P9LjrRk5Sxcx0ki69bIImtt2dmefU6xqaWM/5TkshGsRGRxpl/j8nW +ZjEgQRCHLQzWwa80mMpkg/sTV9HB8Dx6jKXB/ZUhoHHBk2dxEuqPiAppGWSZI1b7rCoucL5mxAyE +7+WL85MB+GqQk2dLsmijtWKP6T+MejteD+eMuMZ87zf9dOLITzNy4ZQ5bb0Sr74MTnB8G2+NszKT +c0QWbej09+CVgI+WXTik9KveCjCHk9hNAHFiRSdLOkKEW39lt2c0Ui2cFmuqqNh7o0JMcccMyj6D +5KbvtwEwXlGjefVwaaZBRA+GsCyRxj3qrg+E +-----END CERTIFICATE----- + +e-Szigno Root CA 2017 +===================== +-----BEGIN CERTIFICATE----- +MIICQDCCAeWgAwIBAgIMAVRI7yH9l1kN9QQKMAoGCCqGSM49BAMCMHExCzAJBgNVBAYTAkhVMREw +DwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUt +MjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25vIFJvb3QgQ0EgMjAxNzAeFw0xNzA4MjIxMjA3MDZa +Fw00MjA4MjIxMjA3MDZaMHExCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UE +CgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3pp +Z25vIFJvb3QgQ0EgMjAxNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJbcPYrYsHtvxie+RJCx +s1YVe45DJH0ahFnuY2iyxl6H0BVIHqiQrb1TotreOpCmYF9oMrWGQd+HWyx7xf58etqjYzBhMA8G +A1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSHERUI0arBeAyxr87GyZDv +vzAEwDAfBgNVHSMEGDAWgBSHERUI0arBeAyxr87GyZDvvzAEwDAKBggqhkjOPQQDAgNJADBGAiEA +tVfd14pVCzbhhkT61NlojbjcI4qKDdQvfepz7L9NbKgCIQDLpbQS+ue16M9+k/zzNY9vTlp8tLxO +svxyqltZ+efcMQ== +-----END CERTIFICATE----- + +certSIGN Root CA G2 +=================== +-----BEGIN CERTIFICATE----- +MIIFRzCCAy+gAwIBAgIJEQA0tk7GNi02MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNVBAYTAlJPMRQw +EgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJR04gUk9PVCBDQSBHMjAeFw0xNzAy +MDYwOTI3MzVaFw00MjAyMDYwOTI3MzVaMEExCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lH +TiBTQTEcMBoGA1UECxMTY2VydFNJR04gUk9PVCBDQSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP +ADCCAgoCggIBAMDFdRmRfUR0dIf+DjuW3NgBFszuY5HnC2/OOwppGnzC46+CjobXXo9X69MhWf05 +N0IwvlDqtg+piNguLWkh59E3GE59kdUWX2tbAMI5Qw02hVK5U2UPHULlj88F0+7cDBrZuIt4Imfk +abBoxTzkbFpG583H+u/E7Eu9aqSs/cwoUe+StCmrqzWaTOTECMYmzPhpn+Sc8CnTXPnGFiWeI8Mg +wT0PPzhAsP6CRDiqWhqKa2NYOLQV07YRaXseVO6MGiKscpc/I1mbySKEwQdPzH/iV8oScLumZfNp +dWO9lfsbl83kqK/20U6o2YpxJM02PbyWxPFsqa7lzw1uKA2wDrXKUXt4FMMgL3/7FFXhEZn91Qqh +ngLjYl/rNUssuHLoPj1PrCy7Lobio3aP5ZMqz6WryFyNSwb/EkaseMsUBzXgqd+L6a8VTxaJW732 +jcZZroiFDsGJ6x9nxUWO/203Nit4ZoORUSs9/1F3dmKh7Gc+PoGD4FapUB8fepmrY7+EF3fxDTvf +95xhszWYijqy7DwaNz9+j5LP2RIUZNoQAhVB/0/E6xyjyfqZ90bp4RjZsbgyLcsUDFDYg2WD7rlc +z8sFWkz6GZdr1l0T08JcVLwyc6B49fFtHsufpaafItzRUZ6CeWRgKRM+o/1Pcmqr4tTluCRVLERL +iohEnMqE0yo7AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1Ud +DgQWBBSCIS1mxteg4BXrzkwJd8RgnlRuAzANBgkqhkiG9w0BAQsFAAOCAgEAYN4auOfyYILVAzOB +ywaK8SJJ6ejqkX/GM15oGQOGO0MBzwdw5AgeZYWR5hEit/UCI46uuR59H35s5r0l1ZUa8gWmr4UC +b6741jH/JclKyMeKqdmfS0mbEVeZkkMR3rYzpMzXjWR91M08KCy0mpbqTfXERMQlqiCA2ClV9+BB +/AYm/7k29UMUA2Z44RGx2iBfRgB4ACGlHgAoYXhvqAEBj500mv/0OJD7uNGzcgbJceaBxXntC6Z5 +8hMLnPddDnskk7RI24Zf3lCGeOdA5jGokHZwYa+cNywRtYK3qq4kNFtyDGkNzVmf9nGvnAvRCjj5 +BiKDUyUM/FHE5r7iOZULJK2v0ZXkltd0ZGtxTgI8qoXzIKNDOXZbbFD+mpwUHmUUihW9o4JFWklW +atKcsWMy5WHgUyIOpwpJ6st+H6jiYoD2EEVSmAYY3qXNL3+q1Ok+CHLsIwMCPKaq2LxndD0UF/tU +Sxfj03k9bWtJySgOLnRQvwzZRjoQhsmnP+mg7H/rpXdYaXHmgwo38oZJar55CJD2AhZkPuXaTH4M +NMn5X7azKFGnpyuqSfqNZSlO42sTp5SjLVFteAxEy9/eCG/Oo2Sr05WE1LlSVHJ7liXMvGnjSG4N +0MedJ5qq+BOS3R7fY581qRY27Iy4g/Q9iY/NtBde17MXQRBdJ3NghVdJIgc= +-----END CERTIFICATE----- + +Trustwave Global Certification Authority +======================================== +-----BEGIN CERTIFICATE----- +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 +29FpHOTKyeC2nOnOcXHebD8WpHk= +-----END CERTIFICATE----- + +Trustwave Global ECC P256 Certification Authority +================================================= +-----BEGIN CERTIFICATE----- +MIICYDCCAgegAwIBAgIMDWpfCD8oXD5Rld9dMAoGCCqGSM49BAMCMIGRMQswCQYDVQQGEwJVUzER +MA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBI +b2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBFQ0MgUDI1NiBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eTAeFw0xNzA4MjMxOTM1MTBaFw00MjA4MjMxOTM1MTBaMIGRMQswCQYD +VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRy +dXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBFQ0MgUDI1 +NiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABH77bOYj +43MyCMpg5lOcunSNGLB4kFKA3TjASh3RqMyTpJcGOMoNFWLGjgEqZZ2q3zSRLoHB5DOSMcT9CTqm +P62jQzBBMA8GA1UdEwEB/wQFMAMBAf8wDwYDVR0PAQH/BAUDAwcGADAdBgNVHQ4EFgQUo0EGrJBt +0UrrdaVKEJmzsaGLSvcwCgYIKoZIzj0EAwIDRwAwRAIgB+ZU2g6gWrKuEZ+Hxbb/ad4lvvigtwjz +RM4q3wghDDcCIC0mA6AFvWvR9lz4ZcyGbbOcNEhjhAnFjXca4syc4XR7 +-----END CERTIFICATE----- + +Trustwave Global ECC P384 Certification Authority +================================================= +-----BEGIN CERTIFICATE----- +MIICnTCCAiSgAwIBAgIMCL2Fl2yZJ6SAaEc7MAoGCCqGSM49BAMDMIGRMQswCQYDVQQGEwJVUzER +MA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0d2F2ZSBI +b2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBFQ0MgUDM4NCBDZXJ0aWZp +Y2F0aW9uIEF1dGhvcml0eTAeFw0xNzA4MjMxOTM2NDNaFw00MjA4MjMxOTM2NDNaMIGRMQswCQYD +VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRy +dXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBFQ0MgUDM4 +NCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTB2MBAGByqGSM49AgEGBSuBBAAiA2IABGvaDXU1CDFH +Ba5FmVXxERMuSvgQMSOjfoPTfygIOiYaOs+Xgh+AtycJj9GOMMQKmw6sWASr9zZ9lCOkmwqKi6vr +/TklZvFe/oyujUF5nQlgziip04pt89ZF1PKYhDhloKNDMEEwDwYDVR0TAQH/BAUwAwEB/zAPBgNV +HQ8BAf8EBQMDBwYAMB0GA1UdDgQWBBRVqYSJ0sEyvRjLbKYHTsjnnb6CkDAKBggqhkjOPQQDAwNn +ADBkAjA3AZKXRRJ+oPM+rRk6ct30UJMDEr5E0k9BpIycnR+j9sKS50gU/k6bpZFXrsY3crsCMGcl +CrEMXu6pY5Jv5ZAL/mYiykf9ijH3g/56vxC+GCsej/YpHpRZ744hN8tRmKVuSw== +-----END CERTIFICATE----- + +NAVER Global Root Certification Authority +========================================= +-----BEGIN CERTIFICATE----- +MIIFojCCA4qgAwIBAgIUAZQwHqIL3fXFMyqxQ0Rx+NZQTQ0wDQYJKoZIhvcNAQEMBQAwaTELMAkG +A1UEBhMCS1IxJjAkBgNVBAoMHU5BVkVSIEJVU0lORVNTIFBMQVRGT1JNIENvcnAuMTIwMAYDVQQD +DClOQVZFUiBHbG9iYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xNzA4MTgwODU4 +NDJaFw0zNzA4MTgyMzU5NTlaMGkxCzAJBgNVBAYTAktSMSYwJAYDVQQKDB1OQVZFUiBCVVNJTkVT +UyBQTEFURk9STSBDb3JwLjEyMDAGA1UEAwwpTkFWRVIgR2xvYmFsIFJvb3QgQ2VydGlmaWNhdGlv +biBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC21PGTXLVAiQqrDZBb +UGOukJR0F0Vy1ntlWilLp1agS7gvQnXp2XskWjFlqxcX0TM62RHcQDaH38dq6SZeWYp34+hInDEW ++j6RscrJo+KfziFTowI2MMtSAuXaMl3Dxeb57hHHi8lEHoSTGEq0n+USZGnQJoViAbbJAh2+g1G7 +XNr4rRVqmfeSVPc0W+m/6imBEtRTkZazkVrd/pBzKPswRrXKCAfHcXLJZtM0l/aM9BhK4dA9WkW2 +aacp+yPOiNgSnABIqKYPszuSjXEOdMWLyEz59JuOuDxp7W87UC9Y7cSw0BwbagzivESq2M0UXZR4 +Yb8ObtoqvC8MC3GmsxY/nOb5zJ9TNeIDoKAYv7vxvvTWjIcNQvcGufFt7QSUqP620wbGQGHfnZ3z +VHbOUzoBppJB7ASjjw2i1QnK1sua8e9DXcCrpUHPXFNwcMmIpi3Ua2FzUCaGYQ5fG8Ir4ozVu53B +A0K6lNpfqbDKzE0K70dpAy8i+/Eozr9dUGWokG2zdLAIx6yo0es+nPxdGoMuK8u180SdOqcXYZai +cdNwlhVNt0xz7hlcxVs+Qf6sdWA7G2POAN3aCJBitOUt7kinaxeZVL6HSuOpXgRM6xBtVNbv8ejy +YhbLgGvtPe31HzClrkvJE+2KAQHJuFFYwGY6sWZLxNUxAmLpdIQM201GLQIDAQABo0IwQDAdBgNV +HQ4EFgQU0p+I36HNLL3s9TsBAZMzJ7LrYEswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMB +Af8wDQYJKoZIhvcNAQEMBQADggIBADLKgLOdPVQG3dLSLvCkASELZ0jKbY7gyKoNqo0hV4/GPnrK +21HUUrPUloSlWGB/5QuOH/XcChWB5Tu2tyIvCZwTFrFsDDUIbatjcu3cvuzHV+YwIHHW1xDBE1UB +jCpD5EHxzzp6U5LOogMFDTjfArsQLtk70pt6wKGm+LUx5vR1yblTmXVHIloUFcd4G7ad6Qz4G3bx +hYTeodoS76TiEJd6eN4MUZeoIUCLhr0N8F5OSza7OyAfikJW4Qsav3vQIkMsRIz75Sq0bBwcupTg +E34h5prCy8VCZLQelHsIJchxzIdFV4XTnyliIoNRlwAYl3dqmJLJfGBs32x9SuRwTMKeuB330DTH +D8z7p/8Dvq1wkNoL3chtl1+afwkyQf3NosxabUzyqkn+Zvjp2DXrDige7kgvOtB5CTh8piKCk5XQ +A76+AqAF3SAi428diDRgxuYKuQl1C/AH6GmWNcf7I4GOODm4RStDeKLRLBT/DShycpWbXgnbiUSY +qqFJu3FS8r/2/yehNq+4tneI3TqkbZs0kNwUXTC/t+sX5Ie3cdCh13cV1ELX8vMxmV2b3RZtP+oG +I/hGoiLtk/bdmuYqh7GYVPEi92tF4+KOdh2ajcQGjTa3FPOdVGm3jjzVpG2Tgbet9r1ke8LJaDmg +kpzNNIaRkPpkUZ3+/uul9XXeifdy +-----END CERTIFICATE----- + +AC RAIZ FNMT-RCM SERVIDORES SEGUROS +=================================== +-----BEGIN CERTIFICATE----- +MIICbjCCAfOgAwIBAgIQYvYybOXE42hcG2LdnC6dlTAKBggqhkjOPQQDAzB4MQswCQYDVQQGEwJF +UzERMA8GA1UECgwIRk5NVC1SQ00xDjAMBgNVBAsMBUNlcmVzMRgwFgYDVQRhDA9WQVRFUy1RMjgy +NjAwNEoxLDAqBgNVBAMMI0FDIFJBSVogRk5NVC1SQ00gU0VSVklET1JFUyBTRUdVUk9TMB4XDTE4 +MTIyMDA5MzczM1oXDTQzMTIyMDA5MzczM1oweDELMAkGA1UEBhMCRVMxETAPBgNVBAoMCEZOTVQt +UkNNMQ4wDAYDVQQLDAVDZXJlczEYMBYGA1UEYQwPVkFURVMtUTI4MjYwMDRKMSwwKgYDVQQDDCNB +QyBSQUlaIEZOTVQtUkNNIFNFUlZJRE9SRVMgU0VHVVJPUzB2MBAGByqGSM49AgEGBSuBBAAiA2IA +BPa6V1PIyqvfNkpSIeSX0oNnnvBlUdBeh8dHsVnyV0ebAAKTRBdp20LHsbI6GA60XYyzZl2hNPk2 +LEnb80b8s0RpRBNm/dfF/a82Tc4DTQdxz69qBdKiQ1oKUm8BA06Oi6NCMEAwDwYDVR0TAQH/BAUw +AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFAG5L++/EYZg8k/QQW6rcx/n0m5JMAoGCCqG +SM49BAMDA2kAMGYCMQCuSuMrQMN0EfKVrRYj3k4MGuZdpSRea0R7/DjiT8ucRRcRTBQnJlU5dUoD +zBOQn5ICMQD6SmxgiHPz7riYYqnOK8LZiqZwMR2vsJRM60/G49HzYqc8/5MuB1xJAWdpEgJyv+c= +-----END CERTIFICATE----- + +GlobalSign Root R46 +=================== +-----BEGIN CERTIFICATE----- +MIIFWjCCA0KgAwIBAgISEdK7udcjGJ5AXwqdLdDfJWfRMA0GCSqGSIb3DQEBDAUAMEYxCzAJBgNV +BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJv +b3QgUjQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAX +BgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBSNDYwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCsrHQy6LNl5brtQyYdpokNRbopiLKkHWPd08Es +CVeJOaFV6Wc0dwxu5FUdUiXSE2te4R2pt32JMl8Nnp8semNgQB+msLZ4j5lUlghYruQGvGIFAha/ +r6gjA7aUD7xubMLL1aa7DOn2wQL7Id5m3RerdELv8HQvJfTqa1VbkNud316HCkD7rRlr+/fKYIje +2sGP1q7Vf9Q8g+7XFkyDRTNrJ9CG0Bwta/OrffGFqfUo0q3v84RLHIf8E6M6cqJaESvWJ3En7YEt +bWaBkoe0G1h6zD8K+kZPTXhc+CtI4wSEy132tGqzZfxCnlEmIyDLPRT5ge1lFgBPGmSXZgjPjHvj +K8Cd+RTyG/FWaha/LIWFzXg4mutCagI0GIMXTpRW+LaCtfOW3T3zvn8gdz57GSNrLNRyc0NXfeD4 +12lPFzYE+cCQYDdF3uYM2HSNrpyibXRdQr4G9dlkbgIQrImwTDsHTUB+JMWKmIJ5jqSngiCNI/on +ccnfxkF0oE32kRbcRoxfKWMxWXEM2G/CtjJ9++ZdU6Z+Ffy7dXxd7Pj2Fxzsx2sZy/N78CsHpdls +eVR2bJ0cpm4O6XkMqCNqo98bMDGfsVR7/mrLZqrcZdCinkqaByFrgY/bxFn63iLABJzjqls2k+g9 +vXqhnQt2sQvHnf3PmKgGwvgqo6GDoLclcqUC4wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYD +VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA1yrc4GHqMywptWU4jaWSf8FmSwwDQYJKoZIhvcNAQEM +BQADggIBAHx47PYCLLtbfpIrXTncvtgdokIzTfnvpCo7RGkerNlFo048p9gkUbJUHJNOxO97k4Vg +JuoJSOD1u8fpaNK7ajFxzHmuEajwmf3lH7wvqMxX63bEIaZHU1VNaL8FpO7XJqti2kM3S+LGteWy +gxk6x9PbTZ4IevPuzz5i+6zoYMzRx6Fcg0XERczzF2sUyQQCPtIkpnnpHs6i58FZFZ8d4kuaPp92 +CC1r2LpXFNqD6v6MVenQTqnMdzGxRBF6XLE+0xRFFRhiJBPSy03OXIPBNvIQtQ6IbbjhVp+J3pZm +OUdkLG5NrmJ7v2B0GbhWrJKsFjLtrWhV/pi60zTe9Mlhww6G9kuEYO4Ne7UyWHmRVSyBQ7N0H3qq +JZ4d16GLuc1CLgSkZoNNiTW2bKg2SnkheCLQQrzRQDGQob4Ez8pn7fXwgNNgyYMqIgXQBztSvwye +qiv5u+YfjyW6hY0XHgL+XVAEV8/+LbzvXMAaq7afJMbfc2hIkCwU9D9SGuTSyxTDYWnP4vkYxboz +nxSjBF25cfe1lNj2M8FawTSLfJvdkzrnE6JwYZ+vj+vYxXX4M2bUdGc6N3ec592kD3ZDZopD8p/7 +DEJ4Y9HiD2971KE9dJeFt0g5QdYg/NA6s/rob8SKunE3vouXsXgxT7PntgMTzlSdriVZzH81Xwj3 +QEUxeCp6 +-----END CERTIFICATE----- + +GlobalSign Root E46 +=================== +-----BEGIN CERTIFICATE----- +MIICCzCCAZGgAwIBAgISEdK7ujNu1LzmJGjFDYQdmOhDMAoGCCqGSM49BAMDMEYxCzAJBgNVBAYT +AkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3Qg +RTQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNV +BAoTEEdsb2JhbFNpZ24gbnYtc2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBFNDYwdjAQBgcq +hkjOPQIBBgUrgQQAIgNiAAScDrHPt+ieUnd1NPqlRqetMhkytAepJ8qUuwzSChDH2omwlwxwEwkB +jtjqR+q+soArzfwoDdusvKSGN+1wCAB16pMLey5SnCNoIwZD7JIvU4Tb+0cUB+hflGddyXqBPCCj +QjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQxCpCPtsad0kRL +gLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZk +vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+ +CAezNIm8BZ/3Hobui3A= +-----END CERTIFICATE----- + +GLOBALTRUST 2020 +================ +-----BEGIN CERTIFICATE----- +MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx +IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT +VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh +BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy +MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi +D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO +VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM +CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm +fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA +A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR +JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG +DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU +clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ +mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw +AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud +IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA +VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw +4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9 +iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS +8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2 +HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS +vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918 +oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF +YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl +gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg== +-----END CERTIFICATE----- + +ANF Secure Server Root CA +========================= +-----BEGIN CERTIFICATE----- +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 +-----END CERTIFICATE----- + +Certum EC-384 CA +================ +-----BEGIN CERTIFICATE----- +MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQswCQYDVQQGEwJQ +TDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2Vy +dGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2 +MDcyNDU0WhcNNDMwMzI2MDcyNDU0WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERh +dGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx +GTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATEKI6rGFtq +vm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7TmFy8as10CW4kjPMIRBSqn +iBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68KjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD +VR0OBBYEFI0GZnQkdjrzife81r1HfS+8EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNo +ADBlAjADVS2m5hjEfO/JUG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0 +QoSZ/6vnnvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k= +-----END CERTIFICATE----- + +Certum Trusted Root CA +====================== +-----BEGIN CERTIFICATE----- +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 +-----END CERTIFICATE----- |