aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/uzbl-core.c
diff options
context:
space:
mode:
authorGravatar Brendan Taylor <whateley@gmail.com>2011-02-20 19:06:13 -0700
committerGravatar Brendan Taylor <whateley@gmail.com>2011-02-20 19:06:13 -0700
commit79c069dfd5a40611d83447763a32274cb3cf9f0f (patch)
treec6eb3930b9fbf83c08891c9060e3b17f886266ef /src/uzbl-core.c
parenta299262011692b86b39ed5911418ca5b83f4a68e (diff)
parent60b27c0e224a1153f8cfd6be61524efcf655c3da (diff)
Merge remote-tracking branch 'jakeprobst/imagemenuitem-fix' into experimental
Conflicts: src/uzbl-core.h
Diffstat (limited to 'src/uzbl-core.c')
-rw-r--r--src/uzbl-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index 779f378..638dd1f 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -1230,7 +1230,8 @@ move_statusbar() {
}
g_object_unref(uzbl.gui.scrolled_win);
g_object_unref(uzbl.gui.mainbar);
- gtk_widget_grab_focus (GTK_WIDGET (uzbl.gui.web_view));
+ if (!uzbl.state.plug_mode)
+ gtk_widget_grab_focus (GTK_WIDGET (uzbl.gui.web_view));
return;
}