[tracker] Remove Maemo/Meego leftovers
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] Remove Maemo/Meego leftovers
- Date: Fri, 9 Jun 2017 12:25:08 +0000 (UTC)
commit 809b56767fccd5680136485c6fbbc895e83dd886
Author: Sam Thursfield <sam afuera me uk>
Date: Thu Jun 8 17:03:41 2017 +0100
Remove Maemo/Meego leftovers
This removes various code paths that we believe to be unused.
* The userguides miner has been removed altogether.
* The application miner no longer parses MeeGo-style .desktop files
* The TRACKER_DISABLE_MEEGOTOUCH_LOCALE environment flag is gone
(it already did nothing)
* Character set detection with libmeegotouch is removed, only enca
or libicu are supported
* Meego-specific flags are gone from .desktop files
* Functional tests have lost their vestigal Scratchbox and Aegis support
There are 5 ontologies referencing Maemo, 4 of which are largely unused.
These have been kept around in case anyone is using them outside
Tracker.
https://bugzilla.gnome.org/show_bug.cgi?id=783555
config.h.meson.in | 3 -
configure.ac | 91 +---
docs/manpages/tracker-store.1 | 6 -
docs/reference/libtracker-sparql/overview.sgml | 9 -
meson.build | 24 +-
meson_options.txt | 2 -
po/POTFILES.in | 3 -
po/POTFILES.skip | 1 -
src/libtracker-common/tracker-locale.c | 1 -
src/libtracker-data/tracker-collation.c | 5 -
src/libtracker-extract/Makefile.am | 6 -
src/libtracker-extract/meson.build | 4 -
.../tracker-encoding-meegotouch.cpp | 90 ---
.../tracker-encoding-meegotouch.h | 33 -
src/libtracker-extract/tracker-encoding.c | 13 +-
src/miners/Makefile.am | 4 -
src/miners/apps/tracker-miner-applications.c | 104 +---
src/miners/apps/tracker-miner-apps.desktop.in.in | 3 +-
src/miners/fs/tracker-main.c | 4 +-
src/miners/fs/tracker-miner-fs.desktop.in.in | 3 +-
src/miners/meson.build | 1 -
src/miners/user-guides/.gitignore | 2 -
src/miners/user-guides/Makefile.am | 73 --
src/miners/user-guides/meson.build | 45 --
...desktop.Tracker1.Miner.Userguides.service.in.in | 9 -
src/miners/user-guides/tracker-main.c | 258 -------
src/miners/user-guides/tracker-miner-user-guides.c | 804 --------------------
.../tracker-miner-user-guides.desktop.in.in | 19 -
src/miners/user-guides/tracker-miner-user-guides.h | 54 --
.../tracker-miner-user-guides.service.in | 10 -
src/ontologies/Makefile.am | 9 +-
src/tracker-extract/tracker-extract.desktop.in.in | 3 +-
src/tracker-store/tracker-store.desktop.in.in | 2 +-
tests/functional-tests/400-extractor-metadata.py | 4 -
tests/functional-tests/Makefile.am | 25 -
.../common/utils/configuration.py.in | 3 +-
tests/functional-tests/common/utils/system.py | 3 +-
tests/functional-tests/create-tests-aegis.py | 63 --
tests/functional-tests/create-tests-xml.py | 109 ---
tests/functional-tests/test-extraction-data/README | 2 -
.../audio/Jazz_Audio_OPLs0.expected | 2 -
.../audio/audio-test-1.expected | 2 -
.../audio/audio-test-2.expected | 3 -
.../images/comment-extension-block.expected | 2 -
.../images/test-image-1.expected | 2 -
.../images/test-image-2.expected | 2 -
.../images/test-image-3.expected | 2 -
.../test-extraction-data/office/pdf-doc.expected | 2 -
.../test-extraction-data/video/184505.expected | 2 -
.../test-extraction-data/video/video-1.expected | 2 -
.../test-extraction-data/video/video-2.expected | 2 -
tests/functional-tests/test-runner.sh | 16 +-
tests/libtracker-extract/Makefile.am | 4 -
tests/libtracker-extract/tracker-encoding-test.c | 2 +-
tests/tracker-writeback/tests.xml | 28 -
55 files changed, 23 insertions(+), 1957 deletions(-)
---
diff --git a/config.h.meson.in b/config.h.meson.in
index 4294d84..613511c 100644
--- a/config.h.meson.in
+++ b/config.h.meson.in
@@ -78,9 +78,6 @@
/* libunistring Unicode support library */
#mesondefine HAVE_LIBUNISTRING
-/* Define if we have meegotouch */
-#mesondefine HAVE_MEEGOTOUCH
-
/* Define if we have NetworkManager for network status detection */
#mesondefine HAVE_NETWORK_MANAGER
diff --git a/configure.ac b/configure.ac
index ffdd760..3b6024a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,7 +213,6 @@ GTK_REQUIRED=3.0.0
LIBXML2_REQUIRED=2.6
HAL_REQUIRED=0.5
UPOWER_REQUIRED=0.9.0
-MEEGOTOUCH_REQUIRED=0.20
POPPLER_REQUIRED=0.16.0
CAIRO_REQUIRED=1.0
LIBICU_REQUIRED=4.8.1.1
@@ -399,13 +398,6 @@ TRACKER_MINER_APPS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
PKG_CHECK_MODULES(TRACKER_MINER_APPS, [$TRACKER_MINER_APPS_REQUIRED])
-# Check requirements for tracker-miner-user-guides
-TRACKER_MINER_USER_GUIDES_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
- gio-unix-2.0 >= $GLIB_REQUIRED
- libxml-2.0 >= $LIBXML2_REQUIRED"
-
-PKG_CHECK_MODULES(TRACKER_MINER_USER_GUIDES, [$TRACKER_MINER_USER_GUIDES_REQUIRED])
-
# Check requirements for tracker-miner-evolution
evolution_plugin_name=""
@@ -631,7 +623,6 @@ if test "x$enable_minimal" = "xyes"; then
enable_tracker_writeback=no
enable_miner_fs=no
enable_miner_apps=no
- enable_miner_user_guides=no
enable_miner_rss=no
enable_miner_evolution=no
enable_miner_thunderbird=no
@@ -702,22 +693,6 @@ if test "$native_win32" = "yes" ; then
fi
####################################################################
-# Check if we should install Maemo/MeeGo specific ontologies
-####################################################################
-
-AC_ARG_ENABLE(maemo,
- AS_HELP_STRING([--enable-maemo],
- [enable maemo ontology [[default=no]]]),
- [enable_maemo=$enableval],
- [enable_maemo=no])
-
-AM_CONDITIONAL(HAVE_MAEMO, test "x$enable_maemo" = "xyes")
-
-if test "x$enable_maemo" = "xyes" ; then
- AC_DEFINE(HAVE_MAEMO, 1, [Define if we enable Maemo specific features])
-fi
-
-####################################################################
# Check if we should disable the journal
####################################################################
@@ -1274,40 +1249,6 @@ fi
AM_CONDITIONAL(HAVE_EXEMPI, test "x$have_exempi" = "xyes")
-####################################################################
-# Check for tracker-miner-fs: meegotouch, for MeeGo desktop files
-####################################################################
-
-AC_ARG_ENABLE(meegotouch,
- AS_HELP_STRING([--enable-meegotouch],
- [enable libmeegotouch application extraction [[default=no]]]),
- [enable_meegotouch=$enableval],
- [enable_meegotouch=no])
-
-if test "x$enable_meegotouch" != "xno"; then
- PKG_CHECK_MODULES(MEEGOTOUCH,
- [meegotouch >= $MEEGOTOUCH_REQUIRED],
- [have_meegotouch=yes],
- [have_meegotouch=no])
-
- LIBTRACKER_COMMON_CFLAGS="$LIBTRACKER_COMMON_CFLAGS $MEEGOTOUCH_CFLAGS"
- LIBTRACKER_COMMON_LIBS="$LIBTRACKER_COMMON_LIBS $MEEGOTOUCH_LIBS"
-
- LIBTRACKER_EXTRACT_CFLAGS="$LIBTRACKER_EXTRACT_CFLAGS $MEEGOTOUCH_CFLAGS"
- LIBTRACKER_EXTRACT_LIBS="$LIBTRACKER_EXTRACT_LIBS $MEEGOTOUCH_LIBS"
-
- TRACKER_MINER_FS_CFLAGS="$TRACKER_MINER_FS_CFLAGS $MEEGOTOUCH_CFLAGS"
- TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS $MEEGOTOUCH_LIBS"
-
- if test "x$have_meegotouch" = "xyes"; then
- AC_DEFINE(HAVE_MEEGOTOUCH, [], [Define if we have meegotouch])
- fi
-else
- have_meegotouch="no (disabled)"
-fi
-
-AM_CONDITIONAL(HAVE_MEEGOTOUCH, test "x$have_meegotouch" = "xyes")
-
##################################################################
# Check for tracker-miner-fs
##################################################################
@@ -1409,32 +1350,6 @@ fi
AM_CONDITIONAL(HAVE_TRACKER_MINER_APPS, test "x$have_tracker_miner_apps" = "xyes")
##################################################################
-# Check for tracker-miner-user-guides
-##################################################################
-
-have_tracker_miner_user_guides="yes"
-
-AC_ARG_ENABLE(miner_user_guides,
- AS_HELP_STRING([--enable-miner-user-guides],
- [enable User guides miner [[default=auto]]]),
- [enable_miner_user_guides=$enableval],
- [enable_miner_user_guides=auto])
-
-enable_tracker_miner_user_guides=$enable_miner_user_guides
-
-if test "x$enable_tracker_miner_user_guides" = "xyes"; then
- if test "x$have_tracker_miner_user_guides" != "xyes"; then
- AC_MSG_ERROR([Could not find tracker-miner-user-guides dependencies
($TRACKER_MINER_USER_GUIDES_REQUIRED).])
- fi
-else
- if test "x$enable_tracker_miner_user_guides" = "xno"; then
- have_tracker_miner_user_guides="no (disabled)"
- fi
-fi
-
-AM_CONDITIONAL(HAVE_TRACKER_MINER_USER_GUIDES, test "x$have_tracker_miner_user_guides" = "xyes")
-
-##################################################################
# Check for tracker-miner-rss
##################################################################
@@ -2664,7 +2579,6 @@ AC_CONFIG_FILES([
src/miners/fs/Makefile
src/miners/apps/Makefile
src/miners/rss/Makefile
- src/miners/user-guides/Makefile
src/ontologies/Makefile
src/tracker-store/Makefile
src/tracker/Makefile
@@ -2813,10 +2727,9 @@ Feature Support:
Data Miners / Writebacks:
- FS (File System): $have_tracker_miner_fs (MeeGo support: $have_meegotouch)
+ FS (File System): $have_tracker_miner_fs
Applications: $have_tracker_miner_apps
RSS: $have_tracker_miner_rss
- User Guides: $have_tracker_miner_user_guides
Email:
Evolution: $have_tracker_miner_evolution
($tracker_miner_evolution_install_dir)
Thunderbird: $have_tracker_miner_thunderbird
($tracker_miner_thunderbird_install_dir)
@@ -2871,8 +2784,6 @@ Applications:
Frameworks / Options:
Support GNOME's Nautilus $have_tracker_nautilus_extension
($tracker_nautilus_extension_install_dir)
- Support Maemo $enable_maemo
- Support libmeegotouch $have_meegotouch
Support Guaranteed Metadata $enable_guarantee_metadata (e.g. guess nie:title from files)
"
diff --git a/docs/manpages/tracker-store.1 b/docs/manpages/tracker-store.1
index eb4eab7..77ecb17 100644
--- a/docs/manpages/tracker-store.1
+++ b/docs/manpages/tracker-store.1
@@ -82,12 +82,6 @@ settings. The file is a \\n separated list of SQLite queries to execute on any
newly created SQLite connection in tracker-store.
.TP
-.B TRACKER_DISABLE_MEEGOTOUCH_LOCALE
-If Tracker is compiled with meegotouch locale management support, setting this
-variable in the environment will disable retrieving the locale from GConf, and
-the standard locale settings will be used instead.
-
-.TP
.B TRACKER_USE_LOG_FILES
Don't just log to stdout and stderr, but to log files too which are
kept in $HOME/.local/share/tracker/. This came into effect in 0.15.3
diff --git a/docs/reference/libtracker-sparql/overview.sgml b/docs/reference/libtracker-sparql/overview.sgml
index 586c115..400dca9 100644
--- a/docs/reference/libtracker-sparql/overview.sgml
+++ b/docs/reference/libtracker-sparql/overview.sgml
@@ -184,15 +184,6 @@ $ pkg-config --libs tracker-sparql-0.12
created SQLite connection in tracker-store.
</para>
</listitem>
- <listitem>
- <emphasis>TRACKER_DISABLE_MEEGOTOUCH_LOCALE</emphasis>
- <para>
- If Tracker is compiled with meegotouch locale management support,
- setting this variable in the environment will disable retrieving
- the locale from GConf, and the standard locale settings will be
- used instead.
- </para>
- </listitem>
</itemizedlist>
</para>
diff --git a/meson.build b/meson.build
index 703351d..da221d8 100644
--- a/meson.build
+++ b/meson.build
@@ -56,7 +56,6 @@ libsoup = dependency('libsoup-2.4', version: '> 2.40', required: true)
libtiff = dependency('libtiff-4', required: false)
libxml2 = dependency('libxml-2.0', version: '> 2.6')
libvorbis = dependency('vorbisfile', version: '> 0.22')
-meegotouch = dependency('meegotouch', version: '> 0.20', required: false)
nautilus_extension = dependency('libnautilus-extension', required: false)
network_manager = dependency('libnm-glib', version: '> 0.8', required: false)
poppler = dependency('poppler-glib', version: '> 0.16.0', required: false)
@@ -194,21 +193,6 @@ if unicode_library_name == ''
endif
####################################################################
-# Check for tracker-miner-fs: meegotouch, for MeeGo desktop files
-####################################################################
-
-have_meegotouch = false
-if get_option('meegotouch') != 'no'
- meegotouch = dependency('meegotouch', version: '>= 0.20', required: false)
-
- if meegotouch.found()
- have_meegotouch = true
- elif get_option('meegotouch') == 'yes'
- error('meegotouch support explicitly requested, but meegotouch library couldn\'t be found')
- endif
-endif
-
-####################################################################
# Check for tracker-miner-evolution
####################################################################
@@ -441,7 +425,6 @@ conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
conf.set('HAVE_LIBMEDIAART', libmediaart.found())
conf.set('HAVE_LIBSTEMMER', have_libstemmer)
conf.set('HAVE_LIBUNISTRING', unicode_library_name == 'unistring')
-conf.set('HAVE_MEEGOTOUCH', have_meegotouch)
conf.set('HAVE_NETWORK_MANAGER', network_manager.found())
conf.set('HAVE_UPOWER', battery_detection_library_name == 'upower')
@@ -485,7 +468,6 @@ add_global_arguments('-D_LARGEFILE64_SOURCE', language: 'c')
have_tracker_miner_fs = true
have_tracker_miner_apps = true
-have_tracker_miner_user_guides = true
have_tracker_miner_rss = true
have_tracker_miner_firefox = true
have_tracker_extract = true
@@ -551,11 +533,9 @@ summary = [
' Cache media art ' + libmediaart.found().to_string(),
' Bash completion support: ' + bash_completion_dir,
'\nData Miners / Writebacks:',
- ' FS (File System): @0@ (MeeGo support: @1@)'.format(
- have_tracker_miner_fs, have_meegotouch),
+ ' FS (File System): ' + have_tracker_miner_fs.to_string(),
' Applications: ' + have_tracker_miner_apps.to_string(),
' RSS: ' + have_tracker_miner_rss.to_string(),
- ' User Guides: ' + have_tracker_miner_user_guides.to_string(),
' Email:',
' Evolution: @0@ (@1@)'.format(
have_tracker_miner_evolution, tracker_miner_evolution_install_dir),
@@ -617,8 +597,6 @@ summary += [
'\nFrameworks / Options:',
' Support Nautilus file manager @0@ (@1@)'.format(
nautilus_extension.found().to_string(), tracker_nautilus_extension_install_dir),
- ' Support Maemo false',
- ' Support libmeegotouch ' + meegotouch.found().to_string(),
' Support Guaranteed Metadata ' + get_option('guarantee_metadata').to_string(),
]
diff --git a/meson_options.txt b/meson_options.txt
index 943b48a..1624c4a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -36,8 +36,6 @@ option('generic_media_extractor', type: 'combo', choices: ['auto', 'gstreamer',
description: 'Enables one of the (gstreamer, libav, auto) generic media extractor backends')
option('gstreamer_backend', type: 'combo', choices: ['discoverer', 'gupnp'], value: 'discoverer',
description: 'When GStreamer is used, this enables one of the (discoverer, gupnp) GStreamer backends')
-option('meegotouch', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'no',
- description: 'Enable libmeegotouch application extraction')
option('stemmer', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'no',
description: 'Enable stemming words while indexing')
option('unicode_support', type: 'combo', choices: ['icu', 'unistring', 'auto'], value: 'auto',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2d11910..92030f0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,9 +24,6 @@ src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
src/miners/rss/tracker-main.c
src/miners/rss/tracker-miner-rss.c
src/miners/rss/tracker-miner-rss.desktop.in.in
-src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in.in
-src/miners/user-guides/tracker-main.c
-src/miners/user-guides/tracker-miner-user-guides.desktop.in.in
src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in.in
src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
src/plugins/evolution/tracker-evolution-plugin.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 1cbb71e..798733b 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -14,7 +14,6 @@ src/tracker-status-icon/tracker-status-icon.desktop.in
src/tracker-store/tracker-main.c
src/tracker-store/tracker-store.desktop.in
src/tracker-extract/tracker-extract.desktop.in
-src/miners/user-guides/tracker-miner-user-guides.desktop.in
src/miners/apps/tracker-miner-apps.desktop.in
src/miners/fs/tracker-miner-fs.desktop.in
src/miners/rss/tracker-miner-rss.desktop.in
diff --git a/src/libtracker-common/tracker-locale.c b/src/libtracker-common/tracker-locale.c
index 030f8be..20a5134 100644
--- a/src/libtracker-common/tracker-locale.c
+++ b/src/libtracker-common/tracker-locale.c
@@ -103,7 +103,6 @@ tracker_locale_init (void)
{
guint i;
- /* Initialize those not retrieved from gconf, or if not in meegotouch */
for (i = 0; i < TRACKER_LOCALE_LAST; i++) {
if (!current_locales[i]) {
const gchar *env_locale = NULL;
diff --git a/src/libtracker-data/tracker-collation.c b/src/libtracker-data/tracker-collation.c
index 308f5ee..b43ce91 100644
--- a/src/libtracker-data/tracker-collation.c
+++ b/src/libtracker-data/tracker-collation.c
@@ -108,11 +108,6 @@ tracker_collation_init (void)
/* Get locale! */
locale = tracker_locale_get (TRACKER_LOCALE_COLLATE);
-#ifdef HAVE_MEEGOTOUCH
- /* libmeegotouch ships modified ICU data */
- u_setDataDirectory ("/usr/share/meegotouch/icu");
-#endif
-
g_debug ("[ICU collation] Initializing collator for locale '%s'", locale);
collator = ucol_open (locale, &status);
if (!collator) {
diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am
index dc7d6e3..45f507c 100644
--- a/src/libtracker-extract/Makefile.am
+++ b/src/libtracker-extract/Makefile.am
@@ -56,12 +56,6 @@ libtracker_extract_la_SOURCES += \
tracker-encoding-enca.h
endif
-if HAVE_MEEGOTOUCH
-libtracker_extract_la_SOURCES += \
- tracker-encoding-meegotouch.cpp \
- tracker-encoding-meegotouch.h
-endif
-
if HAVE_LIBICU_CHARSET_DETECTION
libtracker_extract_la_SOURCES += \
tracker-encoding-libicu.c \
diff --git a/src/libtracker-extract/meson.build b/src/libtracker-extract/meson.build
index 96b6c8e..2ecd9d1 100644
--- a/src/libtracker-extract/meson.build
+++ b/src/libtracker-extract/meson.build
@@ -16,10 +16,6 @@ elif charset_library_name == 'icu'
libtracker_extract_sources += 'tracker-encoding-libicu.c'
endif
-if have_meegotouch
- libtracker_extract_sources += 'tracker-encoding-meegotouch.cpp'
-endif
-
tracker_extract_dependencies = [charset_library, gmodule]
if exempi.found()
diff --git a/src/libtracker-extract/tracker-encoding.c b/src/libtracker-extract/tracker-encoding.c
index fe0b342..f015767 100644
--- a/src/libtracker-extract/tracker-encoding.c
+++ b/src/libtracker-extract/tracker-encoding.c
@@ -26,10 +26,6 @@
#include "tracker-encoding-enca.h"
#endif
-#ifdef HAVE_MEEGOTOUCH
-#include "tracker-encoding-meegotouch.h"
-#endif
-
#ifdef HAVE_LIBICU_CHARSET_DETECTION
#include "tracker-encoding-libicu.h"
#endif
@@ -37,7 +33,7 @@
gboolean
tracker_encoding_can_guess (void)
{
-#if defined (HAVE_ENCA) || defined (HAVE_MEEGOTOUCH) || defined (HAVE_LIBICU_CHARSET_DETECTION)
+#if defined (HAVE_ENCA) || defined (HAVE_LIBICU_CHARSET_DETECTION)
return TRUE;
#else
return FALSE;
@@ -52,13 +48,8 @@ tracker_encoding_guess (const gchar *buffer,
gchar *encoding = NULL;
gdouble conf = 1;
-#ifdef HAVE_MEEGOTOUCH
- encoding = tracker_encoding_guess_meegotouch (buffer, size);
-#endif /* HAVE_MEEGOTOUCH */
-
#ifdef HAVE_LIBICU_CHARSET_DETECTION
- if (!encoding)
- encoding = tracker_encoding_guess_icu (buffer, size, &conf);
+ encoding = tracker_encoding_guess_icu (buffer, size, &conf);
#endif /* HAVE_LIBICU_CHARSET_DETECTION */
#ifdef HAVE_ENCA
diff --git a/src/miners/Makefile.am b/src/miners/Makefile.am
index ca32fb8..cbeba54 100644
--- a/src/miners/Makefile.am
+++ b/src/miners/Makefile.am
@@ -12,8 +12,4 @@ if HAVE_TRACKER_MINER_RSS
SUBDIRS += rss
endif
-if HAVE_TRACKER_MINER_USER_GUIDES
-SUBDIRS += user-guides
-endif
-
EXTRA_DIST = meson.build
diff --git a/src/miners/apps/tracker-miner-applications.c b/src/miners/apps/tracker-miner-applications.c
index 749d3e4..6f92603 100644
--- a/src/miners/apps/tracker-miner-applications.c
+++ b/src/miners/apps/tracker-miner-applications.c
@@ -143,24 +143,6 @@ miner_applications_add_directories (TrackerMinerFS *fs)
if (user_data_dir) {
miner_applications_basedir_add (fs, user_data_dir);
}
-
-#ifdef HAVE_MEEGOTOUCH
- /* NOTE: We don't use miner_applications_basedir_add() for
- * this location because it is unique to MeeGoTouch.
- */
- path = "/usr/lib/duicontrolpanel/";
- indexing_tree = tracker_miner_fs_get_indexing_tree (fs);
-
- g_message ("Setting up applications to iterate from MeegoTouch directories");
- g_message (" Adding:'%s'", path);
-
- file = g_file_new_for_path (path);
- tracker_indexing_tree_add (indexing_tree, file,
- TRACKER_DIRECTORY_FLAG_RECURSE |
- TRACKER_DIRECTORY_FLAG_MONITOR |
- TRACKER_DIRECTORY_FLAG_CHECK_MTIME);
- g_object_unref (file);
-#endif /* HAVE_MEEGOTOUCH */
}
static void
@@ -199,7 +181,7 @@ miner_finished_cb (TrackerMinerFS *fs,
/* If a reset is requested, we will remove from the store all items previously
* inserted by the tracker-miner-applications, this is:
* (a) all elements which are nfo:softwareIcon of a given nfo:Software
- * (b) all nfo:Software in our graph (includes both applications and maemo applets)
+ * (b) all nfo:Software in our graph
* (c) all elements which are nfo:softwareCategoryIcon of a given nfo:SoftwareCategory
* (d) all nfo:SoftwareCategory in our graph
*/
@@ -227,7 +209,7 @@ miner_applications_reset (TrackerMiner *miner)
tracker_sparql_builder_object_variable (sparql, "software");
tracker_sparql_builder_where_close (sparql);
- /* (b) all nfo:Software in our graph (includes both applications and maemo applets) */
+ /* (b) all nfo:Software in our graph */
tracker_sparql_builder_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
tracker_sparql_builder_subject_variable (sparql, "software");
tracker_sparql_builder_predicate (sparql, "a");
@@ -520,10 +502,6 @@ process_desktop_file (ProcessApplicationData *data,
gboolean is_software = TRUE;
const gchar *parent_urn;
gchar *lang;
-#ifdef HAVE_MEEGOTOUCH
- gchar *logical_id = NULL;
- gchar *translation_catalog = NULL;
-#endif /* HAVE_MEEGOTOUCH */
sparql = data->sparql;
key_file = data->key_file;
@@ -544,19 +522,6 @@ process_desktop_file (ProcessApplicationData *data,
/* NOTE: We sanitize categories later on when iterating them */
-#ifdef HAVE_MEEGOTOUCH
- /* If defined, start with the logical strings */
- logical_id = g_key_file_get_string (key_file, GROUP_DESKTOP_ENTRY, "X-MeeGo-Logical-Id", NULL);
- translation_catalog = g_key_file_get_string (key_file, GROUP_DESKTOP_ENTRY,
"X-MeeGo-Translation-Catalog", NULL);
-
- if (logical_id && translation_catalog) {
- name = tracker_meego_translate (translation_catalog, logical_id);
- }
-
- g_free (logical_id);
- g_free (translation_catalog);
-#endif /* HAVE_MEEGOTOUCH */
-
if (!name) {
/* Try to get the name with our desired LANG locale... */
name = g_key_file_get_locale_string (key_file, GROUP_DESKTOP_ENTRY, "Name", lang, NULL);
@@ -648,63 +613,6 @@ process_desktop_file (ProcessApplicationData *data,
g_warning ("Invalid desktop file: '%s'", uri);
g_warning (" Type 'Link' requires a URL");
}
-#ifdef HAVE_MEEGOTOUCH
- } else if (name && g_ascii_strcasecmp (type, "ControlPanelApplet") == 0) {
- /* Special case control panel applets */
- /* The URI of the InformationElement should be a UUID URN */
- uri = g_file_get_uri (data->file);
- tracker_sparql_builder_insert_silent_open (sparql, TRACKER_MINER_FS_GRAPH_URN);
-
- tracker_sparql_builder_subject_iri (sparql, APPLET_DATASOURCE_URN);
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "nie:DataSource");
-
- /* TODO This is atm specific for Maemo */
- tracker_sparql_builder_subject_iri (sparql, uri);
-
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "maemo:ControlPanelApplet");
-
- tracker_sparql_builder_predicate (sparql, "nie:dataSource");
- tracker_sparql_builder_object_iri (sparql, APPLET_DATASOURCE_URN);
-
- /* This matches SomeApplet as Type= */
- } else if (name && g_str_has_suffix (type, "Applet")) {
- /* The URI of the InformationElement should be a UUID URN */
- uri = g_file_get_uri (data->file);
- tracker_sparql_builder_insert_silent_open (sparql, TRACKER_MINER_FS_GRAPH_URN);
-
- tracker_sparql_builder_subject_iri (sparql, APPLET_DATASOURCE_URN);
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "nie:DataSource");
-
- /* TODO This is atm specific for Maemo */
- tracker_sparql_builder_subject_iri (sparql, uri);
-
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "maemo:SoftwareApplet");
-
- tracker_sparql_builder_predicate (sparql, "nie:dataSource");
- tracker_sparql_builder_object_iri (sparql, APPLET_DATASOURCE_URN);
-
- } else if (name && g_ascii_strcasecmp (type, "DUIApplication") == 0) {
-
- uri = g_file_get_uri (data->file);
- tracker_sparql_builder_insert_silent_open (sparql, TRACKER_MINER_FS_GRAPH_URN);
-
- tracker_sparql_builder_subject_iri (sparql, APPLICATION_DATASOURCE_URN);
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "nie:DataSource");
-
- tracker_sparql_builder_subject_iri (sparql, uri);
-
- tracker_sparql_builder_predicate (sparql, "a");
- tracker_sparql_builder_object (sparql, "nfo:SoftwareApplication");
- tracker_sparql_builder_object (sparql, "nie:DataObject");
-
- tracker_sparql_builder_predicate (sparql, "nie:dataSource");
- tracker_sparql_builder_object_iri (sparql, APPLICATION_DATASOURCE_URN);
-#endif /* HAVE_MEEGOTOUCH */
} else {
/* Invalid type, all valid types are already listed above */
uri = g_file_get_uri (data->file);
@@ -733,11 +641,7 @@ process_desktop_file (ProcessApplicationData *data,
/* If we didn't get a name, the problem is more severe as we don't default it
* to anything, so we g_warning() it. */
g_warning ("Invalid desktop file: '%s'", uri);
-#ifdef HAVE_MEEGOTOUCH
- g_warning (" Couldn't get name, missing or wrong key (X-MeeGo-Logical-Id,
X-MeeGo-Translation-Catalog or Name)");
-#else
g_warning (" Couldn't get name, missing key (Name)");
-#endif
}
}
@@ -759,8 +663,8 @@ process_desktop_file (ProcessApplicationData *data,
tracker_sparql_builder_object_boolean (sparql, TRUE); */
/* We should always always have a proper name if the desktop file is correct
- * w.r.t to the Meego or Freedesktop specs, but sometimes this is not true,
- * so instead of passing wrong stuff to the SPARQL builder, we avoid it.
+ * w.r.t to the Freedesktop specs, but sometimes this is not true, so
+ * instead of passing wrong stuff to the SPARQL builder, we avoid it.
* If we don't have a proper name, we already warned it before. */
if (name) {
tracker_sparql_builder_predicate (sparql, "nie:title");
diff --git a/src/miners/apps/tracker-miner-apps.desktop.in.in
b/src/miners/apps/tracker-miner-apps.desktop.in.in
index 0c49814..12b49ea 100644
--- a/src/miners/apps/tracker-miner-apps.desktop.in.in
+++ b/src/miners/apps/tracker-miner-apps.desktop.in.in
@@ -6,13 +6,12 @@ Exec=@libexecdir@/tracker-miner-apps
Terminal=false
Type=Application
Categories=Utility;
-X-Meego-Priority=Late
X-GNOME-Autostart-enabled=true
X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
+OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Miners
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index f40ff5c..4e2f607 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -647,8 +647,8 @@ miner_needs_check (TrackerMiner *miner,
}
/* FIXME: We currently don't check the applications
- * miner OR the userguides miner if we are finished
- * before returning TRUE/FALSE here, should we?
+ * miner if we are finished before returning TRUE/FALSE here, should
+ * we?
*/
/* We consider the miner finished */
diff --git a/src/miners/fs/tracker-miner-fs.desktop.in.in b/src/miners/fs/tracker-miner-fs.desktop.in.in
index a1620f6..29d5364 100644
--- a/src/miners/fs/tracker-miner-fs.desktop.in.in
+++ b/src/miners/fs/tracker-miner-fs.desktop.in.in
@@ -6,13 +6,12 @@ Exec=@libexecdir@/tracker-miner-fs
Terminal=false
Type=Application
Categories=Utility;
-X-Meego-Priority=Late
X-GNOME-Autostart-enabled=true
X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
+OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Miners
diff --git a/src/miners/meson.build b/src/miners/meson.build
index 605c7ec..d938410 100644
--- a/src/miners/meson.build
+++ b/src/miners/meson.build
@@ -1,4 +1,3 @@
subdir('fs')
subdir('rss')
subdir('apps')
-subdir('user-guides')
diff --git a/src/ontologies/Makefile.am b/src/ontologies/Makefile.am
index 31ce129..4dce61e 100644
--- a/src/ontologies/Makefile.am
+++ b/src/ontologies/Makefile.am
@@ -1,6 +1,3 @@
-maemo_ontology = \
- 91-maemo.ontology 91-maemo.description
-
configdir = $(datadir)/tracker/ontologies
config_DATA = \
@@ -23,12 +20,8 @@ config_DATA = \
89-mtp.ontology 89-mtp.description \
92-slo.ontology 92-slo.description \
90-tracker.ontology 90-tracker.description \
+ 91-maemo.ontology 91-maemo.description \
93-libosinfo.ontology 93-libosinfo.description
-if HAVE_MAEMO
-config_DATA += $(maemo_ontology)
-endif
-
EXTRA_DIST = \
- $(maemo_ontology) \
$(config_DATA)
diff --git a/src/tracker-extract/tracker-extract.desktop.in.in
b/src/tracker-extract/tracker-extract.desktop.in.in
index f832b32..59fc0af 100644
--- a/src/tracker-extract/tracker-extract.desktop.in.in
+++ b/src/tracker-extract/tracker-extract.desktop.in.in
@@ -6,13 +6,12 @@ Exec=@libexecdir@/tracker-extract
Terminal=false
Type=Application
Categories=Utility;
-X-Meego-Priority=Late
X-GNOME-Autostart-enabled=true
X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
+OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Extractor
diff --git a/src/tracker-store/tracker-store.desktop.in.in b/src/tracker-store/tracker-store.desktop.in.in
index 78e855d..260b880 100644
--- a/src/tracker-store/tracker-store.desktop.in.in
+++ b/src/tracker-store/tracker-store.desktop.in.in
@@ -11,7 +11,7 @@ X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-UniqueApplet=true
NoDisplay=true
-OnlyShowIn=GNOME;KDE;XFCE;X-MEEGO-HS;X-MEEGO-NB;X-IVI;Unity;
+OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=tracker
X-GNOME-Bugzilla-Component=Store
diff --git a/tests/functional-tests/400-extractor-metadata.py
b/tests/functional-tests/400-extractor-metadata.py
index 140b5d5..fc1604e 100755
--- a/tests/functional-tests/400-extractor-metadata.py
+++ b/tests/functional-tests/400-extractor-metadata.py
@@ -137,10 +137,6 @@ class ExtractionTestCase (ut.TestCase):
def __assert_extraction_ok (self, result):
self.__check_section ("Metadata", result)
- if (cfg.haveMaemo and self.configParser.has_section ("Meego")):
- self.__check_section ("Meego", result)
-
-
def __check_section (self, section, result):
error_missing_prop = "Property '%s' hasn't been extracted from file \n'%s'\n (requested on '%s'
[%s])"
error_wrong_value = "on property '%s' from file %s\n (requested on: '%s' [%s])"
diff --git a/tests/functional-tests/Makefile.am b/tests/functional-tests/Makefile.am
index 8dd8455..c3dd296 100644
--- a/tests/functional-tests/Makefile.am
+++ b/tests/functional-tests/Makefile.am
@@ -18,12 +18,6 @@ config_SCRIPTS = \
$(slow_tests) \
$(standard_tests)
-if HAVE_MAEMO
-config_SCRIPTS += \
- tests.xml \
- tracker-tests.aegis
-endif
-
standard_tests = \
01-insertion.py \
02-sparql-bugs.py
@@ -61,18 +55,6 @@ slow_tests = \
12-transactions.py \
13-threaded-store.py
-tests.xml:
- @if test -h /targets/links/scratchbox.config ; then \
- export SBOX_REDIRECT_IGNORE=/usr/bin/python ; \
- fi;
- $(top_srcdir)/tests/functional-tests/create-tests-xml.py $(standard_tests) > tests.xml
-
-tracker-tests.aegis:
- @if test -h /targets/links/scratchbox.config ; then \
- export SBOX_REDIRECT_IGNORE=/usr/bin/python ; \
- fi;
- $(top_srcdir)/tests/functional-tests/create-tests-aegis.py $(standard_tests) > tracker-tests.aegis
-
10-sqlite-misused.py: ttl/gen-test-data.stamp
11-sqlite-misused-batch.py: ttl/gen-test-data.stamp
13-busy-store.py: ttl/gen-test-data.stamp
@@ -95,12 +77,5 @@ functional-test-slow: ${slow_tests}
EXTRA_DIST = \
$(config_SCRIPTS) \
$(config_DATA) \
- create-tests-xml.py \
test-runner.sh \
meson.build
-
-if HAVE_MAEMO
-CLEANFILES = \
- tests.xml \
- tracker-tests.aegis
-endif
diff --git a/tests/functional-tests/common/utils/configuration.py.in
b/tests/functional-tests/common/utils/configuration.py.in
index af7bf8c..2ccaece 100644
--- a/tests/functional-tests/common/utils/configuration.py.in
+++ b/tests/functional-tests/common/utils/configuration.py.in
@@ -78,8 +78,7 @@ RAW_BINDIR = "@bindir@"
EXEC_PREFIX = os.path.normpath (expandvars (RAW_EXEC_DIR))
DATADIR = os.path.normpath (expandvars (RAW_DATA_DIR))
BINDIR = os.path.normpath (expandvars (RAW_BINDIR))
-
-haveMaemo = ("@HAVE_MAEMO_TRUE@" == "")
+
haveUpstart = ("@HAVE_UPSTART_TRUE@" == "")
disableJournal = ("@DISABLE_JOURNAL_TRUE@" == "")
diff --git a/tests/functional-tests/common/utils/system.py b/tests/functional-tests/common/utils/system.py
index 093b468..177f551 100644
--- a/tests/functional-tests/common/utils/system.py
+++ b/tests/functional-tests/common/utils/system.py
@@ -19,8 +19,7 @@ import helpers
TEST_ENV_DIRS = { "XDG_DATA_HOME" : os.path.join (cfg.TEST_TMP_DIR, "data"),
"XDG_CACHE_HOME": os.path.join (cfg.TEST_TMP_DIR, "cache")}
-TEST_ENV_VARS = { "TRACKER_DISABLE_MEEGOTOUCH_LOCALE": "",
- "LC_COLLATE": "en_GB.utf8",
+TEST_ENV_VARS = { "LC_COLLATE": "en_GB.utf8",
"DCONF_PROFILE": os.path.join (cfg.DATADIR, "tracker-tests",
"trackertest") }
diff --git a/tests/functional-tests/test-extraction-data/README
b/tests/functional-tests/test-extraction-data/README
index 1a3e215..cfbc0e1 100644
--- a/tests/functional-tests/test-extraction-data/README
+++ b/tests/functional-tests/test-extraction-data/README
@@ -7,8 +7,6 @@ The python test will traverse recursively this directory, loading the .expected
=====================
It is a .ini (.desktop) formatted file with two mandatory sections: TestFile and Metadata.
-Optionally there can be a "Meego" section, for metadata that should be checked only on that platform.
-Adding more platforms is fairly trivial but requires to modify the python code.
The TestFile section contains the
* Filename (mandatory): relative path from the .expected of the file under test.
diff --git a/tests/functional-tests/test-extraction-data/audio/Jazz_Audio_OPLs0.expected
b/tests/functional-tests/test-extraction-data/audio/Jazz_Audio_OPLs0.expected
index 4336b0e..22a53eb 100644
--- a/tests/functional-tests/test-extraction-data/audio/Jazz_Audio_OPLs0.expected
+++ b/tests/functional-tests/test-extraction-data/audio/Jazz_Audio_OPLs0.expected
@@ -9,5 +9,3 @@ a=nmm:MusicPiece
!a=nmm:Video
!a=nfo:Image
!a=nmm:Photo
-
-[Meego]
diff --git a/tests/functional-tests/test-extraction-data/audio/audio-test-1.expected
b/tests/functional-tests/test-extraction-data/audio/audio-test-1.expected
index 8759962..fda57c5 100644
--- a/tests/functional-tests/test-extraction-data/audio/audio-test-1.expected
+++ b/tests/functional-tests/test-extraction-data/audio/audio-test-1.expected
@@ -15,5 +15,3 @@ nfo_channels=1
nfo_duration=15
nfo_sampleRate=22050
nfo_averageBitrate=32000
-
-[Meego]
diff --git a/tests/functional-tests/test-extraction-data/audio/audio-test-2.expected
b/tests/functional-tests/test-extraction-data/audio/audio-test-2.expected
index 0ab85f9..4edc824 100644
--- a/tests/functional-tests/test-extraction-data/audio/audio-test-2.expected
+++ b/tests/functional-tests/test-extraction-data/audio/audio-test-2.expected
@@ -14,6 +14,3 @@ nfo_codec=MPEG
nfo_channels=2
nfo_sampleRate=44100
nfo_averageBitrate=256000
-
-[Meego]
-nfo_encodedBy=Nokia Music
diff --git a/tests/functional-tests/test-extraction-data/images/comment-extension-block.expected
b/tests/functional-tests/test-extraction-data/images/comment-extension-block.expected
index 906022c..7251f70 100644
--- a/tests/functional-tests/test-extraction-data/images/comment-extension-block.expected
+++ b/tests/functional-tests/test-extraction-data/images/comment-extension-block.expected
@@ -9,5 +9,3 @@ a=nmm:Photo
nfo_width=600
nfo_height=450
nie_comment=GIF image format only supports comments in 7-bit ASCII encoding!
-
-[Meego]
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-1.expected
b/tests/functional-tests/test-extraction-data/images/test-image-1.expected
index 64a11a7..e4a0884 100644
--- a/tests/functional-tests/test-extraction-data/images/test-image-1.expected
+++ b/tests/functional-tests/test-extraction-data/images/test-image-1.expected
@@ -16,5 +16,3 @@ nie_comment=This is a for tracker test
slo_location_postalAddress=@URNUUID@
nfo_horizontalResolution=20
nfo_verticalResolution=20
-
-[Meego]
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-2.expected
b/tests/functional-tests/test-extraction-data/images/test-image-2.expected
index 5264068..f4ab5b6 100644
--- a/tests/functional-tests/test-extraction-data/images/test-image-2.expected
+++ b/tests/functional-tests/test-extraction-data/images/test-image-2.expected
@@ -7,5 +7,3 @@ Comment=Basic png example
a=nmm:Photo
nfo_width=211
nfo_height=217
-
-[Meego]
diff --git a/tests/functional-tests/test-extraction-data/images/test-image-3.expected
b/tests/functional-tests/test-extraction-data/images/test-image-3.expected
index 7aab615..7121a4c 100644
--- a/tests/functional-tests/test-extraction-data/images/test-image-3.expected
+++ b/tests/functional-tests/test-extraction-data/images/test-image-3.expected
@@ -9,5 +9,3 @@ nfo_width=37
nfo_height=39
nie_title=/home/amit/Desktop/test-image-3.tif
nfo_orientation=nfo:orientation-top-mirror
-
-[Meego]
diff --git a/tests/functional-tests/test-extraction-data/office/pdf-doc.expected
b/tests/functional-tests/test-extraction-data/office/pdf-doc.expected
index 93de5b7..3580ec3 100644
--- a/tests/functional-tests/test-extraction-data/office/pdf-doc.expected
+++ b/tests/functional-tests/test-extraction-data/office/pdf-doc.expected
@@ -3,7 +3,5 @@ Filename=pdf-doc.pdf
Comment=PDF document from the office tools
[Metadata]
-
-[Meego]
a=nfo:PaginatedTextDocument
nfo_pageCount=22
diff --git a/tests/functional-tests/test-extraction-data/video/184505.expected
b/tests/functional-tests/test-extraction-data/video/184505.expected
index c2a9839..d62395d 100644
--- a/tests/functional-tests/test-extraction-data/video/184505.expected
+++ b/tests/functional-tests/test-extraction-data/video/184505.expected
@@ -6,7 +6,5 @@ Comment=Video without audio stream. Seems to be clasified as Audio.
[Metadata]
a=nmm:Video
!a=nmm:Audio
-
-[Meego]
nfo_height=480
nfo_width=864
diff --git a/tests/functional-tests/test-extraction-data/video/video-1.expected
b/tests/functional-tests/test-extraction-data/video/video-1.expected
index aaa28be..59237d1 100644
--- a/tests/functional-tests/test-extraction-data/video/video-1.expected
+++ b/tests/functional-tests/test-extraction-data/video/video-1.expected
@@ -5,7 +5,5 @@ Comment=Just one standard mp4
a=nmm:Video
nie_title=MPEG-4-x264.mp4
nfo_codec=MPEG-4 AAC audio
-
-[Meego]
nfo_height=240
nfo_width=320
diff --git a/tests/functional-tests/test-extraction-data/video/video-2.expected
b/tests/functional-tests/test-extraction-data/video/video-2.expected
index a738c85..ce86335 100644
--- a/tests/functional-tests/test-extraction-data/video/video-2.expected
+++ b/tests/functional-tests/test-extraction-data/video/video-2.expected
@@ -5,7 +5,5 @@ Comment=Produces a Critical in Gstreamer freeing a component.
[Metadata]
a=nmm:Video
-
-[Meego]
nfo_height=144
nfo_width=192
diff --git a/tests/functional-tests/test-runner.sh b/tests/functional-tests/test-runner.sh
index b34aaae..857b26c 100755
--- a/tests/functional-tests/test-runner.sh
+++ b/tests/functional-tests/test-runner.sh
@@ -18,19 +18,13 @@ export REAL_HOME=`echo ~`
# in the filesystem
HOME=$TEMP_DIR
-if test -h /targets/links/scratchbox.config ; then
- export SBOX_REDIRECT_IGNORE=/usr/bin/python ;
+eval `dbus-launch --sh-syntax`
- meego-run $@
-else
- eval `dbus-launch --sh-syntax`
+trap "/bin/kill $DBUS_SESSION_BUS_PID; exit" INT
- trap "/bin/kill $DBUS_SESSION_BUS_PID; exit" INT
+echo "Running $@"
+$@
- echo "Running $@"
- $@
-
- kill $DBUS_SESSION_BUS_PID
-fi ;
+kill $DBUS_SESSION_BUS_PID
rm -R $TEMP_DIR
diff --git a/tests/libtracker-extract/Makefile.am b/tests/libtracker-extract/Makefile.am
index 3199a41..932531f 100644
--- a/tests/libtracker-extract/Makefile.am
+++ b/tests/libtracker-extract/Makefile.am
@@ -20,10 +20,6 @@ endif
if HAVE_ENCA
test_programs += tracker-encoding
-else
-if HAVE_MEEGOTOUCH
-test_programs += tracker-encoding
-endif
endif
AM_CPPFLAGS = \
diff --git a/tests/libtracker-extract/tracker-encoding-test.c
b/tests/libtracker-extract/tracker-encoding-test.c
index f6089ba..ede6714 100644
--- a/tests/libtracker-extract/tracker-encoding-test.c
+++ b/tests/libtracker-extract/tracker-encoding-test.c
@@ -53,7 +53,7 @@ static void
test_encoding_can_guess (void)
{
/* This just duplicates the function code... */
-#if defined (HAVE_ENCA) || defined (HAVE_MEEGOTOUCH) || defined (HAVE_LIBICU_CHARSET_DETECTION)
+#if defined (HAVE_ENCA) || defined (HAVE_LIBICU_CHARSET_DETECTION)
g_assert (tracker_encoding_can_guess ());
#else
g_assert (!tracker_encoding_can_guess ());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
