Merge lp:~pitti/autopilot-gtk/fix-1254996 into lp:autopilot-gtk

[Martin Pitt]

Avoid unnecessary string duplication when matching properties. This also fixes a rare crash when cleaning up the temporary string object.

Avoid unnecessary string duplication when matching properties

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/autopilot-gtk-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-gtk-trusty-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-gtk-ci/72/rebuild

review: Approve (continuous-integration)

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

=== modified file 'lib/GtkNode.cpp'
--- lib/GtkNode.cpp	2013-09-04 05:21:51 +0000
+++ lib/GtkNode.cpp	2013-11-26 12:40:41 +0000
@@ -284,13 +284,12 @@
   g_value_init(&dest_value, G_PARAM_SPEC_VALUE_TYPE(pspec));
   g_object_get_property(object_, name.c_str(), &dest_value);
   convert_value(pspec, &dest_value);
-  std::string dest_string;
 
   if (G_VALUE_TYPE(&dest_value) == G_TYPE_STRING) {
       const gchar *str = g_value_get_string(&dest_value);
-      dest_string = (str != NULL) ? str : "";
+      int result = g_strcmp0 (str, value.c_str());
       g_value_unset(&dest_value);
-      return dest_string == value;
+      return result == 0;
   }
   else {
       g_debug("Property %s exists, but is not a string (is %s).",