diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2014-09-22 18:06:37 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2014-09-22 18:11:39 +0100 |
| commit | a8101a99ea48c1af23941a0322246cace3dfa69e (patch) | |
| tree | 71798c33f93950a501d2354c8bebbfa71fb508bc /gtk | |
| parent | 0de8cfc9d40214370ed499e465ebc56e88c4d24f (diff) | |
| download | netsurf-a8101a99ea48c1af23941a0322246cace3dfa69e.tar.gz netsurf-a8101a99ea48c1af23941a0322246cace3dfa69e.tar.bz2 | |
use gtk completion variable and remove uneeded include of netsurf.h
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/dialogs/about.c | 5 | ||||
| -rw-r--r-- | gtk/dialogs/about.h | 2 | ||||
| -rw-r--r-- | gtk/scaffolding.c | 7 | ||||
| -rw-r--r-- | gtk/viewdata.c | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/gtk/dialogs/about.c b/gtk/dialogs/about.c index a86bfe70f..99df137cc 100644 --- a/gtk/dialogs/about.c +++ b/gtk/dialogs/about.c @@ -28,6 +28,7 @@ #include "utils/messages.h" #include "utils/nsoption.h" #include "desktop/browser.h" +#include "desktop/netsurf.h" #include "gtk/compat.h" #include "gtk/gui.h" @@ -65,13 +66,13 @@ nsgtk_about_dialog_info(GtkWidget *button, gpointer data) gtk_widget_destroy(gtk_widget_get_toplevel(button)); } -void nsgtk_about_dialog_init(GtkWindow *parent, const char *version) +void nsgtk_about_dialog_init(GtkWindow *parent) { GtkWidget *dialog, *vbox, *button, *image, *label; gchar *name_string; GList *pixbufs = gtk_window_get_default_icon_list(); - name_string = g_markup_printf_escaped ("<span size=\"xx-large\" weight=\"bold\">NetSurf %s</span>", version); + name_string = g_markup_printf_escaped ("<span size=\"xx-large\" weight=\"bold\">NetSurf %s</span>", netsurf_version); /* Create the widgets */ diff --git a/gtk/dialogs/about.h b/gtk/dialogs/about.h index 1ca0d86b3..bf3c9f58d 100644 --- a/gtk/dialogs/about.h +++ b/gtk/dialogs/about.h @@ -19,6 +19,6 @@ #ifndef NETSURF_GTK_ABOUT_H #define NETSURF_GTK_ABOUT_H -void nsgtk_about_dialog_init(GtkWindow *parent, const char *version); +void nsgtk_about_dialog_init(GtkWindow *parent); #endif diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 93cd7f768..7f40d62a2 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -34,7 +34,6 @@ #include "desktop/browser_history.h" #include "desktop/browser.h" #include "desktop/hotlist.h" -#include "desktop/netsurf.h" #include "desktop/plotters.h" #include "desktop/print.h" #include "desktop/save_complete.h" @@ -246,8 +245,8 @@ static void scaffolding_window_destroy(GtkWidget *widget, gpointer data) LOG(("scaffold list head: %p", scaf_list)); if (scaf_list == NULL) { - /* no more open windows */ - netsurf_quit = true; + /* no more open windows - stop the browser */ + nsgtk_complete = true; } } @@ -1609,7 +1608,7 @@ MULTIHANDLER(info) MULTIHANDLER(about) { - nsgtk_about_dialog_init(g->window, netsurf_version); + nsgtk_about_dialog_init(g->window); return TRUE; } diff --git a/gtk/viewdata.c b/gtk/viewdata.c index 1b5bfb153..47af0fa31 100644 --- a/gtk/viewdata.c +++ b/gtk/viewdata.c @@ -38,7 +38,6 @@ #include "utils/file.h" #include "utils/filepath.h" -#include "desktop/netsurf.h" #include "desktop/browser.h" #include "render/html.h" #include "content/hlcache.h" @@ -337,7 +336,7 @@ gboolean nsgtk_on_viewdata_about_activate(GtkMenuItem *widget, gpointer g) { struct nsgtk_viewdata_ctx *nsg = (struct nsgtk_viewdata_ctx *) g; - nsgtk_about_dialog_init(nsg->window, netsurf_version); + nsgtk_about_dialog_init(nsg->window); return TRUE; } |