diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-07-25 16:29:18 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-07-27 18:07:00 +0100 |
commit | 06a1d75d52dc533474194c0c9b33eecf09b59068 (patch) | |
tree | ec124b7110b54489826b46b02decb1d1735f3014 /gtk/dialogs | |
parent | 984299e5b4feda4ffb6fd80f0d1f489c32e6d512 (diff) | |
download | netsurf-06a1d75d52dc533474194c0c9b33eecf09b59068.tar.gz netsurf-06a1d75d52dc533474194c0c9b33eecf09b59068.tar.bz2 |
stop gtk about dialog forcing navigation of existing browsing contexts
Diffstat (limited to 'gtk/dialogs')
-rw-r--r-- | gtk/dialogs/about.c | 80 | ||||
-rw-r--r-- | gtk/dialogs/about.h | 4 | ||||
-rw-r--r-- | gtk/dialogs/source.c | 8 |
3 files changed, 42 insertions, 50 deletions
diff --git a/gtk/dialogs/about.c b/gtk/dialogs/about.c index 2cd2f346b..a86bfe70f 100644 --- a/gtk/dialogs/about.c +++ b/gtk/dialogs/about.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Mike Lester <element3260@gmail.com> + * Copyright 2014 Vincent Sanders <vince@netsurf-browser.org> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -16,62 +16,56 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +/** + * \file gtk/dialogs/about.c + * + * Implementation of gtk about dialog. + */ + #include <stdint.h> #include "utils/utils.h" +#include "utils/messages.h" +#include "utils/nsoption.h" +#include "desktop/browser.h" #include "gtk/compat.h" #include "gtk/gui.h" #include "gtk/dialogs/about.h" - +/** + * About dialog information button click. + * + * \param button The button widget that was clicked + * \param data The text of the url to open + */ static void -nsgtk_about_dialog_credits(GtkWidget *button, gpointer data) +nsgtk_about_dialog_info(GtkWidget *button, gpointer data) { - struct browser_window *bw = data; nsurl *url; + nserror ret; + const char *url_text = data; + enum browser_window_create_flags flags = BW_CREATE_HISTORY; - if (nsurl_create("about:credits", &url) != NSERROR_OK) { - warn_user("NoMemory", 0); - } else { - browser_window_navigate(bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - nsurl_unref(url); + if (nsoption_bool(show_single_tab) == true) { + flags |= BW_CREATE_TAB; } - gtk_widget_destroy(gtk_widget_get_toplevel(button)); -} - -static void -nsgtk_about_dialog_licence(GtkWidget *button, gpointer data) -{ - struct browser_window *bw = data; - nsurl *url; - - if (nsurl_create("about:licence", &url) != NSERROR_OK) { - warn_user("NoMemory", 0); - } else { - browser_window_navigate(bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); + ret = nsurl_create(url_text, &url); + if (ret == NSERROR_OK) { + ret = browser_window_create(flags, url, NULL, NULL, NULL); nsurl_unref(url); } + if (ret != NSERROR_OK) { + warn_user(messages_get_errorcode(ret), 0); + } + + /* close about dialog */ gtk_widget_destroy(gtk_widget_get_toplevel(button)); } -void nsgtk_about_dialog_init(GtkWindow *parent, - struct browser_window *bw, - const char *version) +void nsgtk_about_dialog_init(GtkWindow *parent, const char *version) { GtkWidget *dialog, *vbox, *button, *image, *label; gchar *name_string; @@ -89,7 +83,7 @@ void nsgtk_about_dialog_init(GtkWindow *parent, vbox = nsgtk_vbox_new(FALSE, 8); gtk_box_pack_start(GTK_BOX(nsgtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0); - + if (pixbufs != NULL) { GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf(GDK_PIXBUF(g_list_nth_data(pixbufs, 0))); @@ -103,7 +97,7 @@ void nsgtk_about_dialog_init(GtkWindow *parent, gtk_box_pack_start(GTK_BOX (vbox), image, FALSE, FALSE, 0); } - + label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), name_string); @@ -112,7 +106,7 @@ void nsgtk_about_dialog_init(GtkWindow *parent, 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("NetSurf is a small fast web browser"); 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); @@ -135,14 +129,14 @@ void nsgtk_about_dialog_init(GtkWindow *parent, 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_credits), (gpointer)bw); + 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"); - gtk_box_pack_end(GTK_BOX (GTK_DIALOG(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog)))), + 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_licence), (gpointer)bw); + 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. */ diff --git a/gtk/dialogs/about.h b/gtk/dialogs/about.h index e34a7bff7..1ca0d86b3 100644 --- a/gtk/dialogs/about.h +++ b/gtk/dialogs/about.h @@ -19,8 +19,6 @@ #ifndef NETSURF_GTK_ABOUT_H #define NETSURF_GTK_ABOUT_H -#include "desktop/browser.h" - -void nsgtk_about_dialog_init(GtkWindow *parent, struct browser_window *bw, const char *version); +void nsgtk_about_dialog_init(GtkWindow *parent, const char *version); #endif diff --git a/gtk/dialogs/source.c b/gtk/dialogs/source.c index 3004d9444..8e4e43333 100644 --- a/gtk/dialogs/source.c +++ b/gtk/dialogs/source.c @@ -76,7 +76,7 @@ MENUPROTO(source_zoom_out); MENUPROTO(source_zoom_normal); MENUPROTO(source_about); -struct menu_events source_menu_events[] = { +static struct menu_events source_menu_events[] = { MENUEVENT(source_save_as), MENUEVENT(source_print), MENUEVENT(source_close), @@ -309,8 +309,8 @@ nsgtk_source_tab_init(GtkWindow *parent, struct browser_window *bw) ret = netsurf_path_to_nsurl(filename, &url); g_free(filename); if (ret == NSERROR_OK) { - ret = browser_window_create(BW_CREATE_TAB | BW_CREATE_CLONE, - url, NULL, bw, NULL); + ret = browser_window_create(BW_CREATE_TAB, + url, NULL, NULL, NULL); nsurl_unref(url); } @@ -530,7 +530,7 @@ gboolean nsgtk_on_source_about_activate(GtkMenuItem *widget, gpointer g) { struct nsgtk_source_window *nsg = (struct nsgtk_source_window *) g; - nsgtk_about_dialog_init(nsg->sourcewindow, nsg->bw, netsurf_version); + nsgtk_about_dialog_init(nsg->sourcewindow, netsurf_version); return TRUE; } |