Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/efdea7757b3bbdb4e092844b30be091d066cfe79
...commit
http://git.netsurf-browser.org/netsurf.git/commit/efdea7757b3bbdb4e092844b30be091d066cfe79
...tree
http://git.netsurf-browser.org/netsurf.git/tree/efdea7757b3bbdb4e092844b30be091d066cfe79
The branch, master has been updated
via efdea7757b3bbdb4e092844b30be091d066cfe79 (commit)
from 9a3b644bf01f746d8e0c57706277ab0bd4ec8002 (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=efdea7757b3bbdb4e092844b30be091d066cfe79
commit efdea7757b3bbdb4e092844b30be091d066cfe79
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
fix enum name incompatability between gtk 2 and 3
diff --git a/frontends/gtk/compat.h b/frontends/gtk/compat.h
index 2276229..20a75a3 100644
--- a/frontends/gtk/compat.h
+++ b/frontends/gtk/compat.h
@@ -159,6 +159,9 @@ GtkStateType nsgtk_widget_get_state(GtkWidget *widget);
typedef GtkStateType GtkStateFlags;
typedef GtkStyle GtkStyleContext;
+/* gtk 3 changed the enum name for the state flags */
+#define GTK_STATE_FLAG_NORMAL GTK_STATE_NORMAL
+
#if GTK_CHECK_VERSION(2,22,0)
enum {
GTK_IN_DESTRUCTION = 1 << 0,
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index e93bd49..d5510f4 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -786,7 +786,10 @@ static void nsgtk_toolbar_close(struct nsgtk_scaffolding
*g)
gtk_widget_show_all(GTK_WIDGET(nsgtk_scaffolding_toolbar(
list)));
nsgtk_scaffolding_set_sensitivity(list);
-
nsgtk_widget_override_background_color(GTK_WIDGET(nsgtk_window_get_layout(nsgtk_scaffolding_top_level(list))),
GTK_STATE_NORMAL, 0, 0xFFFF, 0xFFFF, 0xFFFF);
+ nsgtk_widget_override_background_color(
+
GTK_WIDGET(nsgtk_window_get_layout(nsgtk_scaffolding_top_level(list))),
+ GTK_STATE_FLAG_NORMAL,
+ 0, 0xFFFF, 0xFFFF, 0xFFFF);
g_signal_handler_unblock(GTK_WIDGET(
nsgtk_window_get_layout(
nsgtk_scaffolding_top_level(list))),
-----------------------------------------------------------------------
Summary of changes:
frontends/gtk/compat.h | 3 +++
frontends/gtk/toolbar.c | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/frontends/gtk/compat.h b/frontends/gtk/compat.h
index 2276229..20a75a3 100644
--- a/frontends/gtk/compat.h
+++ b/frontends/gtk/compat.h
@@ -159,6 +159,9 @@ GtkStateType nsgtk_widget_get_state(GtkWidget *widget);
typedef GtkStateType GtkStateFlags;
typedef GtkStyle GtkStyleContext;
+/* gtk 3 changed the enum name for the state flags */
+#define GTK_STATE_FLAG_NORMAL GTK_STATE_NORMAL
+
#if GTK_CHECK_VERSION(2,22,0)
enum {
GTK_IN_DESTRUCTION = 1 << 0,
diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c
index e93bd49..d5510f4 100644
--- a/frontends/gtk/toolbar.c
+++ b/frontends/gtk/toolbar.c
@@ -786,7 +786,10 @@ static void nsgtk_toolbar_close(struct nsgtk_scaffolding
*g)
gtk_widget_show_all(GTK_WIDGET(nsgtk_scaffolding_toolbar(
list)));
nsgtk_scaffolding_set_sensitivity(list);
-
nsgtk_widget_override_background_color(GTK_WIDGET(nsgtk_window_get_layout(nsgtk_scaffolding_top_level(list))),
GTK_STATE_NORMAL, 0, 0xFFFF, 0xFFFF, 0xFFFF);
+ nsgtk_widget_override_background_color(
+
GTK_WIDGET(nsgtk_window_get_layout(nsgtk_scaffolding_top_level(list))),
+ GTK_STATE_FLAG_NORMAL,
+ 0, 0xFFFF, 0xFFFF, 0xFFFF);
g_signal_handler_unblock(GTK_WIDGET(
nsgtk_window_get_layout(
nsgtk_scaffolding_top_level(list))),
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
