---
aaina/configure.ac | 2 +-
aaina/libaaina/aaina-photo.c | 12 ++++++++++--
aaina/libaaina/aaina-photo.h | 1 +
aaina/libaaina/clutter-texture-label.c | 11 ++++++++++-
aaina/src/aaina-slide-show.c | 2 +-
5 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/aaina/configure.ac b/aaina/configure.ac
index 2250804..6e18348 100644
--- a/aaina/configure.ac
+++ b/aaina/configure.ac
@@ -10,7 +10,7 @@ AC_PROG_CC
AC_STDC_HEADERS
AC_PROG_LIBTOOL
-PKG_CHECK_MODULES(DEPS, clutter-0.6 gdk-2.0 gtk+-2.0 neon >= 0.26 libxml-2.0)
+PKG_CHECK_MODULES(DEPS, clutter-0.8 gdk-2.0 gtk+-2.0 neon >= 0.26 libxml-2.0)
AC_SUBST(DEPS_CFLAGS)
AC_SUBST(DEPS_LIBS)
diff --git a/aaina/libaaina/aaina-photo.c b/aaina/libaaina/aaina-photo.c
index a9b13b9..664a4b8 100644
--- a/aaina/libaaina/aaina-photo.c
+++ b/aaina/libaaina/aaina-photo.c
@@ -301,8 +301,16 @@ aaina_photo_set_pixbuf (AainaPhoto *photo, GdkPixbuf
*pixbuf)
clutter_actor_set_size (priv->bg, width+20, height+20);
clutter_actor_set_position (priv->bg, 0, 0);
-
- clutter_texture_set_pixbuf (CLUTTER_TEXTURE (priv->texture), pixbuf, &err);
+
+ clutter_texture_set_from_rgb_data (CLUTTER_TEXTURE (priv->texture),
+ gdk_pixbuf_get_pixels (pixbuf),
+ gdk_pixbuf_get_has_alpha (pixbuf),
+ gdk_pixbuf_get_width (pixbuf),
+ gdk_pixbuf_get_height (pixbuf),
+ gdk_pixbuf_get_rowstride (pixbuf),
+ 4, 0,
+ &err);
+
clutter_actor_set_size (priv->texture, width, height);
if (err)
g_warning ("%s\n", err->message);
diff --git a/aaina/libaaina/aaina-photo.h b/aaina/libaaina/aaina-photo.h
index 664679c..ec3d7db 100644
--- a/aaina/libaaina/aaina-photo.h
+++ b/aaina/libaaina/aaina-photo.h
@@ -22,6 +22,7 @@
#include <config.h>
#include <glib.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <clutter/clutter.h>
#ifndef _HAVE_AAINA_PHOTO_H
diff --git a/aaina/libaaina/clutter-texture-label.c
b/aaina/libaaina/clutter-texture-label.c
index 9a8ce57..4c90101 100644
--- a/aaina/libaaina/clutter-texture-label.c
+++ b/aaina/libaaina/clutter-texture-label.c
@@ -165,7 +165,16 @@ clutter_texture_label_make_pixbuf (ClutterTextureLabel
*label)
priv->fgcol.blue,
priv->fgcol.alpha);
*/
- clutter_texture_set_pixbuf (CLUTTER_TEXTURE (label), pixbuf, NULL);
+ clutter_texture_set_from_rgb_data (CLUTTER_TEXTURE (label),
+ gdk_pixbuf_get_pixels (pixbuf),
+ gdk_pixbuf_get_has_alpha (pixbuf),
+ gdk_pixbuf_get_width (pixbuf),
+ gdk_pixbuf_get_height (pixbuf),
+ gdk_pixbuf_get_rowstride (pixbuf),
+ 4, 0,
+ NULL);
+
+
g_object_set (G_OBJECT (label), "sync-size", TRUE, NULL);
/* Texture has the ref now */
diff --git a/aaina/src/aaina-slide-show.c b/aaina/src/aaina-slide-show.c
index f1a43ef..6a9f490 100644
--- a/aaina/src/aaina-slide-show.c
+++ b/aaina/src/aaina-slide-show.c
@@ -149,7 +149,7 @@ zoom_photo (AainaSlideShow *slide_show)
continue;
x = clutter_actor_get_x (actor);
- clutter_actor_get_abs_size (actor, &w, &h);
+ clutter_actor_get_transformed_size (actor, &w, &h);
x += w;
if (x > 0 && x < stage_width
--
1.5.6.3
--
To unsubscribe send a mail to [email protected]
