Midori Web Browser

Merge lp:~kalikiana/midori/debug-while-running into lp:midori

  1. debug-while-running
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6160
Merged at revision: 6162
Proposed branch: lp:~kalikiana/midori/debug-while-running
Merge into: lp:midori
Diff against target: 14 lines (+4/-0)
1 file modified
midori/midori-frontend.c (+4/-0)
To merge this branch: bzr merge lp:~kalikiana/midori/debug-while-running
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+164618@code.launchpad.net

Description of the change

MIDORI_DEBUG on a running instance doesn't work, so it needs to print a warning message.

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

Looks and works fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-frontend.c'
2--- midori/midori-frontend.c 2013-05-19 09:33:02 +0000
3+++ midori/midori-frontend.c 2013-05-19 12:10:33 +0000
4@@ -442,6 +442,10 @@
5 MidoriApp* app = midori_app_new (nickname);
6 if (midori_app_instance_is_running (app))
7 {
8+ /* midori_debug makes no sense on a running instance */
9+ if (g_getenv ("MIDORI_DEBUG"))
10+ g_warning ("MIDORI_DEBUG only works for a new instance");
11+
12 /* It makes no sense to show a crash dialog while running */
13 if (!diagnostic_dialog)
14 {

Subscribers

People subscribed via source and target branches

to all changes: