Warning fixes
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2908 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -178,7 +178,6 @@ nm_act_request_new (NMConnection *connection,
|
||||
{
|
||||
GObject *obj;
|
||||
NMActRequestPrivate *priv;
|
||||
gulong id;
|
||||
|
||||
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
|
||||
|
||||
@@ -218,7 +217,6 @@ connection_added_cb (NMManager *manager,
|
||||
NMActRequestPrivate *priv;
|
||||
const char *service_name;
|
||||
const char *path;
|
||||
gulong id;
|
||||
|
||||
g_return_if_fail (NM_IS_ACT_REQUEST (user_data));
|
||||
g_return_if_fail (NM_IS_CONNECTION (connection));
|
||||
|
@@ -526,7 +526,6 @@ nm_ppp_manager_start (NMPPPManager *manager,
|
||||
NMPPPManagerPrivate *priv;
|
||||
NMCmdLine *ppp_cmd;
|
||||
char *cmd_str;
|
||||
GPid pid;
|
||||
GSource *ppp_watch;
|
||||
|
||||
g_return_val_if_fail (NM_IS_PPP_MANAGER (manager), FALSE);
|
||||
@@ -559,7 +558,7 @@ nm_ppp_manager_start (NMPPPManager *manager,
|
||||
|
||||
nm_debug ("ppp started with pid %d", priv->pid);
|
||||
|
||||
ppp_watch = g_child_watch_source_new (pid);
|
||||
ppp_watch = g_child_watch_source_new (priv->pid);
|
||||
g_source_set_callback (ppp_watch, (GSourceFunc) ppp_watch_cb, manager, NULL);
|
||||
g_source_attach (ppp_watch, NULL);
|
||||
g_source_unref (ppp_watch);
|
||||
|
@@ -109,7 +109,6 @@ nm_vpn_connection_new (NMConnection *connection,
|
||||
{
|
||||
NMVPNConnection *vpn_connection;
|
||||
NMVPNConnectionPrivate *priv;
|
||||
gulong id;
|
||||
|
||||
g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL);
|
||||
g_return_val_if_fail (NM_IS_DEVICE (parent_device), NULL);
|
||||
@@ -504,7 +503,6 @@ get_secrets_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
|
||||
NMVPNConnectionPrivate *priv;
|
||||
GError *err = NULL;
|
||||
GHashTable *secrets = NULL;
|
||||
NMConnection *connection;
|
||||
|
||||
if (!info || !info->vpn_connection || !info->setting_name)
|
||||
goto error;
|
||||
@@ -605,7 +603,7 @@ connection_need_secrets_cb (DBusGProxy *proxy,
|
||||
NULL);
|
||||
|
||||
if (error) {
|
||||
g_warning ("%s.%d: NeedSecrets failed: %d %s",
|
||||
g_warning ("%s.%d: NeedSecrets failed: %s %s",
|
||||
__FILE__, __LINE__,
|
||||
g_quark_to_string (error->domain), error->message);
|
||||
nm_vpn_connection_fail (vpn_connection);
|
||||
@@ -625,7 +623,6 @@ static void
|
||||
call_need_secrets (NMVPNConnection *vpn_connection)
|
||||
{
|
||||
NMVPNConnectionPrivate *priv;
|
||||
const char *setting_name;
|
||||
GHashTable *settings;
|
||||
|
||||
priv = NM_VPN_CONNECTION_GET_PRIVATE (vpn_connection);
|
||||
|
Reference in New Issue
Block a user