[fusion-commits] compiz mirror: Changes to 'master' (bd1b75665ccd5c651b6230516136f862c259757d)

[compiz at server.beryl-project.org]

New commits:
commit bd1b75665ccd5c651b6230516136f862c259757d
Author: Roland Baer <roland at Vista.(none)>
Date:   Fri Aug 17 15:54:11 2007 +0300

    Removed effectivly unused stuff in gtk-window-decorator

commit 92f50d9178b24d136d59ca779c6e39fd1f43e398
Author: David Reveman <davidr at novell.com>
Date:   Sun Aug 19 23:50:44 2007 -0400

    Don't avoid sync to vblank when we have multiple outputs.


 gtk/window-decorator/gtk-window-decorator.c |   13 +------------
 src/display.c                               |    5 -----
 2 files changed, 1 insertions(+), 17 deletions(-)


Modified: compiz/gtk/window-decorator/gtk-window-decorator.c
===================================================================
--- compiz/gtk/window-decorator/gtk-window-decorator.c
+++ compiz/gtk/window-decorator/gtk-window-decorator.c
@@ -2379,7 +2379,6 @@ draw_switcher_foreground (decor_t *d)
 {
     cairo_t	  *cr;
     GtkStyle	  *style;
-    decor_color_t color;
     double	  alpha = SWITCHER_ALPHA / 65535.0;
 
     if (!d->pixmap || !d->buffer_pixmap)
@@ -2387,10 +2386,6 @@ draw_switcher_foreground (decor_t *d)
 
     style = gtk_widget_get_style (style_window);
 
-    color.r = style->bg[GTK_STATE_NORMAL].red   / 65535.0;
-    color.g = style->bg[GTK_STATE_NORMAL].green / 65535.0;
-    color.b = style->bg[GTK_STATE_NORMAL].blue  / 65535.0;
-
     cr = gdk_cairo_create (GDK_DRAWABLE (d->buffer_pixmap));
 
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
@@ -3166,7 +3161,7 @@ update_window_decoration_name (WnckWindow *win)
     name = wnck_window_get_name (win);
     if (name && (name_length = strlen (name)))
     {
-	gint w, n_line;
+	gint w;
 
 	if (theme_draw_window_decoration != draw_window_decoration)
 	{
@@ -3187,8 +3182,6 @@ update_window_decoration_name (WnckWindow *win)
 	pango_layout_set_width (d->layout, w * PANGO_SCALE);
 	pango_layout_set_text (d->layout, name, name_length);
 
-	n_line = pango_layout_get_line_count (d->layout);
-
 	line = pango_layout_get_line (d->layout, 0);
 
 	name_length = line->length;
@@ -3604,8 +3597,6 @@ update_switcher_window (WnckWindow *win,
 	name = wnck_window_get_name (selected_win);
 	if (name && (name_length = strlen (name)))
 	{
-	    gint n_line;
-
 	    if (!d->layout)
 	    {
 		d->layout = pango_layout_new (pango_context);
@@ -3622,8 +3613,6 @@ update_switcher_window (WnckWindow *win,
 		pango_layout_set_width (d->layout, tw * PANGO_SCALE);
 		pango_layout_set_text (d->layout, name, name_length);
 
-		n_line = pango_layout_get_line_count (d->layout);
-
 		line = pango_layout_get_line (d->layout, 0);
 
 		name_length = line->length;

Modified: compiz/src/display.c
===================================================================
--- compiz/src/display.c
+++ compiz/src/display.c
@@ -1432,11 +1432,6 @@ waitForVideoSync (CompScreen *s)
     if (!s->opt[COMP_SCREEN_OPTION_SYNC_TO_VBLANK].value.b)
 	return;
 
-    /* we currently can't handle sync to vblank when we have more than one
-       output device */
-    if (s->nOutputDev > 1)
-	return;
-
     if (s->getVideoSync)
     {
 	glFlush ();