summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-10-22 16:40:05 +0200
committerStefano Karapetsas <[email protected]>2012-10-22 16:40:05 +0200
commitdc2e834a6bec8716cdfdcf9d5a506f23796b3ffe (patch)
treede7e31c2155f70b262cd314ddc3395dcc371f2ce
parent78bd678462f2f5cc78b8986e4d17d98e5286819d (diff)
downloadmate-control-center-dc2e834a6bec8716cdfdcf9d5a506f23796b3ffe.tar.bz2
mate-control-center-dc2e834a6bec8716cdfdcf9d5a506f23796b3ffe.tar.xz
remove mateconf from default-applications
-rw-r--r--capplets/default-applications/Makefile.am14
-rw-r--r--capplets/default-applications/mate-at-commandline.in.in101
-rw-r--r--capplets/default-applications/mate-at-session.desktop.in.in11
3 files changed, 1 insertions, 125 deletions
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index 906ba6ba..1b70aa5d 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -3,8 +3,6 @@ cappletname = default-applications
bin_PROGRAMS = mate-default-applications-properties
-bin_SCRIPTS = mate-at-visual mate-at-mobility
-
mate_default_applications_properties_LDADD = $(MATECC_CAPPLETS_LIBS)
mate_default_applications_properties_SOURCES = \
mate-da-capplet.c mate-da-capplet.h
@@ -14,12 +12,6 @@ mate_default_applications_properties_SOURCES = \
uidir = $(pkgdatadir)/ui
dist_ui_DATA = mate-default-applications-properties.ui
-mate-at-visual: mate-at-commandline.in
- cp $< $@
-
-mate-at-mobility: mate-at-commandline.in
- cp $< $@
-
desktopdir = $(datadir)/applications
Desktop_in_files = default-applications.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
@@ -27,17 +19,13 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = mate-default-applications.pc
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = mate-at-session.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
INCLUDES = \
$(MATECC_CAPPLETS_CFLAGS) \
$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \
-DMATELOCALEDIR=\""$(datadir)/locale"\"\
-DMATECC_UI_DIR=\""$(uidir)"\"
-CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(autostart_DATA) $(bin_SCRIPTS)
+CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(autostart_DATA)
EXTRA_DIST = mate-default-applications.pc.in
-include $(top_srcdir)/git.mk
diff --git a/capplets/default-applications/mate-at-commandline.in.in b/capplets/default-applications/mate-at-commandline.in.in
deleted file mode 100644
index f9d93b16..00000000
--- a/capplets/default-applications/mate-at-commandline.in.in
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2006 IBM Corp.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of version 2 of the GNU General Public License
-# as published by the Free Software Foundation
-#
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
-#
-###############################################################################
-#
-# NOTE: This script is intended to be run from the command line,
-# MATE menu, or from the desktop autostart.
-#
-# /usr/bin/mate-at-visual
-# /usr/bin/mate-at-mobility
-#
-# If the "-s" flag is used then it is assumed to have been invoked
-# from /usr/share/mate/autostart/, and the first AT flagged
-# to "startup" from MATECONF_ALL will be executed.
-#
-
-USAGE="$0 [-s]"
-MATECONF_PATH=/desktop/mate/applications/at
-MATECONF_VISUAL="visual"
-MATECONF_MOBILITY="mobility"
-MATECONF_ALL="$MATECONF_VISUAL $MATECONF_MOBILITY"
-
-run_at() {
- CMDLINE=`mateconftool-2 --get $MATECONF_PATH/$1/exec`
- if [ $? -ne 0 ]; then
- exit $?
- fi
-
- if [ -z "$CMDLINE" ]; then
- exit 2
- fi
-
- STARTUP=`mateconftool-2 --get $MATECONF_PATH/$1/startup`
- if [ $? -ne 0 ]; then
- exit $?
- fi
-
- if [ ! -z "$AUTOSTART" ]; then
- # assuming ran from /usr/share/mate/autostart
- if [ "x$STARTUP" = "xtrue" ]; then
- # mateconf indicated requested autostart
- ($CMDLINE &)
- fi
- else
- # run from command line or desktop menu
- ($CMDLINE &)
- fi
-}
-
-case `basename $0` in
- mate-at-visual )
- AT=$MATECONF_VISUAL
- ;;
- mate-at-mobility )
- AT=$MATECONF_MOBILITY
- ;;
- mate-at-session | * )
- AUTOSTART="yes"
- AT=$MATECONF_ALL
- ;;
-esac
-
-while getopts "s" options; do
- case $options in
- s ) AUTOSTART="yes"
- AT=$MATECONF_ALL
- shift
- ;;
- \? ) echo $USAGE
- exit 1
- ;;
- * ) echo $USAGE
- exit 1
- ;;
- esac
-done
-
-if [ $# -ne 0 ]; then
- echo $USAGE
- exit 1
-fi
-
-for I in $AT ; do
- run_at $I
-done
-
-#EOF
diff --git a/capplets/default-applications/mate-at-session.desktop.in.in b/capplets/default-applications/mate-at-session.desktop.in.in
deleted file mode 100644
index 10cef785..00000000
--- a/capplets/default-applications/mate-at-session.desktop.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-_Name=Visual Assistance
-_Comment=Start the preferred visual assistive technology
-Exec=mate-at-visual -s
-Icon=preferences-desktop-accessibility
-Terminal=false
-Type=Application
-StartupNotify=false
-OnlyShowIn=MATE;
-AutostartCondition=MATE /desktop/mate/interface/accessibility
-X-MATE-Autostart-enabled=true