Midori Web Browser

Merge lp:~gue5t/midori/rightclick-grip into lp:midori

  1. rightclick-grip
  2. Merge into trunk
Proposed by gue5t gue5t
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6976
Merged at revision: 6979
Proposed branch: lp:~gue5t/midori/rightclick-grip
Merge into: lp:midori
Diff against target: 12 lines (+1/-1)
1 file modified
midori/midori-browser.c (+1/-1)
To merge this branch: bzr merge lp:~gue5t/midori/rightclick-grip
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+262881@code.launchpad.net

Commit message

fix warnings printed when right-clicking resize grip between location and search entries

Description of the change

The "context-menu" signal of MidoriWindow passes a nullable GtkAction argument to its handlers, but the handler in midori-browser.c assumed its action parameter would be non-NULL. This correctly handles NULL and fixes the warnings mentioned in the bug.

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2015-06-12 20:43:52 +0000
3+++ midori/midori-browser.c 2015-06-24 17:40:04 +0000
4@@ -4352,7 +4352,7 @@
5 GtkAction* action,
6 MidoriBrowser* browser)
7 {
8- const gchar* name = gtk_action_get_name (action);
9+ const gchar* name = action ? gtk_action_get_name (action) : "";
10 gboolean back = !g_strcmp0 (name, "Back");
11 if (back
12 || g_str_has_suffix (name, "Forward"))

Subscribers

People subscribed via source and target branches

to all changes: