diff options
author | Perberos <[email protected]> | 2012-06-05 17:00:12 -0300 |
---|---|---|
committer | Perberos <[email protected]> | 2012-06-05 17:00:12 -0300 |
commit | 2c47083b6cb8803970b1977b46fcc6c8acf72d0c (patch) | |
tree | ffabf9611d61514012be5bb38e13621e9b394567 | |
parent | 206fe346c7aa4ab963103bab290b1fe38a4e6121 (diff) | |
download | mate-desktop-2c47083b6cb8803970b1977b46fcc6c8acf72d0c.tar.bz2 mate-desktop-2c47083b6cb8803970b1977b46fcc6c8acf72d0c.tar.xz |
Update master
-rw-r--r-- | libmate-desktop/mate-bg-crossfade.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libmate-desktop/mate-bg-crossfade.c b/libmate-desktop/mate-bg-crossfade.c index 0642c5b..48afc37 100644 --- a/libmate-desktop/mate-bg-crossfade.c +++ b/libmate-desktop/mate-bg-crossfade.c @@ -300,24 +300,17 @@ MateBGCrossfade* mate_bg_crossfade_new(int width, int height) gboolean mate_bg_crossfade_set_start_pixmap(MateBGCrossfade* fade, GdkPixmap* pixmap) #endif { -/* I am disabling this because background fade break the mate-file-manager - * Estoy deshabilitando esto por que el efecto de desvanecimiento del fondo de pantalla, hace - * el mate-file-manager se cierre por un evento de BadDrawing enviado por Xorg. - * Y hasta que no sea solucionado, no es tan indispensable esta funcion. - * Pero sospecho que la funcion tile_pixmap tiene algo que ver... - */ -return FALSE; - g_return_val_if_fail (MATE_IS_BG_CROSSFADE (fade), FALSE); - if (fade->priv->fading_pixmap != NULL) { + if (fade->priv->fading_pixmap != NULL) + { g_object_unref (fade->priv->fading_pixmap); fade->priv->fading_pixmap = NULL; } - fade->priv->fading_pixmap = tile_pixmap (pixmap, - fade->priv->width, - fade->priv->height); + fade->priv->fading_pixmap = tile_pixmap(pixmap, + fade->priv->width, + fade->priv->height); return fade->priv->fading_pixmap != NULL; } |