misc. reformatting
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1306 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -386,7 +386,7 @@ static NMData *nm_data_new (gboolean enable_test_devices)
|
|||||||
data->main_context = g_main_context_new ();
|
data->main_context = g_main_context_new ();
|
||||||
data->main_loop = g_main_loop_new (data->main_context, FALSE);
|
data->main_loop = g_main_loop_new (data->main_context, FALSE);
|
||||||
|
|
||||||
if (pipe(data->sigterm_pipe) < 0)
|
if (pipe (data->sigterm_pipe) < 0)
|
||||||
{
|
{
|
||||||
nm_error ("Couldn't create pipe: %s", g_strerror (errno));
|
nm_error ("Couldn't create pipe: %s", g_strerror (errno));
|
||||||
exit (EXIT_FAILURE);
|
exit (EXIT_FAILURE);
|
||||||
@@ -623,10 +623,10 @@ nm_monitor_wired_link_state (NMData *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
nm_info_handler (const gchar *log_domain,
|
nm_info_handler (const gchar *log_domain,
|
||||||
GLogLevelFlags log_level,
|
GLogLevelFlags log_level,
|
||||||
const gchar *message,
|
const gchar *message,
|
||||||
gboolean is_daemon)
|
gboolean is_daemon)
|
||||||
{
|
{
|
||||||
int syslog_priority;
|
int syslog_priority;
|
||||||
|
|
||||||
|
@@ -309,10 +309,6 @@ NMState nm_get_app_state_from_data (NMData *data)
|
|||||||
return NM_STATE_CONNECTING;
|
return NM_STATE_CONNECTING;
|
||||||
else
|
else
|
||||||
return NM_STATE_CONNECTED;
|
return NM_STATE_CONNECTED;
|
||||||
|
|
||||||
g_assert_not_reached ();
|
|
||||||
|
|
||||||
return NM_STATE_UNKNOWN;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -344,6 +340,7 @@ void nm_dbus_signal_state_change (DBusConnection *connection, NMData *data)
|
|||||||
dbus_message_unref (message);
|
dbus_message_unref (message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* nm_dbus_signal_wireless_network_change
|
* nm_dbus_signal_wireless_network_change
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user