Merge lp:~mhr3/libunity/floating-fixes into lp:libunity

[Michal Hruby]

Deal correctly with InitiallyUnowned classes.

Deal correctly with InitiallyUnowned classes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/libunity-ci/34/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/19
    FAILURE: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libunity-ci/34/rebuild

review: Needs Fixing (continuous-integration)

[Matt Fischer (mfisch)]

This solves the issue I had with the openclipart demo scope (lp:ubuntu-sdk-tutorials).

review: Approve

[James Henstridge (jamesh)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/unity-previews.vala'
--- src/unity-previews.vala	2013-03-22 12:55:21 +0000
+++ src/unity-previews.vala	2013-06-19 19:00:35 +0000
@@ -43,6 +43,13 @@
     get { return _raw.description; }
     set { _raw.description = value; }
   }
+  /**
+   * Source for the image.
+   *
+   * URI to the source which can be used to generate a thumbnail. (for example
+   * a .pdf file, .webm etc). If a thumbnail in appropriate resolution
+   * is already available use the "image" property instead.
+   */
   public string image_source_uri
   {
     get { return _raw.image_source_uri; }
@@ -85,9 +92,10 @@
 
   public void add_info (InfoHint info_hint)
   {
-    info_hint.ref_sink ();
-    _raw.add_info_hint (info_hint.id, info_hint.display_name,
-                        info_hint.icon_hint, info_hint.data);
+    // unlike Vala, C will likely pass floating ref
+    var sunk = info_hint.ref_sink () as InfoHint;
+    _raw.add_info_hint (sunk.id, sunk.display_name,
+                        sunk.icon_hint, sunk.data);
   }
 
   internal unowned GenericArray<PreviewAction> get_actions ()
@@ -531,10 +539,8 @@
     set { _raw.sender = value; }
   }
 
-  public SocialPreview (string sender,
-                             string subtitle,
-                             string content,
-                             Icon? avatar)
+  public SocialPreview (string sender, string subtitle,
+                        string content, Icon? avatar)
   {
     Object (title: sender, subtitle: subtitle, content: content,
             avatar: avatar);
@@ -550,7 +556,9 @@
 
   public void add_comment (Comment comment)
   {
-    _raw.add_comment (comment.id, comment.name, comment.text, comment.time);
+    // unlike Vala, C will likely pass floating ref
+    var sunk = comment.ref_sink () as Comment;
+    _raw.add_comment (sunk.id, sunk.name, sunk.text, sunk.time);
   }
 
 }