summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-10-23 23:46:13 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-10-23 23:46:13 +0800
commit69b02f657cab11b9c2db85de118f766323e758cd (patch)
tree03312a860aa26f576de72022ae9ff60e9a96d165
parentd4ceef6abe6729e4b05d1cdb5fe17c6abe56c99c (diff)
parent848c7dd5845a6f0a9a74762258518202a57fc083 (diff)
downloaddialog-69b02f657cab11b9c2db85de118f766323e758cd.tar.gz
dialog-69b02f657cab11b9c2db85de118f766323e758cd.tar.bz2
Merge branch 'master' of git+ssh://git.compiz.org/git/users/rcxdude/dialog
-rw-r--r--dialog.xml.in2
-rw-r--r--src/dialog.cpp4
-rw-r--r--src/dialog.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/dialog.xml.in b/dialog.xml.in
index d8ea8e5..cf66a5d 100644
--- a/dialog.xml.in
+++ b/dialog.xml.in
@@ -13,7 +13,7 @@
</relation>
<requirement>
<plugin>regex</plugin>
- <plugin>composite</plugin>
+ <plugin>fade</plugin>
<plugin>opengl</plugin>
</requirement>
</deps>
diff --git a/src/dialog.cpp b/src/dialog.cpp
index 1503cf2..0dd8a27 100644
--- a/src/dialog.cpp
+++ b/src/dialog.cpp
@@ -1,6 +1,6 @@
/**
*
- * dialog.c
+ * dialog.cpp
*
* Copyright (c) 2008 Douglas Young <rcxdude@gmail.com>
* Input shaping adapted from FreeWins plugin
@@ -96,7 +96,7 @@ DialogScreen::handleEvent (XEvent *event)
if (event->type == MapNotify)
{
CompWindow *w = screen->findWindow (event->xmap.window);
- if (w && w->transientFor ())
+ if (w && w->transientFor () && optionGetDialogtypes ().evaluate (w))
{
CompWindow *ww = screen->findWindow (w->transientFor ());
DialogWindow *dww = DialogWindow::get (ww);
diff --git a/src/dialog.h b/src/dialog.h
index 5e1a48c..6b45e4e 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -1,6 +1,6 @@
/**
*
- * dialog.c
+ * dialog.h
*
* Copyright (c) 2008 Douglas Young <rcxdude@gmail.com>
* Input shaping adapted from FreeWins plugin