Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/529b94be73a1ba080a72f620c8d1165da02bc66b
...commit
http://git.netsurf-browser.org/netsurf.git/commit/529b94be73a1ba080a72f620c8d1165da02bc66b
...tree
http://git.netsurf-browser.org/netsurf.git/tree/529b94be73a1ba080a72f620c8d1165da02bc66b
The branch, master has been updated
via 529b94be73a1ba080a72f620c8d1165da02bc66b (commit)
via 84f0c760e6cadb2ccf3c7f5abd91990ab8b5c62f (commit)
from e2f34232a2e9a652e04f0b4e721a61dfde92422a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=529b94be73a1ba080a72f620c8d1165da02bc66b
commit 529b94be73a1ba080a72f620c8d1165da02bc66b
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fixup riscos image configuration dialog gadget id
when minimum GIF delay was removed in
38c632a7da14c2b0e46b0b81724200578482f4c9 the
remaining gadget identifier numbers were not updated.
Fixes #2745
diff --git a/frontends/riscos/configure/con_image.c
b/frontends/riscos/configure/con_image.c
index 3f12f89..23c663a 100644
--- a/frontends/riscos/configure/con_image.c
+++ b/frontends/riscos/configure/con_image.c
@@ -38,10 +38,10 @@
#define IMAGE_BACKGROUND_FIELD 6
#define IMAGE_BACKGROUND_MENU 7
#define IMAGE_CURRENT_DISPLAY 8
-#define IMAGE_DISABLE_ANIMATION 16
-#define IMAGE_DEFAULT_BUTTON 17
-#define IMAGE_CANCEL_BUTTON 18
-#define IMAGE_OK_BUTTON 19
+#define IMAGE_DISABLE_ANIMATION 11
+#define IMAGE_DEFAULT_BUTTON 12
+#define IMAGE_CANCEL_BUTTON 13
+#define IMAGE_OK_BUTTON 14
static bool ro_gui_options_image_click(wimp_pointer *pointer);
static bool ro_gui_options_image_ok(wimp_w w);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=84f0c760e6cadb2ccf3c7f5abd91990ab8b5c62f
commit 84f0c760e6cadb2ccf3c7f5abd91990ab8b5c62f
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
use form of window create which returns an error instead of aborting
diff --git a/frontends/riscos/cookies.c b/frontends/riscos/cookies.c
index 125d043..4884950 100644
--- a/frontends/riscos/cookies.c
+++ b/frontends/riscos/cookies.c
@@ -342,6 +342,7 @@ cookie_menu_select(wimp_w w,
*/
static nserror ro_cookie_init(void)
{
+ os_error *error;
struct ro_cookie_window *ncwin;
nserror res;
static const struct ns_menu cookie_menu_def = {
@@ -383,7 +384,14 @@ static nserror ro_cookie_init(void)
}
/* create window from template */
- ncwin->core.wh = wimp_create_window(dialog_cookie_template);
+ error = xwimp_create_window(dialog_cookie_template, &ncwin->core.wh);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+ error->errnum, error->errmess);
+ ro_warn_user("WimpError", error->errmess);
+ free(ncwin);
+ return NSERROR_NOMEM;
+ }
ro_gui_set_window_title(ncwin->core.wh, messages_get("Cookies"));
diff --git a/frontends/riscos/global_history.c
b/frontends/riscos/global_history.c
index 7dfc583..4f0dbd4 100644
--- a/frontends/riscos/global_history.c
+++ b/frontends/riscos/global_history.c
@@ -367,6 +367,7 @@ global_history_menu_select(wimp_w w,
*/
static nserror ro_global_history_init(void)
{
+ os_error *error;
struct ro_global_history_window *ncwin;
nserror res;
static const struct ns_menu global_history_menu_def = {
@@ -411,7 +412,15 @@ static nserror ro_global_history_init(void)
}
/* create window from template */
- ncwin->core.wh = wimp_create_window(dialog_global_history_template);
+ error = xwimp_create_window(dialog_global_history_template,
+ &ncwin->core.wh);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+ error->errnum, error->errmess);
+ ro_warn_user("WimpError", error->errmess);
+ free(ncwin);
+ return NSERROR_NOMEM;
+ }
ro_gui_set_window_title(ncwin->core.wh, messages_get("GlobalHistory"));
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index b0ed1e2..7e18ce8 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -423,6 +423,7 @@ hotlist_menu_select(wimp_w w,
*/
static nserror ro_hotlist_init(void)
{
+ os_error *error;
struct ro_hotlist_window *ncwin;
nserror res;
static const struct ns_menu hotlist_menu_def = {
@@ -472,7 +473,14 @@ static nserror ro_hotlist_init(void)
}
/* create window from template */
- ncwin->core.wh = wimp_create_window(dialog_hotlist_template);
+ error = xwimp_create_window(dialog_hotlist_template, &ncwin->core.wh);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+ error->errnum, error->errmess);
+ ro_warn_user("WimpError", error->errmess);
+ free(ncwin);
+ return NSERROR_NOMEM;
+ }
ro_gui_set_window_title(ncwin->core.wh, messages_get("Hotlist"));
diff --git a/frontends/riscos/local_history.c b/frontends/riscos/local_history.c
index 3e4e5c3..03f1d86 100644
--- a/frontends/riscos/local_history.c
+++ b/frontends/riscos/local_history.c
@@ -289,6 +289,7 @@ static nserror
ro_local_history_init(struct browser_window *bw,
struct ro_local_history_window **win_out)
{
+ os_error *error;
struct ro_local_history_window *ncwin;
nserror res;
@@ -306,7 +307,15 @@ ro_local_history_init(struct browser_window *bw,
}
/* create window from template */
- ncwin->core.wh = wimp_create_window(dialog_local_history_template);
+ error = xwimp_create_window(dialog_local_history_template,
+ &ncwin->core.wh);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+ error->errnum, error->errmess);
+ ro_warn_user("WimpError", error->errmess);
+ free(ncwin);
+ return NSERROR_NOMEM;
+ }
/* initialise callbacks */
ncwin->core.draw = ro_local_history_draw;
-----------------------------------------------------------------------
Summary of changes:
frontends/riscos/configure/con_image.c | 8 ++++----
frontends/riscos/cookies.c | 10 +++++++++-
frontends/riscos/global_history.c | 11 ++++++++++-
frontends/riscos/hotlist.c | 10 +++++++++-
frontends/riscos/local_history.c | 11 ++++++++++-
5 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/frontends/riscos/configure/con_image.c
b/frontends/riscos/configure/con_image.c
index 3f12f89..23c663a 100644
--- a/frontends/riscos/configure/con_image.c
+++ b/frontends/riscos/configure/con_image.c
@@ -38,10 +38,10 @@
#define IMAGE_BACKGROUND_FIELD 6
#define IMAGE_BACKGROUND_MENU 7
#define IMAGE_CURRENT_DISPLAY 8
-#define IMAGE_DISABLE_ANIMATION 16
-#define IMAGE_DEFAULT_BUTTON 17
-#define IMAGE_CANCEL_BUTTON 18
-#define IMAGE_OK_BUTTON 19
+#define IMAGE_DISABLE_ANIMATION 11
+#define IMAGE_DEFAULT_BUTTON 12
+#define IMAGE_CANCEL_BUTTON 13
+#define IMAGE_OK_BUTTON 14
static bool ro_gui_options_image_click(wimp_pointer *pointer);
static bool ro_gui_options_image_ok(wimp_w w);
diff --git a/frontends/riscos/cookies.c b/frontends/riscos/cookies.c
index 125d043..4884950 100644
--- a/frontends/riscos/cookies.c
+++ b/frontends/riscos/cookies.c
@@ -342,6 +342,7 @@ cookie_menu_select(wimp_w w,
*/
static nserror ro_cookie_init(void)
{
+ os_error *error;
struct ro_cookie_window *ncwin;
nserror res;
static const struct ns_menu cookie_menu_def = {
@@ -383,7 +384,14 @@ static nserror ro_cookie_init(void)
}
/* create window from template */
- ncwin->core.wh = wimp_create_window(dialog_cookie_template);
+ error = xwimp_create_window(dialog_cookie_template, &ncwin->core.wh);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+ error->errnum, error->errmess);
+ ro_warn_user("WimpError", error->errmess);
+ free(ncwin);
+ return NSERROR_NOMEM;
+ }
ro_gui_set_window_title(ncwin->core.wh, messages_get("Cookies"));
diff --git a/frontends/riscos/global_history.c
b/frontends/riscos/global_history.c
index 7dfc583..4f0dbd4 100644
--- a/frontends/riscos/global_history.c
+++ b/frontends/riscos/global_history.c
@@ -367,6 +367,7 @@ global_history_menu_select(wimp_w w,
*/
static nserror ro_global_history_init(void)
{
+ os_error *error;
struct ro_global_history_window *ncwin;
nserror res;
static const struct ns_menu global_history_menu_def = {
@@ -411,7 +412,15 @@ static nserror ro_global_history_init(void)
}
/* create window from template */
- ncwin->core.wh = wimp_create_window(dialog_global_history_template);
+ error = xwimp_create_window(dialog_global_history_template,
+ &ncwin->core.wh);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+ error->errnum, error->errmess);
+ ro_warn_user("WimpError", error->errmess);
+ free(ncwin);
+ return NSERROR_NOMEM;
+ }
ro_gui_set_window_title(ncwin->core.wh, messages_get("GlobalHistory"));
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index b0ed1e2..7e18ce8 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -423,6 +423,7 @@ hotlist_menu_select(wimp_w w,
*/
static nserror ro_hotlist_init(void)
{
+ os_error *error;
struct ro_hotlist_window *ncwin;
nserror res;
static const struct ns_menu hotlist_menu_def = {
@@ -472,7 +473,14 @@ static nserror ro_hotlist_init(void)
}
/* create window from template */
- ncwin->core.wh = wimp_create_window(dialog_hotlist_template);
+ error = xwimp_create_window(dialog_hotlist_template, &ncwin->core.wh);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+ error->errnum, error->errmess);
+ ro_warn_user("WimpError", error->errmess);
+ free(ncwin);
+ return NSERROR_NOMEM;
+ }
ro_gui_set_window_title(ncwin->core.wh, messages_get("Hotlist"));
diff --git a/frontends/riscos/local_history.c b/frontends/riscos/local_history.c
index 3e4e5c3..03f1d86 100644
--- a/frontends/riscos/local_history.c
+++ b/frontends/riscos/local_history.c
@@ -289,6 +289,7 @@ static nserror
ro_local_history_init(struct browser_window *bw,
struct ro_local_history_window **win_out)
{
+ os_error *error;
struct ro_local_history_window *ncwin;
nserror res;
@@ -306,7 +307,15 @@ ro_local_history_init(struct browser_window *bw,
}
/* create window from template */
- ncwin->core.wh = wimp_create_window(dialog_local_history_template);
+ error = xwimp_create_window(dialog_local_history_template,
+ &ncwin->core.wh);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_create_window: 0x%x: %s",
+ error->errnum, error->errmess);
+ ro_warn_user("WimpError", error->errmess);
+ free(ncwin);
+ return NSERROR_NOMEM;
+ }
/* initialise callbacks */
ncwin->core.draw = ro_local_history_draw;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
