debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make sure selection actions have a widget.

Browse source 
The return value of gtk_window_get_focus can be NULL. Return
early in that case.
This commit is contained in:
Christian Dywan 2008-01-09 07:44:56 +01:00
parent a9236468d9
commit 54e03ab030
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/browser.c
View file

@ -76,24 +76,32 @@ void on_action_edit_activate(GtkAction* action, CBrowser* browser)
void on_action_cut_activate(GtkAction* action, CBrowser* browser) void on_action_cut_activate(GtkAction* action, CBrowser* browser)
{ {
GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window));
if(G_UNLIKELY(!widget))
return;
g_signal_emit_by_name(widget, "cut-clipboard"); g_signal_emit_by_name(widget, "cut-clipboard");
} }
void on_action_copy_activate(GtkAction* action, CBrowser* browser) void on_action_copy_activate(GtkAction* action, CBrowser* browser)
{ {
GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window));
if(G_UNLIKELY(!widget))
return;
g_signal_emit_by_name(widget, "copy-clipboard"); g_signal_emit_by_name(widget, "copy-clipboard");
} }
void on_action_paste_activate(GtkAction* action, CBrowser* browser) void on_action_paste_activate(GtkAction* action, CBrowser* browser)
{ {
GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window));
if(G_UNLIKELY(!widget))
return;
g_signal_emit_by_name(widget, "paste-clipboard"); g_signal_emit_by_name(widget, "paste-clipboard");
} }
void on_action_delete_activate(GtkAction* action, CBrowser* browser) void on_action_delete_activate(GtkAction* action, CBrowser* browser)
{ {
GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window));
if(G_UNLIKELY(!widget))
return;
if(WEBKIT_IS_WEB_VIEW(widget)) if(WEBKIT_IS_WEB_VIEW(widget))
webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(widget)); webkit_web_view_delete_selection(WEBKIT_WEB_VIEW(widget));
else if(GTK_IS_EDITABLE(widget)) else if(GTK_IS_EDITABLE(widget))
@ -103,6 +111,8 @@ void on_action_delete_activate(GtkAction* action, CBrowser* browser)
void on_action_selectAll_activate(GtkAction* action, CBrowser* browser) void on_action_selectAll_activate(GtkAction* action, CBrowser* browser)
{ {
GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window)); GtkWidget* widget = gtk_window_get_focus(GTK_WINDOW(browser->window));
if(G_UNLIKELY(!widget))
return;
if(GTK_IS_ENTRY(widget)) if(GTK_IS_ENTRY(widget))
gtk_editable_select_region(GTK_EDITABLE(widget), 0, -1); gtk_editable_select_region(GTK_EDITABLE(widget), 0, -1);
else else