[gnome-user-share] Remove preferences application
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-share] Remove preferences application
- Date: Tue, 15 Jan 2013 16:39:45 +0000 (UTC)
commit 8937b254af31f9e4f74a1e100375bad945a6d12e
Author: Bastien Nocera <hadess hadess net>
Date: Tue Jan 15 17:26:17 2013 +0100
Remove preferences application
Sharing is now merged in gnome-control-center 3.7.4
data/Makefile.am | 13 +-
data/file-share-properties.ui | 369 --------------------
data/gnome-user-share-properties.desktop.in | 14 -
po/POTFILES.in | 3 -
src/Makefile.am | 13 -
src/file-share-properties.c | 494 ---------------------------
6 files changed, 3 insertions(+), 903 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index a3f4ab7..3b49820 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,16 +1,11 @@
SUBDIRS = icons
- INTLTOOL_DESKTOP_RULE@
-desktopdir = $(datadir)/applications
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-desktop_in_files = gnome-user-share-properties.desktop.in
-
autostartdir = $(sysconfdir)/xdg/autostart/
autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
autostart_in_files = gnome-user-share.desktop.in
appdir = $(datadir)/gnome-user-share
-app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile file-share-properties.ui
+app_DATA=dav_user_2.0.conf dav_user_2.2.conf dav_groupfile
gsettingsdir = $(datadir)/glib-2.0/schemas
gsettings_in_files = org.gnome.desktop.file-sharing.gschema.xml.in
@@ -22,13 +17,11 @@ convertdir = $(datadir)/GConf/gsettings
convert_DATA = gnome-user-share.convert
EXTRA_DIST = $(app_DATA) \
- $(desktop_in_files) \
$(gsettings_in_files) \
$(convert_DATA) \
- gnome-user-share.desktop.in.in \
- file-share-properties.ui
+ gnome-user-share.desktop.in.in
-CLEANFILES = $(desktop_DATA) $(autostart_DATA) $(gsettings_DATA)
+CLEANFILES = $(autostart_DATA) $(gsettings_DATA)
DISTCLEANFILES = $(gsettings_DATA)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index df4ab18..f3e6239 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,12 +1,9 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
data/org.gnome.desktop.file-sharing.gschema.xml.in.in
-[type: gettext/glade]data/file-share-properties.ui
-data/gnome-user-share-properties.desktop.in
data/gnome-user-share.desktop.in.in
src/nautilus-share-bar.c
src/share-extension.c
-src/file-share-properties.c
src/http.c
src/obexpush.c
src/user_share.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 09e82e3..c24dcc9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,3 @@
-
MARSHALFILES = marshal.c marshal.h
BUILT_SOURCES = $(MARSHALFILES)
@@ -8,9 +7,6 @@ marshal.h: marshal.list
$(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=marshal $(srcdir)/marshal.list --header > marshal.h )
-bin_PROGRAMS= \
- gnome-file-share-properties
-
libexec_PROGRAMS= \
gnome-user-share
@@ -53,14 +49,6 @@ gnome_user_share_LDADD = \
$(SELINUX_LIBS) \
$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
-gnome_file_share_properties_SOURCES = \
- file-share-properties.c \
- user_share-private.h \
- user_share-private.c
-
-gnome_file_share_properties_LDADD = \
- $(USER_SHARE_CONFIG_LIBS)
-
nautilus_extensiondir = $(NAUTILUSDIR)
nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la
@@ -77,5 +65,4 @@ EXTRA_DIST = marshal.list
CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]