diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2009-11-04 17:54:55 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2009-11-04 17:54:55 -0500 |
| commit | 740f2b459e38ae26d244980851ce27caf059cbb4 (patch) | |
| tree | 375e8c15d745141bb63e1d551b393bc9a3053a6f | |
| parent | 9252dcd454ffe5d1aa740d066169834961cb383c (diff) | |
Temp fix for focus problem.
| -rw-r--r-- | gtk/window-decorator/gtk-window-decorator.c | 11 | ||||
| -rw-r--r-- | plugins/flask.c | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c index 5b246ca..b20360a 100644 --- a/gtk/window-decorator/gtk-window-decorator.c +++ b/gtk/window-decorator/gtk-window-decorator.c @@ -3279,19 +3279,23 @@ update_security_pixmap (WnckScreen *screen) Window xroot = RootWindowOfScreen (gdk_x11_screen_get_xscreen (gdkscreen)); data[0] = GDK_PIXMAP_XID (security_pixmap); + data[1] = 0; + data[2] = 0; win = wnck_screen_get_active_window (screen); if (win) { d = g_object_get_data (G_OBJECT (win), "decor"); - if (d && wnck_window_is_active (win)) + if (d && wnck_window_is_active (win)) { draw_security_pixmap(d); - data[1] = d->width; - data[2] = max_seclabel_height * 2; + data[1] = d->width; + data[2] = max_seclabel_height * 2; + } } else { + /* GdkColor c = { 0, 30000, 30000, 30000 }; cr = gdk_cairo_create (GDK_DRAWABLE (security_pixmap)); cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); @@ -3302,6 +3306,7 @@ update_security_pixmap (WnckScreen *screen) data[1] = 250; data[2] = max_seclabel_height * 2; + */ } gdk_error_trap_push (); diff --git a/plugins/flask.c b/plugins/flask.c index 00043cc..c71e636 100644 --- a/plugins/flask.c +++ b/plugins/flask.c @@ -200,8 +200,8 @@ flaskUpdateSecurityPixmap (CompScreen *s) &n, &nleft, &data); if (result == Success && data) { - if (n >= 3) { - prop = (long *) data; + prop = (long *) data; + if (n >= 3 && prop[1] && prop[2]) { as->pixmap = prop[0]; as->width = 1000; //prop[1]; as->height = 40; //prop[2]; |