mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-23 19:24:38 +00:00
2004-07-15 Dan Williams <dcbw@redhat.com>
* dispatcher-daemon/Makefile.am - Turn on warnings * dispatcher-daemon/NetworkManagerDispatcher.c - Remove unused variables due to warnings - Fix some comments - Print message on receipt of NeedKeyForNetwork signal (testing only) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@14 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
0073d4dd55
commit
d3ad52d649
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2004-07-15 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* dispatcher-daemon/Makefile.am
|
||||
- Turn on warnings
|
||||
|
||||
* dispatcher-daemon/NetworkManagerDispatcher.c
|
||||
- Remove unused variables due to warnings
|
||||
- Fix some comments
|
||||
- Print message on receipt of NeedKeyForNetwork signal (testing only)
|
||||
|
||||
2004-07-06 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/NetworkManager.c
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
INCLUDES = \
|
||||
$(NM_CFLAGS) \
|
||||
-DDBUS_API_SUBJECT_TO_CHANGE \
|
||||
-DBINDIR=\"$(bindir)\" \
|
||||
INCLUDES = \
|
||||
$(NM_CFLAGS) \
|
||||
-Wall \
|
||||
-DDBUS_API_SUBJECT_TO_CHANGE \
|
||||
-DBINDIR=\"$(bindir)\" \
|
||||
-DDATADIR=\"$(datadir)\"
|
||||
|
||||
bin_PROGRAMS = NetworkManagerDispatcher
|
||||
|
|
|
@ -56,6 +56,8 @@ ECHO_N = @ECHO_N@
|
|||
ECHO_T = @ECHO_T@
|
||||
EGREP = @EGREP@
|
||||
EXEEXT = @EXEEXT@
|
||||
GLADE_CFLAGS = @GLADE_CFLAGS@
|
||||
GLADE_LIBS = @GLADE_LIBS@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
|
@ -108,9 +110,10 @@ sharedstatedir = @sharedstatedir@
|
|||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
INCLUDES = \
|
||||
$(NM_CFLAGS) \
|
||||
-DDBUS_API_SUBJECT_TO_CHANGE \
|
||||
-DBINDIR=\"$(bindir)\" \
|
||||
$(NM_CFLAGS) \
|
||||
-Wall \
|
||||
-DDBUS_API_SUBJECT_TO_CHANGE \
|
||||
-DBINDIR=\"$(bindir)\" \
|
||||
-DDATADIR=\"$(datadir)\"
|
||||
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <dirent.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
enum NMDAction
|
||||
{
|
||||
|
@ -228,6 +228,8 @@ static DBusHandlerResult nmd_dbus_filter (DBusConnection *connection, DBusMessag
|
|||
action = NMD_DEVICE_NOW_INACTIVE;
|
||||
else if (dbus_message_is_signal (message, "org.freedesktop.NetworkManager", "DeviceNowActive"))
|
||||
action = NMD_DEVICE_NOW_ACTIVE;
|
||||
else if (dbus_message_is_signal (message, "org.freedesktop.NetworkManager", "NeedKeyForNetwork"))
|
||||
fprintf (stderr, "NeedKeyForNetwork\n");
|
||||
|
||||
if (action != NMD_DEVICE_DONT_KNOW)
|
||||
{
|
||||
|
@ -271,7 +273,7 @@ static DBusConnection *nmd_dbus_init (void)
|
|||
DBusConnection *connection = NULL;
|
||||
DBusError error;
|
||||
|
||||
/* connect to hald service on the system bus */
|
||||
/* connect to NetworkManager service on the system bus */
|
||||
dbus_error_init (&error);
|
||||
connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
|
||||
if (connection == NULL)
|
||||
|
@ -377,7 +379,6 @@ int main( int argc, char *argv[] )
|
|||
if (become_daemon)
|
||||
{
|
||||
int child_pid;
|
||||
int dev_null_fd;
|
||||
|
||||
if (chdir ("/") < 0)
|
||||
{
|
||||
|
@ -406,11 +407,10 @@ int main( int argc, char *argv[] )
|
|||
if (!g_thread_supported ())
|
||||
g_thread_init (NULL);
|
||||
|
||||
/* Create our dbus service */
|
||||
/* Connect to the NetworkManager dbus service and run the main loop */
|
||||
connection = nmd_dbus_init ();
|
||||
if (connection)
|
||||
{
|
||||
/* Run the main loop, all events processed by callbacks from libhal. */
|
||||
loop = g_main_loop_new (NULL, FALSE);
|
||||
g_main_loop_run (loop);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue