Updating branch refs/heads/master
to 6313c0140d9593ccf8082fe4be45c1c4f56235cc (commit)
from ea02573de966fed5f18c80f21536936980ecac37 (commit)
commit 6313c0140d9593ccf8082fe4be45c1c4f56235cc
Author: Christian Dywan <[email protected]>
Date: Thu Jan 31 08:06:10 2013 +0100
Show URI in 'not responding' dialog
midori/midori-frontend.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/midori/midori-frontend.c b/midori/midori-frontend.c
index 6814a88..f481791 100644
--- a/midori/midori-frontend.c
+++ b/midori/midori-frontend.c
@@ -396,9 +396,10 @@ midori_normal_app_new (const gchar* config,
if (!execute_commands && !open_uris &&
midori_app_instance_send_new_browser (app))
return NULL;
+ /* FIXME: We mustn't lose the URL here; either instance is freezing or
inside a crash dialog */
sokoke_message_dialog (GTK_MESSAGE_INFO,
_("An instance of Midori is already running but not
responding.\n"),
- "", TRUE);
+ open_uris ? *open_uris : "", TRUE);
return (void*)0xdeadbeef;
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
