Merge lp:~unity-team/unity-lens-friends/libunity7-compatible into lp:unity-lens-friends

[James Henstridge]

Merge libunity7-compatible branch to trunk.

Merge the libunity7-compatible branch to trunk. We are in the process of integrating libunity7/smart-scopes into Saucy, so further development should be against the new API.

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-01-15 17:25:52 +0000
+++ configure.ac	2013-05-14 09:34:26 +0000
@@ -25,8 +25,8 @@
 ######################################################
 # intltool rule for generating translated .lens file
 ######################################################
-INTLTOOL_LENS_RULE='%.lens: %.lens.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-AC_SUBST(INTLTOOL_LENS_RULE)
+INTLTOOL_SCOPE_RULE='%.scope: %.scope.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST(INTLTOOL_SCOPE_RULE)
 
 DEE_REQUIRED=1.0.0
 UNITY_REQUIRED=6.7
@@ -44,18 +44,18 @@
 AC_SUBST(BASE_LIBS)
 
 if test "x$with_localinstall" = "xyes"; then
-	LENSESDIR="${datadir}/unity/lenses"
+	SCOPESDIR="${datadir}/unity/scopes"
 else
-	LENSESDIR=`$PKG_CONFIG --variable=lensesdir unity`
+	SCOPESDIR=`$PKG_CONFIG --variable=scopesdir unity`
 fi
-AC_SUBST(LENSESDIR)
+AC_SUBST(SCOPESDIR)
 
 
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
 	data/Makefile
-        data/friends.lens.in
+        data/social.scope.in
         data/icons/Makefile
         data/icons/hicolor/Makefile
         data/icons/hicolor/scalable/places/Makefile
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2012-10-26 23:23:06 +0000
+++ data/Makefile.am	2013-05-14 09:34:26 +0000
@@ -8,19 +8,19 @@
 %.service: %.service.in
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-lens_in_files = friends.lens.in
-lensdir = $(LENSESDIR)/friends
-lens_DATA = $(lens_in_files:.lens.in=.lens)
+scope_in_files = social.scope.in
+scopedir = $(SCOPESDIR)
+scope_DATA = $(scope_in_files:.scope.in=.scope)
 
-@INTLTOOL_LENS_RULE@
+@INTLTOOL_SCOPE_RULE@
 
 defaultdir = $(datadir)/friends/unity
 
 EXTRA_DIST = \
-  $(lens_DATA)	\
-  $(lens_in_files) \
+  $(scope_DATA)	\
+  $(scope_in_files) \
   $(service_in_files)
 
 CLEANFILES = \
   $(dbus_services_DATA) \
-  $(lens_DATA)
+  $(scope_DATA)
 
=== renamed file 'data/friends.lens.in.in' => 'data/social.scope.in.in'
--- data/friends.lens.in.in	2012-10-17 04:41:32 +0000
+++ data/social.scope.in.in	2013-05-14 09:34:26 +0000
@@ -1,14 +1,15 @@
-[Lens]
-DBusName=com.canonical.Unity.Lens.Friends
-DBusPath=/com/canonical/unity/lens/friends
-Icon=/usr/share/unity/6/lens-nav-gwibber.svg
+[Scope]
+DBusName=com.canonical.Unity.Scope.Friends
+DBusPath=/com/canonical/unity/scope/friends
+Icon=@prefix@/share/unity/icons/lens-nav-gwibber.svg
 _Name=Social
-_Description=Social Network
+_Description=This is an Ubuntu search plugin that enables information from Online accounts to be searched and displayed in the Dash underneath the Social header. If you do not wish to search this content source, you can disable this search plugin.
 _SearchHint=Enter name or content you would like to search for
 Shortcut=g
+Type=social
 
 #
 # Make translation work with Ubuntu's special handling of keyfiles
 #
 [Desktop Entry]
-X-Ubuntu-Gettext-Domain=friends
+X-Ubuntu-Gettext-Domain=unity-lens-friends
 
