netsurf: branch master updated. release/3.3-59-g1922eb1
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/1922eb1e2a688c1927ab0...
...commit http://git.netsurf-browser.org/netsurf.git/commit/1922eb1e2a688c1927ab054...
...tree http://git.netsurf-browser.org/netsurf.git/tree/1922eb1e2a688c1927ab05436...
The branch, master has been updated
via 1922eb1e2a688c1927ab05436dec5043c31b8e78 (commit)
via 98f8acdfe572cc9805b4bf492ca91e802e578ea1 (commit)
from 44c0196dbf09c4e48ee4229e76382f29a8a35dd3 (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=1922eb1e2a688c1927a...
commit 1922eb1e2a688c1927ab05436dec5043c31b8e78
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
remove no longer required gtk_dialog_get_action_area compatability interface
diff --git a/gtk/compat.c b/gtk/compat.c
index f65f3ac..c00e7b3 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -377,15 +377,6 @@ GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog)
#endif
}
-GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog)
-{
-#if GTK_CHECK_VERSION(2,14,0)
- return gtk_dialog_get_action_area(dialog);
-#else
- return dialog->action_area;
-#endif
-}
-
gboolean nsgtk_show_uri(GdkScreen *screen,
const gchar *uri,
guint32 timestamp,
diff --git a/gtk/compat.h b/gtk/compat.h
index eeeeac4..a5fd33c 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -177,7 +177,6 @@ gulong nsgtk_connect_draw_event(GtkWidget *widget, GCallback callback, gpointer
void nsgdk_cursor_unref(GdkCursor *cursor);
void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc);
GdkWindow *nsgtk_widget_get_window(GtkWidget *widget);
-GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog);
GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog);
gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error);
GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout);
diff --git a/gtk/theme.c b/gtk/theme.c
index 1e65416..3a13640 100644
--- a/gtk/theme.c
+++ b/gtk/theme.c
@@ -260,16 +260,21 @@ void nsgtk_theme_add(const char *themename)
/* notification that theme was added successfully */
notification = gtk_dialog_new_with_buttons(messages_get("gtkThemeAdd"),
- NULL, GTK_DIALOG_DESTROY_WITH_PARENT, NSGTK_STOCK_OK,
- GTK_RESPONSE_NONE, NULL);
+ NULL,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ NSGTK_STOCK_OK, GTK_RESPONSE_NONE,
+ NULL, NULL);
if (notification == NULL) {
warn_user(messages_get("NoMemory"), 0);
return;
}
+
len = SLEN("\t\t\t\t\t\t") + strlen(messages_get("gtkThemeAdd")) + 1;
+
char labelcontent[len];
snprintf(labelcontent, len, "\t\t\t%s\t\t\t",
messages_get("gtkThemeAdd"));
+
label = gtk_label_new(labelcontent);
if (label == NULL) {
warn_user(messages_get("NoMemory"), 0);
@@ -277,7 +282,9 @@ void nsgtk_theme_add(const char *themename)
}
g_signal_connect_swapped(notification, "response",
G_CALLBACK(gtk_widget_destroy), notification);
- gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_action_area(GTK_DIALOG(notification))), label);
+
+ gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_content_area(GTK_DIALOG(notification))), label);
+
gtk_widget_show_all(notification);
/* update combo */
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=98f8acdfe572cc9805b...
commit 98f8acdfe572cc9805b4bf492ca91e802e578ea1
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Change gtk about dialog construction to use the API as intended.
The about dialog box construction was awkward and brittle using
several depricated interfaces. This changes it to use a more generic
dialog creation and uses the response API to simplify click
processing.
It would be even better to use the gtk about dialog but that is a more
invasive change.
diff --git a/gtk/about.c b/gtk/about.c
index 5e8818c..dcc151f 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -34,18 +34,19 @@
#include "gtk/gui.h"
#include "gtk/about.h"
+#define ABOUT_RESPONSE_ID_LICENCE 1
+#define ABOUT_RESPONSE_ID_CREDITS 2
+
+
/**
- * About dialog information button click.
+ * Open a url and a browser window/tab
*
- * \param button The button widget that was clicked
- * \param data The text of the url to open
+ * \param url_text The text of the url to open
*/
-static void
-nsgtk_about_dialog_info(GtkWidget *button, gpointer data)
+static void about_open(const char *url_text)
{
nsurl *url;
nserror ret;
- const char *url_text = data;
enum browser_window_create_flags flags = BW_CREATE_HISTORY;
if (nsoption_bool(show_single_tab) == true) {
@@ -61,30 +62,55 @@ nsgtk_about_dialog_info(GtkWidget *button, gpointer data)
if (ret != NSERROR_OK) {
warn_user(messages_get_errorcode(ret), 0);
}
+}
+
+/**
+ * About dialog response handling.
+ *
+ * \param dialog The dialog widget
+ * \param response_id The response ID from the user clicking.
+ * \param user_data The value from the signal connection.
+ */
+static void
+nsgtk_about_dialog_response(GtkDialog *dialog,
+ gint response_id,
+ gpointer user_data)
+{
+ switch (response_id) {
+
+ case ABOUT_RESPONSE_ID_LICENCE:
+ about_open("about:credits");
+ break;
+
+ case ABOUT_RESPONSE_ID_CREDITS:
+ about_open("about:licence");
+ break;
+ }
/* close about dialog */
- gtk_widget_destroy(gtk_widget_get_toplevel(button));
+ gtk_widget_destroy(GTK_WIDGET(dialog));
}
void nsgtk_about_dialog_init(GtkWindow *parent)
{
- GtkWidget *dialog, *vbox, *button, *label;
+ GtkWidget *dialog, *vbox, *label;
gchar *name_string;
GList *pixbufs;
- name_string = g_markup_printf_escaped ("<span size=\"xx-large\" weight=\"bold\">NetSurf %s</span>", netsurf_version);
-
-
- /* Create the widgets */
+ /* Create the dialog */
dialog = gtk_dialog_new_with_buttons("About NetSurf",
parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
+ "Licence", ABOUT_RESPONSE_ID_LICENCE,
+ "Credits", ABOUT_RESPONSE_ID_CREDITS,
+ "Close", GTK_RESPONSE_CANCEL,
NULL, NULL);
vbox = nsgtk_vbox_new(FALSE, 8);
gtk_box_pack_start(GTK_BOX(nsgtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
+ /* NetSurf icon */
pixbufs = gtk_window_get_default_icon_list();
if (pixbufs != NULL) {
GtkWidget *image;
@@ -96,51 +122,33 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
}
-
+ /* version string */
label = gtk_label_new (NULL);
+ name_string = g_markup_printf_escaped("<span size=\"xx-large\" weight=\"bold\">NetSurf %s</span>", netsurf_version);
gtk_label_set_markup (GTK_LABEL (label), name_string);
- g_free (name_string);
+ g_free(name_string);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
- label = gtk_label_new("NetSurf is a small fast web browser");
+ label = gtk_label_new(messages_get("AboutDesc"));
gtk_label_set_selectable(GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
- label = gtk_label_new("Copyright © 2003 - 2011 The NetSurf Developers");
+ label = gtk_label_new(messages_get("NetSurfCopyright"));
gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
gtk_box_pack_start(GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ /* Remove separator */
+ nsgtk_dialog_set_has_separator(GTK_DIALOG (dialog), FALSE);
- nsgtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
- /* Add the OK button */
- gtk_dialog_add_button(GTK_DIALOG(dialog), NSGTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
-
- /* Add the credits button */
- button = nsgtk_button_new_from_stock("Credits");
- gtk_box_pack_end(GTK_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))),
- button, FALSE, TRUE, 0);
- gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE);
- g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_info), (gpointer)"about:credits");
-
- /* Add the Licence button */
- button = nsgtk_button_new_from_stock("Licence");
- gtk_box_pack_end(GTK_BOX (nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))),
- button, FALSE, TRUE, 0);
- gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE);
- g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_info), (gpointer)"about:licence");
-
-
- /* Ensure that the dialog box is destroyed when the user responds. */
+ /* Ensure that the dialog box response is processed. */
g_signal_connect_swapped(dialog,
"response",
- G_CALLBACK (gtk_widget_destroy),
+ G_CALLBACK(nsgtk_about_dialog_response),
dialog);
/* Add the label, and show everything we've added to the dialog. */
diff --git a/resources/FatMessages b/resources/FatMessages
index 5ecb751..50bc7df 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -29,16 +29,16 @@
# instead (currently en)
#
# If you find something tagged 'all', but it is only relevant to a specific
-# front end, please change it. Currently, we have 'all', 'ro', 'gtk' and
-# 'ami'.
+# front end, please change it. Currently, we have:
+# 'all', 'ro', 'gtk', 'ami', 'beos'
#
+
# Globals
en.all.NetSurf:NetSurf
-en.all.NetSurfCopyright:Copyright © 2003 - 2014 The NetSurf Developers
-nl.all.NetSurfCopyright:Auteursrecht © 2003 - 2015 De NetSurf-ontwikkelaars
-en.ami.NetSurfDesc:Small as a mouse, fast as a cheetah and available for free. NetSurf is a multi-platform web browser.
-fr.ami.NetSurfDesc:Petit comme une souris, rapide comme un guépard. NetSurf est un navigateur Web multi-plate-forme libre.
-it.ami.NetSurfDesc:Piccolo come un mouse, veloce come un ghepardo. NetSurf è un browser web opensource e multi-piattaforma.
+
+en.all.NetSurfCopyright:© 2003-2015 The NetSurf Developers
+nl.all.NetSurfCopyright:© 2003-2015 De NetSurf-ontwikkelaars
+
# Menus
# =====
@@ -1306,6 +1306,19 @@ it.all.TreeHotlist:Segnalibri di NetSurf
nl.all.TreeHotlist:NetSurf-favorieten
+# About user interface tokens
+# ===========================
+#
+# This secion is for tokens that have user information about the browser
+
+en.ami.NetSurfDesc:Small as a mouse, fast as a cheetah and available for free. NetSurf is a multi-platform web browser.
+fr.ami.NetSurfDesc:Petit comme une souris, rapide comme un guépard. NetSurf est un navigateur Web multi-plate-forme libre.
+it.ami.NetSurfDesc:Piccolo come un mouse, veloce come un ghepardo. NetSurf è un browser web opensource e multi-piattaforma.
+
+en.gtk.AboutDesc:NetSurf is a small and fast web browser.
+fr.gtk.AboutDesc:NetSurf est un navigateur Web multi-plate-forme libre.
+it.gtk.AboutDesc:NetSurf è un browser web opensource e multi-piattaforma.
+
# Hotlist user interface tokens
# =============================
#
-----------------------------------------------------------------------
Summary of changes:
gtk/about.c | 86 +++++++++++++++++++++++++++----------------------
gtk/compat.c | 9 ------
gtk/compat.h | 1 -
gtk/theme.c | 13 ++++++--
resources/FatMessages | 27 ++++++++++++----
5 files changed, 77 insertions(+), 59 deletions(-)
diff --git a/gtk/about.c b/gtk/about.c
index 5e8818c..dcc151f 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -34,18 +34,19 @@
#include "gtk/gui.h"
#include "gtk/about.h"
+#define ABOUT_RESPONSE_ID_LICENCE 1
+#define ABOUT_RESPONSE_ID_CREDITS 2
+
+
/**
- * About dialog information button click.
+ * Open a url and a browser window/tab
*
- * \param button The button widget that was clicked
- * \param data The text of the url to open
+ * \param url_text The text of the url to open
*/
-static void
-nsgtk_about_dialog_info(GtkWidget *button, gpointer data)
+static void about_open(const char *url_text)
{
nsurl *url;
nserror ret;
- const char *url_text = data;
enum browser_window_create_flags flags = BW_CREATE_HISTORY;
if (nsoption_bool(show_single_tab) == true) {
@@ -61,30 +62,55 @@ nsgtk_about_dialog_info(GtkWidget *button, gpointer data)
if (ret != NSERROR_OK) {
warn_user(messages_get_errorcode(ret), 0);
}
+}
+
+/**
+ * About dialog response handling.
+ *
+ * \param dialog The dialog widget
+ * \param response_id The response ID from the user clicking.
+ * \param user_data The value from the signal connection.
+ */
+static void
+nsgtk_about_dialog_response(GtkDialog *dialog,
+ gint response_id,
+ gpointer user_data)
+{
+ switch (response_id) {
+
+ case ABOUT_RESPONSE_ID_LICENCE:
+ about_open("about:credits");
+ break;
+
+ case ABOUT_RESPONSE_ID_CREDITS:
+ about_open("about:licence");
+ break;
+ }
/* close about dialog */
- gtk_widget_destroy(gtk_widget_get_toplevel(button));
+ gtk_widget_destroy(GTK_WIDGET(dialog));
}
void nsgtk_about_dialog_init(GtkWindow *parent)
{
- GtkWidget *dialog, *vbox, *button, *label;
+ GtkWidget *dialog, *vbox, *label;
gchar *name_string;
GList *pixbufs;
- name_string = g_markup_printf_escaped ("<span size=\"xx-large\" weight=\"bold\">NetSurf %s</span>", netsurf_version);
-
-
- /* Create the widgets */
+ /* Create the dialog */
dialog = gtk_dialog_new_with_buttons("About NetSurf",
parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
+ "Licence", ABOUT_RESPONSE_ID_LICENCE,
+ "Credits", ABOUT_RESPONSE_ID_CREDITS,
+ "Close", GTK_RESPONSE_CANCEL,
NULL, NULL);
vbox = nsgtk_vbox_new(FALSE, 8);
gtk_box_pack_start(GTK_BOX(nsgtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
+ /* NetSurf icon */
pixbufs = gtk_window_get_default_icon_list();
if (pixbufs != NULL) {
GtkWidget *image;
@@ -96,51 +122,33 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
}
-
+ /* version string */
label = gtk_label_new (NULL);
+ name_string = g_markup_printf_escaped("<span size=\"xx-large\" weight=\"bold\">NetSurf %s</span>", netsurf_version);
gtk_label_set_markup (GTK_LABEL (label), name_string);
- g_free (name_string);
+ g_free(name_string);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
- label = gtk_label_new("NetSurf is a small fast web browser");
+ label = gtk_label_new(messages_get("AboutDesc"));
gtk_label_set_selectable(GTK_LABEL (label), TRUE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
- label = gtk_label_new("Copyright © 2003 - 2011 The NetSurf Developers");
+ label = gtk_label_new(messages_get("NetSurfCopyright"));
gtk_label_set_selectable(GTK_LABEL(label), TRUE);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);
gtk_box_pack_start(GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ /* Remove separator */
+ nsgtk_dialog_set_has_separator(GTK_DIALOG (dialog), FALSE);
- nsgtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-
- /* Add the OK button */
- gtk_dialog_add_button(GTK_DIALOG(dialog), NSGTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
- gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
-
- /* Add the credits button */
- button = nsgtk_button_new_from_stock("Credits");
- gtk_box_pack_end(GTK_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))),
- button, FALSE, TRUE, 0);
- gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE);
- g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_info), (gpointer)"about:credits");
-
- /* Add the Licence button */
- button = nsgtk_button_new_from_stock("Licence");
- gtk_box_pack_end(GTK_BOX (nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))),
- button, FALSE, TRUE, 0);
- gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE);
- g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_info), (gpointer)"about:licence");
-
-
- /* Ensure that the dialog box is destroyed when the user responds. */
+ /* Ensure that the dialog box response is processed. */
g_signal_connect_swapped(dialog,
"response",
- G_CALLBACK (gtk_widget_destroy),
+ G_CALLBACK(nsgtk_about_dialog_response),
dialog);
/* Add the label, and show everything we've added to the dialog. */
diff --git a/gtk/compat.c b/gtk/compat.c
index f65f3ac..c00e7b3 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -377,15 +377,6 @@ GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog)
#endif
}
-GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog)
-{
-#if GTK_CHECK_VERSION(2,14,0)
- return gtk_dialog_get_action_area(dialog);
-#else
- return dialog->action_area;
-#endif
-}
-
gboolean nsgtk_show_uri(GdkScreen *screen,
const gchar *uri,
guint32 timestamp,
diff --git a/gtk/compat.h b/gtk/compat.h
index eeeeac4..a5fd33c 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -177,7 +177,6 @@ gulong nsgtk_connect_draw_event(GtkWidget *widget, GCallback callback, gpointer
void nsgdk_cursor_unref(GdkCursor *cursor);
void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc);
GdkWindow *nsgtk_widget_get_window(GtkWidget *widget);
-GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog);
GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog);
gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error);
GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout);
diff --git a/gtk/theme.c b/gtk/theme.c
index 1e65416..3a13640 100644
--- a/gtk/theme.c
+++ b/gtk/theme.c
@@ -260,16 +260,21 @@ void nsgtk_theme_add(const char *themename)
/* notification that theme was added successfully */
notification = gtk_dialog_new_with_buttons(messages_get("gtkThemeAdd"),
- NULL, GTK_DIALOG_DESTROY_WITH_PARENT, NSGTK_STOCK_OK,
- GTK_RESPONSE_NONE, NULL);
+ NULL,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ NSGTK_STOCK_OK, GTK_RESPONSE_NONE,
+ NULL, NULL);
if (notification == NULL) {
warn_user(messages_get("NoMemory"), 0);
return;
}
+
len = SLEN("\t\t\t\t\t\t") + strlen(messages_get("gtkThemeAdd")) + 1;
+
char labelcontent[len];
snprintf(labelcontent, len, "\t\t\t%s\t\t\t",
messages_get("gtkThemeAdd"));
+
label = gtk_label_new(labelcontent);
if (label == NULL) {
warn_user(messages_get("NoMemory"), 0);
@@ -277,7 +282,9 @@ void nsgtk_theme_add(const char *themename)
}
g_signal_connect_swapped(notification, "response",
G_CALLBACK(gtk_widget_destroy), notification);
- gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_action_area(GTK_DIALOG(notification))), label);
+
+ gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_content_area(GTK_DIALOG(notification))), label);
+
gtk_widget_show_all(notification);
/* update combo */
diff --git a/resources/FatMessages b/resources/FatMessages
index 5ecb751..50bc7df 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -29,16 +29,16 @@
# instead (currently en)
#
# If you find something tagged 'all', but it is only relevant to a specific
-# front end, please change it. Currently, we have 'all', 'ro', 'gtk' and
-# 'ami'.
+# front end, please change it. Currently, we have:
+# 'all', 'ro', 'gtk', 'ami', 'beos'
#
+
# Globals
en.all.NetSurf:NetSurf
-en.all.NetSurfCopyright:Copyright © 2003 - 2014 The NetSurf Developers
-nl.all.NetSurfCopyright:Auteursrecht © 2003 - 2015 De NetSurf-ontwikkelaars
-en.ami.NetSurfDesc:Small as a mouse, fast as a cheetah and available for free. NetSurf is a multi-platform web browser.
-fr.ami.NetSurfDesc:Petit comme une souris, rapide comme un guépard. NetSurf est un navigateur Web multi-plate-forme libre.
-it.ami.NetSurfDesc:Piccolo come un mouse, veloce come un ghepardo. NetSurf è un browser web opensource e multi-piattaforma.
+
+en.all.NetSurfCopyright:© 2003-2015 The NetSurf Developers
+nl.all.NetSurfCopyright:© 2003-2015 De NetSurf-ontwikkelaars
+
# Menus
# =====
@@ -1306,6 +1306,19 @@ it.all.TreeHotlist:Segnalibri di NetSurf
nl.all.TreeHotlist:NetSurf-favorieten
+# About user interface tokens
+# ===========================
+#
+# This secion is for tokens that have user information about the browser
+
+en.ami.NetSurfDesc:Small as a mouse, fast as a cheetah and available for free. NetSurf is a multi-platform web browser.
+fr.ami.NetSurfDesc:Petit comme une souris, rapide comme un guépard. NetSurf est un navigateur Web multi-plate-forme libre.
+it.ami.NetSurfDesc:Piccolo come un mouse, veloce come un ghepardo. NetSurf è un browser web opensource e multi-piattaforma.
+
+en.gtk.AboutDesc:NetSurf is a small and fast web browser.
+fr.gtk.AboutDesc:NetSurf est un navigateur Web multi-plate-forme libre.
+it.gtk.AboutDesc:NetSurf è un browser web opensource e multi-piattaforma.
+
# Hotlist user interface tokens
# =============================
#
--
NetSurf Browser
8 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.3-57-g44c0196
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/44c0196dbf09c4e48ee42...
...commit http://git.netsurf-browser.org/netsurf.git/commit/44c0196dbf09c4e48ee4229...
...tree http://git.netsurf-browser.org/netsurf.git/tree/44c0196dbf09c4e48ee4229e7...
The branch, master has been updated
via 44c0196dbf09c4e48ee4229e76382f29a8a35dd3 (commit)
from 85f90899ed5fc9756fdd884b8936dc9e97c9fa09 (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=44c0196dbf09c4e48ee...
commit 44c0196dbf09c4e48ee4229e76382f29a8a35dd3
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
extend GTK 3 compatability with opacity and viewport helpers
diff --git a/gtk/compat.c b/gtk/compat.c
index 0ae98e1..f65f3ac 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -493,3 +493,24 @@ gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item)
return gtk_stock_lookup(stock_id, item);
#endif
}
+
+/* exported interface documented in gtk/compat.h */
+void nsgtk_window_set_opacity(GtkWindow *window, gdouble opacity)
+{
+#if GTK_CHECK_VERSION(3,8,0)
+ gtk_widget_set_opacity(GTK_WIDGET(window), opacity);
+#else
+ gtk_window_set_opacity(window, opacity);
+#endif
+}
+
+/* exported interface documented in gtk/compat.h */
+void nsgtk_scrolled_window_add_with_viewport(GtkScrolledWindow *window,
+ GtkWidget *child)
+{
+#if GTK_CHECK_VERSION(3,8,0)
+ gtk_container_add(GTK_CONTAINER(window), child);
+#else
+ gtk_scrolled_window_add_with_viewport(window, child);
+#endif
+}
diff --git a/gtk/compat.h b/gtk/compat.h
index 0b5e02e..eeeeac4 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -159,6 +159,10 @@ GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id);
*/
gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item);
+void nsgtk_window_set_opacity(GtkWindow *window, gdouble opacity);
+
+void nsgtk_scrolled_window_add_with_viewport(GtkScrolledWindow *window, GtkWidget *child);
+
GtkWidget *nsgtk_entry_new(void);
void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index a5f8c57..2e51799 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -1456,7 +1456,7 @@ MULTIHANDLER(localhistory)
-1, -1);
gtk_window_resize(g->history_window->window, width, height);
gtk_window_set_transient_for(g->history_window->window, g->window);
- gtk_window_set_opacity(g->history_window->window, 0.9);
+ nsgtk_window_set_opacity(g->history_window->window, 0.9);
gtk_widget_show(GTK_WIDGET(g->history_window->window));
gtk_window_move(g->history_window->window, x + g->historybase, y +
g->toolbarbase);
@@ -2160,7 +2160,7 @@ struct nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
nsgtk_widget_override_background_color(GTK_WIDGET(g->history_window->drawing_area),
GTK_STATE_NORMAL,
0, 0xffff, 0xffff, 0xffff);
- gtk_scrolled_window_add_with_viewport(g->history_window->scrolled,
+ nsgtk_scrolled_window_add_with_viewport(g->history_window->scrolled,
GTK_WIDGET(g->history_window->drawing_area));
gtk_widget_show(GTK_WIDGET(g->history_window->drawing_area));
-----------------------------------------------------------------------
Summary of changes:
gtk/compat.c | 21 +++++++++++++++++++++
gtk/compat.h | 4 ++++
gtk/scaffolding.c | 4 ++--
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/gtk/compat.c b/gtk/compat.c
index 0ae98e1..f65f3ac 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -493,3 +493,24 @@ gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item)
return gtk_stock_lookup(stock_id, item);
#endif
}
+
+/* exported interface documented in gtk/compat.h */
+void nsgtk_window_set_opacity(GtkWindow *window, gdouble opacity)
+{
+#if GTK_CHECK_VERSION(3,8,0)
+ gtk_widget_set_opacity(GTK_WIDGET(window), opacity);
+#else
+ gtk_window_set_opacity(window, opacity);
+#endif
+}
+
+/* exported interface documented in gtk/compat.h */
+void nsgtk_scrolled_window_add_with_viewport(GtkScrolledWindow *window,
+ GtkWidget *child)
+{
+#if GTK_CHECK_VERSION(3,8,0)
+ gtk_container_add(GTK_CONTAINER(window), child);
+#else
+ gtk_scrolled_window_add_with_viewport(window, child);
+#endif
+}
diff --git a/gtk/compat.h b/gtk/compat.h
index 0b5e02e..eeeeac4 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -159,6 +159,10 @@ GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id);
*/
gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item);
+void nsgtk_window_set_opacity(GtkWindow *window, gdouble opacity);
+
+void nsgtk_scrolled_window_add_with_viewport(GtkScrolledWindow *window, GtkWidget *child);
+
GtkWidget *nsgtk_entry_new(void);
void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index a5f8c57..2e51799 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -1456,7 +1456,7 @@ MULTIHANDLER(localhistory)
-1, -1);
gtk_window_resize(g->history_window->window, width, height);
gtk_window_set_transient_for(g->history_window->window, g->window);
- gtk_window_set_opacity(g->history_window->window, 0.9);
+ nsgtk_window_set_opacity(g->history_window->window, 0.9);
gtk_widget_show(GTK_WIDGET(g->history_window->window));
gtk_window_move(g->history_window->window, x + g->historybase, y +
g->toolbarbase);
@@ -2160,7 +2160,7 @@ struct nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
nsgtk_widget_override_background_color(GTK_WIDGET(g->history_window->drawing_area),
GTK_STATE_NORMAL,
0, 0xffff, 0xffff, 0xffff);
- gtk_scrolled_window_add_with_viewport(g->history_window->scrolled,
+ nsgtk_scrolled_window_add_with_viewport(g->history_window->scrolled,
GTK_WIDGET(g->history_window->drawing_area));
gtk_widget_show(GTK_WIDGET(g->history_window->drawing_area));
--
NetSurf Browser
8 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.3-56-g85f9089
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/85f90899ed5fc9756fdd8...
...commit http://git.netsurf-browser.org/netsurf.git/commit/85f90899ed5fc9756fdd884...
...tree http://git.netsurf-browser.org/netsurf.git/tree/85f90899ed5fc9756fdd884b8...
The branch, master has been updated
via 85f90899ed5fc9756fdd884b8936dc9e97c9fa09 (commit)
from 50f68b11a4983341bd94f0946e2f05f1d89ca1c8 (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=85f90899ed5fc9756fd...
commit 85f90899ed5fc9756fdd884b8936dc9e97c9fa09
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Fix up silly recusrsion typo in nsgtk_button_new_from_stock compatability
diff --git a/gtk/compat.c b/gtk/compat.c
index f403e36..0ae98e1 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -480,7 +480,7 @@ GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id)
#if GTK_CHECK_VERSION(3,10,0)
return gtk_button_new_with_label(stock_id);
#else
- return nsgtk_button_new_from_stock(stock_id);
+ return gtk_button_new_from_stock(stock_id);
#endif
}
@@ -488,7 +488,7 @@ GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id)
gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item)
{
#if GTK_CHECK_VERSION(3,10,0)
- return false;
+ return FALSE;
#else
return gtk_stock_lookup(stock_id, item);
#endif
-----------------------------------------------------------------------
Summary of changes:
gtk/compat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gtk/compat.c b/gtk/compat.c
index f403e36..0ae98e1 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -480,7 +480,7 @@ GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id)
#if GTK_CHECK_VERSION(3,10,0)
return gtk_button_new_with_label(stock_id);
#else
- return nsgtk_button_new_from_stock(stock_id);
+ return gtk_button_new_from_stock(stock_id);
#endif
}
@@ -488,7 +488,7 @@ GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id)
gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item)
{
#if GTK_CHECK_VERSION(3,10,0)
- return false;
+ return FALSE;
#else
return gtk_stock_lookup(stock_id, item);
#endif
--
NetSurf Browser
8 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.3-55-g50f68b1
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/50f68b11a4983341bd94f...
...commit http://git.netsurf-browser.org/netsurf.git/commit/50f68b11a4983341bd94f09...
...tree http://git.netsurf-browser.org/netsurf.git/tree/50f68b11a4983341bd94f0946...
The branch, master has been updated
via 50f68b11a4983341bd94f0946e2f05f1d89ca1c8 (commit)
from 23ae8ccf110f94019c745ebc4959c06b842a626d (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=50f68b11a4983341bd9...
commit 50f68b11a4983341bd94f0946e2f05f1d89ca1c8
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fixup default toolbar button creation for depricated GTK 3 operations
diff --git a/gtk/compat.c b/gtk/compat.c
index 3248254..f403e36 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -483,3 +483,13 @@ GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id)
return nsgtk_button_new_from_stock(stock_id);
#endif
}
+
+/* exported interface documented in gtk/compat.h */
+gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item)
+{
+#if GTK_CHECK_VERSION(3,10,0)
+ return false;
+#else
+ return gtk_stock_lookup(stock_id, item);
+#endif
+}
diff --git a/gtk/compat.h b/gtk/compat.h
index 42deab2..0b5e02e 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -148,6 +148,17 @@ GtkWidget *nsgtk_image_new_from_stock(const gchar *stock_id, GtkIconSize size);
*/
GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id);
+/**
+
+ * Fills item with the registered values for stock_id.
+ *
+ * Compatability interface for original deprecated in GTK 3.10
+ *
+ * \param stock_id the name of the stock item
+ * \return TRUE if stock_id was known.
+ */
+gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item);
+
GtkWidget *nsgtk_entry_new(void);
void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 132ab2d..dd542d7 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -684,19 +684,23 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
switch(i) {
/* gtk_tool_button_new() accepts NULL args */
-#define MAKE_STOCKBUTTON(p, q) case p##_BUTTON: {\
- GtkStockItem item;\
- char *label = NULL;\
- gtk_stock_lookup(q, &item);\
- if (item.label != NULL)\
- label = remove_underscores(item.label, false);\
- GtkWidget *w = GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(\
- theme->image[p##_BUTTON]), label));\
- if (label != NULL) {\
- free(label);\
- label = NULL;\
- }\
- return w;\
+#define MAKE_STOCKBUTTON(p, q) \
+ case p##_BUTTON: { \
+ GtkStockItem item; \
+ GtkWidget *w; \
+ if (nsgtk_stock_lookup(q, &item) && \
+ (item.label != NULL)) { \
+ char *label = NULL; \
+ w = GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET( \
+ theme->image[p##_BUTTON]), label)); \
+ label = remove_underscores(item.label, false); \
+ free(label); \
+ label = NULL; \
+ } else { \
+ w = GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET( \
+ theme->image[p##_BUTTON]), q)); \
+ } \
+ return w; \
}
MAKE_STOCKBUTTON(HOME, NSGTK_STOCK_HOME)
-----------------------------------------------------------------------
Summary of changes:
gtk/compat.c | 10 ++++++++++
gtk/compat.h | 11 +++++++++++
gtk/toolbar.c | 30 +++++++++++++++++-------------
3 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/gtk/compat.c b/gtk/compat.c
index 3248254..f403e36 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -483,3 +483,13 @@ GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id)
return nsgtk_button_new_from_stock(stock_id);
#endif
}
+
+/* exported interface documented in gtk/compat.h */
+gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item)
+{
+#if GTK_CHECK_VERSION(3,10,0)
+ return false;
+#else
+ return gtk_stock_lookup(stock_id, item);
+#endif
+}
diff --git a/gtk/compat.h b/gtk/compat.h
index 42deab2..0b5e02e 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -148,6 +148,17 @@ GtkWidget *nsgtk_image_new_from_stock(const gchar *stock_id, GtkIconSize size);
*/
GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id);
+/**
+
+ * Fills item with the registered values for stock_id.
+ *
+ * Compatability interface for original deprecated in GTK 3.10
+ *
+ * \param stock_id the name of the stock item
+ * \return TRUE if stock_id was known.
+ */
+gboolean nsgtk_stock_lookup(const gchar *stock_id, GtkStockItem *item);
+
GtkWidget *nsgtk_entry_new(void);
void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 132ab2d..dd542d7 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -684,19 +684,23 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
switch(i) {
/* gtk_tool_button_new() accepts NULL args */
-#define MAKE_STOCKBUTTON(p, q) case p##_BUTTON: {\
- GtkStockItem item;\
- char *label = NULL;\
- gtk_stock_lookup(q, &item);\
- if (item.label != NULL)\
- label = remove_underscores(item.label, false);\
- GtkWidget *w = GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(\
- theme->image[p##_BUTTON]), label));\
- if (label != NULL) {\
- free(label);\
- label = NULL;\
- }\
- return w;\
+#define MAKE_STOCKBUTTON(p, q) \
+ case p##_BUTTON: { \
+ GtkStockItem item; \
+ GtkWidget *w; \
+ if (nsgtk_stock_lookup(q, &item) && \
+ (item.label != NULL)) { \
+ char *label = NULL; \
+ w = GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET( \
+ theme->image[p##_BUTTON]), label)); \
+ label = remove_underscores(item.label, false); \
+ free(label); \
+ label = NULL; \
+ } else { \
+ w = GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET( \
+ theme->image[p##_BUTTON]), q)); \
+ } \
+ return w; \
}
MAKE_STOCKBUTTON(HOME, NSGTK_STOCK_HOME)
--
NetSurf Browser
8 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.3-54-g23ae8cc
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/23ae8ccf110f94019c745...
...commit http://git.netsurf-browser.org/netsurf.git/commit/23ae8ccf110f94019c745eb...
...tree http://git.netsurf-browser.org/netsurf.git/tree/23ae8ccf110f94019c745ebc4...
The branch, master has been updated
via 23ae8ccf110f94019c745ebc4959c06b842a626d (commit)
from d0b56d660f1018741f0aabd5f5e02dc69db2e479 (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=23ae8ccf110f94019c7...
commit 23ae8ccf110f94019c745ebc4959c06b842a626d
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Extend gtk compatability to fix more items depricated in GTK 3.10
diff --git a/gtk/about.c b/gtk/about.c
index 9ab600f..5e8818c 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -87,18 +87,10 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
pixbufs = gtk_window_get_default_icon_list();
if (pixbufs != NULL) {
- GtkIconSet *icon_set;
GtkWidget *image;
- icon_set = gtk_icon_set_new_from_pixbuf(GDK_PIXBUF(g_list_nth_data(pixbufs, 0)));
-
- image = gtk_image_new();
-
- gtk_image_set_from_icon_set(GTK_IMAGE(image),
- icon_set,
- GTK_ICON_SIZE_DIALOG);
-
- gtk_icon_set_unref(icon_set);
+ image = nsgtk_image_new_from_pixbuf_icon(GDK_PIXBUF(g_list_nth_data(pixbufs, 0)),
+ GTK_ICON_SIZE_DIALOG);
g_list_free(pixbufs);
gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
@@ -131,14 +123,14 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
/* Add the credits button */
- button = gtk_button_new_from_stock ("Credits");
+ button = nsgtk_button_new_from_stock("Credits");
gtk_box_pack_end(GTK_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))),
button, FALSE, TRUE, 0);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE);
g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_info), (gpointer)"about:credits");
/* Add the Licence button */
- button = gtk_button_new_from_stock ("Licence");
+ button = nsgtk_button_new_from_stock("Licence");
gtk_box_pack_end(GTK_BOX (nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))),
button, FALSE, TRUE, 0);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE);
diff --git a/gtk/compat.c b/gtk/compat.c
index fe57ba2..3248254 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -316,7 +316,7 @@ const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style,
GtkStateFlags state)
{
#if GTK_CHECK_VERSION(3,8,0)
- const PangoFontDescription* fontdesc;
+ const PangoFontDescription* fontdesc = NULL;
gtk_style_context_get(style, state, GTK_STYLE_PROPERTY_FONT, &fontdesc, NULL);
return fontdesc;
#else
@@ -454,3 +454,32 @@ void nsgtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation)
allocation->height = widget->allocation.height;
#endif
}
+
+/* exported interface documented in gtk/compat.h */
+GtkWidget *nsgtk_image_new_from_pixbuf_icon(GdkPixbuf *pixbuf, GtkIconSize size)
+{
+#if GTK_CHECK_VERSION(3,10,0)
+ return gtk_image_new_from_pixbuf(pixbuf);
+#else
+ GtkIconSet *icon_set;
+ GtkWidget *image;
+
+ icon_set = gtk_icon_set_new_from_pixbuf(pixbuf);
+
+ image = gtk_image_new_from_icon_set(icon_set, size);
+
+ gtk_icon_set_unref(icon_set);
+
+ return image;
+#endif
+}
+
+/* exported interface documented in gtk/compat.h */
+GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id)
+{
+#if GTK_CHECK_VERSION(3,10,0)
+ return gtk_button_new_with_label(stock_id);
+#else
+ return nsgtk_button_new_from_stock(stock_id);
+#endif
+}
diff --git a/gtk/compat.h b/gtk/compat.h
index 4f83aac..42deab2 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -73,6 +73,14 @@ GtkWidget *nsgtk_combo_box_text_new(void);
void nsgtk_combo_box_text_append_text(GtkWidget *combo_box, const gchar *text);
gchar *nsgtk_combo_box_text_get_active_text(GtkWidget *combo_box);
+/**
+ * creates a new image widget of an appropriate icon size from a pixbuf.
+ *
+ * \param pixbuf The pixbuf to use as a source.
+ * \param size The size of icon to create
+ * \return An image widget.
+ */
+GtkWidget *nsgtk_image_new_from_pixbuf_icon(GdkPixbuf *pixbuf, GtkIconSize size);
/* GTK prior to 2.16 needs the sexy interface for icons */
#if !GTK_CHECK_VERSION(2,16,0)
@@ -111,23 +119,39 @@ enum {
#endif
-GtkWidget *nsgtk_entry_new(void);
-void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
/**
- * Sets the icon shown in the entry at the specified position from a stock image.
+ * Sets the icon shown in the entry at the specified position from a
+ * stock image.
+ *
+ * Compatability interface for original deprecated in GTK 3.10
*
- * Compatability interface for interface deprecated in 3.10
+ * \param stock_id the name of the stock item
*/
void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id);
/**
* Creates a GtkImage displaying a stock icon.
*
- * Compatability interface for interface deprecated in 3.10
+ * Compatability interface for original deprecated in GTK 3.10
+ *
+ * \param stock_id the name of the stock item
*/
GtkWidget *nsgtk_image_new_from_stock(const gchar *stock_id, GtkIconSize size);
+/**
+ * Creates a new GtkButton containing the image and text from a stock item.
+ *
+ * Compatability interface for original deprecated in GTK 3.10
+ *
+ * \param stock_id the name of the stock item
+ */
+GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id);
+
+GtkWidget *nsgtk_entry_new(void);
+
+void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
+
void nsgtk_widget_override_background_color(GtkWidget *widget, GtkStateFlags state, uint16_t a, uint16_t r, uint16_t g, uint16_t b);
GtkWidget* nsgtk_hbox_new(gboolean homogeneous, gint spacing);
GtkWidget* nsgtk_vbox_new(gboolean homogeneous, gint spacing);
-----------------------------------------------------------------------
Summary of changes:
gtk/about.c | 16 ++++------------
gtk/compat.c | 31 ++++++++++++++++++++++++++++++-
gtk/compat.h | 34 +++++++++++++++++++++++++++++-----
3 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/gtk/about.c b/gtk/about.c
index 9ab600f..5e8818c 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -87,18 +87,10 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
pixbufs = gtk_window_get_default_icon_list();
if (pixbufs != NULL) {
- GtkIconSet *icon_set;
GtkWidget *image;
- icon_set = gtk_icon_set_new_from_pixbuf(GDK_PIXBUF(g_list_nth_data(pixbufs, 0)));
-
- image = gtk_image_new();
-
- gtk_image_set_from_icon_set(GTK_IMAGE(image),
- icon_set,
- GTK_ICON_SIZE_DIALOG);
-
- gtk_icon_set_unref(icon_set);
+ image = nsgtk_image_new_from_pixbuf_icon(GDK_PIXBUF(g_list_nth_data(pixbufs, 0)),
+ GTK_ICON_SIZE_DIALOG);
g_list_free(pixbufs);
gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
@@ -131,14 +123,14 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
/* Add the credits button */
- button = gtk_button_new_from_stock ("Credits");
+ button = nsgtk_button_new_from_stock("Credits");
gtk_box_pack_end(GTK_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))),
button, FALSE, TRUE, 0);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE);
g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_info), (gpointer)"about:credits");
/* Add the Licence button */
- button = gtk_button_new_from_stock ("Licence");
+ button = nsgtk_button_new_from_stock("Licence");
gtk_box_pack_end(GTK_BOX (nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))),
button, FALSE, TRUE, 0);
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE);
diff --git a/gtk/compat.c b/gtk/compat.c
index fe57ba2..3248254 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -316,7 +316,7 @@ const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style,
GtkStateFlags state)
{
#if GTK_CHECK_VERSION(3,8,0)
- const PangoFontDescription* fontdesc;
+ const PangoFontDescription* fontdesc = NULL;
gtk_style_context_get(style, state, GTK_STYLE_PROPERTY_FONT, &fontdesc, NULL);
return fontdesc;
#else
@@ -454,3 +454,32 @@ void nsgtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation)
allocation->height = widget->allocation.height;
#endif
}
+
+/* exported interface documented in gtk/compat.h */
+GtkWidget *nsgtk_image_new_from_pixbuf_icon(GdkPixbuf *pixbuf, GtkIconSize size)
+{
+#if GTK_CHECK_VERSION(3,10,0)
+ return gtk_image_new_from_pixbuf(pixbuf);
+#else
+ GtkIconSet *icon_set;
+ GtkWidget *image;
+
+ icon_set = gtk_icon_set_new_from_pixbuf(pixbuf);
+
+ image = gtk_image_new_from_icon_set(icon_set, size);
+
+ gtk_icon_set_unref(icon_set);
+
+ return image;
+#endif
+}
+
+/* exported interface documented in gtk/compat.h */
+GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id)
+{
+#if GTK_CHECK_VERSION(3,10,0)
+ return gtk_button_new_with_label(stock_id);
+#else
+ return nsgtk_button_new_from_stock(stock_id);
+#endif
+}
diff --git a/gtk/compat.h b/gtk/compat.h
index 4f83aac..42deab2 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -73,6 +73,14 @@ GtkWidget *nsgtk_combo_box_text_new(void);
void nsgtk_combo_box_text_append_text(GtkWidget *combo_box, const gchar *text);
gchar *nsgtk_combo_box_text_get_active_text(GtkWidget *combo_box);
+/**
+ * creates a new image widget of an appropriate icon size from a pixbuf.
+ *
+ * \param pixbuf The pixbuf to use as a source.
+ * \param size The size of icon to create
+ * \return An image widget.
+ */
+GtkWidget *nsgtk_image_new_from_pixbuf_icon(GdkPixbuf *pixbuf, GtkIconSize size);
/* GTK prior to 2.16 needs the sexy interface for icons */
#if !GTK_CHECK_VERSION(2,16,0)
@@ -111,23 +119,39 @@ enum {
#endif
-GtkWidget *nsgtk_entry_new(void);
-void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
/**
- * Sets the icon shown in the entry at the specified position from a stock image.
+ * Sets the icon shown in the entry at the specified position from a
+ * stock image.
+ *
+ * Compatability interface for original deprecated in GTK 3.10
*
- * Compatability interface for interface deprecated in 3.10
+ * \param stock_id the name of the stock item
*/
void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id);
/**
* Creates a GtkImage displaying a stock icon.
*
- * Compatability interface for interface deprecated in 3.10
+ * Compatability interface for original deprecated in GTK 3.10
+ *
+ * \param stock_id the name of the stock item
*/
GtkWidget *nsgtk_image_new_from_stock(const gchar *stock_id, GtkIconSize size);
+/**
+ * Creates a new GtkButton containing the image and text from a stock item.
+ *
+ * Compatability interface for original deprecated in GTK 3.10
+ *
+ * \param stock_id the name of the stock item
+ */
+GtkWidget *nsgtk_button_new_from_stock(const gchar *stock_id);
+
+GtkWidget *nsgtk_entry_new(void);
+
+void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
+
void nsgtk_widget_override_background_color(GtkWidget *widget, GtkStateFlags state, uint16_t a, uint16_t r, uint16_t g, uint16_t b);
GtkWidget* nsgtk_hbox_new(gboolean homogeneous, gint spacing);
GtkWidget* nsgtk_vbox_new(gboolean homogeneous, gint spacing);
--
NetSurf Browser
8 years, 1 month
- 1
- 0
netsurf: branch master updated. release/3.3-53-gd0b56d6
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/d0b56d660f1018741f0aa...
...commit http://git.netsurf-browser.org/netsurf.git/commit/d0b56d660f1018741f0aabd...
...tree http://git.netsurf-browser.org/netsurf.git/tree/d0b56d660f1018741f0aabd5f...
The branch, master has been updated
via d0b56d660f1018741f0aabd5f5e02dc69db2e479 (commit)
from ab997398ad2d413fa272fe4614e5b946d0349786 (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=d0b56d660f1018741f0...
commit d0b56d660f1018741f0aabd5f5e02dc69db2e479
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Allow URL completion to pick up non-visited URLs
diff --git a/amiga/stringview/urlhistory.c b/amiga/stringview/urlhistory.c
index d55a4b4..c58a377 100644
--- a/amiga/stringview/urlhistory.c
+++ b/amiga/stringview/urlhistory.c
@@ -79,8 +79,9 @@ static bool URLHistoryFound(nsurl *url, const struct url_data *data)
{
struct Node *node;
- /* skip non-visited pages */
+ /* skip non-visited pages - disabled for testing
if(data->visits <= 0) return true;
+ */
/* skip this URL if it is already in the list */
if(URLHistory_FindPage(nsurl_access(url))) return true;
-----------------------------------------------------------------------
Summary of changes:
amiga/stringview/urlhistory.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/amiga/stringview/urlhistory.c b/amiga/stringview/urlhistory.c
index d55a4b4..c58a377 100644
--- a/amiga/stringview/urlhistory.c
+++ b/amiga/stringview/urlhistory.c
@@ -79,8 +79,9 @@ static bool URLHistoryFound(nsurl *url, const struct url_data *data)
{
struct Node *node;
- /* skip non-visited pages */
+ /* skip non-visited pages - disabled for testing
if(data->visits <= 0) return true;
+ */
/* skip this URL if it is already in the list */
if(URLHistory_FindPage(nsurl_access(url))) return true;
--
NetSurf Browser
8 years, 2 months
- 1
- 0
netsurf: branch master updated. release/3.3-52-gab99739
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/ab997398ad2d413fa272f...
...commit http://git.netsurf-browser.org/netsurf.git/commit/ab997398ad2d413fa272fe4...
...tree http://git.netsurf-browser.org/netsurf.git/tree/ab997398ad2d413fa272fe461...
The branch, master has been updated
via ab997398ad2d413fa272fe4614e5b946d0349786 (commit)
from b9b952cddf161535548644c3df31e2856859a895 (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=ab997398ad2d413fa27...
commit ab997398ad2d413fa272fe4614e5b946d0349786
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
cope with deprication of gtk_style_context_get_font
diff --git a/gtk/compat.c b/gtk/compat.c
index c41a05e..fe57ba2 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -173,7 +173,7 @@ void nsgtk_entry_set_icon_from_stock(GtkWidget *entry,
const gchar *id)
{
#if GTK_CHECK_VERSION(3,10,0)
- gtk_entry_set_icon_from_icon_name(entry, icon_pos, id);
+ gtk_entry_set_icon_from_icon_name(GTK_ENTRY(entry), icon_pos, id);
#else
#if GTK_CHECK_VERSION(2,16,0)
gtk_entry_set_icon_from_stock(GTK_ENTRY(entry), icon_pos, id);
@@ -315,11 +315,17 @@ GtkStyleContext *nsgtk_widget_get_style_context(GtkWidget *widget)
const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style,
GtkStateFlags state)
{
+#if GTK_CHECK_VERSION(3,8,0)
+ const PangoFontDescription* fontdesc;
+ gtk_style_context_get(style, state, GTK_STYLE_PROPERTY_FONT, &fontdesc, NULL);
+ return fontdesc;
+#else
#if GTK_CHECK_VERSION(3,0,0)
return gtk_style_context_get_font(style, state);
#else
return style->font_desc;
#endif
+#endif
}
gulong nsgtk_connect_draw_event(GtkWidget *widget,
diff --git a/gtk/compat.h b/gtk/compat.h
index 0947b79..4f83aac 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -113,6 +113,12 @@ enum {
GtkWidget *nsgtk_entry_new(void);
void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
+
+/**
+ * Sets the icon shown in the entry at the specified position from a stock image.
+ *
+ * Compatability interface for interface deprecated in 3.10
+ */
void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id);
/**
-----------------------------------------------------------------------
Summary of changes:
gtk/compat.c | 8 +++++++-
gtk/compat.h | 6 ++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/gtk/compat.c b/gtk/compat.c
index c41a05e..fe57ba2 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -173,7 +173,7 @@ void nsgtk_entry_set_icon_from_stock(GtkWidget *entry,
const gchar *id)
{
#if GTK_CHECK_VERSION(3,10,0)
- gtk_entry_set_icon_from_icon_name(entry, icon_pos, id);
+ gtk_entry_set_icon_from_icon_name(GTK_ENTRY(entry), icon_pos, id);
#else
#if GTK_CHECK_VERSION(2,16,0)
gtk_entry_set_icon_from_stock(GTK_ENTRY(entry), icon_pos, id);
@@ -315,11 +315,17 @@ GtkStyleContext *nsgtk_widget_get_style_context(GtkWidget *widget)
const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style,
GtkStateFlags state)
{
+#if GTK_CHECK_VERSION(3,8,0)
+ const PangoFontDescription* fontdesc;
+ gtk_style_context_get(style, state, GTK_STYLE_PROPERTY_FONT, &fontdesc, NULL);
+ return fontdesc;
+#else
#if GTK_CHECK_VERSION(3,0,0)
return gtk_style_context_get_font(style, state);
#else
return style->font_desc;
#endif
+#endif
}
gulong nsgtk_connect_draw_event(GtkWidget *widget,
diff --git a/gtk/compat.h b/gtk/compat.h
index 0947b79..4f83aac 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -113,6 +113,12 @@ enum {
GtkWidget *nsgtk_entry_new(void);
void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
+
+/**
+ * Sets the icon shown in the entry at the specified position from a stock image.
+ *
+ * Compatability interface for interface deprecated in 3.10
+ */
void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id);
/**
--
NetSurf Browser
8 years, 2 months
- 1
- 0
netsurf: branch master updated. release/3.3-51-gb9b952c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b9b952cddf16153554864...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b9b952cddf161535548644c...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b9b952cddf161535548644c3d...
The branch, master has been updated
via b9b952cddf161535548644c3df31e2856859a895 (commit)
via ae98fbe8c81712746073d10e328b02bfb454fda8 (commit)
from 5a14a74ab193c1252cac62a94e019747aaad9d99 (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=b9b952cddf161535548...
commit b9b952cddf161535548644c3df31e2856859a895
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Ensure the about dialog construction does not cause warnings
The about dialog construction calls were missing a NULL sentinal which
was causing warnings on GTK 3 builds.
diff --git a/gtk/about.c b/gtk/about.c
index 6d10386..9ab600f 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -68,9 +68,9 @@ nsgtk_about_dialog_info(GtkWidget *button, gpointer data)
void nsgtk_about_dialog_init(GtkWindow *parent)
{
- GtkWidget *dialog, *vbox, *button, *image, *label;
+ GtkWidget *dialog, *vbox, *button, *label;
gchar *name_string;
- GList *pixbufs = gtk_window_get_default_icon_list();
+ GList *pixbufs;
name_string = g_markup_printf_escaped ("<span size=\"xx-large\" weight=\"bold\">NetSurf %s</span>", netsurf_version);
@@ -79,24 +79,29 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
dialog = gtk_dialog_new_with_buttons("About NetSurf",
parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- NULL);
+ NULL, NULL);
vbox = nsgtk_vbox_new(FALSE, 8);
gtk_box_pack_start(GTK_BOX(nsgtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
+ pixbufs = gtk_window_get_default_icon_list();
if (pixbufs != NULL) {
- GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf(GDK_PIXBUF(g_list_nth_data(pixbufs, 0)));
+ GtkIconSet *icon_set;
+ GtkWidget *image;
+
+ icon_set = gtk_icon_set_new_from_pixbuf(GDK_PIXBUF(g_list_nth_data(pixbufs, 0)));
image = gtk_image_new();
- gtk_image_set_from_icon_set (GTK_IMAGE (image),
- icon_set, GTK_ICON_SIZE_DIALOG);
+ gtk_image_set_from_icon_set(GTK_IMAGE(image),
+ icon_set,
+ GTK_ICON_SIZE_DIALOG);
- gtk_icon_set_unref (icon_set);
- g_list_free (pixbufs);
+ gtk_icon_set_unref(icon_set);
+ g_list_free(pixbufs);
- gtk_box_pack_start(GTK_BOX (vbox), image, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ae98fbe8c8171274607...
commit ae98fbe8c81712746073d10e328b02bfb454fda8
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Only define compatability helpers for sexy icons if required.
The helper nsgtk_widget_get_state is only necessary for sexy icons and
introduces unecessary GTK 3 compatability issues otehrwise.
diff --git a/gtk/compat.c b/gtk/compat.c
index 0dea5aa..c41a05e 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -25,8 +25,24 @@
#include "gtk/compat.h"
-#if !GTK_CHECK_VERSION(2,16,0)
+#ifdef _SEXY_ICON_ENTRY_H_
#include "gtk/sexy_icon_entry.c"
+
+/*
+ * exported interface documented in gtk/compat.h
+ *
+ * Only required for the lib sexy interface before 2.16
+ */
+GtkStateType nsgtk_widget_get_state(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+ return gtk_widget_get_state(widget);
+#else
+ return GTK_WIDGET_STATE(widget);
+#endif
+}
+
+
#endif
void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
@@ -86,15 +102,6 @@ gboolean nsgtk_widget_is_drawable(GtkWidget *widget)
#endif
}
-GtkStateType nsgtk_widget_get_state(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_get_state(widget);
-#else
- return GTK_WIDGET_STATE(widget);
-#endif
-}
-
void nsgtk_dialog_set_has_separator(GtkDialog *dialog, gboolean setting)
{
#if GTK_CHECK_VERSION(2,21,8)
diff --git a/gtk/compat.h b/gtk/compat.h
index d644276..0947b79 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -68,19 +68,24 @@ gboolean nsgtk_widget_get_visible(GtkWidget *widget);
gboolean nsgtk_widget_get_realized(GtkWidget *widget);
gboolean nsgtk_widget_get_mapped(GtkWidget *widget);
gboolean nsgtk_widget_is_drawable(GtkWidget *widget);
-GtkStateType nsgtk_widget_get_state(GtkWidget *widget);
void nsgtk_dialog_set_has_separator(GtkDialog *dialog, gboolean setting);
GtkWidget *nsgtk_combo_box_text_new(void);
void nsgtk_combo_box_text_append_text(GtkWidget *combo_box, const gchar *text);
gchar *nsgtk_combo_box_text_get_active_text(GtkWidget *combo_box);
+
+/* GTK prior to 2.16 needs the sexy interface for icons */
#if !GTK_CHECK_VERSION(2,16,0)
+
#include "gtk/sexy_icon_entry.h"
typedef enum {
GTK_ENTRY_ICON_PRIMARY = SEXY_ICON_ENTRY_PRIMARY,
GTK_ENTRY_ICON_SECONDARY = SEXY_ICON_ENTRY_SECONDARY
} GtkEntryIconPosition;
+
+GtkStateType nsgtk_widget_get_state(GtkWidget *widget);
+
#endif
#if GTK_CHECK_VERSION (2, 90, 7)
-----------------------------------------------------------------------
Summary of changes:
gtk/about.c | 23 ++++++++++++++---------
gtk/compat.c | 27 +++++++++++++++++----------
gtk/compat.h | 7 ++++++-
3 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/gtk/about.c b/gtk/about.c
index 6d10386..9ab600f 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -68,9 +68,9 @@ nsgtk_about_dialog_info(GtkWidget *button, gpointer data)
void nsgtk_about_dialog_init(GtkWindow *parent)
{
- GtkWidget *dialog, *vbox, *button, *image, *label;
+ GtkWidget *dialog, *vbox, *button, *label;
gchar *name_string;
- GList *pixbufs = gtk_window_get_default_icon_list();
+ GList *pixbufs;
name_string = g_markup_printf_escaped ("<span size=\"xx-large\" weight=\"bold\">NetSurf %s</span>", netsurf_version);
@@ -79,24 +79,29 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
dialog = gtk_dialog_new_with_buttons("About NetSurf",
parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
- NULL);
+ NULL, NULL);
vbox = nsgtk_vbox_new(FALSE, 8);
gtk_box_pack_start(GTK_BOX(nsgtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0);
+ pixbufs = gtk_window_get_default_icon_list();
if (pixbufs != NULL) {
- GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf(GDK_PIXBUF(g_list_nth_data(pixbufs, 0)));
+ GtkIconSet *icon_set;
+ GtkWidget *image;
+
+ icon_set = gtk_icon_set_new_from_pixbuf(GDK_PIXBUF(g_list_nth_data(pixbufs, 0)));
image = gtk_image_new();
- gtk_image_set_from_icon_set (GTK_IMAGE (image),
- icon_set, GTK_ICON_SIZE_DIALOG);
+ gtk_image_set_from_icon_set(GTK_IMAGE(image),
+ icon_set,
+ GTK_ICON_SIZE_DIALOG);
- gtk_icon_set_unref (icon_set);
- g_list_free (pixbufs);
+ gtk_icon_set_unref(icon_set);
+ g_list_free(pixbufs);
- gtk_box_pack_start(GTK_BOX (vbox), image, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), image, FALSE, FALSE, 0);
}
diff --git a/gtk/compat.c b/gtk/compat.c
index 0dea5aa..c41a05e 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -25,8 +25,24 @@
#include "gtk/compat.h"
-#if !GTK_CHECK_VERSION(2,16,0)
+#ifdef _SEXY_ICON_ENTRY_H_
#include "gtk/sexy_icon_entry.c"
+
+/*
+ * exported interface documented in gtk/compat.h
+ *
+ * Only required for the lib sexy interface before 2.16
+ */
+GtkStateType nsgtk_widget_get_state(GtkWidget *widget)
+{
+#if GTK_CHECK_VERSION(2,18,0)
+ return gtk_widget_get_state(widget);
+#else
+ return GTK_WIDGET_STATE(widget);
+#endif
+}
+
+
#endif
void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
@@ -86,15 +102,6 @@ gboolean nsgtk_widget_is_drawable(GtkWidget *widget)
#endif
}
-GtkStateType nsgtk_widget_get_state(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2,18,0)
- return gtk_widget_get_state(widget);
-#else
- return GTK_WIDGET_STATE(widget);
-#endif
-}
-
void nsgtk_dialog_set_has_separator(GtkDialog *dialog, gboolean setting)
{
#if GTK_CHECK_VERSION(2,21,8)
diff --git a/gtk/compat.h b/gtk/compat.h
index d644276..0947b79 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -68,19 +68,24 @@ gboolean nsgtk_widget_get_visible(GtkWidget *widget);
gboolean nsgtk_widget_get_realized(GtkWidget *widget);
gboolean nsgtk_widget_get_mapped(GtkWidget *widget);
gboolean nsgtk_widget_is_drawable(GtkWidget *widget);
-GtkStateType nsgtk_widget_get_state(GtkWidget *widget);
void nsgtk_dialog_set_has_separator(GtkDialog *dialog, gboolean setting);
GtkWidget *nsgtk_combo_box_text_new(void);
void nsgtk_combo_box_text_append_text(GtkWidget *combo_box, const gchar *text);
gchar *nsgtk_combo_box_text_get_active_text(GtkWidget *combo_box);
+
+/* GTK prior to 2.16 needs the sexy interface for icons */
#if !GTK_CHECK_VERSION(2,16,0)
+
#include "gtk/sexy_icon_entry.h"
typedef enum {
GTK_ENTRY_ICON_PRIMARY = SEXY_ICON_ENTRY_PRIMARY,
GTK_ENTRY_ICON_SECONDARY = SEXY_ICON_ENTRY_SECONDARY
} GtkEntryIconPosition;
+
+GtkStateType nsgtk_widget_get_state(GtkWidget *widget);
+
#endif
#if GTK_CHECK_VERSION (2, 90, 7)
--
NetSurf Browser
8 years, 2 months
- 1
- 0
netsurf: branch master updated. release/3.3-49-g5a14a74
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/5a14a74ab193c1252cac6...
...commit http://git.netsurf-browser.org/netsurf.git/commit/5a14a74ab193c1252cac62a...
...tree http://git.netsurf-browser.org/netsurf.git/tree/5a14a74ab193c1252cac62a94...
The branch, master has been updated
via 5a14a74ab193c1252cac62a94e019747aaad9d99 (commit)
from a6b02680a70afebacc479730edcf3a7b1449b5f3 (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=5a14a74ab193c1252ca...
commit 5a14a74ab193c1252cac62a94e019747aaad9d99
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Update gtk compatability header to cope with deprication of stock icon interface
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 23c0145..b22da97 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -36,7 +36,6 @@ $(eval $(call pkg_config_find_and_add_enabled,VIDEO,gstreamer-0.10,Video))
GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_SINGLE_INCLUDES \
- -DGTK_DISABLE_DEPRECATED \
-DGTK_MULTIHEAD_SAFE \
-DPANGO_DISABLE_DEPRECATED
@@ -46,6 +45,12 @@ GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
# libsexy currently means we cannot enable this
# -DGDK_DISABLE_DEPRECATED
+# gtk3 is depricating interfaces we use a lot
+ifeq ($(NETSURF_GTK_MAJOR),2)
+GTKDEPFLAGS += -DGTK_DISABLE_DEPRECATED
+endif
+
+
GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
$(GTKDEPFLAGS) \
-D_BSD_SOURCE \
diff --git a/gtk/about.c b/gtk/about.c
index 27c164a..6d10386 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -122,7 +122,7 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
nsgtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
/* Add the OK button */
- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_button(GTK_DIALOG(dialog), NSGTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
/* Add the credits button */
diff --git a/gtk/compat.c b/gtk/compat.c
index 5f4c641..0dea5aa 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Compatibility functions for older GTK versions (implementation)
+/**
+ * \file
+ * Compatibility functions for older GTK versions implementation
*/
#include <stdint.h>
@@ -30,105 +31,105 @@
void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
{
- #if GTK_CHECK_VERSION(2,22,0)
+#if GTK_CHECK_VERSION(2,22,0)
gtk_widget_set_can_focus(widget, can_focus);
- #else
+#else
if (can_focus == TRUE)
GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS);
else
GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS);
- #endif
+#endif
}
gboolean nsgtk_widget_has_focus(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2,20,0)
return gtk_widget_has_focus(widget);
- #else
+#else
return GTK_WIDGET_HAS_FOCUS(widget);
- #endif
+#endif
}
gboolean nsgtk_widget_get_visible(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2,20,0)
return gtk_widget_get_visible(widget);
- #else
+#else
return GTK_WIDGET_VISIBLE(widget);
- #endif
+#endif
}
gboolean nsgtk_widget_get_realized(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2,20,0)
return gtk_widget_get_realized(widget);
- #else
+#else
return GTK_WIDGET_REALIZED(widget);
- #endif
+#endif
}
gboolean nsgtk_widget_get_mapped(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2,20,0)
return gtk_widget_get_mapped(widget);
- #else
+#else
return GTK_WIDGET_MAPPED(widget);
- #endif
+#endif
}
gboolean nsgtk_widget_is_drawable(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,18,0)
+#if GTK_CHECK_VERSION(2,18,0)
return gtk_widget_is_drawable(widget);
- #else
+#else
return GTK_WIDGET_DRAWABLE(widget);
- #endif
+#endif
}
GtkStateType nsgtk_widget_get_state(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,18,0)
+#if GTK_CHECK_VERSION(2,18,0)
return gtk_widget_get_state(widget);
- #else
+#else
return GTK_WIDGET_STATE(widget);
- #endif
+#endif
}
void nsgtk_dialog_set_has_separator(GtkDialog *dialog, gboolean setting)
{
- #if GTK_CHECK_VERSION(2,21,8)
+#if GTK_CHECK_VERSION(2,21,8)
/* Deprecated */
- #else
+#else
gtk_dialog_set_has_separator(dialog, setting);
- #endif
+#endif
}
GtkWidget *nsgtk_combo_box_text_new(void)
{
- #if GTK_CHECK_VERSION(2,24,0)
- return gtk_combo_box_text_new();
- #else
+#if GTK_CHECK_VERSION(2,24,0)
+ return gtk_combo_box_text_new();
+#else
return gtk_combo_box_new_text();
- #endif
+#endif
}
void nsgtk_combo_box_text_append_text(GtkWidget *combo_box, const gchar *text)
{
- #if GTK_CHECK_VERSION(2,24,0)
+#if GTK_CHECK_VERSION(2,24,0)
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), text);
- #else
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), text);
- #endif
+#else
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), text);
+#endif
}
gchar *nsgtk_combo_box_text_get_active_text(GtkWidget *combo_box)
{
- #if GTK_CHECK_VERSION(2,24,0)
+#if GTK_CHECK_VERSION(2,24,0)
return gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo_box));
- #else
+#else
return gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo_box));
- #endif
+#endif
}
GtkWidget *nsgtk_entry_new(void)
@@ -137,10 +138,12 @@ GtkWidget *nsgtk_entry_new(void)
return gtk_entry_new();
#else
return GTK_WIDGET(sexy_icon_entry_new());
-#endif
+#endif
}
-void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf)
+void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry,
+ GtkEntryIconPosition icon_pos,
+ GdkPixbuf *pixbuf)
{
#if GTK_CHECK_VERSION(2,16,0)
gtk_entry_set_icon_from_pixbuf(GTK_ENTRY(entry), icon_pos, pixbuf);
@@ -158,12 +161,17 @@ void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition ico
#endif
}
-void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id)
+void nsgtk_entry_set_icon_from_stock(GtkWidget *entry,
+ GtkEntryIconPosition icon_pos,
+ const gchar *id)
{
+#if GTK_CHECK_VERSION(3,10,0)
+ gtk_entry_set_icon_from_icon_name(entry, icon_pos, id);
+#else
#if GTK_CHECK_VERSION(2,16,0)
- gtk_entry_set_icon_from_stock(GTK_ENTRY(entry), icon_pos, stock_id);
+ gtk_entry_set_icon_from_stock(GTK_ENTRY(entry), icon_pos, id);
#else
- GtkImage *image = GTK_IMAGE(gtk_image_new_from_stock(stock_id,
+ GtkImage *image = GTK_IMAGE(gtk_image_new_from_stock(id,
GTK_ICON_SIZE_LARGE_TOOLBAR));
if (image != NULL) {
@@ -172,11 +180,25 @@ void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon
image);
g_object_unref(image);
}
+#endif
+#endif
+}
+GtkWidget *nsgtk_image_new_from_stock(const gchar *id, GtkIconSize size)
+{
+#if GTK_CHECK_VERSION(3,10,0)
+ return gtk_image_new_from_icon_name(id, size);
+#else
+ return gtk_image_new_from_stock(id, size);
#endif
}
-void nsgtk_widget_override_background_color(GtkWidget *widget, GtkStateFlags state, uint16_t a, uint16_t r, uint16_t g, uint16_t b)
+void nsgtk_widget_override_background_color(GtkWidget *widget,
+ GtkStateFlags state,
+ uint16_t a,
+ uint16_t r,
+ uint16_t g,
+ uint16_t b)
{
#if GTK_CHECK_VERSION(3,0,0)
GdkRGBA colour;
@@ -223,7 +245,7 @@ static void nsgtk_layout_set_adjustment_step_increment(GtkAdjustment *adj,
#endif
}
-void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj)
+void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj)
{
#if GTK_CHECK_VERSION(3,0,0)
gtk_scrollable_set_hadjustment(GTK_SCROLLABLE(layout), adj);
@@ -233,7 +255,7 @@ void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj)
nsgtk_layout_set_adjustment_step_increment(adj, 8);
}
-void nsgtk_layout_set_vadjustment(GtkLayout *layout, GtkAdjustment *adj)
+void nsgtk_layout_set_vadjustment(GtkLayout *layout, GtkAdjustment *adj)
{
#if GTK_CHECK_VERSION(3,0,0)
gtk_scrollable_set_vadjustment(GTK_SCROLLABLE(layout), adj);
@@ -283,7 +305,8 @@ GtkStyleContext *nsgtk_widget_get_style_context(GtkWidget *widget)
#endif
}
-const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style, GtkStateFlags state)
+const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style,
+ GtkStateFlags state)
{
#if GTK_CHECK_VERSION(3,0,0)
return gtk_style_context_get_font(style, state);
@@ -292,7 +315,9 @@ const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style,
#endif
}
-gulong nsgtk_connect_draw_event(GtkWidget *widget, GCallback callback, gpointer g)
+gulong nsgtk_connect_draw_event(GtkWidget *widget,
+ GCallback callback,
+ gpointer g)
{
#if GTK_CHECK_VERSION(3,0,0)
return g_signal_connect(G_OBJECT(widget), "draw", callback, g);
@@ -310,7 +335,8 @@ void nsgdk_cursor_unref(GdkCursor *cursor)
#endif
}
-void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc)
+void nsgtk_widget_modify_font(GtkWidget *widget,
+ PangoFontDescription *font_desc)
{
#if GTK_CHECK_VERSION(3,0,0)
/* FIXME */
@@ -323,92 +349,95 @@ void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc
GdkWindow *nsgtk_widget_get_window(GtkWidget *widget)
{
#if GTK_CHECK_VERSION(2,14,0)
-return gtk_widget_get_window(widget);
+ return gtk_widget_get_window(widget);
#else
- return widget->window;
+ return widget->window;
#endif
}
GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_dialog_get_content_area(dialog);
+ return gtk_dialog_get_content_area(dialog);
#else
- return dialog->vbox;
+ return dialog->vbox;
#endif
}
GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_dialog_get_action_area(dialog);
+ return gtk_dialog_get_action_area(dialog);
#else
- return dialog->action_area;
+ return dialog->action_area;
#endif
}
-gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error)
+gboolean nsgtk_show_uri(GdkScreen *screen,
+ const gchar *uri,
+ guint32 timestamp,
+ GError **error)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_show_uri(screen, uri, timestamp, error);
+ return gtk_show_uri(screen, uri, timestamp, error);
#else
- return FALSE; /* FIXME */
+ return FALSE; /* FIXME */
#endif
}
GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_layout_get_bin_window(layout);
+ return gtk_layout_get_bin_window(layout);
#else
- return layout->bin_window;
+ return layout->bin_window;
#endif
}
gdouble nsgtk_adjustment_get_step_increment(GtkAdjustment *adjustment)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_adjustment_get_step_increment(adjustment);
+ return gtk_adjustment_get_step_increment(adjustment);
#else
- return adjustment->step_increment;
+ return adjustment->step_increment;
#endif
}
gdouble nsgtk_adjustment_get_upper(GtkAdjustment *adjustment)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_adjustment_get_upper(adjustment);
+ return gtk_adjustment_get_upper(adjustment);
#else
- return adjustment->upper;
+ return adjustment->upper;
#endif
}
gdouble nsgtk_adjustment_get_lower(GtkAdjustment *adjustment)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_adjustment_get_lower(adjustment);
+ return gtk_adjustment_get_lower(adjustment);
#else
- return adjustment->lower;
+ return adjustment->lower;
#endif
}
gdouble nsgtk_adjustment_get_page_increment(GtkAdjustment *adjustment)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_adjustment_get_page_increment(adjustment);
+ return gtk_adjustment_get_page_increment(adjustment);
#else
- return adjustment->page_increment;
+ return adjustment->page_increment;
#endif
}
void nsgtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation)
{
#if GTK_CHECK_VERSION(2,18,0)
- gtk_widget_get_allocation(widget, allocation);
+ gtk_widget_get_allocation(widget, allocation);
#else
- allocation->x = widget->allocation.x;
- allocation->y = widget->allocation.y;
- allocation->width = widget->allocation.width;
- allocation->height = widget->allocation.height;
+ allocation->x = widget->allocation.x;
+ allocation->y = widget->allocation.y;
+ allocation->width = widget->allocation.width;
+ allocation->height = widget->allocation.height;
#endif
}
diff --git a/gtk/compat.h b/gtk/compat.h
index ee2ebb2..d644276 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -27,6 +27,41 @@
#include <gtk/gtk.h>
+/* gtk 3.10 depricated the use of stock names */
+#if GTK_CHECK_VERSION(3,10,0)
+#define NSGTK_STOCK_ADD "list-add"
+#define NSGTK_STOCK_CANCEL "gtk-cancel"
+#define NSGTK_STOCK_CLEAR "edit-clear"
+#define NSGTK_STOCK_CLOSE "window-close"
+#define NSGTK_STOCK_FIND "edit-find"
+#define NSGTK_STOCK_GO_BACK "go-previous"
+#define NSGTK_STOCK_GO_FORWARD "go-next"
+#define NSGTK_STOCK_HOME "go-home"
+#define NSGTK_STOCK_INFO "dialog-information"
+#define NSGTK_STOCK_REFRESH "view-refresh"
+#define NSGTK_STOCK_SAVE "document-save"
+#define NSGTK_STOCK_SAVE_AS "document-save-as"
+#define NSGTK_STOCK_STOP "process-stop"
+#define NSGTK_STOCK_OK "gtk-ok"
+#define NSGTK_STOCK_OPEN "document-open"
+#else
+#define NSGTK_STOCK_ADD GTK_STOCK_ADD
+#define NSGTK_STOCK_CANCEL GTK_STOCK_CANCEL
+#define NSGTK_STOCK_CLEAR GTK_STOCK_CLEAR
+#define NSGTK_STOCK_CLOSE GTK_STOCK_CLOSE
+#define NSGTK_STOCK_FIND GTK_STOCK_FIND
+#define NSGTK_STOCK_GO_BACK GTK_STOCK_GO_BACK
+#define NSGTK_STOCK_GO_FORWARD GTK_STOCK_GO_FORWARD
+#define NSGTK_STOCK_HOME GTK_STOCK_HOME
+#define NSGTK_STOCK_INFO GTK_STOCK_INFO
+#define NSGTK_STOCK_REFRESH GTK_STOCK_REFRESH
+#define NSGTK_STOCK_SAVE GTK_STOCK_SAVE
+#define NSGTK_STOCK_SAVE_AS GTK_STOCK_SAVE_AS
+#define NSGTK_STOCK_STOP GTK_STOCK_STOP
+#define NSGTK_STOCK_OK GTK_STOCK_OK
+#define NSGTK_STOCK_OPEN GTK_STOCK_OPEN
+#endif
+
void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus);
gboolean nsgtk_widget_has_focus(GtkWidget *widget);
gboolean nsgtk_widget_get_visible(GtkWidget *widget);
@@ -74,6 +109,14 @@ enum {
GtkWidget *nsgtk_entry_new(void);
void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id);
+
+/**
+ * Creates a GtkImage displaying a stock icon.
+ *
+ * Compatability interface for interface deprecated in 3.10
+ */
+GtkWidget *nsgtk_image_new_from_stock(const gchar *stock_id, GtkIconSize size);
+
void nsgtk_widget_override_background_color(GtkWidget *widget, GtkStateFlags state, uint16_t a, uint16_t r, uint16_t g, uint16_t b);
GtkWidget* nsgtk_hbox_new(gboolean homogeneous, gint spacing);
GtkWidget* nsgtk_vbox_new(gboolean homogeneous, gint spacing);
diff --git a/gtk/download.c b/gtk/download.c
index d2588ed..8f79166 100644
--- a/gtk/download.c
+++ b/gtk/download.c
@@ -595,9 +595,9 @@ static gchar* nsgtk_download_dialog_show (const gchar *filename, const gchar *do
"\n\n<small>%s</small>",
message, info);
- gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_SAVE,
- GTK_RESPONSE_DOWNLOAD, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE_AS,
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog), NSGTK_STOCK_SAVE,
+ GTK_RESPONSE_DOWNLOAD, NSGTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL, NSGTK_STOCK_SAVE_AS,
GTK_RESPONSE_SAVE_AS, NULL);
gint result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -611,8 +611,8 @@ static gchar* nsgtk_download_dialog_show (const gchar *filename, const gchar *do
(messages_get("gtkSave"),
nsgtk_download_parent,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_name
(GTK_FILE_CHOOSER(dialog), filename);
@@ -664,12 +664,11 @@ static gchar* nsgtk_download_dialog_show (const gchar *filename, const gchar *do
"_Replace",
GTK_RESPONSE_DOWNLOAD);
gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(
- "gtk-save",
+ nsgtk_image_new_from_stock(
+ NSGTK_STOCK_SAVE,
GTK_ICON_SIZE_BUTTON));
- gint result = gtk_dialog_run(GTK_DIALOG(
- dialog));
+ gint result = gtk_dialog_run(GTK_DIALOG(dialog));
if (result == GTK_RESPONSE_CANCEL)
destination = NULL;
diff --git a/gtk/history.c b/gtk/history.c
index deb1763..e24794b 100644
--- a/gtk/history.c
+++ b/gtk/history.c
@@ -18,17 +18,19 @@
*/
+#include "utils/log.h"
+#include "utils/utils.h"
#include "desktop/global_history.h"
#include "desktop/plotters.h"
#include "desktop/tree.h"
#include "desktop/textinput.h"
+
#include "gtk/gui.h"
#include "gtk/history.h"
#include "gtk/plotters.h"
#include "gtk/scaffolding.h"
#include "gtk/treeview.h"
-#include "utils/log.h"
-#include "utils/utils.h"
+#include "gtk/compat.h"
#define MENUPROTO(x) static gboolean nsgtk_on_##x##_activate( \
GtkMenuItem *widget, gpointer g)
@@ -171,8 +173,8 @@ MENUHANDLER(export)
save_dialog = gtk_file_chooser_dialog_new("Save File",
wndHistory,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog),
diff --git a/gtk/hotlist.c b/gtk/hotlist.c
index b12d09d..551a2d0 100644
--- a/gtk/hotlist.c
+++ b/gtk/hotlist.c
@@ -29,6 +29,7 @@
#include "gtk/plotters.h"
#include "gtk/scaffolding.h"
#include "gtk/treeview.h"
+#include "gtk/compat.h"
#define GLADE_NAME "hotlist.glade"
@@ -178,8 +179,8 @@ MENUHANDLER(export)
save_dialog = gtk_file_chooser_dialog_new("Save File",
wndHotlist,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog),
diff --git a/gtk/preferences.c b/gtk/preferences.c
index 0255b4b..7348afd 100644
--- a/gtk/preferences.c
+++ b/gtk/preferences.c
@@ -712,9 +712,9 @@ nsgtk_preferences_buttonAddTheme_clicked(GtkButton *button, struct ppref *priv)
fc = gtk_file_chooser_dialog_new(messages_get("gtkAddThemeTitle"),
GTK_WINDOW(priv->dialog),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_OK,
+ NSGTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL,
+ NSGTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
NULL);
len = SLEN("themes") + strlen(res_dir_location) + 1;
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 7c785e2..a5f8c57 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -590,7 +590,7 @@ MULTIHANDLER(openfile)
scaf_current = g;
GtkWidget *dlgOpen = gtk_file_chooser_dialog_new("Open File",
scaf_current->window, GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, -6, GTK_STOCK_OPEN, -5, NULL);
+ NSGTK_STOCK_CANCEL, -6, NSGTK_STOCK_OPEN, -5, NULL);
gint response = gtk_dialog_run(GTK_DIALOG(dlgOpen));
if (response == GTK_RESPONSE_OK) {
@@ -624,8 +624,8 @@ MULTIHANDLER(savepage)
GtkWidget *fc = gtk_file_chooser_dialog_new(
messages_get("gtkcompleteSave"), g->window,
GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
DIR *d;
char *path;
@@ -720,8 +720,8 @@ MULTIHANDLER(pdf)
save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog),
@@ -764,8 +764,8 @@ MULTIHANDLER(plaintext)
GtkWidget *fc = gtk_file_chooser_dialog_new(
messages_get("gtkplainSave"), g->window,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
char *filename;
nserror res;
@@ -2457,7 +2457,7 @@ gui_search_web_provider_update(const char *provider_name,
} else {
nsgtk_entry_set_icon_from_stock(current->webSearchEntry,
GTK_ENTRY_ICON_PRIMARY,
- "gtk-find");
+ NSGTK_STOCK_FIND);
}
/* set search entry text */
diff --git a/gtk/sexy_icon_entry.c b/gtk/sexy_icon_entry.c
index b2899b1..fff650c 100644
--- a/gtk/sexy_icon_entry.c
+++ b/gtk/sexy_icon_entry.c
@@ -961,18 +961,19 @@ sexy_icon_entry_add_clear_button(SexyIconEntry *icon_entry)
g_return_if_fail(icon_entry != NULL);
g_return_if_fail(SEXY_IS_ICON_ENTRY(icon_entry));
- icon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU);
+ icon = nsgtk_image_new_from_stock(NSGTK_STOCK_CLEAR,
+ GTK_ICON_SIZE_MENU);
gtk_widget_show(icon);
sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(icon_entry),
- SEXY_ICON_ENTRY_SECONDARY,
- GTK_IMAGE(icon));
+ SEXY_ICON_ENTRY_SECONDARY,
+ GTK_IMAGE(icon));
sexy_icon_entry_set_icon_highlight(SEXY_ICON_ENTRY(icon_entry),
- SEXY_ICON_ENTRY_SECONDARY, TRUE);
+ SEXY_ICON_ENTRY_SECONDARY, TRUE);
if (icon_entry->priv->icon_released_id != 0)
{
g_signal_handler_disconnect(icon_entry,
- icon_entry->priv->icon_released_id);
+ icon_entry->priv->icon_released_id);
}
icon_entry->priv->icon_released_id =
diff --git a/gtk/tabs.c b/gtk/tabs.c
index f8d560c..75e3a03 100644
--- a/gtk/tabs.c
+++ b/gtk/tabs.c
@@ -82,7 +82,8 @@ static GtkWidget *nsgtk_tab_label_setup(struct gui_window *window)
button = gtk_button_new();
- close = gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU);
+ close = nsgtk_image_new_from_stock(NSGTK_STOCK_CLOSE,
+ GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(button), close);
gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
@@ -218,7 +219,7 @@ nsgtk_tab_add_newtab(GtkNotebook *notebook)
tablabel = nsgtk_hbox_new(FALSE, 1);
tabcontents = nsgtk_hbox_new(FALSE, 1);
- add = gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_MENU);
+ add = nsgtk_image_new_from_stock(NSGTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
gtk_box_pack_start(GTK_BOX(tablabel), add, FALSE, FALSE, 0);
diff --git a/gtk/theme.c b/gtk/theme.c
index 9e673da..1e65416 100644
--- a/gtk/theme.c
+++ b/gtk/theme.c
@@ -260,7 +260,7 @@ void nsgtk_theme_add(const char *themename)
/* notification that theme was added successfully */
notification = gtk_dialog_new_with_buttons(messages_get("gtkThemeAdd"),
- NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK,
+ NULL, GTK_DIALOG_DESTROY_WITH_PARENT, NSGTK_STOCK_OK,
GTK_RESPONSE_NONE, NULL);
if (notification == NULL) {
warn_user(messages_get("NoMemory"), 0);
@@ -401,37 +401,37 @@ nsgtk_theme_image_default(nsgtk_toolbar_button tbbutton, GtkIconSize iconsize)
#define BUTTON_IMAGE(p, q) \
case p##_BUTTON: \
- image = GTK_IMAGE(gtk_image_new_from_stock(#q, iconsize)); \
+ image = GTK_IMAGE(nsgtk_image_new_from_stock(q, iconsize)); \
break
- BUTTON_IMAGE(BACK, gtk-go-back);
- BUTTON_IMAGE(FORWARD, gtk-go-forward);
- BUTTON_IMAGE(STOP, gtk-stop);
- BUTTON_IMAGE(RELOAD, gtk-refresh);
- BUTTON_IMAGE(HOME, gtk-home);
- BUTTON_IMAGE(NEWWINDOW, gtk-new);
- BUTTON_IMAGE(NEWTAB, gtk-new);
- BUTTON_IMAGE(OPENFILE, gtk-open);
- BUTTON_IMAGE(CLOSETAB, gtk-close);
- BUTTON_IMAGE(CLOSEWINDOW, gtk-close);
- BUTTON_IMAGE(SAVEPAGE, gtk-save-as);
- BUTTON_IMAGE(PRINTPREVIEW, gtk-print-preview);
- BUTTON_IMAGE(PRINT, gtk-print);
- BUTTON_IMAGE(QUIT, gtk-quit);
- BUTTON_IMAGE(CUT, gtk-cut);
- BUTTON_IMAGE(COPY, gtk-copy);
- BUTTON_IMAGE(PASTE, gtk-paste);
- BUTTON_IMAGE(DELETE, gtk-delete);
- BUTTON_IMAGE(SELECTALL, gtk-select-all);
- BUTTON_IMAGE(FIND, gtk-find);
- BUTTON_IMAGE(PREFERENCES, gtk-preferences);
- BUTTON_IMAGE(ZOOMPLUS, gtk-zoom-in);
- BUTTON_IMAGE(ZOOMMINUS, gtk-zoom-out);
- BUTTON_IMAGE(ZOOMNORMAL, gtk-zoom-100);
- BUTTON_IMAGE(FULLSCREEN, gtk-fullscreen);
- BUTTON_IMAGE(VIEWSOURCE, gtk-index);
- BUTTON_IMAGE(CONTENTS, gtk-help);
- BUTTON_IMAGE(ABOUT, gtk-about);
+ BUTTON_IMAGE(BACK, NSGTK_STOCK_GO_BACK);
+ BUTTON_IMAGE(FORWARD, NSGTK_STOCK_GO_FORWARD);
+ BUTTON_IMAGE(STOP, NSGTK_STOCK_STOP);
+ BUTTON_IMAGE(RELOAD, NSGTK_STOCK_REFRESH);
+ BUTTON_IMAGE(HOME, NSGTK_STOCK_HOME);
+ BUTTON_IMAGE(NEWWINDOW, "gtk-new");
+ BUTTON_IMAGE(NEWTAB, "gtk-new");
+ BUTTON_IMAGE(OPENFILE, NSGTK_STOCK_OPEN);
+ BUTTON_IMAGE(CLOSETAB, NSGTK_STOCK_CLOSE);
+ BUTTON_IMAGE(CLOSEWINDOW, NSGTK_STOCK_CLOSE);
+ BUTTON_IMAGE(SAVEPAGE, NSGTK_STOCK_SAVE_AS);
+ BUTTON_IMAGE(PRINTPREVIEW, "gtk-print-preview");
+ BUTTON_IMAGE(PRINT, "gtk-print");
+ BUTTON_IMAGE(QUIT, "gtk-quit");
+ BUTTON_IMAGE(CUT, "gtk-cut");
+ BUTTON_IMAGE(COPY, "gtk-copy");
+ BUTTON_IMAGE(PASTE, "gtk-paste");
+ BUTTON_IMAGE(DELETE, "gtk-delete");
+ BUTTON_IMAGE(SELECTALL, "gtk-select-all");
+ BUTTON_IMAGE(FIND, NSGTK_STOCK_FIND);
+ BUTTON_IMAGE(PREFERENCES, "gtk-preferences");
+ BUTTON_IMAGE(ZOOMPLUS, "gtk-zoom-in");
+ BUTTON_IMAGE(ZOOMMINUS, "gtk-zoom-out");
+ BUTTON_IMAGE(ZOOMNORMAL, "gtk-zoom-100");
+ BUTTON_IMAGE(FULLSCREEN, "gtk-fullscreen");
+ BUTTON_IMAGE(VIEWSOURCE, "gtk-index");
+ BUTTON_IMAGE(CONTENTS, "gtk-help");
+ BUTTON_IMAGE(ABOUT, "gtk-about");
#undef BUTTON_IMAGE
case HISTORY_BUTTON:
@@ -481,12 +481,14 @@ nsgtk_theme_searchimage_default(nsgtk_search_buttons tbbutton,
switch(tbbutton) {
case (SEARCH_BACK_BUTTON):
- return GTK_IMAGE(gtk_image_new_from_stock("gtk-go-back", iconsize));
+ return GTK_IMAGE(nsgtk_image_new_from_stock(NSGTK_STOCK_GO_BACK,
+ iconsize));
case (SEARCH_FORWARD_BUTTON):
- return GTK_IMAGE(gtk_image_new_from_stock("gtk-go-forward",
- iconsize));
+ return GTK_IMAGE(nsgtk_image_new_from_stock(NSGTK_STOCK_GO_FORWARD,
+ iconsize));
case (SEARCH_CLOSE_BUTTON):
- return GTK_IMAGE(gtk_image_new_from_stock("gtk-close", iconsize));
+ return GTK_IMAGE(nsgtk_image_new_from_stock(NSGTK_STOCK_CLOSE,
+ iconsize));
default: {
size_t len = SLEN("themes/Alpha.png") +
strlen(res_dir_location) + 1;
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 5bc5f6c..132ab2d 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -687,7 +687,7 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
#define MAKE_STOCKBUTTON(p, q) case p##_BUTTON: {\
GtkStockItem item;\
char *label = NULL;\
- gtk_stock_lookup(#q, &item);\
+ gtk_stock_lookup(q, &item);\
if (item.label != NULL)\
label = remove_underscores(item.label, false);\
GtkWidget *w = GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(\
@@ -699,11 +699,11 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
return w;\
}
- MAKE_STOCKBUTTON(HOME, gtk-home)
- MAKE_STOCKBUTTON(BACK, gtk-go-back)
- MAKE_STOCKBUTTON(FORWARD, gtk-go-forward)
- MAKE_STOCKBUTTON(STOP, gtk-stop)
- MAKE_STOCKBUTTON(RELOAD, gtk-refresh)
+ MAKE_STOCKBUTTON(HOME, NSGTK_STOCK_HOME)
+ MAKE_STOCKBUTTON(BACK, NSGTK_STOCK_GO_BACK)
+ MAKE_STOCKBUTTON(FORWARD, NSGTK_STOCK_GO_FORWARD)
+ MAKE_STOCKBUTTON(STOP, NSGTK_STOCK_STOP)
+ MAKE_STOCKBUTTON(RELOAD, NSGTK_STOCK_REFRESH)
#undef MAKE_STOCKBUTTON
case HISTORY_BUTTON:
return GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(
@@ -752,7 +752,7 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
case WEBSEARCH_ITEM: {
if (edit_mode)
return GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(
- gtk_image_new_from_stock("gtk-find",
+ nsgtk_image_new_from_stock(NSGTK_STOCK_FIND,
GTK_ICON_SIZE_LARGE_TOOLBAR)),
"[websearch]"));
@@ -767,7 +767,8 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
gtk_widget_set_size_request(entry, NSGTK_WEBSEARCH_WIDTH, -1);
- nsgtk_entry_set_icon_from_stock(entry, GTK_ENTRY_ICON_PRIMARY, "gtk-info");
+ nsgtk_entry_set_icon_from_stock(entry, GTK_ENTRY_ICON_PRIMARY,
+ NSGTK_STOCK_INFO);
gtk_container_add(GTK_CONTAINER(w), entry);
return w;
diff --git a/gtk/viewdata.c b/gtk/viewdata.c
index be857b1..460d58b 100644
--- a/gtk/viewdata.c
+++ b/gtk/viewdata.c
@@ -164,8 +164,10 @@ static void nsgtk_viewdata_file_save(GtkWindow *parent, const char *filename,
/* inform user of faliure */
notif = gtk_dialog_new_with_buttons(messages_get("gtkSaveFailedTitle"),
parent,
- GTK_DIALOG_MODAL, GTK_STOCK_OK,
- GTK_RESPONSE_NONE, NULL);
+ GTK_DIALOG_MODAL,
+ NSGTK_STOCK_OK,
+ GTK_RESPONSE_NONE,
+ NULL);
g_signal_connect_swapped(notif, "response",
G_CALLBACK(gtk_widget_destroy), notif);
@@ -185,9 +187,9 @@ gboolean nsgtk_on_viewdata_save_as_activate(GtkMenuItem *widget, gpointer g)
fc = gtk_file_chooser_dialog_new(messages_get("gtkSaveFile"),
nsg->window,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL,
+ NSGTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE,
+ NSGTK_STOCK_SAVE,
GTK_RESPONSE_ACCEPT,
NULL);
diff --git a/gtk/window.c b/gtk/window.c
index 107f686..00d9692 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -1269,8 +1269,8 @@ gui_window_file_gadget_open(struct gui_window *g,
dialog = gtk_file_chooser_dialog_new("Select File",
nsgtk_scaffolding_window(g->scaffold),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
LOG(("*** open dialog: %p", dialog));
-----------------------------------------------------------------------
Summary of changes:
gtk/Makefile.target | 7 +-
gtk/about.c | 2 +-
gtk/compat.c | 173 +++++++++++++++++++++++++++++--------------------
gtk/compat.h | 43 ++++++++++++
gtk/download.c | 17 +++--
gtk/history.c | 10 +--
gtk/hotlist.c | 5 +-
gtk/preferences.c | 4 +-
gtk/scaffolding.c | 16 ++---
gtk/sexy_icon_entry.c | 11 ++--
gtk/tabs.c | 5 +-
gtk/theme.c | 70 ++++++++++----------
gtk/toolbar.c | 17 ++---
gtk/viewdata.c | 10 +--
gtk/window.c | 4 +-
15 files changed, 240 insertions(+), 154 deletions(-)
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index 23c0145..b22da97 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -36,7 +36,6 @@ $(eval $(call pkg_config_find_and_add_enabled,VIDEO,gstreamer-0.10,Video))
GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_SINGLE_INCLUDES \
- -DGTK_DISABLE_DEPRECATED \
-DGTK_MULTIHEAD_SAFE \
-DPANGO_DISABLE_DEPRECATED
@@ -46,6 +45,12 @@ GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
# libsexy currently means we cannot enable this
# -DGDK_DISABLE_DEPRECATED
+# gtk3 is depricating interfaces we use a lot
+ifeq ($(NETSURF_GTK_MAJOR),2)
+GTKDEPFLAGS += -DGTK_DISABLE_DEPRECATED
+endif
+
+
GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \
$(GTKDEPFLAGS) \
-D_BSD_SOURCE \
diff --git a/gtk/about.c b/gtk/about.c
index 27c164a..6d10386 100644
--- a/gtk/about.c
+++ b/gtk/about.c
@@ -122,7 +122,7 @@ void nsgtk_about_dialog_init(GtkWindow *parent)
nsgtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
/* Add the OK button */
- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_button(GTK_DIALOG(dialog), NSGTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
/* Add the credits button */
diff --git a/gtk/compat.c b/gtk/compat.c
index 5f4c641..0dea5aa 100644
--- a/gtk/compat.c
+++ b/gtk/compat.c
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Compatibility functions for older GTK versions (implementation)
+/**
+ * \file
+ * Compatibility functions for older GTK versions implementation
*/
#include <stdint.h>
@@ -30,105 +31,105 @@
void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
{
- #if GTK_CHECK_VERSION(2,22,0)
+#if GTK_CHECK_VERSION(2,22,0)
gtk_widget_set_can_focus(widget, can_focus);
- #else
+#else
if (can_focus == TRUE)
GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS);
else
GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS);
- #endif
+#endif
}
gboolean nsgtk_widget_has_focus(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2,20,0)
return gtk_widget_has_focus(widget);
- #else
+#else
return GTK_WIDGET_HAS_FOCUS(widget);
- #endif
+#endif
}
gboolean nsgtk_widget_get_visible(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2,20,0)
return gtk_widget_get_visible(widget);
- #else
+#else
return GTK_WIDGET_VISIBLE(widget);
- #endif
+#endif
}
gboolean nsgtk_widget_get_realized(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2,20,0)
return gtk_widget_get_realized(widget);
- #else
+#else
return GTK_WIDGET_REALIZED(widget);
- #endif
+#endif
}
gboolean nsgtk_widget_get_mapped(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,20,0)
+#if GTK_CHECK_VERSION(2,20,0)
return gtk_widget_get_mapped(widget);
- #else
+#else
return GTK_WIDGET_MAPPED(widget);
- #endif
+#endif
}
gboolean nsgtk_widget_is_drawable(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,18,0)
+#if GTK_CHECK_VERSION(2,18,0)
return gtk_widget_is_drawable(widget);
- #else
+#else
return GTK_WIDGET_DRAWABLE(widget);
- #endif
+#endif
}
GtkStateType nsgtk_widget_get_state(GtkWidget *widget)
{
- #if GTK_CHECK_VERSION(2,18,0)
+#if GTK_CHECK_VERSION(2,18,0)
return gtk_widget_get_state(widget);
- #else
+#else
return GTK_WIDGET_STATE(widget);
- #endif
+#endif
}
void nsgtk_dialog_set_has_separator(GtkDialog *dialog, gboolean setting)
{
- #if GTK_CHECK_VERSION(2,21,8)
+#if GTK_CHECK_VERSION(2,21,8)
/* Deprecated */
- #else
+#else
gtk_dialog_set_has_separator(dialog, setting);
- #endif
+#endif
}
GtkWidget *nsgtk_combo_box_text_new(void)
{
- #if GTK_CHECK_VERSION(2,24,0)
- return gtk_combo_box_text_new();
- #else
+#if GTK_CHECK_VERSION(2,24,0)
+ return gtk_combo_box_text_new();
+#else
return gtk_combo_box_new_text();
- #endif
+#endif
}
void nsgtk_combo_box_text_append_text(GtkWidget *combo_box, const gchar *text)
{
- #if GTK_CHECK_VERSION(2,24,0)
+#if GTK_CHECK_VERSION(2,24,0)
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), text);
- #else
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), text);
- #endif
+#else
+ gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), text);
+#endif
}
gchar *nsgtk_combo_box_text_get_active_text(GtkWidget *combo_box)
{
- #if GTK_CHECK_VERSION(2,24,0)
+#if GTK_CHECK_VERSION(2,24,0)
return gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo_box));
- #else
+#else
return gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo_box));
- #endif
+#endif
}
GtkWidget *nsgtk_entry_new(void)
@@ -137,10 +138,12 @@ GtkWidget *nsgtk_entry_new(void)
return gtk_entry_new();
#else
return GTK_WIDGET(sexy_icon_entry_new());
-#endif
+#endif
}
-void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf)
+void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry,
+ GtkEntryIconPosition icon_pos,
+ GdkPixbuf *pixbuf)
{
#if GTK_CHECK_VERSION(2,16,0)
gtk_entry_set_icon_from_pixbuf(GTK_ENTRY(entry), icon_pos, pixbuf);
@@ -158,12 +161,17 @@ void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition ico
#endif
}
-void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id)
+void nsgtk_entry_set_icon_from_stock(GtkWidget *entry,
+ GtkEntryIconPosition icon_pos,
+ const gchar *id)
{
+#if GTK_CHECK_VERSION(3,10,0)
+ gtk_entry_set_icon_from_icon_name(entry, icon_pos, id);
+#else
#if GTK_CHECK_VERSION(2,16,0)
- gtk_entry_set_icon_from_stock(GTK_ENTRY(entry), icon_pos, stock_id);
+ gtk_entry_set_icon_from_stock(GTK_ENTRY(entry), icon_pos, id);
#else
- GtkImage *image = GTK_IMAGE(gtk_image_new_from_stock(stock_id,
+ GtkImage *image = GTK_IMAGE(gtk_image_new_from_stock(id,
GTK_ICON_SIZE_LARGE_TOOLBAR));
if (image != NULL) {
@@ -172,11 +180,25 @@ void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon
image);
g_object_unref(image);
}
+#endif
+#endif
+}
+GtkWidget *nsgtk_image_new_from_stock(const gchar *id, GtkIconSize size)
+{
+#if GTK_CHECK_VERSION(3,10,0)
+ return gtk_image_new_from_icon_name(id, size);
+#else
+ return gtk_image_new_from_stock(id, size);
#endif
}
-void nsgtk_widget_override_background_color(GtkWidget *widget, GtkStateFlags state, uint16_t a, uint16_t r, uint16_t g, uint16_t b)
+void nsgtk_widget_override_background_color(GtkWidget *widget,
+ GtkStateFlags state,
+ uint16_t a,
+ uint16_t r,
+ uint16_t g,
+ uint16_t b)
{
#if GTK_CHECK_VERSION(3,0,0)
GdkRGBA colour;
@@ -223,7 +245,7 @@ static void nsgtk_layout_set_adjustment_step_increment(GtkAdjustment *adj,
#endif
}
-void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj)
+void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj)
{
#if GTK_CHECK_VERSION(3,0,0)
gtk_scrollable_set_hadjustment(GTK_SCROLLABLE(layout), adj);
@@ -233,7 +255,7 @@ void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj)
nsgtk_layout_set_adjustment_step_increment(adj, 8);
}
-void nsgtk_layout_set_vadjustment(GtkLayout *layout, GtkAdjustment *adj)
+void nsgtk_layout_set_vadjustment(GtkLayout *layout, GtkAdjustment *adj)
{
#if GTK_CHECK_VERSION(3,0,0)
gtk_scrollable_set_vadjustment(GTK_SCROLLABLE(layout), adj);
@@ -283,7 +305,8 @@ GtkStyleContext *nsgtk_widget_get_style_context(GtkWidget *widget)
#endif
}
-const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style, GtkStateFlags state)
+const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style,
+ GtkStateFlags state)
{
#if GTK_CHECK_VERSION(3,0,0)
return gtk_style_context_get_font(style, state);
@@ -292,7 +315,9 @@ const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style,
#endif
}
-gulong nsgtk_connect_draw_event(GtkWidget *widget, GCallback callback, gpointer g)
+gulong nsgtk_connect_draw_event(GtkWidget *widget,
+ GCallback callback,
+ gpointer g)
{
#if GTK_CHECK_VERSION(3,0,0)
return g_signal_connect(G_OBJECT(widget), "draw", callback, g);
@@ -310,7 +335,8 @@ void nsgdk_cursor_unref(GdkCursor *cursor)
#endif
}
-void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc)
+void nsgtk_widget_modify_font(GtkWidget *widget,
+ PangoFontDescription *font_desc)
{
#if GTK_CHECK_VERSION(3,0,0)
/* FIXME */
@@ -323,92 +349,95 @@ void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc
GdkWindow *nsgtk_widget_get_window(GtkWidget *widget)
{
#if GTK_CHECK_VERSION(2,14,0)
-return gtk_widget_get_window(widget);
+ return gtk_widget_get_window(widget);
#else
- return widget->window;
+ return widget->window;
#endif
}
GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_dialog_get_content_area(dialog);
+ return gtk_dialog_get_content_area(dialog);
#else
- return dialog->vbox;
+ return dialog->vbox;
#endif
}
GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_dialog_get_action_area(dialog);
+ return gtk_dialog_get_action_area(dialog);
#else
- return dialog->action_area;
+ return dialog->action_area;
#endif
}
-gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error)
+gboolean nsgtk_show_uri(GdkScreen *screen,
+ const gchar *uri,
+ guint32 timestamp,
+ GError **error)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_show_uri(screen, uri, timestamp, error);
+ return gtk_show_uri(screen, uri, timestamp, error);
#else
- return FALSE; /* FIXME */
+ return FALSE; /* FIXME */
#endif
}
GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_layout_get_bin_window(layout);
+ return gtk_layout_get_bin_window(layout);
#else
- return layout->bin_window;
+ return layout->bin_window;
#endif
}
gdouble nsgtk_adjustment_get_step_increment(GtkAdjustment *adjustment)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_adjustment_get_step_increment(adjustment);
+ return gtk_adjustment_get_step_increment(adjustment);
#else
- return adjustment->step_increment;
+ return adjustment->step_increment;
#endif
}
gdouble nsgtk_adjustment_get_upper(GtkAdjustment *adjustment)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_adjustment_get_upper(adjustment);
+ return gtk_adjustment_get_upper(adjustment);
#else
- return adjustment->upper;
+ return adjustment->upper;
#endif
}
gdouble nsgtk_adjustment_get_lower(GtkAdjustment *adjustment)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_adjustment_get_lower(adjustment);
+ return gtk_adjustment_get_lower(adjustment);
#else
- return adjustment->lower;
+ return adjustment->lower;
#endif
}
gdouble nsgtk_adjustment_get_page_increment(GtkAdjustment *adjustment)
{
#if GTK_CHECK_VERSION(2,14,0)
- return gtk_adjustment_get_page_increment(adjustment);
+ return gtk_adjustment_get_page_increment(adjustment);
#else
- return adjustment->page_increment;
+ return adjustment->page_increment;
#endif
}
void nsgtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation)
{
#if GTK_CHECK_VERSION(2,18,0)
- gtk_widget_get_allocation(widget, allocation);
+ gtk_widget_get_allocation(widget, allocation);
#else
- allocation->x = widget->allocation.x;
- allocation->y = widget->allocation.y;
- allocation->width = widget->allocation.width;
- allocation->height = widget->allocation.height;
+ allocation->x = widget->allocation.x;
+ allocation->y = widget->allocation.y;
+ allocation->width = widget->allocation.width;
+ allocation->height = widget->allocation.height;
#endif
}
diff --git a/gtk/compat.h b/gtk/compat.h
index ee2ebb2..d644276 100644
--- a/gtk/compat.h
+++ b/gtk/compat.h
@@ -27,6 +27,41 @@
#include <gtk/gtk.h>
+/* gtk 3.10 depricated the use of stock names */
+#if GTK_CHECK_VERSION(3,10,0)
+#define NSGTK_STOCK_ADD "list-add"
+#define NSGTK_STOCK_CANCEL "gtk-cancel"
+#define NSGTK_STOCK_CLEAR "edit-clear"
+#define NSGTK_STOCK_CLOSE "window-close"
+#define NSGTK_STOCK_FIND "edit-find"
+#define NSGTK_STOCK_GO_BACK "go-previous"
+#define NSGTK_STOCK_GO_FORWARD "go-next"
+#define NSGTK_STOCK_HOME "go-home"
+#define NSGTK_STOCK_INFO "dialog-information"
+#define NSGTK_STOCK_REFRESH "view-refresh"
+#define NSGTK_STOCK_SAVE "document-save"
+#define NSGTK_STOCK_SAVE_AS "document-save-as"
+#define NSGTK_STOCK_STOP "process-stop"
+#define NSGTK_STOCK_OK "gtk-ok"
+#define NSGTK_STOCK_OPEN "document-open"
+#else
+#define NSGTK_STOCK_ADD GTK_STOCK_ADD
+#define NSGTK_STOCK_CANCEL GTK_STOCK_CANCEL
+#define NSGTK_STOCK_CLEAR GTK_STOCK_CLEAR
+#define NSGTK_STOCK_CLOSE GTK_STOCK_CLOSE
+#define NSGTK_STOCK_FIND GTK_STOCK_FIND
+#define NSGTK_STOCK_GO_BACK GTK_STOCK_GO_BACK
+#define NSGTK_STOCK_GO_FORWARD GTK_STOCK_GO_FORWARD
+#define NSGTK_STOCK_HOME GTK_STOCK_HOME
+#define NSGTK_STOCK_INFO GTK_STOCK_INFO
+#define NSGTK_STOCK_REFRESH GTK_STOCK_REFRESH
+#define NSGTK_STOCK_SAVE GTK_STOCK_SAVE
+#define NSGTK_STOCK_SAVE_AS GTK_STOCK_SAVE_AS
+#define NSGTK_STOCK_STOP GTK_STOCK_STOP
+#define NSGTK_STOCK_OK GTK_STOCK_OK
+#define NSGTK_STOCK_OPEN GTK_STOCK_OPEN
+#endif
+
void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus);
gboolean nsgtk_widget_has_focus(GtkWidget *widget);
gboolean nsgtk_widget_get_visible(GtkWidget *widget);
@@ -74,6 +109,14 @@ enum {
GtkWidget *nsgtk_entry_new(void);
void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf);
void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id);
+
+/**
+ * Creates a GtkImage displaying a stock icon.
+ *
+ * Compatability interface for interface deprecated in 3.10
+ */
+GtkWidget *nsgtk_image_new_from_stock(const gchar *stock_id, GtkIconSize size);
+
void nsgtk_widget_override_background_color(GtkWidget *widget, GtkStateFlags state, uint16_t a, uint16_t r, uint16_t g, uint16_t b);
GtkWidget* nsgtk_hbox_new(gboolean homogeneous, gint spacing);
GtkWidget* nsgtk_vbox_new(gboolean homogeneous, gint spacing);
diff --git a/gtk/download.c b/gtk/download.c
index d2588ed..8f79166 100644
--- a/gtk/download.c
+++ b/gtk/download.c
@@ -595,9 +595,9 @@ static gchar* nsgtk_download_dialog_show (const gchar *filename, const gchar *do
"\n\n<small>%s</small>",
message, info);
- gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_SAVE,
- GTK_RESPONSE_DOWNLOAD, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE_AS,
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog), NSGTK_STOCK_SAVE,
+ GTK_RESPONSE_DOWNLOAD, NSGTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL, NSGTK_STOCK_SAVE_AS,
GTK_RESPONSE_SAVE_AS, NULL);
gint result = gtk_dialog_run(GTK_DIALOG(dialog));
@@ -611,8 +611,8 @@ static gchar* nsgtk_download_dialog_show (const gchar *filename, const gchar *do
(messages_get("gtkSave"),
nsgtk_download_parent,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_name
(GTK_FILE_CHOOSER(dialog), filename);
@@ -664,12 +664,11 @@ static gchar* nsgtk_download_dialog_show (const gchar *filename, const gchar *do
"_Replace",
GTK_RESPONSE_DOWNLOAD);
gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(
- "gtk-save",
+ nsgtk_image_new_from_stock(
+ NSGTK_STOCK_SAVE,
GTK_ICON_SIZE_BUTTON));
- gint result = gtk_dialog_run(GTK_DIALOG(
- dialog));
+ gint result = gtk_dialog_run(GTK_DIALOG(dialog));
if (result == GTK_RESPONSE_CANCEL)
destination = NULL;
diff --git a/gtk/history.c b/gtk/history.c
index deb1763..e24794b 100644
--- a/gtk/history.c
+++ b/gtk/history.c
@@ -18,17 +18,19 @@
*/
+#include "utils/log.h"
+#include "utils/utils.h"
#include "desktop/global_history.h"
#include "desktop/plotters.h"
#include "desktop/tree.h"
#include "desktop/textinput.h"
+
#include "gtk/gui.h"
#include "gtk/history.h"
#include "gtk/plotters.h"
#include "gtk/scaffolding.h"
#include "gtk/treeview.h"
-#include "utils/log.h"
-#include "utils/utils.h"
+#include "gtk/compat.h"
#define MENUPROTO(x) static gboolean nsgtk_on_##x##_activate( \
GtkMenuItem *widget, gpointer g)
@@ -171,8 +173,8 @@ MENUHANDLER(export)
save_dialog = gtk_file_chooser_dialog_new("Save File",
wndHistory,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog),
diff --git a/gtk/hotlist.c b/gtk/hotlist.c
index b12d09d..551a2d0 100644
--- a/gtk/hotlist.c
+++ b/gtk/hotlist.c
@@ -29,6 +29,7 @@
#include "gtk/plotters.h"
#include "gtk/scaffolding.h"
#include "gtk/treeview.h"
+#include "gtk/compat.h"
#define GLADE_NAME "hotlist.glade"
@@ -178,8 +179,8 @@ MENUHANDLER(export)
save_dialog = gtk_file_chooser_dialog_new("Save File",
wndHotlist,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog),
diff --git a/gtk/preferences.c b/gtk/preferences.c
index 0255b4b..7348afd 100644
--- a/gtk/preferences.c
+++ b/gtk/preferences.c
@@ -712,9 +712,9 @@ nsgtk_preferences_buttonAddTheme_clicked(GtkButton *button, struct ppref *priv)
fc = gtk_file_chooser_dialog_new(messages_get("gtkAddThemeTitle"),
GTK_WINDOW(priv->dialog),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_OK,
+ NSGTK_STOCK_OK,
GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL,
+ NSGTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
NULL);
len = SLEN("themes") + strlen(res_dir_location) + 1;
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 7c785e2..a5f8c57 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -590,7 +590,7 @@ MULTIHANDLER(openfile)
scaf_current = g;
GtkWidget *dlgOpen = gtk_file_chooser_dialog_new("Open File",
scaf_current->window, GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, -6, GTK_STOCK_OPEN, -5, NULL);
+ NSGTK_STOCK_CANCEL, -6, NSGTK_STOCK_OPEN, -5, NULL);
gint response = gtk_dialog_run(GTK_DIALOG(dlgOpen));
if (response == GTK_RESPONSE_OK) {
@@ -624,8 +624,8 @@ MULTIHANDLER(savepage)
GtkWidget *fc = gtk_file_chooser_dialog_new(
messages_get("gtkcompleteSave"), g->window,
GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
DIR *d;
char *path;
@@ -720,8 +720,8 @@ MULTIHANDLER(pdf)
save_dialog = gtk_file_chooser_dialog_new("Export to PDF", g->window,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog),
@@ -764,8 +764,8 @@ MULTIHANDLER(plaintext)
GtkWidget *fc = gtk_file_chooser_dialog_new(
messages_get("gtkplainSave"), g->window,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
char *filename;
nserror res;
@@ -2457,7 +2457,7 @@ gui_search_web_provider_update(const char *provider_name,
} else {
nsgtk_entry_set_icon_from_stock(current->webSearchEntry,
GTK_ENTRY_ICON_PRIMARY,
- "gtk-find");
+ NSGTK_STOCK_FIND);
}
/* set search entry text */
diff --git a/gtk/sexy_icon_entry.c b/gtk/sexy_icon_entry.c
index b2899b1..fff650c 100644
--- a/gtk/sexy_icon_entry.c
+++ b/gtk/sexy_icon_entry.c
@@ -961,18 +961,19 @@ sexy_icon_entry_add_clear_button(SexyIconEntry *icon_entry)
g_return_if_fail(icon_entry != NULL);
g_return_if_fail(SEXY_IS_ICON_ENTRY(icon_entry));
- icon = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU);
+ icon = nsgtk_image_new_from_stock(NSGTK_STOCK_CLEAR,
+ GTK_ICON_SIZE_MENU);
gtk_widget_show(icon);
sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(icon_entry),
- SEXY_ICON_ENTRY_SECONDARY,
- GTK_IMAGE(icon));
+ SEXY_ICON_ENTRY_SECONDARY,
+ GTK_IMAGE(icon));
sexy_icon_entry_set_icon_highlight(SEXY_ICON_ENTRY(icon_entry),
- SEXY_ICON_ENTRY_SECONDARY, TRUE);
+ SEXY_ICON_ENTRY_SECONDARY, TRUE);
if (icon_entry->priv->icon_released_id != 0)
{
g_signal_handler_disconnect(icon_entry,
- icon_entry->priv->icon_released_id);
+ icon_entry->priv->icon_released_id);
}
icon_entry->priv->icon_released_id =
diff --git a/gtk/tabs.c b/gtk/tabs.c
index f8d560c..75e3a03 100644
--- a/gtk/tabs.c
+++ b/gtk/tabs.c
@@ -82,7 +82,8 @@ static GtkWidget *nsgtk_tab_label_setup(struct gui_window *window)
button = gtk_button_new();
- close = gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU);
+ close = nsgtk_image_new_from_stock(NSGTK_STOCK_CLOSE,
+ GTK_ICON_SIZE_MENU);
gtk_container_add(GTK_CONTAINER(button), close);
gtk_button_set_focus_on_click(GTK_BUTTON(button), FALSE);
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
@@ -218,7 +219,7 @@ nsgtk_tab_add_newtab(GtkNotebook *notebook)
tablabel = nsgtk_hbox_new(FALSE, 1);
tabcontents = nsgtk_hbox_new(FALSE, 1);
- add = gtk_image_new_from_stock("gtk-add", GTK_ICON_SIZE_MENU);
+ add = nsgtk_image_new_from_stock(NSGTK_STOCK_ADD, GTK_ICON_SIZE_MENU);
gtk_box_pack_start(GTK_BOX(tablabel), add, FALSE, FALSE, 0);
diff --git a/gtk/theme.c b/gtk/theme.c
index 9e673da..1e65416 100644
--- a/gtk/theme.c
+++ b/gtk/theme.c
@@ -260,7 +260,7 @@ void nsgtk_theme_add(const char *themename)
/* notification that theme was added successfully */
notification = gtk_dialog_new_with_buttons(messages_get("gtkThemeAdd"),
- NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK,
+ NULL, GTK_DIALOG_DESTROY_WITH_PARENT, NSGTK_STOCK_OK,
GTK_RESPONSE_NONE, NULL);
if (notification == NULL) {
warn_user(messages_get("NoMemory"), 0);
@@ -401,37 +401,37 @@ nsgtk_theme_image_default(nsgtk_toolbar_button tbbutton, GtkIconSize iconsize)
#define BUTTON_IMAGE(p, q) \
case p##_BUTTON: \
- image = GTK_IMAGE(gtk_image_new_from_stock(#q, iconsize)); \
+ image = GTK_IMAGE(nsgtk_image_new_from_stock(q, iconsize)); \
break
- BUTTON_IMAGE(BACK, gtk-go-back);
- BUTTON_IMAGE(FORWARD, gtk-go-forward);
- BUTTON_IMAGE(STOP, gtk-stop);
- BUTTON_IMAGE(RELOAD, gtk-refresh);
- BUTTON_IMAGE(HOME, gtk-home);
- BUTTON_IMAGE(NEWWINDOW, gtk-new);
- BUTTON_IMAGE(NEWTAB, gtk-new);
- BUTTON_IMAGE(OPENFILE, gtk-open);
- BUTTON_IMAGE(CLOSETAB, gtk-close);
- BUTTON_IMAGE(CLOSEWINDOW, gtk-close);
- BUTTON_IMAGE(SAVEPAGE, gtk-save-as);
- BUTTON_IMAGE(PRINTPREVIEW, gtk-print-preview);
- BUTTON_IMAGE(PRINT, gtk-print);
- BUTTON_IMAGE(QUIT, gtk-quit);
- BUTTON_IMAGE(CUT, gtk-cut);
- BUTTON_IMAGE(COPY, gtk-copy);
- BUTTON_IMAGE(PASTE, gtk-paste);
- BUTTON_IMAGE(DELETE, gtk-delete);
- BUTTON_IMAGE(SELECTALL, gtk-select-all);
- BUTTON_IMAGE(FIND, gtk-find);
- BUTTON_IMAGE(PREFERENCES, gtk-preferences);
- BUTTON_IMAGE(ZOOMPLUS, gtk-zoom-in);
- BUTTON_IMAGE(ZOOMMINUS, gtk-zoom-out);
- BUTTON_IMAGE(ZOOMNORMAL, gtk-zoom-100);
- BUTTON_IMAGE(FULLSCREEN, gtk-fullscreen);
- BUTTON_IMAGE(VIEWSOURCE, gtk-index);
- BUTTON_IMAGE(CONTENTS, gtk-help);
- BUTTON_IMAGE(ABOUT, gtk-about);
+ BUTTON_IMAGE(BACK, NSGTK_STOCK_GO_BACK);
+ BUTTON_IMAGE(FORWARD, NSGTK_STOCK_GO_FORWARD);
+ BUTTON_IMAGE(STOP, NSGTK_STOCK_STOP);
+ BUTTON_IMAGE(RELOAD, NSGTK_STOCK_REFRESH);
+ BUTTON_IMAGE(HOME, NSGTK_STOCK_HOME);
+ BUTTON_IMAGE(NEWWINDOW, "gtk-new");
+ BUTTON_IMAGE(NEWTAB, "gtk-new");
+ BUTTON_IMAGE(OPENFILE, NSGTK_STOCK_OPEN);
+ BUTTON_IMAGE(CLOSETAB, NSGTK_STOCK_CLOSE);
+ BUTTON_IMAGE(CLOSEWINDOW, NSGTK_STOCK_CLOSE);
+ BUTTON_IMAGE(SAVEPAGE, NSGTK_STOCK_SAVE_AS);
+ BUTTON_IMAGE(PRINTPREVIEW, "gtk-print-preview");
+ BUTTON_IMAGE(PRINT, "gtk-print");
+ BUTTON_IMAGE(QUIT, "gtk-quit");
+ BUTTON_IMAGE(CUT, "gtk-cut");
+ BUTTON_IMAGE(COPY, "gtk-copy");
+ BUTTON_IMAGE(PASTE, "gtk-paste");
+ BUTTON_IMAGE(DELETE, "gtk-delete");
+ BUTTON_IMAGE(SELECTALL, "gtk-select-all");
+ BUTTON_IMAGE(FIND, NSGTK_STOCK_FIND);
+ BUTTON_IMAGE(PREFERENCES, "gtk-preferences");
+ BUTTON_IMAGE(ZOOMPLUS, "gtk-zoom-in");
+ BUTTON_IMAGE(ZOOMMINUS, "gtk-zoom-out");
+ BUTTON_IMAGE(ZOOMNORMAL, "gtk-zoom-100");
+ BUTTON_IMAGE(FULLSCREEN, "gtk-fullscreen");
+ BUTTON_IMAGE(VIEWSOURCE, "gtk-index");
+ BUTTON_IMAGE(CONTENTS, "gtk-help");
+ BUTTON_IMAGE(ABOUT, "gtk-about");
#undef BUTTON_IMAGE
case HISTORY_BUTTON:
@@ -481,12 +481,14 @@ nsgtk_theme_searchimage_default(nsgtk_search_buttons tbbutton,
switch(tbbutton) {
case (SEARCH_BACK_BUTTON):
- return GTK_IMAGE(gtk_image_new_from_stock("gtk-go-back", iconsize));
+ return GTK_IMAGE(nsgtk_image_new_from_stock(NSGTK_STOCK_GO_BACK,
+ iconsize));
case (SEARCH_FORWARD_BUTTON):
- return GTK_IMAGE(gtk_image_new_from_stock("gtk-go-forward",
- iconsize));
+ return GTK_IMAGE(nsgtk_image_new_from_stock(NSGTK_STOCK_GO_FORWARD,
+ iconsize));
case (SEARCH_CLOSE_BUTTON):
- return GTK_IMAGE(gtk_image_new_from_stock("gtk-close", iconsize));
+ return GTK_IMAGE(nsgtk_image_new_from_stock(NSGTK_STOCK_CLOSE,
+ iconsize));
default: {
size_t len = SLEN("themes/Alpha.png") +
strlen(res_dir_location) + 1;
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 5bc5f6c..132ab2d 100644
--- a/gtk/toolbar.c
+++ b/gtk/toolbar.c
@@ -687,7 +687,7 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
#define MAKE_STOCKBUTTON(p, q) case p##_BUTTON: {\
GtkStockItem item;\
char *label = NULL;\
- gtk_stock_lookup(#q, &item);\
+ gtk_stock_lookup(q, &item);\
if (item.label != NULL)\
label = remove_underscores(item.label, false);\
GtkWidget *w = GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(\
@@ -699,11 +699,11 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
return w;\
}
- MAKE_STOCKBUTTON(HOME, gtk-home)
- MAKE_STOCKBUTTON(BACK, gtk-go-back)
- MAKE_STOCKBUTTON(FORWARD, gtk-go-forward)
- MAKE_STOCKBUTTON(STOP, gtk-stop)
- MAKE_STOCKBUTTON(RELOAD, gtk-refresh)
+ MAKE_STOCKBUTTON(HOME, NSGTK_STOCK_HOME)
+ MAKE_STOCKBUTTON(BACK, NSGTK_STOCK_GO_BACK)
+ MAKE_STOCKBUTTON(FORWARD, NSGTK_STOCK_GO_FORWARD)
+ MAKE_STOCKBUTTON(STOP, NSGTK_STOCK_STOP)
+ MAKE_STOCKBUTTON(RELOAD, NSGTK_STOCK_REFRESH)
#undef MAKE_STOCKBUTTON
case HISTORY_BUTTON:
return GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(
@@ -752,7 +752,7 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
case WEBSEARCH_ITEM: {
if (edit_mode)
return GTK_WIDGET(gtk_tool_button_new(GTK_WIDGET(
- gtk_image_new_from_stock("gtk-find",
+ nsgtk_image_new_from_stock(NSGTK_STOCK_FIND,
GTK_ICON_SIZE_LARGE_TOOLBAR)),
"[websearch]"));
@@ -767,7 +767,8 @@ GtkWidget *nsgtk_toolbar_make_widget(struct nsgtk_scaffolding *g,
gtk_widget_set_size_request(entry, NSGTK_WEBSEARCH_WIDTH, -1);
- nsgtk_entry_set_icon_from_stock(entry, GTK_ENTRY_ICON_PRIMARY, "gtk-info");
+ nsgtk_entry_set_icon_from_stock(entry, GTK_ENTRY_ICON_PRIMARY,
+ NSGTK_STOCK_INFO);
gtk_container_add(GTK_CONTAINER(w), entry);
return w;
diff --git a/gtk/viewdata.c b/gtk/viewdata.c
index be857b1..460d58b 100644
--- a/gtk/viewdata.c
+++ b/gtk/viewdata.c
@@ -164,8 +164,10 @@ static void nsgtk_viewdata_file_save(GtkWindow *parent, const char *filename,
/* inform user of faliure */
notif = gtk_dialog_new_with_buttons(messages_get("gtkSaveFailedTitle"),
parent,
- GTK_DIALOG_MODAL, GTK_STOCK_OK,
- GTK_RESPONSE_NONE, NULL);
+ GTK_DIALOG_MODAL,
+ NSGTK_STOCK_OK,
+ GTK_RESPONSE_NONE,
+ NULL);
g_signal_connect_swapped(notif, "response",
G_CALLBACK(gtk_widget_destroy), notif);
@@ -185,9 +187,9 @@ gboolean nsgtk_on_viewdata_save_as_activate(GtkMenuItem *widget, gpointer g)
fc = gtk_file_chooser_dialog_new(messages_get("gtkSaveFile"),
nsg->window,
GTK_FILE_CHOOSER_ACTION_SAVE,
- GTK_STOCK_CANCEL,
+ NSGTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL,
- GTK_STOCK_SAVE,
+ NSGTK_STOCK_SAVE,
GTK_RESPONSE_ACCEPT,
NULL);
diff --git a/gtk/window.c b/gtk/window.c
index 107f686..00d9692 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -1269,8 +1269,8 @@ gui_window_file_gadget_open(struct gui_window *g,
dialog = gtk_file_chooser_dialog_new("Select File",
nsgtk_scaffolding_window(g->scaffold),
GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ NSGTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ NSGTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
LOG(("*** open dialog: %p", dialog));
--
NetSurf Browser
8 years, 2 months
- 1
- 0
netsurf: branch master updated. release/3.3-48-ga6b0268
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/a6b02680a70afebacc479...
...commit http://git.netsurf-browser.org/netsurf.git/commit/a6b02680a70afebacc47973...
...tree http://git.netsurf-browser.org/netsurf.git/tree/a6b02680a70afebacc479730e...
The branch, master has been updated
discards 6b7d724311bb785b0893f1db900db9e9595bd176 (commit)
discards 694baf4bc7f7871b49b0a2f823554f73d2f1bfb7 (commit)
discards 5142d59d412a191e97b6c683c135f8593e40345d (commit)
discards fa6fed166df85eece10d67f79f39fa0b94893518 (commit)
discards 748efc0c40c7067651c92091155dd020bf3cfff4 (commit)
via a6b02680a70afebacc479730edcf3a7b1449b5f3 (commit)
via a14048f6d19a3206a00d71ed76b5df52f51a8328 (commit)
via 062c40140f355feecc73623ddc4faeff7e1db99f (commit)
via a838fa3ee93c813cc648bbf540639ea7fbbe6189 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (6b7d724311bb785b0893f1db900db9e9595bd176)
\
N -- N -- N (a6b02680a70afebacc479730edcf3a7b1449b5f3)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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=a6b02680a70afebacc4...
commit a6b02680a70afebacc479730edcf3a7b1449b5f3
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
update beos meakfile to filter split messages
diff --git a/beos/Makefile.target b/beos/Makefile.target
index bab6429..8b41a96 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -121,6 +121,9 @@ RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
EXETARGET := NetSurf
+# The filter and target for split messages
+MESSAGES_FILTER=beos
+
# ----------------------------------------------------------------------------
# Resources
# ----------------------------------------------------------------------------
@@ -153,7 +156,6 @@ install-beos:
@cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
@cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES)
# @cp -vRL beos/res/throbber/*.png $(DESTDIR)$(NETSURF_BEOS_RESOURCES)throbber
- $(call split_install_messages, beos, $(DESTDIR)$(NETSURF_BEOS_RESOURCES))
# ----------------------------------------------------------------------------
# Package target
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a14048f6d19a3206a00...
commit a14048f6d19a3206a00d71ed76b5df52f51a8328
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Update amiga makefile to set filter for split messages
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index bca0c30..9c7b8f5 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -61,6 +61,9 @@ endif
EXETARGET := NetSurf
+# The filter and target for split messages
+MESSAGES_FILTER=ami
+
# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------
@@ -116,7 +119,6 @@ netsurf.lha: $(EXETARGET)
$(Q)cp \!NetSurf/Resources/netsurf.png,b60 $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png
$(Q)cp amiga/pkg/drawer.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
$(Q)cp amiga/pkg/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
- $(call split_install_messages, ami, $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/)
$(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
lha a netsurf.lha NetSurf NetSurf.info AutoInstall
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=062c40140f355feecc7...
commit 062c40140f355feecc73623ddc4faeff7e1db99f
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Update RISC OS make target to filter split messages
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index e40795c..de848cf 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -36,7 +36,7 @@ $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript))
TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
!NetSurf/Resources/$(TPL)/Templates$(TPLEXT))
-RESOURCES = $(TPD_RISCOS) split-messages
+RESOURCES = $(TPD_RISCOS)
CFLAGS += -Driscos -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \
-mpoke-function-name -fno-strict-aliasing
@@ -89,6 +89,9 @@ SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RISCOS)
EXETARGET := !NetSurf/!RunImage$(EXEEXT)
+# The filter and target for split messages
+MESSAGES_FILTER=ro
+
!NetSurf/!Run$(RUNEXT): riscos/scripts/Run $(EXETARGET)
$(VQ)echo " MAKERUN: $@"
$(Q)$(MAKERUN) $(EXETARGET) $< $@
@@ -115,10 +118,6 @@ clean-help:
CLEANS += clean-run clean-help
-split-messages:
- $(call split_install_messages, ro, !NetSurf/Resources/)
-.PHONY: split-messages
-
# ----------------------------------------------------------------------------
# Template targets
# ----------------------------------------------------------------------------
@@ -127,6 +126,7 @@ split-messages:
TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these
TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS))
+# Template target creation macro
define compile_template
!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2)
$$(VQ)echo "TEMPLATE: $(2)"
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a838fa3ee93c813cc64...
commit a838fa3ee93c813cc648bbf540639ea7fbbe6189
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Improve split message generation
Changes the way message files are generated to be driven by make as
rules rather than from explicit macro calls causing their regeneration
every build.
A secondary benefit is that errors in message generation actually stop
the build instead of being ignored
Each frontend will require its filter settings updated to avoid
getting the default message filter of "any". Initially gtk has been
adapted as proof of concept.
diff --git a/.gitignore b/.gitignore
index 43881bd..4102f3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,11 @@ windows/res/preferences
\!NetSurf/Resources/nl/Templates,fec
\!NetSurf/Resources/nl/Messages
\!NetSurf/Resources/it/Messages
+gtk/res/en/Messages
+gtk/res/fr/Messages
+gtk/res/de/Messages
+gtk/res/nl/Messages
+gtk/res/it/Messages
test/nsoption
test/nsurl
test/urldbtest
diff --git a/Makefile b/Makefile
index d54bfd4..077d194 100644
--- a/Makefile
+++ b/Makefile
@@ -122,9 +122,23 @@ ifeq ($(filter $(VLDTARGET),$(TARGET)),)
$(error Unknown TARGET "$(TARGET)", Must be one of $(VLDTARGET))
endif
-SUBTARGET =
-RESOURCES =
-
+# ensure empty values for base variables
+
+# Sub target for build
+SUBTARGET=
+# Resources executable target depends upon
+RESOURCES=
+# Messages executable target depends on
+MESSAGES:=
+
+# The filter applied to the fat (full) messages to generate split messages
+MESSAGES_FILTER=any
+# The languages in the fat messages to convert
+MESSAGES_LANGUAGES=de en fr it nl
+# The target directory for the split messages
+MESSAGES_TARGET=!NetSurf/Resources
+
+# Defaults for tools
PERL=perl
MKDIR=mkdir
TOUCH=touch
@@ -521,8 +535,7 @@ $(TOOLROOT)/created: $(OBJROOT)/created
$(Q)$(MKDIR) $(TOOLROOT)
$(Q)$(TOUCH) $(TOOLROOT)/created
-CLEANS := clean-target clean-testament
-
+CLEANS :=
POSTEXES :=
# ----------------------------------------------------------------------------
@@ -568,6 +581,39 @@ S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_CSS) $(S_RENDER) $(S_UTILS) \
# ----------------------------------------------------------------------------
+# Message targets
+# ----------------------------------------------------------------------------
+
+# Message splitting rule generation macro
+# 1 = Language
+define split_messages
+.INTERMEDIATE:$$(MESSAGES_TARGET)/$(1)/Messages.tmp
+
+$$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages
+ $$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)"
+ $$(Q)mkdir -p $$(MESSAGES_TARGET)/$(1)
+ $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ $$<
+
+$$(MESSAGES_TARGET)/$(1)/Messages: $$(MESSAGES_TARGET)/$(1)/Messages.tmp
+ $$(VQ)echo "COMPRESS: $$@"
+ $$(Q)gzip -9n < $$< > $$@
+
+CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
+MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
+
+endef
+
+# geenrate the message file rules
+$(eval $(foreach LANG,$(MESSAGES_LANGUAGES), \
+ $(call split_messages,$(LANG))))
+
+clean-messages:
+ $(VQ)echo " CLEAN: $(CLEAN_MESSAGES)"
+ $(Q)$(RM) $(CLEAN_MESSAGES)
+CLEANS += clean-messages
+
+
+# ----------------------------------------------------------------------------
# Source file setup
# ----------------------------------------------------------------------------
@@ -580,7 +626,7 @@ endif
OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.m,%.o,$(patsubst %.s,%.o,$(SOURCES))))))))
-$(EXETARGET): $(OBJECTS) $(RESOURCES)
+$(EXETARGET): $(OBJECTS) $(RESOURCES) $(MESSAGES)
$(VQ)echo " LINK: $(EXETARGET)"
ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
@@ -615,11 +661,12 @@ endif
clean-target:
$(VQ)echo " CLEAN: $(EXETARGET)"
$(Q)$(RM) $(EXETARGET)
- $(call clean_install_messages, !NetSurf/Resources)
+CLEANS += clean-target
clean-testament:
$(VQ)echo " CLEAN: testament.h"
$(Q)$(RM) $(OBJROOT)/testament.h
+CLEANS += clean-testament
clean-builddir:
$(VQ)echo " CLEAN: $(OBJROOT)"
@@ -627,15 +674,12 @@ clean-builddir:
CLEANS += clean-builddir
-.PHONY: all-program all-messages testament
+.PHONY: all-program testament
testament $(OBJROOT)/testament.h:
$(Q)$(PERL) utils/git-testament.pl $(CURDIR) $(OBJROOT)/testament.h
-all-messages:
- $(call split_install_messages, any, !NetSurf/Resources)
-
-all-program: all-messages $(EXETARGET) $(POSTEXES)
+all-program: $(EXETARGET) $(POSTEXES)
.SUFFIXES:
@@ -758,25 +802,6 @@ clean: $(CLEANS)
# Target builds a distribution package
package: all-program package-$(TARGET)
-FAT_LANGUAGES=de en fr it nl
-# 1 = front end name (gtk, ro, ami, etc)
-# 2 = Destination directory (where resources being installed, creates en/Messages etc)
-# 3 = suffix after language name
-define split_install_messages
- $(foreach LANG, $(FAT_LANGUAGES), @echo MSGSPLIT: $(1)/$(LANG) to $(2)
- $(Q)mkdir -p $(2)/$(LANG)$(3)
- $(Q)$(SPLIT_MESSAGES) -l $(LANG) -p $(1) -f messages resources/FatMessages | gzip -9n > $(2)$(3)/$(LANG)/Messages
- )
-endef
-
-# Clean Message target
-# 1 = Destination directory (where resources being installed, creates en/Messages etc)
-# 2 = suffix after language name
-define clean_install_messages
- $(foreach LANG, $(FAT_LANGUAGES), @echo MSGCLEAN: $(LANG) in $(1)
- $(Q)$(RM) -f $(1)$(2)/$(LANG)/Messages
- )
-endef
.PHONY: messages-split-tfx messages-fetch-tfx messages-import-tfx
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index e69f6c2..23c0145 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -121,8 +121,14 @@ S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
# Note this is deliberately *not* expanded here as common and image
# are not yet available
SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PIXBUF) $(S_GTK)
+
+# The gtk binary target
EXETARGET := nsgtk
+# The filter and target for split messages
+MESSAGES_FILTER=gtk
+MESSAGES_TARGET=gtk/res
+
# ----------------------------------------------------------------------------
# Install target
# ----------------------------------------------------------------------------
@@ -150,7 +156,6 @@ install-gtk:
$(Q)install -m 0644 gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber
$(Q)tar -c -h -C gtk/res -f - themes | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f -
$(Q)tar -c -h -C gtk/res -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f -
- $(call split_install_messages, gtk, $(DESTDIR)$(NETSURF_GTK_RESOURCES))
$(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(DESTDIR)$(NETSURF_GTK_RESOURCES)
# ----------------------------------------------------------------------------
diff --git a/gtk/res/de/Messages b/gtk/res/de/Messages
deleted file mode 120000
index 2f1fc39..0000000
--- a/gtk/res/de/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/de/Messages
\ No newline at end of file
diff --git a/gtk/res/en/Messages b/gtk/res/en/Messages
deleted file mode 120000
index 72c9eff..0000000
--- a/gtk/res/en/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/en/Messages
\ No newline at end of file
diff --git a/gtk/res/fr/Messages b/gtk/res/fr/Messages
deleted file mode 120000
index a42cf08..0000000
--- a/gtk/res/fr/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/fr/Messages
\ No newline at end of file
diff --git a/gtk/res/it/Messages b/gtk/res/it/Messages
deleted file mode 120000
index d4c5c29..0000000
--- a/gtk/res/it/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/it/Messages
\ No newline at end of file
diff --git a/gtk/res/nl/Messages b/gtk/res/nl/Messages
deleted file mode 120000
index d484ebd..0000000
--- a/gtk/res/nl/Messages
+++ /dev/null
@@ -1 +0,0 @@
-../../../!NetSurf/Resources/nl/Messages
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 549bfb5..077d194 100644
--- a/Makefile
+++ b/Makefile
@@ -596,7 +596,7 @@ $$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages
$$(MESSAGES_TARGET)/$(1)/Messages: $$(MESSAGES_TARGET)/$(1)/Messages.tmp
$$(VQ)echo "COMPRESS: $$@"
- $$(VQ)gzip -9n < $$< > $$@
+ $$(Q)gzip -9n < $$< > $$@
CLEAN_MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
MESSAGES += $$(MESSAGES_TARGET)/$(1)/Messages
--
NetSurf Browser
8 years, 2 months
- 1
- 0