Merge lp:~super-friends/unity-lens-friends/raring into lp:unity-lens-friends

[Ken VanDine]

Merge queued up changes for raring to trunk now that the FFe bug 1156979 was approved

[Ken VanDine (ken-vandine)]

This was reviewed before merging into the raring branch

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-25 15:18:38 +0000
+++ debian/changelog	2013-03-20 13:50:55 +0000
@@ -1,3 +1,11 @@
+unity-lens-friends (0.1.1bzr13.03.20-0ubuntu1) UNRELEASED; urgency=low
+
+  * Ported to the flatter schema
+  * debian/control
+    - depend on friends (>= 0.1.3) for schema changes (LP: #1156941)
+
+ -- Ken VanDine <[e-mail]>  Thu, 14 Mar 2013 10:12:48 -0400
+
 unity-lens-friends (0.1.1bzr13.02.25-0ubuntu1) raring; urgency=low
 
   * Dropped src/stream-model-schema.vala, the schema is defined 
 
=== modified file 'debian/control'
--- debian/control	2013-02-22 00:09:33 +0000
+++ debian/control	2013-03-20 13:50:55 +0000
@@ -19,7 +19,9 @@
 
 Package: unity-lens-friends
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         friends (>= 0.1.3),
 Description: Friends Lens for unity
  This package contains the "friends" lens which can be used
  in Unity to view streams from Friends.
 
=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-02-14 14:13:05 +0000
+++ src/daemon.vala	2013-03-20 13:50:55 +0000
@@ -521,14 +521,9 @@
 
             if (account_ids.size > 0)
             {
-                var _message_ids = model.get_value (iter, StreamModelColumn.MESSAGE_IDS);
-                foreach (var _message_id in _message_ids)
-                {
-                    var _message_id_item = (string[])_message_id;
-                    var _account = _message_id_item[1];
-                    if (!(_account in account_ids))
-                        account_match = false;
-                }
+                var _account = (uint)model.get_uint64 (iter, StreamModelColumn.ACCOUNT_ID);
+                if (!(_account.to_string() in account_ids))
+                    account_match = false;
             }
 
             var _stream = model.get_string (iter, StreamModelColumn.STREAM);
@@ -635,7 +630,7 @@
                     var avatar = Icon.new_for_string (icon_uri);
 
                     //var avatar = new FileIcon (File.new_for_path (get_avatar_path (icon_uri)));
-                    var likes = model.get_double (iter, StreamModelColumn.LIKES);
+                    var likes = model.get_uint64 (iter, StreamModelColumn.LIKES);
                     var sender = model.get_string (iter, StreamModelColumn.SENDER);
                     var timestring = utils.create_time_string (model.get_string (iter, StreamModelColumn.TIMESTAMP));
                     var content = model.get_string (iter, StreamModelColumn.MESSAGE);
@@ -661,96 +656,87 @@
                 iter = model.next (iter);
             }
 
