summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2014-02-08 19:52:17 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2014-02-08 19:52:17 +0000
commit5e495f0ab973d6fb7b5b209b6cd8a8684358bf46 (patch)
tree91d56514dfc6158c545cbe2d12d25ab42e5a7be4 /gtk
parent616335c9ca63fcdc625e02469c5adbdc14535ca2 (diff)
downloadnetsurf-5e495f0ab973d6fb7b5b209b6cd8a8684358bf46.tar.gz
netsurf-5e495f0ab973d6fb7b5b209b6cd8a8684358bf46.tar.bz2
Avoid dereffing bw in a few places.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/scaffolding.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index ef737d1e9..615526b68 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -667,8 +667,7 @@ static gboolean nsgtk_filter_directory(const GtkFileFilterInfo *info,
MULTIHANDLER(savepage)
{
- if (nsgtk_get_browser_window(g->top_level)->current_content
- == NULL)
+ if (!browser_window_has_content(nsgtk_get_browser_window(g->top_level)))
return FALSE;
GtkWidget *fc = gtk_file_chooser_dialog_new(
@@ -809,8 +808,7 @@ MULTIHANDLER(pdf)
MULTIHANDLER(plaintext)
{
- if (nsgtk_get_browser_window(g->top_level)->current_content
- == NULL)
+ if (!browser_window_has_content(nsgtk_get_browser_window(g->top_level)))
return FALSE;
GtkWidget *fc = gtk_file_chooser_dialog_new(
@@ -2537,13 +2535,9 @@ void nsgtk_scaffolding_initial_sensitivity(struct gtk_scaffolding *g)
*/
static bool is_menu_over_link(struct gtk_scaffolding *g, gdouble x, gdouble y)
{
- struct browser_window *bw = nsgtk_get_browser_window(g->top_level);
-
- if ((bw->current_content != NULL) &&
- (content_get_type(bw->current_content) == CONTENT_HTML)) {
- browser_window_get_contextual_content(bw, x, y,
- &current_menu_ctx);
- }
+ browser_window_get_contextual_content(
+ nsgtk_get_browser_window(g->top_level),
+ x, y, &current_menu_ctx);
if (current_menu_ctx.link_url == NULL)
return false;