Commit 7126181b authored by Dan Williams's avatar Dan Williams
Browse files

2005-08-26 Dan Williams <dcbw@redhat.com>

    * gnome/applet/applet-dbus-devices.c
      gnome/applet/applet-dbus-vpn.c
        - Remove calls to dbus_pending_call_ref() because we already
            "own" the pending call
        - Remove calls to dbus_pending_call_get_completed() because
            when we are in the callback, the pending call is completed
            by definition


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@901 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
parent c40cb663
2005-08-26 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet-dbus-devices.c
gnome/applet/applet-dbus-vpn.c
- Remove calls to dbus_pending_call_ref() because we already
"own" the pending call
- Remove calls to dbus_pending_call_get_completed() because
when we are in the callback, the pending call is completed
by definition
2005-08-22 Dan Williams <dcbw@redhat.com>
Patch by Bill Moss <bmoss@clemson.edu>
......
......@@ -53,11 +53,6 @@ static void nmwa_dbus_nm_state_cb (DBusPendingCall *pcall, void *user_data)
g_return_if_fail (pcall != NULL);
g_return_if_fail (applet != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -123,11 +118,6 @@ static void nmwa_dbus_update_wireless_enabled_cb (DBusPendingCall *pcall, void *
g_return_if_fail (pcall != NULL);
g_return_if_fail (applet != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -259,11 +249,6 @@ static void hal_info_product_cb (DBusPendingCall *pcall, void *user_data)
g_return_if_fail (cb_data->parent_op != NULL);
g_return_if_fail (cb_data->vendor != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -307,11 +292,6 @@ static void hal_info_vendor_cb (DBusPendingCall *pcall, void *user_data)
g_return_if_fail (cb_data->dev != NULL);
g_return_if_fail (cb_data->parent_op != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -375,11 +355,6 @@ static void hal_info_parent_cb (DBusPendingCall *pcall, void *user_data)
g_return_if_fail (cb_data->applet != NULL);
g_return_if_fail (cb_data->dev != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -631,11 +606,6 @@ static void nmwa_dbus_net_properties_cb (DBusPendingCall *pcall, void *user_data
applet = cb_data->applet;
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -779,11 +749,6 @@ static void nmwa_dbus_device_properties_cb (DBusPendingCall *pcall, void *user_d
g_return_if_fail (pcall != NULL);
g_return_if_fail (applet != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -901,11 +866,6 @@ static void nmwa_dbus_update_devices_cb (DBusPendingCall *pcall, void *user_data
g_return_if_fail (pcall != NULL);
g_return_if_fail (applet != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -948,11 +908,6 @@ static void nmwa_dbus_update_dialup_cb (DBusPendingCall *pcall, void *user_data)
g_return_if_fail (pcall != NULL);
g_return_if_fail (applet != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -1233,11 +1188,6 @@ static void nmwa_dbus_update_device_strength_cb (DBusPendingCall *pcall, void *u
applet = cb_data->applet;
g_return_if_fail (applet != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......
......@@ -53,11 +53,6 @@ static void nmwa_dbus_vpn_get_active_vpn_connection_cb (DBusPendingCall *pcall,
g_return_if_fail (pcall != NULL);
g_return_if_fail (applet != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -155,13 +150,8 @@ static void nmwa_dbus_vpn_properties_cb (DBusPendingCall *pcall, void *user_data
g_return_if_fail (cb_data->applet != NULL);
g_return_if_fail (cb_data->name != NULL);
dbus_pending_call_ref (pcall);
applet = cb_data->applet;
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......@@ -258,11 +248,6 @@ static void nmwa_dbus_vpn_update_vpn_connections_cb (DBusPendingCall *pcall, voi
g_return_if_fail (pcall != NULL);
g_return_if_fail (applet != NULL);
dbus_pending_call_ref (pcall);
if (!dbus_pending_call_get_completed (pcall))
goto out;
if (!(reply = dbus_pending_call_steal_reply (pcall)))
goto out;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment