---
fluttr/config.guess | 1 -
fluttr/config.sub | 1 -
fluttr/configure.ac | 2 +-
fluttr/ltmain.sh | 1 -
fluttr/src/fluttr-list.c | 10 ++++++++-
fluttr/src/fluttr-photo.c | 48 ++++++++++++++++++++++++++++++++++--------
fluttr/src/fluttr-spinner.c | 12 +++++++++-
fluttr/src/fluttr-viewer.c | 10 +++++++-
fluttr/src/main.c | 9 +++++++-
9 files changed, 75 insertions(+), 19 deletions(-)
delete mode 120000 fluttr/config.guess
delete mode 120000 fluttr/config.sub
delete mode 120000 fluttr/ltmain.sh
diff --git a/fluttr/config.guess b/fluttr/config.guess
deleted file mode 120000
index d0bb19b..0000000
--- a/fluttr/config.guess
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/libtool/config.guess
\ No newline at end of file
diff --git a/fluttr/config.sub b/fluttr/config.sub
deleted file mode 120000
index 31a57ca..0000000
--- a/fluttr/config.sub
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/libtool/config.sub
\ No newline at end of file
diff --git a/fluttr/configure.ac b/fluttr/configure.ac
index 02fcd08..4353402 100644
--- a/fluttr/configure.ac
+++ b/fluttr/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.0 libxml-2.0)
+PKG_CHECK_MODULES(DEPS, clutter-0.8 gdk-2.0 gtk+-2.0 neon >= 0.26.0 libxml-2.0)
AC_SUBST(DEPS_CFLAGS)
AC_SUBST(DEPS_LIBS)
diff --git a/fluttr/ltmain.sh b/fluttr/ltmain.sh
deleted file mode 120000
index 72940b6..0000000
--- a/fluttr/ltmain.sh
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/libtool/ltmain.sh
\ No newline at end of file
diff --git a/fluttr/src/fluttr-list.c b/fluttr/src/fluttr-list.c
index 0fe38ee..08f2139 100644
--- a/fluttr/src/fluttr-list.c
+++ b/fluttr/src/fluttr-list.c
@@ -6,6 +6,7 @@
*/
#include <GL/gl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "fluttr-list.h"
@@ -561,7 +562,14 @@ fluttr_list_init (FluttrList *self)
height,
FALSE,
NULL);
- clutter_texture_set_pixbuf (CLUTTER_TEXTURE (message), msg_buf, NULL);
+ clutter_texture_set_from_rgb_data (CLUTTER_TEXTURE (message),
+
gdk_pixbuf_get_pixels (msg_buf),
+
gdk_pixbuf_get_has_alpha (msg_buf),
+
gdk_pixbuf_get_width (msg_buf),
+
gdk_pixbuf_get_height (msg_buf),
+
gdk_pixbuf_get_rowstride (msg_buf),
+ 4, 0,
+ NULL);
clutter_group_add (CLUTTER_GROUP (priv->group),message);
clutter_actor_set_size (message, width, height);
clutter_actor_set_position (message, -(width/2),-(height/2));
diff --git a/fluttr/src/fluttr-photo.c b/fluttr/src/fluttr-photo.c
index 061c901..6fd3e6c 100644
--- a/fluttr/src/fluttr-photo.c
+++ b/fluttr/src/fluttr-photo.c
@@ -114,18 +114,32 @@ fluttr_photo_set_visible (FluttrPhoto *photo, gboolean
visible)
if (priv->visible == visible)
return;
if (visible) {
- priv->texture = clutter_texture_new_from_pixbuf (default_pic);
+ priv->texture = clutter_texture_new();
+ clutter_texture_set_from_rgb_data(CLUTTER_TEXTURE
(priv->texture),
+
gdk_pixbuf_get_pixels (default_pic),
+
gdk_pixbuf_get_has_alpha (default_pic),
+
gdk_pixbuf_get_width (default_pic),
+
gdk_pixbuf_get_height (default_pic),
+
gdk_pixbuf_get_rowstride (default_pic),
+ 4, 0,
+ NULL);
+
clutter_group_add (CLUTTER_GROUP (priv->clip), priv->texture);
clutter_actor_set_size (priv->texture,
width -(FRAME*2),
height -(FRAME*2));
clutter_actor_set_position (priv->texture, FRAME, FRAME);
if (priv->pixbuf) {
- clutter_texture_set_pixbuf (CLUTTER_TEXTURE (
- priv->texture),
- priv->pixbuf, NULL);
+ clutter_texture_set_from_rgb_data(CLUTTER_TEXTURE
(priv->texture),
+
gdk_pixbuf_get_pixels (default_pic),
+
gdk_pixbuf_get_has_alpha (default_pic),
+
gdk_pixbuf_get_width (default_pic),
+
gdk_pixbuf_get_height (default_pic),
+
gdk_pixbuf_get_rowstride (default_pic),
+ 4, 0,
+ NULL);
clutter_actor_set_scale (priv->texture, 0.6, 0.6);
- clutter_actor_get_abs_size (priv->texture, &w, &h);
+ clutter_actor_get_transformed_size (priv->texture, &w,
&h);
clutter_actor_set_position (priv->texture,
(width/2) - (w/2),
@@ -325,10 +339,17 @@ fluttr_photo_swap_alpha_func (ClutterBehaviour *behave,
factor = (gfloat) alpha_value / CLUTTER_ALPHA_MAX_ALPHA;
if (priv->pixbuf != NULL && factor > 0.5 && priv->texture) {
- clutter_texture_set_pixbuf (CLUTTER_TEXTURE (priv->texture),
- priv->pixbuf, NULL);
+ clutter_texture_set_from_rgb_data(CLUTTER_TEXTURE (priv->texture),
+
gdk_pixbuf_get_pixels (priv->pixbuf),
+
gdk_pixbuf_get_has_alpha (priv->pixbuf),
+
gdk_pixbuf_get_width (priv->pixbuf),
+
gdk_pixbuf_get_height (priv->pixbuf),
+
gdk_pixbuf_get_rowstride (priv->pixbuf),
+ 4, 0,
+ NULL);
+
clutter_actor_set_scale (priv->texture, 0.6, 0.6);
- clutter_actor_get_abs_size (priv->texture, &w, &h);
+ clutter_actor_get_transformed_size (priv->texture, &w, &h);
clutter_actor_set_position (priv->texture,
(width/2) - (w/2),
@@ -912,7 +933,16 @@ fluttr_photo_init (FluttrPhoto *self)
height -(FRAME*2));
/* The pixture texture */
- priv->texture = clutter_texture_new_from_pixbuf (default_pic);
+ priv->texture = clutter_texture_new();
+ clutter_texture_set_from_rgb_data(CLUTTER_TEXTURE (priv->texture),
+
gdk_pixbuf_get_pixels (default_pic),
+
gdk_pixbuf_get_has_alpha (default_pic),
+
gdk_pixbuf_get_width (default_pic),
+
gdk_pixbuf_get_height (default_pic),
+
gdk_pixbuf_get_rowstride (default_pic),
+ 4, 0,
+ NULL);
+
clutter_group_add (CLUTTER_GROUP (priv->clip), priv->texture);
clutter_actor_set_size (priv->texture,
width -(FRAME*2),
diff --git a/fluttr/src/fluttr-spinner.c b/fluttr/src/fluttr-spinner.c
index b31066c..ab7a72b 100644
--- a/fluttr/src/fluttr-spinner.c
+++ b/fluttr/src/fluttr-spinner.c
@@ -5,6 +5,8 @@
* Author: Neil J. Patel <[email protected]>
*/
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
#include "fluttr-spinner.h"
#include "fluttr-behave.h"
@@ -140,8 +142,14 @@ fluttr_spinner_new (void)
NULL);
}
if (spinner_pixbuf)
- clutter_texture_set_pixbuf (CLUTTER_TEXTURE (spinner),
- spinner_pixbuf, NULL);
+ clutter_texture_set_from_rgb_data(CLUTTER_TEXTURE (spinner),
+
gdk_pixbuf_get_pixels (spinner_pixbuf),
+
gdk_pixbuf_get_has_alpha (spinner_pixbuf),
+
gdk_pixbuf_get_width (spinner_pixbuf),
+
gdk_pixbuf_get_height (spinner_pixbuf),
+
gdk_pixbuf_get_rowstride (spinner_pixbuf),
+ 4, 0,
+ NULL);
else
g_print ("Could not load spinner\n");
return CLUTTER_ACTOR (spinner);
diff --git a/fluttr/src/fluttr-viewer.c b/fluttr/src/fluttr-viewer.c
index fa1c367..24fd936 100644
--- a/fluttr/src/fluttr-viewer.c
+++ b/fluttr/src/fluttr-viewer.c
@@ -295,8 +295,14 @@ fluttr_viewer_swap_alpha_func (ClutterBehaviour *behave,
factor = (gfloat) alpha_value / CLUTTER_ALPHA_MAX_ALPHA;
if (priv->pixbuf != NULL && factor > 0.5) {
- clutter_texture_set_pixbuf (CLUTTER_TEXTURE (priv->texture),
- priv->pixbuf, NULL);
+ clutter_texture_set_from_rgb_data(CLUTTER_TEXTURE (priv->texture),
+
gdk_pixbuf_get_pixels (priv->pixbuf),
+
gdk_pixbuf_get_has_alpha (priv->pixbuf),
+
gdk_pixbuf_get_width (priv->pixbuf),
+
gdk_pixbuf_get_height (priv->pixbuf),
+
gdk_pixbuf_get_rowstride (priv->pixbuf),
+ 4, 0,
+ NULL);
clutter_actor_get_size (priv->texture, &w, &h);
clutter_actor_set_position (priv->texture,
diff --git a/fluttr/src/main.c b/fluttr/src/main.c
index c394c3f..594102c 100644
--- a/fluttr/src/main.c
+++ b/fluttr/src/main.c
@@ -688,7 +688,14 @@ create_background (ClutterActor *bg, guint width, guint
height)
FALSE,
NULL);
if (pixbuf)
- clutter_texture_set_pixbuf (CLUTTER_TEXTURE (bg), pixbuf, NULL);
+ clutter_texture_set_from_rgb_data (CLUTTER_TEXTURE (bg),
+
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);
else
g_print ("Could not load pixbuf\n");
}
--
1.5.6.3
--
To unsubscribe send a mail to [email protected]
