diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-07-30 15:53:05 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-07-30 15:53:05 +0000 |
| commit | 5281d66b1a85e8f203c71798305f838fa3089dc2 (patch) | |
| tree | cc3c8c61428eaa7308db24ee6c5b1c9c2fa5c2d3 /src/ui/dialog/dialog-manager.cpp | |
| parent | Refactoring of linejoin code (diff) | |
| parent | Update to trunk r13482 (diff) | |
| download | inkscape-5281d66b1a85e8f203c71798305f838fa3089dc2.tar.gz inkscape-5281d66b1a85e8f203c71798305f838fa3089dc2.zip | |
Update to experimental r13452
(bzr r13090.1.95)
Diffstat (limited to 'src/ui/dialog/dialog-manager.cpp')
| -rw-r--r-- | src/ui/dialog/dialog-manager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp index bd2f1eb12..5c0437133 100644 --- a/src/ui/dialog/dialog-manager.cpp +++ b/src/ui/dialog/dialog-manager.cpp @@ -257,7 +257,7 @@ void DialogManager::showDialog(gchar const *name, bool grabfocus) { /** * Shows the named dialog, creating it if necessary. */ -void DialogManager::showDialog(GQuark name, bool grabfocus) { +void DialogManager::showDialog(GQuark name, bool /*grabfocus*/) { bool wantTiming = Inkscape::Preferences::get()->getBool("/dialogs/debug/trackAppear", false); GTimer *timer = (wantTiming) ? g_timer_new() : 0; // if needed, must be created/started before getDialog() Dialog *dialog = getDialog(name); @@ -268,8 +268,8 @@ void DialogManager::showDialog(GQuark name, bool grabfocus) { tracker->setAutodelete(true); timer = 0; } - if (grabfocus) - dialog->present(); + // should check for grabfocus, but lp:1348927 prevents it + dialog->present(); } if ( timer ) { |