Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/f4620a3f68cf386394cbdd595827a2b60525b26f
...commit
http://git.netsurf-browser.org/netsurf.git/commit/f4620a3f68cf386394cbdd595827a2b60525b26f
...tree
http://git.netsurf-browser.org/netsurf.git/tree/f4620a3f68cf386394cbdd595827a2b60525b26f
The branch, master has been updated
via f4620a3f68cf386394cbdd595827a2b60525b26f (commit)
via eee67a65e8336b05de504db07f3c9d93879f0ca8 (commit)
via 5dd5d5da4b1cc8cdb780559f8e1ea0d058b27b20 (commit)
from 865796486d979a26a0c5e31fd046918d44c58899 (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=f4620a3f68cf386394cbdd595827a2b60525b26f
commit f4620a3f68cf386394cbdd595827a2b60525b26f
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove depricated gtk 3 interfaces
diff --git a/frontends/gtk/compat.c b/frontends/gtk/compat.c
index 4c5524b..65ef51d 100644
--- a/frontends/gtk/compat.c
+++ b/frontends/gtk/compat.c
@@ -234,12 +234,17 @@ void nsgtk_widget_override_background_color(GtkWidget
*widget,
uint16_t b)
{
#if GTK_CHECK_VERSION(3,0,0)
+#if GTK_CHECK_VERSION(3,16,0)
+ /* do nothing - deprecated - must use css styling */
+ return;
+#else
GdkRGBA colour;
colour.alpha = (double)a / 0xffff;
colour.red = (double)r / 0xffff;
colour.green = (double)g / 0xffff;
colour.blue = (double)b / 0xffff;
gtk_widget_override_background_color(widget, state, &colour);
+#endif
#else
GdkColor colour;
colour.pixel = a;
@@ -403,15 +408,25 @@ GtkWidget *nsgtk_dialog_get_content_area(GtkDialog
*dialog)
#endif
}
+#if GTK_CHECK_VERSION(3,22,0)
+#include "gtk/scaffolding.h"
+#endif
+
gboolean nsgtk_show_uri(GdkScreen *screen,
const gchar *uri,
guint32 timestamp,
GError **error)
{
#if GTK_CHECK_VERSION(2,14,0)
+#if GTK_CHECK_VERSION(3,22,0)
+ GtkWindow *parent;
+ parent = nsgtk_scaffolding_window(nsgtk_current_scaffolding());
+ return gtk_show_uri_on_window(parent, uri, timestamp,error);
+#else
return gtk_show_uri(screen, uri, timestamp, error);
+#endif
#else
- return FALSE; /* FIXME */
+ return FALSE; /** \todo add uri opening for before gtk 2.14 */
#endif
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=eee67a65e8336b05de504db07f3c9d93879f0ca8
commit eee67a65e8336b05de504db07f3c9d93879f0ca8
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove warning by replacing sprintf snprintf
diff --git a/content/handlers/html/form.c b/content/handlers/html/form.c
index 8ba99d4..4a9d710 100644
--- a/content/handlers/html/form.c
+++ b/content/handlers/html/form.c
@@ -972,6 +972,9 @@ static char *form_url_encode(struct form *form,
assert(url_err == NSERROR_OK);
+ /* resize string to allow for new key/value pair,
+ * equals, amphersand and terminator
+ */
len1 = len + strlen(name) + strlen(value) + 2;
s2 = realloc(s, len1 + 1);
if (!s2) {
@@ -981,7 +984,8 @@ static char *form_url_encode(struct form *form,
return NULL;
}
s = s2;
- sprintf(s + len, "%s=%s&", name, value);
+
+ snprintf(s + len, (len1 + 1) - len, "%s=%s&", name, value);
len = len1;
free(name);
free(value);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5dd5d5da4b1cc8cdb780559f8e1ea0d058b27b20
commit 5dd5d5da4b1cc8cdb780559f8e1ea0d058b27b20
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
remove warning by replacing strcpy with safer strncpy
diff --git a/content/handlers/html/imagemap.c b/content/handlers/html/imagemap.c
index 5f4dd54..d26ba5f 100644
--- a/content/handlers/html/imagemap.c
+++ b/content/handlers/html/imagemap.c
@@ -299,8 +299,11 @@ void imagemap_dump(html_content *c)
* \return false on memory exhaustion, true otherwise
*/
static bool
-imagemap_addtolist(const struct html_content *c, dom_node *n, nsurl *base_url,
- struct mapentry **entry, dom_string *tagtype)
+imagemap_addtolist(const struct html_content *c,
+ dom_node *n,
+ nsurl *base_url,
+ struct mapentry **entry,
+ dom_string *tagtype)
{
dom_exception exc;
dom_string *href = NULL, *target = NULL, *shape = NULL;
@@ -377,9 +380,12 @@ imagemap_addtolist(const struct html_content *c, dom_node
*n, nsurl *base_url,
new_map->target = malloc(dom_string_byte_length(target) + 1);
if (new_map->target == NULL)
goto bad_out;
- /* Safe, but relies on dom_strings being NULL terminated */
- /* \todo Do this better */
- strcpy(new_map->target, dom_string_data(target));
+
+ strncpy(new_map->target,
+ dom_string_data(target),
+ dom_string_byte_length(target));
+
+ new_map->target[dom_string_byte_length(target)] = 0;
}
if (new_map->type != IMAGEMAP_DEFAULT) {
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/form.c | 6 +++++-
content/handlers/html/imagemap.c | 16 +++++++++++-----
frontends/gtk/compat.c | 17 ++++++++++++++++-
3 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/content/handlers/html/form.c b/content/handlers/html/form.c
index 8ba99d4..4a9d710 100644
--- a/content/handlers/html/form.c
+++ b/content/handlers/html/form.c
@@ -972,6 +972,9 @@ static char *form_url_encode(struct form *form,
assert(url_err == NSERROR_OK);
+ /* resize string to allow for new key/value pair,
+ * equals, amphersand and terminator
+ */
len1 = len + strlen(name) + strlen(value) + 2;
s2 = realloc(s, len1 + 1);
if (!s2) {
@@ -981,7 +984,8 @@ static char *form_url_encode(struct form *form,
return NULL;
}
s = s2;
- sprintf(s + len, "%s=%s&", name, value);
+
+ snprintf(s + len, (len1 + 1) - len, "%s=%s&", name, value);
len = len1;
free(name);
free(value);
diff --git a/content/handlers/html/imagemap.c b/content/handlers/html/imagemap.c
index 5f4dd54..d26ba5f 100644
--- a/content/handlers/html/imagemap.c
+++ b/content/handlers/html/imagemap.c
@@ -299,8 +299,11 @@ void imagemap_dump(html_content *c)
* \return false on memory exhaustion, true otherwise
*/
static bool
-imagemap_addtolist(const struct html_content *c, dom_node *n, nsurl *base_url,
- struct mapentry **entry, dom_string *tagtype)
+imagemap_addtolist(const struct html_content *c,
+ dom_node *n,
+ nsurl *base_url,
+ struct mapentry **entry,
+ dom_string *tagtype)
{
dom_exception exc;
dom_string *href = NULL, *target = NULL, *shape = NULL;
@@ -377,9 +380,12 @@ imagemap_addtolist(const struct html_content *c, dom_node
*n, nsurl *base_url,
new_map->target = malloc(dom_string_byte_length(target) + 1);
if (new_map->target == NULL)
goto bad_out;
- /* Safe, but relies on dom_strings being NULL terminated */
- /* \todo Do this better */
- strcpy(new_map->target, dom_string_data(target));
+
+ strncpy(new_map->target,
+ dom_string_data(target),
+ dom_string_byte_length(target));
+
+ new_map->target[dom_string_byte_length(target)] = 0;
}
if (new_map->type != IMAGEMAP_DEFAULT) {
diff --git a/frontends/gtk/compat.c b/frontends/gtk/compat.c
index 4c5524b..65ef51d 100644
--- a/frontends/gtk/compat.c
+++ b/frontends/gtk/compat.c
@@ -234,12 +234,17 @@ void nsgtk_widget_override_background_color(GtkWidget
*widget,
uint16_t b)
{
#if GTK_CHECK_VERSION(3,0,0)
+#if GTK_CHECK_VERSION(3,16,0)
+ /* do nothing - deprecated - must use css styling */
+ return;
+#else
GdkRGBA colour;
colour.alpha = (double)a / 0xffff;
colour.red = (double)r / 0xffff;
colour.green = (double)g / 0xffff;
colour.blue = (double)b / 0xffff;
gtk_widget_override_background_color(widget, state, &colour);
+#endif
#else
GdkColor colour;
colour.pixel = a;
@@ -403,15 +408,25 @@ GtkWidget *nsgtk_dialog_get_content_area(GtkDialog
*dialog)
#endif
}
+#if GTK_CHECK_VERSION(3,22,0)
+#include "gtk/scaffolding.h"
+#endif
+
gboolean nsgtk_show_uri(GdkScreen *screen,
const gchar *uri,
guint32 timestamp,
GError **error)
{
#if GTK_CHECK_VERSION(2,14,0)
+#if GTK_CHECK_VERSION(3,22,0)
+ GtkWindow *parent;
+ parent = nsgtk_scaffolding_window(nsgtk_current_scaffolding());
+ return gtk_show_uri_on_window(parent, uri, timestamp,error);
+#else
return gtk_show_uri(screen, uri, timestamp, error);
+#endif
#else
- return FALSE; /* FIXME */
+ return FALSE; /** \todo add uri opening for before gtk 2.14 */
#endif
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
