Merge lp:~3v1n0/bamf/factory-local-views-removal into lp:bamf

[Marco Trevisan (Treviño)]

BamfFactory: remove the local_views list, we don't need that anymore

Having them tracked on allocated_views list is enough, and fixes an issue as explained on bug #1193559

We need to check if we already have allocated a view with the requested .desktop file when calling BamfMatcher's get_application_for_desktop_file

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:571
http://jenkins.qa.ubuntu.com/job/bamf-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/43
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/43

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/62/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:571
http://jenkins.qa.ubuntu.com/job/bamf-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/44
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/44

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/63/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:571
http://jenkins.qa.ubuntu.com/job/bamf-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/48
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/48

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/67/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/bamf-autolanding/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-autolanding/29
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-autolanding/28

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:571
http://jenkins.qa.ubuntu.com/job/bamf-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/52

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/70/rebuild

review: Approve (continuous-integration)

=== modified file 'lib/libbamf/bamf-factory.c'
--- lib/libbamf/bamf-factory.c	2013-06-13 13:21:03 +0000
+++ lib/libbamf/bamf-factory.c	2013-06-21 17:57:27 +0000
@@ -48,7 +48,6 @@
 struct _BamfFactoryPrivate
 {
   GHashTable *open_views;
-  GList *local_views;
   GList *allocated_views;
 };
 
@@ -74,12 +73,6 @@
       self->priv->allocated_views = NULL;
     }
 
-  if (self->priv->local_views)
-    {
-      g_list_free (self->priv->local_views);
-      self->priv->local_views = NULL;
-    }
-
   if (self->priv->open_views)
     {
       g_hash_table_remove_all (self->priv->open_views);
@@ -163,7 +156,6 @@
 static void
 on_view_weak_unref (BamfFactory *self, BamfView *view_was_here)
 {
-  self->priv->local_views = g_list_remove (self->priv->local_views, view_was_here);
   self->priv->allocated_views = g_list_remove (self->priv->allocated_views, view_was_here);
 }
 
@@ -199,8 +191,8 @@
   BamfApplication *result = NULL, *app;
   GList *l;
 
-  /* check if result is available in known local_views */
-  for (l = factory->priv->local_views; l; l = l->next)
+  /* check if result is available in known allocated_views */
+  for (l = factory->priv->allocated_views; l; l = l->next)
     {
       if (!BAMF_IS_APPLICATION (l->data))
         continue;
@@ -221,7 +213,6 @@
 
       if (BAMF_IS_APPLICATION (result))
         {
-          factory->priv->local_views = g_list_prepend (factory->priv->local_views, result);
           bamf_factory_track_view (factory, BAMF_VIEW (result));
         }
     }