diff options
| author | Claudio Saavedra <csaavedra@igalia.com> | 2011-06-24 04:18:37 +0800 |
|---|---|---|
| committer | Claudio Saavedra <csaavedra@igalia.com> | 2011-06-24 05:00:18 +0800 |
| commit | 3af15cdbcd31a7ac4eda748ae83180a228d30a80 (patch) | |
| tree | 1454d2f428a9b6ef143efb54447ed4ebd49827a8 /src/Makefile.am | |
| parent | ab913fa36787366d68e08a0831403872d3e62ffc (diff) | |
| download | gsoc2013-epiphany-3af15cdbcd31a7ac4eda748ae83180a228d30a80.tar gsoc2013-epiphany-3af15cdbcd31a7ac4eda748ae83180a228d30a80.tar.gz gsoc2013-epiphany-3af15cdbcd31a7ac4eda748ae83180a228d30a80.tar.bz2 gsoc2013-epiphany-3af15cdbcd31a7ac4eda748ae83180a228d30a80.tar.lz gsoc2013-epiphany-3af15cdbcd31a7ac4eda748ae83180a228d30a80.tar.xz gsoc2013-epiphany-3af15cdbcd31a7ac4eda748ae83180a228d30a80.tar.zst gsoc2013-epiphany-3af15cdbcd31a7ac4eda748ae83180a228d30a80.zip | |
Use a gdbus-codegen generated GDBusProxy to monitor NM state
Get rid of the EphyNetMonitor code and instead generate a GDBusProxy
subclass that monitors the StateChanged signal and State property in
org.gnome.NetworkManager. This proxy exports these features as
standard GObject signal and property, respectively, so we can use it
directly through the relevant accessors.
https://bugzilla.gnome.org/show_bug.cgi?id=622903
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f3995050a..9c2e87eaf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -116,10 +116,26 @@ libephymain_la_CFLAGS = \ $(WEBKIT_CFLAGS) \ $(AM_CFLAGS) +BUILT_SOURCES = \ + $(TYPES_SOURCE) \ + ephy-dbus-client-bindings.h \ + ephy-dbus-server-bindings.h + if ENABLE_NETWORK_MANAGER -libephymain_la_SOURCES += \ - ephy-net-monitor.c \ - ephy-net-monitor.h +nodist_libephymain_la_SOURCES += \ + ephy-network-manager.c \ + ephy-network-manager.h + +BUILT_SOURCES += \ + ephy-network-manager.h \ + ephy-network-manager.c + +ephy-network-manager.c ephy-network-manager.h: $(top_srcdir)/data/ephy-network-manager.xml + $(AM_V_GEN) $(GDBUS_CODEGEN) \ + --c-namespace Ephy \ + --generate-c-code ephy-network-manager \ + --interface-prefix org.freedesktop. \ + $< libephymain_la_CFLAGS += $(NETWORK_MANAGER_CFLAGS) endif @@ -184,12 +200,6 @@ epiphany_LDADD += \ $(NETWORK_MANAGER_LIBS) endif -BUILT_SOURCES = \ - $(TYPES_SOURCE) \ - ephy-dbus-client-bindings.h \ - ephy-dbus-server-bindings.h - - TYPES_SOURCE = \ ephy-type-builtins.c \ ephy-type-builtins.h |