diff options
author | Bastien Nocera <hadess@hadess.net> | 2016-09-26 19:02:22 +0200 |
---|---|---|
committer | Bastien Nocera <hadess@hadess.net> | 2016-10-11 11:00:56 +0200 |
commit | 6d01a434ca2faa88acb2aed1224d23cea329f1f8 (patch) | |
tree | ed1e66b9904359de66973926264141ac88a661ff /plugins/screensaver-proxy | |
parent | 6296cbf3be0571b795eb0c7877c83890aa6a099d (diff) | |
download | gnome-settings-daemon-6d01a434ca2faa88acb2aed1224d23cea329f1f8.tar.gz |
plugins: Stop building helpers as plugins
https://bugzilla.gnome.org/show_bug.cgi?id=772370
Diffstat (limited to 'plugins/screensaver-proxy')
-rw-r--r-- | plugins/screensaver-proxy/Makefile.am | 34 | ||||
-rw-r--r-- | plugins/screensaver-proxy/gsd-screensaver-proxy-plugin.c | 28 | ||||
-rw-r--r-- | plugins/screensaver-proxy/screensaver-proxy.gnome-settings-plugin.in | 9 |
3 files changed, 3 insertions, 68 deletions
diff --git a/plugins/screensaver-proxy/Makefile.am b/plugins/screensaver-proxy/Makefile.am index 2f2da3a3..e35cd55a 100644 --- a/plugins/screensaver-proxy/Makefile.am +++ b/plugins/screensaver-proxy/Makefile.am @@ -1,27 +1,5 @@ plugin_name = screensaver-proxy -plugin_LTLIBRARIES = libscreensaver-proxy.la - -libscreensaver_proxy_la_SOURCES = \ - gsd-screensaver-proxy-manager.c \ - gsd-screensaver-proxy-manager.h \ - gsd-screensaver-proxy-plugin.c - -libscreensaver_proxy_la_CPPFLAGS = \ - -I$(top_srcdir)/gnome-settings-daemon \ - -I$(top_builddir)/gnome-settings-daemon \ - -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ - $(AM_CPPFLAGS) - -libscreensaver_proxy_la_CFLAGS = \ - $(PLUGIN_CFLAGS) \ - $(SETTINGS_PLUGIN_CFLAGS) \ - $(AM_CFLAGS) - -libscreensaver_proxy_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS) - -libscreensaver_proxy_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) - libexec_PROGRAMS = gsd-screensaver-proxy gsd_screensaver_proxy_SOURCES = \ @@ -49,10 +27,6 @@ gsd_screensaver_proxy_LDADD = \ $(SETTINGS_DAEMON_LIBS) \ $(SETTINGS_PLUGIN_LIBS) -plugin_in_files = screensaver-proxy.gnome-settings-plugin.in - -plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) - desktopdir = $(sysconfdir)/xdg/autostart desktop_in_files = org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -60,10 +34,8 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) org.gnome.SettingsDaemon.ScreensaverProxy.desktop: $(desktop_in_files) Makefile $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -EXTRA_DIST = $(plugin_in_files) $(desktop_in_files) - -CLEANFILES = $(plugin_DATA) $(desktop_DATA) +EXTRA_DIST = $(desktop_in_files) -DISTCLEANFILES = $(plugin_DATA) $(desktop_DATA) +CLEANFILES = $(desktop_DATA) -@GSD_INTLTOOL_PLUGIN_RULE@ +DISTCLEANFILES = $(desktop_DATA) diff --git a/plugins/screensaver-proxy/gsd-screensaver-proxy-plugin.c b/plugins/screensaver-proxy/gsd-screensaver-proxy-plugin.c deleted file mode 100644 index c6ed6c3d..00000000 --- a/plugins/screensaver-proxy/gsd-screensaver-proxy-plugin.c +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. - * - */ - -#include "config.h" - -#include <glib/gi18n-lib.h> -#include <gmodule.h> - -#include "gnome-settings-plugin.h" -#include "gsd-screensaver-proxy-manager.h" - -GNOME_SETTINGS_PLUGIN_REGISTER (GsdScreensaverProxy, gsd_screensaver_proxy) diff --git a/plugins/screensaver-proxy/screensaver-proxy.gnome-settings-plugin.in b/plugins/screensaver-proxy/screensaver-proxy.gnome-settings-plugin.in deleted file mode 100644 index 0cc328ab..00000000 --- a/plugins/screensaver-proxy/screensaver-proxy.gnome-settings-plugin.in +++ /dev/null @@ -1,9 +0,0 @@ -[GNOME Settings Plugin] -Module=screensaver-proxy -IAge=0 -Priority=8 -_Name=Screensaver Proxy -_Description=Proxy FreeDesktop screensaver inhibition to gnome-session -Authors=Bastien Nocera -Copyright=Copyright © 2012 Bastien Nocera -Website= |