-            uint[] _seen = null;
-            var _message_ids = model.get_value (iter, StreamModelColumn.MESSAGE_IDS);
-            foreach (var _message_id in _message_ids)
-            {
-                var _message_id_item = (string[])_message_id;
-                uint _account_id = (uint)uint64.parse(_message_id_item[1]);
-                debug ("account_id: %u", _account_id);
-                if (_account_id in _seen)
-                    continue;
-                _seen += _account_id;
-                var _account_service = _message_id_item[0];
-                var _status_id = _message_id_item[2];
-                var icon_str = icon_dir.get_child ("service-" + _account_service + ".svg");
-                if (icon_str.query_exists ())
-                    icon = new FileIcon (icon_str);
-                else
-                    icon = null;
-
-                string[] _features = null;
-                if (featureMap.has_key(_account_service))
-                {
-                    _features = featureMap[_account_service].dup_strv ();
-                }
-
-                parse_comments (preview, _status_id);
-
-                var view_action = new Unity.PreviewAction ("view", _("View"), icon);
-                preview.add_action (view_action);
-
-                view_action.activated.connect ((source) => {
-                    try
-                    {
-                        if (GLib.AppInfo.launch_default_for_uri (uri, null))
-                        {
-                            return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
-                        }
-                    }
-                    catch (GLib.Error e)
-                    {
-                        warning ("Failed to launch default application for uri '%s': %s", uri, e.message);
-                    }
-                    return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
+            uint _account_id = (uint)model.get_uint64(iter, StreamModelColumn.ACCOUNT_ID);
+            debug ("account_id: %u", _account_id);
+            var _account_service = model.get_string (iter, StreamModelColumn.PROTOCOL);
+            var _status_id = model.get_string (iter, StreamModelColumn.MESSAGE_ID);
+            var icon_str = icon_dir.get_child ("service-" + _account_service + ".svg");
+            if (icon_str.query_exists ())
+                icon = new FileIcon (icon_str);
+            else
+                icon = null;
+
+            string[] _features = null;
+            if (featureMap.has_key(_account_service))
+            {
+                _features = featureMap[_account_service].dup_strv ();
+            }
+
+            parse_comments (preview, _status_id);
+
+            var view_action = new Unity.PreviewAction ("view", _("View"), icon);
+            preview.add_action (view_action);
+
+            view_action.activated.connect ((source) => {
+                try
+                {
+                    if (GLib.AppInfo.launch_default_for_uri (uri, null))
+                    {
+                        return new Unity.ActivationResponse (Unity.HandledType.HIDE_DASH);
+                    }
+                }
+                catch (GLib.Error e)
+                {
+                    warning ("Failed to launch default application for uri '%s': %s", uri, e.message);
+                }
+                return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED);
+            });
+
+            if ("retweet" in _features)
+            {
+                if (_account_service == "twitter")
+                    retweet_str = _("Retweet");
+                else 
+                    retweet_str = _("Share");
+                var retweet_action = new Unity.PreviewAction ("retweet", retweet_str, icon);
+                preview.add_action (retweet_action);
+                retweet_action.activated.connect ((source) => {
+                    Idle.add (() => {
+                        var dispatcher = new Friends.Dispatcher ();
+                        dispatcher.retweet (_account_id, _status_id);
+                        return false;
+                    });
+                    return new Unity.ActivationResponse (Unity.HandledType.SHOW_PREVIEW);
                 });
-
-                if ("retweet" in _features)
-                {
-                    if (_account_service == "twitter")
-                        retweet_str = _("Retweet");
-                    else 
-                        retweet_str = _("Share");
-                    var retweet_action = new Unity.PreviewAction ("retweet", retweet_str, icon);
-                    preview.add_action (retweet_action);
-                    retweet_action.activated.connect ((source) => {
-                        Idle.add (() => {
-                            var dispatcher = new Friends.Dispatcher ();
-                            dispatcher.retweet (_account_id, _status_id);
-                            return false;
-                        });
-                        return new Unity.ActivationResponse (Unity.HandledType.SHOW_PREVIEW);
-                    });
-                }
+            }
             
-                bool from_me = model.get_bool (iter, StreamModelColumn.FROM_ME);
-                // REPLY
-                //if ("reply" in _features && !from_me)
-                //{
-                //    var reply_action = new Unity.PreviewAction ("reply", _("Reply"), icon);
-                //    preview.add_action (reply_action);
-                //    reply_action.activated.connect ((source) => {
-                //        return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
-                //    });
-                //}
+            bool from_me = model.get_bool (iter, StreamModelColumn.FROM_ME);
+            // REPLY
+            //if ("reply" in _features && !from_me)
+            //{
+            //    var reply_action = new Unity.PreviewAction ("reply", _("Reply"), icon);
+            //    preview.add_action (reply_action);
+            //    reply_action.activated.connect ((source) => {
+            //        return new Unity.ActivationResponse(Unity.HandledType.HIDE_DASH);
+            //    });
+            //}
 
-                bool liked = model.get_bool (iter, StreamModelColumn.LIKED);
-                if ("like" in _features && "unlike" in _features && !from_me)
-                {
-                    like_str = liked ? _("Unlike") : _("Like");
-                    var like_action = new Unity.PreviewAction ("like", like_str, icon);
-                    preview.add_action (like_action);
-                    like_action.activated.connect ((source) => {
-                        Idle.add (() => {
-                            var dispatcher = new Friends.Dispatcher ();
-                            var ret = liked ? dispatcher.unlike (_account_id, _status_id) : dispatcher.like (_account_id, _status_id);
-                            return false;
-                        });
-                        model.set_value (iter, StreamModelColumn.LIKED, !liked);
-                        Unity.Preview new_preview = this.preview (uri);
-                        return new Unity.ActivationResponse.with_preview (new_preview);
+            bool liked = model.get_bool (iter, StreamModelColumn.LIKED);
+            if ("like" in _features && "unlike" in _features && !from_me)
+            {
+                like_str = liked ? _("Unlike") : _("Like");
+                var like_action = new Unity.PreviewAction ("like", like_str, icon);
+                preview.add_action (like_action);
+                like_action.activated.connect ((source) => {
+                    Idle.add (() => {
+                        var dispatcher = new Friends.Dispatcher ();
+                        var ret = liked ? dispatcher.unlike (_account_id, _status_id) : dispatcher.like (_account_id, _status_id);
+                        return false;
                     });
-                }
+                    model.set_value (iter, StreamModelColumn.LIKED, !liked);
+                    Unity.Preview new_preview = this.preview (uri);
+                    return new Unity.ActivationResponse.with_preview (new_preview);
+                });
             }
 
             return preview;
 
=== modified file 'src/schemas.vala'
--- src/schemas.vala	2013-02-25 15:09:57 +0000
+++ src/schemas.vala	2013-03-20 13:50:55 +0000
@@ -51,7 +51,9 @@
     /* Dee.Model schema */
     public enum StreamModelColumn
     {
-        MESSAGE_IDS,
+        PROTOCOL,
+        ACCOUNT_ID,
+        MESSAGE_ID,
         STREAM,
         SENDER,
         SENDER_ID,
@@ -68,7 +70,10 @@
         LINK_URL,
         LINK_DESC,
         LINK_CAPTION,
-        LINK_ICON
+        LINK_ICON,
+        LOCATION,
+        LATITUDE,
+        LONGITUDE
     }
 
 } /* end UnityFriends namespace */