Merge lp:~thumper/unity/fix-865840 into lp:unity

[Tim Penhey]

Don't assign null to a std::string

The bamf call could return null when a window doesn't have a name.

We should never assign null to a std::string.

Not sure how to best test this, as we can't reproduce the problem, and bamf doesn't yet have mocking or faking.

[Sam Spilsbury (smspillaz)]

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Yep, that was something I planned to do too.
Nice.

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/153/console reported an error when processing this lp:~thumper/unity/fix-865840 branch.
Not merging it.

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2012-01-15 19:01:11 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2012-01-24 02:22:25 +0000
@@ -323,9 +323,7 @@
     view = static_cast <BamfView*> (l->data);
     if (BAMF_IS_WINDOW(view) && (Window) bamf_window_get_xid(BAMF_WINDOW(view)) == window)
     {
-      gchar *name = bamf_view_get_name (view);
-      result = name;
-      g_free (name);
+      result = glib::String(bamf_view_get_name(view)).Str();
       break;
     }
   }