Merge lp:~victored/pantheon-notify/lp-991557 into lp:pantheon-notify

[Victor Martinez]

Properly load image corresponding to "image_data". Also add support for "image-data" since the former has been deprecated. Fixes lp:991557

Properly load image corresponding to "image_data". Also add support for "image-data" since the former has been deprecated. Fixes lp:991557

[Tom Beckmann (tombeckmann)]

Awesome!!! Finally this bug is solved, I cannot thank you enough!

I had to set the size of 48px on the GtkClutterTexture manually here on 13.04 in order to make the image show up, not sure why, now it's working perfectly. Anyway, I will push this fix right after I merged this awesomeness.

review: Approve

[Victor Martinez (victored)]

Fantastic, thanks for the review :)

=== modified file 'src/notification.vala'
--- src/notification.vala	2012-06-30 14:45:47 +0000
+++ src/notification.vala	2013-06-12 21:18:28 +0000
@@ -1,5 +1,4 @@
 
-
 public class Notification : Clutter.Group {
 	
 	public enum Urgency {
@@ -232,35 +231,39 @@
 	
 	public void set_pix (HashTable<string, Variant> hints, string app, string icon) {
 		/*decide on the icon, order:
-		 image-data
+		 image-data (also supports deprecated version: image_data)
 		 image-path
 		 app_icon
 		 icon_data
 		 from app name?
 		 fallback to dialog-information
 		*/
-		if (hints.contains ("image_data")) {						/*image-data*/
+		if (hints.contains ("image_data") || hints.contains ("image-data")) {
 			debug ("Using image_data");
-			
-			int width;
-			int height;
-			int rowstride;
+
+			var image_data = hints.lookup ("image_data");
+			if (image_data == null)
+				image_data = hints.lookup ("image-data");	
+
+			return_if_fail (image_data != null);
+
+			weak uchar[] dummy_data;
 			bool has_alpha;
-			int bits_per_sample;
-			int channels;
-			weak Array<uint8> data;
-			//weak uint8 [] pixel;
-			
-			hints.lookup ("image_data").get ("(iiibiiay)", out width, out height, out rowstride, out has_alpha, out bits_per_sample, out channels, out data, uint.MAX);
-			
-			/*var size = (height - 1) * rowstride + width * ((channels * bits_per_sample + 7) / 8);
-			pixel = (uint8[])GLib.Memory.dup (data, size);*/
-			
-			debug ("datalen: %u, width: %i, height: %i\n", data.length, width, height);
-			
-			var pix = new Gdk.Pixbuf.from_data ((uint8[])data, Gdk.Colorspace.RGB, has_alpha, bits_per_sample, width, height, rowstride, null).scale_simple (48, 48, Gdk.InterpType.HYPER);
+			int width, height, rowstride, bits_per_sample, n_channels;
+
+			image_data.get ("(iiibiiay)", out width, out height, out rowstride,
+				out has_alpha, out bits_per_sample, out n_channels, out dummy_data);
+
+			var pixels = image_data.get_child_value (6);
+			weak uchar[] pixel_data = (uchar[]) pixels.get_data ();
+
+			var pix = new Gdk.Pixbuf.from_data (pixel_data, Gdk.Colorspace.RGB,
+				has_alpha, bits_per_sample, width, height, rowstride, null);
+
+			var scaled_pix = pix.scale_simple (48, 48, Gdk.InterpType.HYPER);
+
 			try {
-				tex.set_from_pixbuf (pix);
+				tex.set_from_pixbuf (scaled_pix);
 			} catch (Error e) { warning (e.message); }
 		} else if (hints.contains ("image-path")) {				 /*image-path*/
 			debug ("Using image-path");