colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-05-11 Dan Williams <dcbw@redhat.com>

Browse Source 
* configure.in
	  Makefile.am
	  gfilemonitor/*
		- Add a private copy of the GIO GFileMonitor code, with a custom GFile
			implementation, so that the same change monitoring code can be used
			on systems without glib-2.14 (like Fedora 8)

	* system-settings/plugins/keyfile/Makefile.am
	  system-settings/plugins/keyfile/plugin.c
	  system-settings/plugins/ifcfg-suse/Makefile.am
	  system-settings/plugins/ifcfg-suse/plugin.c
		- Use private gfilemonitor code if GIO is not present



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3654 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-05-11 20:12:18 +00:00
parent 2f9019b268
commit d7eafc71b1
30 changed files with 3965 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system-settings/plugins/ifcfg-suse/Makefile.am
View File

@@ -28,7 +28,14 @@ libnm_settings_plugin_ifcfg_suse_la_LIBADD = \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
$(POLKIT_LIBS) \
$(GIO_LIBS) \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm_glib.la
if NO_GIO
libnm_settings_plugin_ifcfg_suse_la_LIBADD += \
$(top_builddir)/gfilemonitor/libgfilemonitor.la
else
libnm_settings_plugin_ifcfg_suse_la_LIBADD += \
$(GIO_LIBS)
endif

6
system-settings/plugins/ifcfg-suse/plugin.c
View File

@@ -21,13 +21,19 @@
* (C) Copyright 2007 Red Hat, Inc.
*/
#include <config.h>
#include <gmodule.h>
#include <glib-object.h>
#include <glib/gi18n.h>
#include <string.h>
#include <sys/inotify.h>
#include <unistd.h>
#ifndef NO_GIO
#include <gio/gio.h>
#else
#include <gfilemonitor/gfilemonitor.h>
#endif
#include <nm-setting-connection.h>
#include <nm-setting-ip4-config.h>

8
system-settings/plugins/keyfile/Makefile.am
View File

@@ -27,7 +27,13 @@ libnm_settings_plugin_keyfile_la_LIBADD = \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \
$(DBUS_LIBS) \
$(GIO_LIBS) \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/libnm-glib/libnm_glib.la
if NO_GIO
libnm_settings_plugin_keyfile_la_LIBADD += \
$(top_builddir)/gfilemonitor/libgfilemonitor.la
else
libnm_settings_plugin_keyfile_la_LIBADD += \
$(GIO_LIBS)
endif

8
system-settings/plugins/keyfile/plugin.c
View File

@@ -1,16 +1,22 @@
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
#include <config.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
#include <gmodule.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <gio/gio.h>
#include <nm-connection.h>
#include <nm-setting.h>
#include <nm-setting-connection.h>
#ifndef NO_GIO
#include <gio/gio.h>
#else
#include <gfilemonitor/gfilemonitor.h>
#endif
#include "plugin.h"
#include "nm-system-config-interface.h"
#include "nm-keyfile-connection.h"