diff options
| author | infirit <[email protected]> | 2014-12-13 15:30:40 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-13 18:32:16 +0100 |
| commit | 420c17e9df0fe75f74b13f9d0caa91e764780c4b (patch) | |
| tree | f2be9e365bcc05fac2923f23b04e0ea4891144b6 /plugins/mouse/Makefile.am | |
| parent | 5561f9707602bca1e768a58f9c2ff30d70586ead (diff) | |
| download | mate-settings-daemon-420c17e9df0fe75f74b13f9d0caa91e764780c4b.tar.bz2 mate-settings-daemon-420c17e9df0fe75f74b13f9d0caa91e764780c4b.tar.xz | |
mouse: Move "has touchpad" function to common
So it can be reused. This also fixes a memory leak in the function.
We were leaking the device list
Taken from GSD commit: f6dcba4e954f3e910854f3c92fb69b157683267d
From: Bastien Nocera <[email protected]>
Diffstat (limited to 'plugins/mouse/Makefile.am')
| -rw-r--r-- | plugins/mouse/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am index 8e1ab77..01a1f43 100644 --- a/plugins/mouse/Makefile.am +++ b/plugins/mouse/Makefile.am @@ -8,6 +8,7 @@ libmouse_la_SOURCES = \ libmouse_la_CPPFLAGS = \ -I$(top_srcdir)/mate-settings-daemon \ + -I$(top_srcdir)/plugins/common/ \ -DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ -DLIBEXECDIR=\""$(libexecdir)"\" \ $(AM_CPPFLAGS) @@ -19,9 +20,10 @@ libmouse_la_CFLAGS = \ libmouse_la_LDFLAGS = \ $(MSD_PLUGIN_LDFLAGS) -libmouse_la_LIBADD = \ - $(SETTINGS_PLUGIN_LIBS) \ - $(X11_LIBS) \ +libmouse_la_LIBADD = \ + $(top_builddir)/plugins/common/libcommon.la \ + $(SETTINGS_PLUGIN_LIBS) \ + $(X11_LIBS) \ $(XINPUT_LIBS) plugin_in_files = mouse.mate-settings-plugin.in |