Bug 717862 Error: Goto dbus_done bypasses a variable (or an exception) initialization. r=tbsaunde
authorGinn Chen <ginn.chen@oracle.com>
Mon, 16 Jan 2012 09:34:35 +0800
changeset 85795 f64609a2123591ff07d78ad5fab542293e9acce0
parent 85794 a3bdb21f350c2f69fe0c67d9849417cc12081a7e
child 85796 3f378d354444754f1e072d55426155e56e8df80c
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstbsaunde
bugs717862
milestone12.0a1
Bug 717862 Error: Goto dbus_done bypasses a variable (or an exception) initialization. r=tbsaunde
accessible/src/atk/nsApplicationAccessibleWrap.cpp
--- a/accessible/src/atk/nsApplicationAccessibleWrap.cpp
+++ b/accessible/src/atk/nsApplicationAccessibleWrap.cpp
@@ -891,25 +891,25 @@ PreInit()
     return;
 
   DBusConnection* bus = dbus_bus_get(DBUS_BUS_SESSION, nsnull);
   if (!bus)
     return;
 
   dbus_connection_set_exit_on_disconnect(bus, FALSE);
 
+  static const char* iface = "org.a11y.Status";
+  static const char* member = "IsEnabled";
   DBusMessage *message;
   message = dbus_message_new_method_call("org.a11y.Bus", "/org/a11y/bus",
                                          "org.freedesktop.DBus.Properties",
                                          "Get");
   if (!message)
     goto dbus_done;
 
-  static const char* iface = "org.a11y.Status";
-  static const char* member = "IsEnabled";
   dbus_message_append_args(message, DBUS_TYPE_STRING, &iface,
                            DBUS_TYPE_STRING, &member, DBUS_TYPE_INVALID);
   dbus_connection_send_with_reply(bus, message, &sPendingCall, 1000);
   dbus_message_unref(message);
 
 dbus_done:
   dbus_connection_unref(bus);
 #endif