=== modified file 'data/unity-lens-friends.service.in'
--- data/unity-lens-friends.service.in	2012-10-17 20:13:50 +0000
+++ data/unity-lens-friends.service.in	2013-05-14 09:34:26 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=com.canonical.Unity.Lens.Friends
+Name=com.canonical.Unity.Scope.Friends
 Exec=@libexecdir@/unity-lens-friends
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-04-12 16:39:54 +0000
+++ debian/changelog	2013-05-14 09:34:26 +0000
@@ -1,3 +1,17 @@
+unity-lens-friends (0.1.2daily13.05.07ubuntu.unity.experimental.certified-0ubuntu1) raring; urgency=low
+
+  [ Michal Hruby ]
+  * Bump version
+
+  [ Ken VanDine ]
+  * [FFe] Provide an API for access data from Friends (LP: #1156941)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 60 (ubuntu-unity/experimental-
+    certified)
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 07 May 2013 07:22:42 +0000
+
 unity-lens-friends (0.1.1bzr13.04.12-0ubuntu1) raring; urgency=low
 
   [ Sebastien Bacher ]
@@ -11,6 +25,15 @@
 
 unity-lens-friends (0.1.1bzr13.03.26-0ubuntu1) raring; urgency=low
 
+  [ James Henstridge ]
+  * Require new libunity.
+
+  [ Didier Roche ]
+  * Some packaging fixes
+  * transition from gwibber lens to the friends one
+  * Automatic snapshot from revision 43 (bootstrap)
+
+  [ Ken VanDine ]
   * strip links from content, the lens can't render them
 
  -- Ken VanDine <[e-mail]>  Tue, 26 Mar 2013 13:53:53 -0400
 
=== modified file 'debian/control'
--- debian/control	2013-04-12 15:12:28 +0000
+++ debian/control	2013-05-14 09:34:26 +0000
@@ -1,6 +1,6 @@
 Source: unity-lens-friends
 Section: misc
-Priority: extra
+Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 Build-Depends: autotools-dev,
                debhelper (>= 9),
@@ -10,7 +10,7 @@
                libaccounts-glib-dev,
                libdee-dev (>= 1.0.0),
                libfriends-dev (>= 0.1),
-               libunity-dev,
+               libunity-dev (>= 6.91),
                valac-0.18,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/unity-lens-friends
@@ -23,6 +23,9 @@
 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.
+Conflicts: unity-lens-gwibber,
+Provides: unity-lens-gwibber,
+Replaces: unity-lens-gwibber,
+Description: Friends scope for unity
+ This package contains the "friends" scope which allows Unity
+ to search for view streams from Friends.
 
=== modified file 'debian/rules'
--- debian/rules	2013-04-12 15:12:28 +0000
+++ debian/rules	2013-05-14 09:34:26 +0000
@@ -3,11 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+%:
+	dh $@  --with autoreconf,translations
+
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_install:
 	dh_install --fail-missing
-
-%:
-	dh $@  --with autoreconf,translations
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-10-17 20:13:50 +0000
+++ po/POTFILES.in	2013-05-14 09:34:26 +0000
@@ -2,4 +2,4 @@
 
 src/daemon.vala
 src/main.vala
-[type: gettext/ini] data/friends.lens.in.in
+[type: gettext/ini] data/social.scope.in.in
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-02-25 15:09:57 +0000
+++ src/Makefile.am	2013-05-14 09:34:26 +0000
@@ -26,7 +26,8 @@
   --pkg unity \
   --pkg gio-2.0 \
   --pkg accounts \
-  --basedir=.
+  --basedir=. \
+  $(MAINTAINER_VALAFLAGS)
 
 unity_lens_friends_LDADD = \
   $(BASE_LIBS) \
 
