Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/96254254a6ed491ebf8826f8e28d40425aa4f2ef
...commit
http://git.netsurf-browser.org/netsurf.git/commit/96254254a6ed491ebf8826f8e28d40425aa4f2ef
...tree
http://git.netsurf-browser.org/netsurf.git/tree/96254254a6ed491ebf8826f8e28d40425aa4f2ef
The branch, master has been updated
via 96254254a6ed491ebf8826f8e28d40425aa4f2ef (commit)
via 5eb7345cc7d266dbb74534bb7510d428b58ce0a3 (commit)
from df79047cb62c26755f35083557686828849008b3 (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=96254254a6ed491ebf8826f8e28d40425aa4f2ef
commit 96254254a6ed491ebf8826f8e28d40425aa4f2ef
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
GTK: Squash GCC8.2 warning.
frontends/gtk/download.c: In function ‘gui_download_window_create’:
frontends/gtk/download.c:829:10: warning: cast between incompatible
function types from ‘gboolean (*)(gboolean)’ {aka ‘int (*)(int)’} to ‘gboolean
(*)(void *)’ {aka ‘int (*)(void *)’} [-Wcast-function-type]
(GSourceFunc) nsgtk_download_update, FALSE);
^
diff --git a/frontends/gtk/download.c b/frontends/gtk/download.c
index c9cc1ea..3eab532 100644
--- a/frontends/gtk/download.c
+++ b/frontends/gtk/download.c
@@ -745,6 +745,16 @@ static void nsgtk_download_store_create_item (struct
gui_download_window *dl)
NSGTK_DOWNLOAD, dl, -1);
}
+/**
+ * Wrapper to GSourceFunc-ify nsgtk_download_update.
+ */
+static gboolean nsgtk_download_gsourcefunc__nsgtk_download_update(
+ gpointer user_data)
+{
+ bool *force_update = user_data;
+ return nsgtk_download_update(*force_update);
+}
+
static struct gui_download_window *
gui_download_window_create(download_context *ctx, struct gui_window *gui)
{
@@ -825,8 +835,10 @@ gui_download_window_create(download_context *ctx, struct
gui_window *gui)
nsgtk_download_change_status(download, NSGTK_DOWNLOAD_WORKING);
if (nsgtk_downloads_num_active == 0) {
- g_timeout_add(UPDATE_RATE,
- (GSourceFunc) nsgtk_download_update, FALSE);
+ g_timeout_add(
+ UPDATE_RATE,
+ nsgtk_download_gsourcefunc__nsgtk_download_update,
+ FALSE);
}
nsgtk_downloads_list = g_list_prepend(nsgtk_downloads_list, download);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=5eb7345cc7d266dbb74534bb7510d428b58ce0a3
commit 5eb7345cc7d266dbb74534bb7510d428b58ce0a3
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
GTK: Make nsgtk_download_selection_action match GFunc prototype.
Squashes GCC 8.2 warning:
frontends/gtk/download.c:244:22: warning: cast between incompatible
function types
from ‘nsgtk_download_selection_action’ {aka ‘void (*)(struct
gui_download_window *)’}
to ‘void (*)(void *, void *)’ [-Wcast-function-type]
g_list_foreach(dls, (GFunc)action, NULL);
^
diff --git a/frontends/gtk/download.c b/frontends/gtk/download.c
index 57f92bf..c9cc1ea 100644
--- a/frontends/gtk/download.c
+++ b/frontends/gtk/download.c
@@ -89,7 +89,9 @@ struct gui_download_window {
GError *error;
};
-typedef void (*nsgtk_download_selection_action)(struct
gui_download_window *dl);
+typedef void (*nsgtk_download_selection_action)(
+ struct gui_download_window *dl,
+ void *user_data);
static GtkWindow *nsgtk_download_window, *nsgtk_download_parent;
static GtkProgressBar *nsgtk_download_progress_bar;
@@ -408,7 +410,9 @@ static gboolean nsgtk_download_update(gboolean force_update)
return TRUE;
}
-static void nsgtk_download_store_clear_item(struct gui_download_window *dl)
+static void nsgtk_download_store_clear_item(
+ struct gui_download_window *dl,
+ void *user_data)
{
if (dl->sensitivity & NSGTK_DOWNLOAD_CLEAR) {
nsgtk_downloads_list = g_list_remove(nsgtk_downloads_list, dl);
@@ -465,7 +469,9 @@ static void nsgtk_download_change_status (
}
}
-static void nsgtk_download_store_cancel_item (struct gui_download_window *dl)
+static void nsgtk_download_store_cancel_item (
+ struct gui_download_window *dl,
+ void *user_data)
{
if (dl->sensitivity & NSGTK_DOWNLOAD_CANCEL) {
dl->speed = 0;
@@ -871,7 +877,7 @@ static void gui_download_window_done(struct
gui_download_window *dw)
nsgtk_download_change_status(dw, NSGTK_DOWNLOAD_COMPLETE);
if (nsoption_bool(downloads_clear))
- nsgtk_download_store_clear_item(dw);
+ nsgtk_download_store_clear_item(dw, NULL);
else
nsgtk_download_update(TRUE);
}
-----------------------------------------------------------------------
Summary of changes:
frontends/gtk/download.c | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/frontends/gtk/download.c b/frontends/gtk/download.c
index 57f92bf..3eab532 100644
--- a/frontends/gtk/download.c
+++ b/frontends/gtk/download.c
@@ -89,7 +89,9 @@ struct gui_download_window {
GError *error;
};
-typedef void (*nsgtk_download_selection_action)(struct
gui_download_window *dl);
+typedef void (*nsgtk_download_selection_action)(
+ struct gui_download_window *dl,
+ void *user_data);
static GtkWindow *nsgtk_download_window, *nsgtk_download_parent;
static GtkProgressBar *nsgtk_download_progress_bar;
@@ -408,7 +410,9 @@ static gboolean nsgtk_download_update(gboolean force_update)
return TRUE;
}
-static void nsgtk_download_store_clear_item(struct gui_download_window *dl)
+static void nsgtk_download_store_clear_item(
+ struct gui_download_window *dl,
+ void *user_data)
{
if (dl->sensitivity & NSGTK_DOWNLOAD_CLEAR) {
nsgtk_downloads_list = g_list_remove(nsgtk_downloads_list, dl);
@@ -465,7 +469,9 @@ static void nsgtk_download_change_status (
}
}
-static void nsgtk_download_store_cancel_item (struct gui_download_window *dl)
+static void nsgtk_download_store_cancel_item (
+ struct gui_download_window *dl,
+ void *user_data)
{
if (dl->sensitivity & NSGTK_DOWNLOAD_CANCEL) {
dl->speed = 0;
@@ -739,6 +745,16 @@ static void nsgtk_download_store_create_item (struct
gui_download_window *dl)
NSGTK_DOWNLOAD, dl, -1);
}
+/**
+ * Wrapper to GSourceFunc-ify nsgtk_download_update.
+ */
+static gboolean nsgtk_download_gsourcefunc__nsgtk_download_update(
+ gpointer user_data)
+{
+ bool *force_update = user_data;
+ return nsgtk_download_update(*force_update);
+}
+
static struct gui_download_window *
gui_download_window_create(download_context *ctx, struct gui_window *gui)
{
@@ -819,8 +835,10 @@ gui_download_window_create(download_context *ctx, struct
gui_window *gui)
nsgtk_download_change_status(download, NSGTK_DOWNLOAD_WORKING);
if (nsgtk_downloads_num_active == 0) {
- g_timeout_add(UPDATE_RATE,
- (GSourceFunc) nsgtk_download_update, FALSE);
+ g_timeout_add(
+ UPDATE_RATE,
+ nsgtk_download_gsourcefunc__nsgtk_download_update,
+ FALSE);
}
nsgtk_downloads_list = g_list_prepend(nsgtk_downloads_list, download);
@@ -871,7 +889,7 @@ static void gui_download_window_done(struct
gui_download_window *dw)
nsgtk_download_change_status(dw, NSGTK_DOWNLOAD_COMPLETE);
if (nsoption_bool(downloads_clear))
- nsgtk_download_store_clear_item(dw);
+ nsgtk_download_store_clear_item(dw, NULL);
else
nsgtk_download_update(TRUE);
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