=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-03-27 00:34:30 +0000
+++ src/daemon.vala	2013-05-14 09:34:26 +0000
@@ -25,7 +25,7 @@
 namespace UnityFriends {
 
     /* DBus name for the place. Must match out .place file */
-    const string BUS_NAME = "com.canonical.Unity.Lens.Friends";
+    const string BUS_NAME = "com.canonical.Unity.Scope.Friends";
     const string ICON_PATH = Config.DATADIR + "/icons/unity-icon-theme/places/svg/";
     const string STRIP_LINKS = """</?a[^>]*>""";
 
@@ -35,8 +35,7 @@
      */
     public class Daemon : GLib.Object
     {
-        private Unity.Lens lens;
-        private Unity.Scope scope;
+        private Unity.DeprecatedScope scope;
         private Unity.PreferencesManager preferences = Unity.PreferencesManager.get_default ();
         private unowned Dee.ResourceManager resources;
         private Dee.Model? _model = null;
@@ -53,16 +52,18 @@
         private Ag.Manager _account_manager;
         private bool _has_accounts = false;
         private HashMap<string,Variant> featureMap;
+        private Variant empty_asv;
 
         construct
         {
-            lens = new Unity.Lens("/com/canonical/unity/lens/friends", "friends");
-            lens.search_in_global = false;
-            lens.search_hint = _("Enter name or content you would like to search for");
-            lens.visible = false;
+            empty_asv = new Variant.array (VariantType.VARDICT.element (), {});
+            scope = new Unity.DeprecatedScope("/com/canonical/unity/scope/friends", "friends.scope");
+            scope.search_in_global = false;
+            scope.search_hint = _("Enter name or content you would like to search for");
+            scope.visible = false;
             try
             {
-                lens.export ();
+                scope.export ();
             } catch (GLib.IOError e)
             {
                 warning ("failed to export lens: %s", e.message);
@@ -84,7 +85,7 @@
                 }
                 else if (accts.length () == 0)
                 {
-                    lens.visible = false;
+                    scope.visible = false;
                     _has_accounts = false;
                 }
                 else
@@ -98,58 +99,24 @@
         void setup ()
         {
             setup_friends ();
-            scope = new Unity.Scope ("/com/canonical/unity/scope/friends");
-            scope.search_in_global = false;
+
+            scope.visible = true;
             scope.preview_uri.connect (preview);
 
-            lens.visible = true;
-
-            lens.add_local_scope (scope);
-
             /* Listen for filter changes */
-            scope.notify["active"].connect (() =>
-            {
-                if (scope.active)
-                {
-                    scope.queue_search_changed (SearchType.DEFAULT);
-                }
-            });
-
             scope.generate_search_key.connect ((lens_search) =>
             {
                 return lens_search.search_string.strip ();
             });
-            scope.search_changed.connect ((lens_search, search_type, cancellable) =>
-            {
-                if (search_type == SearchType.DEFAULT)
-                    update_scope_search.begin (lens_search, cancellable);
-                else
-                    update_global_search.begin (lens_search, cancellable);
-            });
-
-            lens.notify["active"].connect ((obj, pspec) => {
-                if (lens.active && scope.active)
-                {
-                    if (_stream_iter_first != _model.get_first_iter () || _stream_iter_last != _model.get_last_iter ())
-                    {
-                        if (scope.active)
-                        {
-                            scope.queue_search_changed (SearchType.DEFAULT);
-                        }
-                    }
-                }
-            });
-
-            scope.filters_changed.connect (() =>
-            {
-                scope.queue_search_changed (SearchType.DEFAULT);
+            scope.search_changed.connect ((search, search_type, cancellable) =>
+            {
+                dispatch_search.begin (search, search_type, cancellable);
             });
 
             preferences.notify["remote-content-search"].connect ((obj, pspec) =>
             {
                 scope.queue_search_changed (SearchType.DEFAULT);
             });
-
         }
 
         private void map_account_features ()
@@ -238,7 +205,7 @@
 
         private void populate_filters ()
         {
-            var filters = new GLib.List<Unity.Filter> ();
+            var filters = new Unity.FilterSet ();
 
             /* Stream filter */
             {
@@ -254,21 +221,21 @@
                 filter.add_option ("public", _("Public"));
                 */
 
-                filters.append (filter);
+                filters.add (filter);
             }
 
             /* Account filter */
             {
                 var filter = create_account_filter ();
-                filters.append (filter);
+                filters.add (filter);
             }
 
-            lens.filters = filters;
+            scope.filters = filters;
 
             _account_manager.account_created.connect ((id) => {
                 debug ("ACCOUNT ADDED");
                 var _acct = _account_manager.get_account ((Ag.AccountId)id);
-                var filter = scope.get_filter ("account_id") as CheckOptionFilter;
+                var filter = scope.filters.get_filter_by_id ("account_id") as CheckOptionFilter;
                 create_account_filter_option (filter, _acct);
                 map_account_features ();
             });
@@ -310,49 +277,49 @@
 
         private void populate_categories ()
         {
-            var categories = new GLib.List<Unity.Category> ();
+            var categories = new Unity.CategorySet ();
             Icon icon;
 
             var icon_dir = File.new_for_path ("/usr/share/unity-lens-friends/ui/icons/hicolor/scalable/places/");
 
             icon = new FileIcon (icon_dir.get_child ("group-messages.svg"));
-            var cat = new Unity.Category (_("Messages"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
-            categories.append (cat);
+            var cat = new Unity.Category ("messages", _("Messages"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
+            categories.add (cat);
 
             icon = new FileIcon (icon_dir.get_child ("group-replies.svg"));
-            cat =    new Unity.Category (_("Mentions"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
-            categories.append (cat);
+            cat =    new Unity.Category ("mentions", _("Mentions"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
+            categories.add (cat);
 
             icon = new FileIcon (icon_dir.get_child ("group-images.svg"));
-            cat =    new Unity.Category (_("Images"), icon, Unity.CategoryRenderer.FLOW);
-            categories.append (cat);
+            cat =    new Unity.Category ("images", _("Images"), icon, Unity.CategoryRenderer.FLOW);
+            categories.add (cat);
 
             icon = new FileIcon (icon_dir.get_child ("group-videos.svg"));
-            cat =    new Unity.Category (_("Videos"), icon, Unity.CategoryRenderer.FLOW);
-            categories.append (cat);
+            cat =    new Unity.Category ("videos", _("Videos"), icon, Unity.CategoryRenderer.FLOW);
+            categories.add (cat);
 
             icon = new FileIcon (icon_dir.get_child ("group-links.svg"));
-            cat =    new Unity.Category (_("Links"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
-            categories.append (cat);
+            cat =    new Unity.Category ("links", _("Links"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
+            categories.add (cat);
 
             icon = new FileIcon (icon_dir.get_child ("group-private.svg"));
-            cat =    new Unity.Category (_("Private"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
-            categories.append (cat);
+            cat =    new Unity.Category ("private", _("Private"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
+            categories.add (cat);
 
             icon = new FileIcon (icon_dir.get_child ("group-public.svg"));
-            cat =    new Unity.Category (_("Public"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
-            categories.append (cat);
+            cat =    new Unity.Category ("public", _("Public"), icon, Unity.CategoryRenderer.HORIZONTAL_TILE);
+            categories.add (cat);
 
-            lens.categories = categories;
+            scope.categories = categories;
         }
 
 
-        private bool is_empty_search (LensSearch search)
+        private bool is_empty_search (DeprecatedScopeSearch search)
         {
             return search.search_string.strip () == "";
         }
 
-        private async void update_global_search (LensSearch search, Cancellable cancellable)
+        private async void dispatch_search (DeprecatedScopeSearch search, SearchType search_type, GLib.Cancellable cancellable)
         {
             /**
              * only perform the request if the user has not disabled
@@ -365,51 +332,29 @@
                 return;
             }
 
-            var results_model = scope.global_results_model;
-
             // FIXME: no results for home screen of the dash?
-            if (is_empty_search (search))
-            {
-                search.finished ();
-                return;
-            }
-
-            update_results_model (results_model, search.search_string, null);
-
-            search.finished ();
-        }
-
-        private async void update_scope_search (LensSearch search, Cancellable cancellable)
-        {
-            /**
-             * only perform the request if the user has not disabled
-             * online/commercial suggestions. That will hide the category as well.
-             */
-            if (preferences.remote_content_search != Unity.PreferencesManager.RemoteContent.ALL)
-            {
-                search.results_model.clear ();
-                search.finished ();
-                return;
-            }
-
-            var results_model = search.results_model;
-
-            update_results_model (results_model, search.search_string, null);
-            debug ("%u results", results_model.get_n_rows ());
-            search.finished ();
-        }
-
+            if (search_type == SearchType.GLOBAL && is_empty_search (search))
+            {
+                search.finished ();
+                return;
+            }
+
+            update_results_model (search, null);
+            debug ("%u results", search.results_model.get_n_rows ());
+            search.finished ();
+        }
 
         /* Generic method to update a results model. We do it like this to minimize
          * code dup between updating the global- and the entry results model */
-        private void update_results_model (Dee.Model results_model,
-                                           string? search, Categories? category)
+        private void update_results_model (DeprecatedScopeSearch search,
+                                           Categories? category)
         {
             debug ("%u TOTAL ROWS", _model.get_n_rows ());
             unowned Dee.ModelIter iter, end;
 
+            var results_model = search.results_model;
             var stream_ids = new Gee.ArrayList<string> ();
-            var filter = scope.get_filter("stream") as CheckOptionFilter;
+            var filter = search.get_filter("stream") as CheckOptionFilter;
             if (filter.filtering)
             {
                 foreach (Unity.FilterOption option in filter.options)
@@ -422,7 +367,7 @@
             }
 
             var account_ids = new Gee.ArrayList<string> ();
-            filter = scope.get_filter ("account_id") as CheckOptionFilter;
+            filter = search.get_filter ("account_id") as CheckOptionFilter;
             if (filter.filtering)
             {
                 foreach (Unity.FilterOption option in filter.options)
@@ -447,7 +392,7 @@
          
             var term_list = Object.new (typeof (Dee.TermList)) as Dee.TermList;
             // search only the folded terms, FIXME: is that a good idea?
-            _analyzer.tokenize (_ascii_filter.apply (search), term_list);
+            _analyzer.tokenize (_ascii_filter.apply (search.search_string), term_list);
 
             var matches = new Sequence<Dee.ModelIter> ();
             for (uint i = 0; i < term_list.num_terms (); i++)
@@ -556,7 +501,8 @@
                 case "private": group = Categories.PRIVATE; break;
                 case "public": group = Categories.PUBLIC; break;
             }
-            
+
+            string uri = model.get_string (iter, StreamModelColumn.URL);
             string _icon_uri = model.get_string (iter, StreamModelColumn.ICON_URI);
             if (stream_id == "images")
                 _img_uri = model.get_string (iter, StreamModelColumn.LINK_PICTURE);
@@ -569,12 +515,15 @@
             else
                 _img_uri = get_avatar_path (_icon_uri);
 
-            results_model.append (model.get_string (iter, StreamModelColumn.URL),
-                                                    _img_uri,
-                                                    group,
-                                                    "text/html",
-                                                    GLib.Markup.escape_text (_model.get_string(iter, StreamModelColumn.SENDER)),
-                                                    sanitize_message (_model.get_string(iter, StreamModelColumn.MESSAGE)));
+            results_model.append (uri,
+                                  _img_uri,
+                                  group,
+                                  ResultType.PERSONAL,
+                                  "text/html",
+                                  GLib.Markup.escape_text (_model.get_string(iter, StreamModelColumn.SENDER)),
+                                  sanitize_message (_model.get_string(iter, StreamModelColumn.MESSAGE)),
+                                  uri,
+                                  empty_asv);
         }
 
         private string get_avatar_path (string uri)
 
=== modified file 'src/main.vala'
--- src/main.vala	2012-10-30 18:21:51 +0000
+++ src/main.vala	2013-05-14 09:34:26 +0000
@@ -67,7 +67,7 @@
          * making it race against GDBus' worker thread to export our
          * objects on the bus before/after owning our name and receiving
          * method calls on our objects (which may not yet be up!)*/
-        if (dbus_name_has_owner ("com.canonical.Unity.Lens.Friends"))
+        if (dbus_name_has_owner (BUS_NAME))
         {
             print ("Another instance of the Unity Friends Daemon " +
                    "already appears to be running.\nBailing out.\n");
@@ -79,8 +79,7 @@
         daemon = new Daemon ();
     
         /* Use GApplication directly for single instance app functionality */
-        app = new Application ("com.canonical.Unity.Lens.Friends",
-                               ApplicationFlags.IS_SERVICE);
+        app = new Application (BUS_NAME, ApplicationFlags.IS_SERVICE);
         try {
             app.register ();
         } catch (Error e) {