Commit 809b5676 authored by Sam Thursfield's avatar Sam Thursfield

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
parent 5b997a90
...@@ -78,9 +78,6 @@ ...@@ -78,9 +78,6 @@
/* libunistring Unicode support library */ /* libunistring Unicode support library */
#mesondefine HAVE_LIBUNISTRING #mesondefine HAVE_LIBUNISTRING
/* Define if we have meegotouch */
#mesondefine HAVE_MEEGOTOUCH
/* Define if we have NetworkManager for network status detection */ /* Define if we have NetworkManager for network status detection */
#mesondefine HAVE_NETWORK_MANAGER #mesondefine HAVE_NETWORK_MANAGER
......
...@@ -213,7 +213,6 @@ GTK_REQUIRED=3.0.0 ...@@ -213,7 +213,6 @@ GTK_REQUIRED=3.0.0
LIBXML2_REQUIRED=2.6 LIBXML2_REQUIRED=2.6
HAL_REQUIRED=0.5 HAL_REQUIRED=0.5
UPOWER_REQUIRED=0.9.0 UPOWER_REQUIRED=0.9.0
MEEGOTOUCH_REQUIRED=0.20
POPPLER_REQUIRED=0.16.0 POPPLER_REQUIRED=0.16.0
CAIRO_REQUIRED=1.0 CAIRO_REQUIRED=1.0
LIBICU_REQUIRED=4.8.1.1 LIBICU_REQUIRED=4.8.1.1
...@@ -399,13 +398,6 @@ TRACKER_MINER_APPS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED ...@@ -399,13 +398,6 @@ TRACKER_MINER_APPS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
PKG_CHECK_MODULES(TRACKER_MINER_APPS, [$TRACKER_MINER_APPS_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 # Check requirements for tracker-miner-evolution
evolution_plugin_name="" evolution_plugin_name=""
...@@ -631,7 +623,6 @@ if test "x$enable_minimal" = "xyes"; then ...@@ -631,7 +623,6 @@ if test "x$enable_minimal" = "xyes"; then
enable_tracker_writeback=no enable_tracker_writeback=no
enable_miner_fs=no enable_miner_fs=no
enable_miner_apps=no enable_miner_apps=no
enable_miner_user_guides=no
enable_miner_rss=no enable_miner_rss=no
enable_miner_evolution=no enable_miner_evolution=no
enable_miner_thunderbird=no enable_miner_thunderbird=no
...@@ -701,22 +692,6 @@ if test "$native_win32" = "yes" ; then ...@@ -701,22 +692,6 @@ if test "$native_win32" = "yes" ; then
AC_DEFINE(OS_WIN32, 1, [Define if we are on win32]) AC_DEFINE(OS_WIN32, 1, [Define if we are on win32])
fi 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 # Check if we should disable the journal
#################################################################### ####################################################################
...@@ -1274,40 +1249,6 @@ fi ...@@ -1274,40 +1249,6 @@ fi
AM_CONDITIONAL(HAVE_EXEMPI, test "x$have_exempi" = "xyes") 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 # Check for tracker-miner-fs
################################################################## ##################################################################
...@@ -1408,32 +1349,6 @@ fi ...@@ -1408,32 +1349,6 @@ fi
AM_CONDITIONAL(HAVE_TRACKER_MINER_APPS, test "x$have_tracker_miner_apps" = "xyes") 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 # Check for tracker-miner-rss
################################################################## ##################################################################
...@@ -2664,7 +2579,6 @@ AC_CONFIG_FILES([ ...@@ -2664,7 +2579,6 @@ AC_CONFIG_FILES([
src/miners/fs/Makefile src/miners/fs/Makefile
src/miners/apps/Makefile src/miners/apps/Makefile
src/miners/rss/Makefile src/miners/rss/Makefile
src/miners/user-guides/Makefile
src/ontologies/Makefile src/ontologies/Makefile
src/tracker-store/Makefile src/tracker-store/Makefile
src/tracker/Makefile src/tracker/Makefile
...@@ -2813,10 +2727,9 @@ Feature Support: ...@@ -2813,10 +2727,9 @@ Feature Support:
Data Miners / Writebacks: 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 Applications: $have_tracker_miner_apps
RSS: $have_tracker_miner_rss RSS: $have_tracker_miner_rss
User Guides: $have_tracker_miner_user_guides
Email: Email:
Evolution: $have_tracker_miner_evolution ($tracker_miner_evolution_install_dir) Evolution: $have_tracker_miner_evolution ($tracker_miner_evolution_install_dir)
Thunderbird: $have_tracker_miner_thunderbird ($tracker_miner_thunderbird_install_dir) Thunderbird: $have_tracker_miner_thunderbird ($tracker_miner_thunderbird_install_dir)
...@@ -2871,8 +2784,6 @@ Applications: ...@@ -2871,8 +2784,6 @@ Applications:
Frameworks / Options: Frameworks / Options:
Support GNOME's Nautilus $have_tracker_nautilus_extension ($tracker_nautilus_extension_install_dir) 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) Support Guaranteed Metadata $enable_guarantee_metadata (e.g. guess nie:title from files)
" "
......
...@@ -81,12 +81,6 @@ With this environment variable pointing to a text file you can override these ...@@ -81,12 +81,6 @@ With this environment variable pointing to a text file you can override these
settings. The file is a \\n separated list of SQLite queries to execute on any settings. The file is a \\n separated list of SQLite queries to execute on any
newly created SQLite connection in tracker-store. 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 .TP
.B TRACKER_USE_LOG_FILES .B TRACKER_USE_LOG_FILES
Don't just log to stdout and stderr, but to log files too which are Don't just log to stdout and stderr, but to log files too which are
......
...@@ -184,15 +184,6 @@ $ pkg-config --libs tracker-sparql-0.12 ...@@ -184,15 +184,6 @@ $ pkg-config --libs tracker-sparql-0.12
created SQLite connection in tracker-store. created SQLite connection in tracker-store.
</para> </para>
</listitem> </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> </itemizedlist>
</para> </para>
......
...@@ -56,7 +56,6 @@ libsoup = dependency('libsoup-2.4', version: '> 2.40', required: true) ...@@ -56,7 +56,6 @@ libsoup = dependency('libsoup-2.4', version: '> 2.40', required: true)
libtiff = dependency('libtiff-4', required: false) libtiff = dependency('libtiff-4', required: false)
libxml2 = dependency('libxml-2.0', version: '> 2.6') libxml2 = dependency('libxml-2.0', version: '> 2.6')
libvorbis = dependency('vorbisfile', version: '> 0.22') libvorbis = dependency('vorbisfile', version: '> 0.22')
meegotouch = dependency('meegotouch', version: '> 0.20', required: false)
nautilus_extension = dependency('libnautilus-extension', required: false) nautilus_extension = dependency('libnautilus-extension', required: false)
network_manager = dependency('libnm-glib', version: '> 0.8', required: false) network_manager = dependency('libnm-glib', version: '> 0.8', required: false)
poppler = dependency('poppler-glib', version: '> 0.16.0', required: false) poppler = dependency('poppler-glib', version: '> 0.16.0', required: false)
...@@ -193,21 +192,6 @@ if unicode_library_name == '' ...@@ -193,21 +192,6 @@ if unicode_library_name == ''
endif endif
endif 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 # Check for tracker-miner-evolution
#################################################################### ####################################################################
...@@ -441,7 +425,6 @@ conf.set('HAVE_LIBIPTCDATA', libiptcdata.found()) ...@@ -441,7 +425,6 @@ conf.set('HAVE_LIBIPTCDATA', libiptcdata.found())
conf.set('HAVE_LIBMEDIAART', libmediaart.found()) conf.set('HAVE_LIBMEDIAART', libmediaart.found())
conf.set('HAVE_LIBSTEMMER', have_libstemmer) conf.set('HAVE_LIBSTEMMER', have_libstemmer)
conf.set('HAVE_LIBUNISTRING', unicode_library_name == 'unistring') 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_NETWORK_MANAGER', network_manager.found())
conf.set('HAVE_UPOWER', battery_detection_library_name == 'upower') conf.set('HAVE_UPOWER', battery_detection_library_name == 'upower')
...@@ -485,7 +468,6 @@ add_global_arguments('-D_LARGEFILE64_SOURCE', language: 'c') ...@@ -485,7 +468,6 @@ add_global_arguments('-D_LARGEFILE64_SOURCE', language: 'c')
have_tracker_miner_fs = true have_tracker_miner_fs = true
have_tracker_miner_apps = true have_tracker_miner_apps = true
have_tracker_miner_user_guides = true
have_tracker_miner_rss = true have_tracker_miner_rss = true
have_tracker_miner_firefox = true have_tracker_miner_firefox = true
have_tracker_extract = true have_tracker_extract = true
...@@ -551,11 +533,9 @@ summary = [ ...@@ -551,11 +533,9 @@ summary = [
' Cache media art ' + libmediaart.found().to_string(), ' Cache media art ' + libmediaart.found().to_string(),
' Bash completion support: ' + bash_completion_dir, ' Bash completion support: ' + bash_completion_dir,
'\nData Miners / Writebacks:', '\nData Miners / Writebacks:',
' FS (File System): @0@ (MeeGo support: @1@)'.format( ' FS (File System): ' + have_tracker_miner_fs.to_string(),
have_tracker_miner_fs, have_meegotouch),
' Applications: ' + have_tracker_miner_apps.to_string(), ' Applications: ' + have_tracker_miner_apps.to_string(),
' RSS: ' + have_tracker_miner_rss.to_string(), ' RSS: ' + have_tracker_miner_rss.to_string(),
' User Guides: ' + have_tracker_miner_user_guides.to_string(),
' Email:', ' Email:',
' Evolution: @0@ (@1@)'.format( ' Evolution: @0@ (@1@)'.format(
have_tracker_miner_evolution, tracker_miner_evolution_install_dir), have_tracker_miner_evolution, tracker_miner_evolution_install_dir),
...@@ -617,8 +597,6 @@ summary += [ ...@@ -617,8 +597,6 @@ summary += [
'\nFrameworks / Options:', '\nFrameworks / Options:',
' Support Nautilus file manager @0@ (@1@)'.format( ' Support Nautilus file manager @0@ (@1@)'.format(
nautilus_extension.found().to_string(), tracker_nautilus_extension_install_dir), 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(), ' Support Guaranteed Metadata ' + get_option('guarantee_metadata').to_string(),
] ]
......
...@@ -36,8 +36,6 @@ option('generic_media_extractor', type: 'combo', choices: ['auto', 'gstreamer', ...@@ -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') description: 'Enables one of the (gstreamer, libav, auto) generic media extractor backends')
option('gstreamer_backend', type: 'combo', choices: ['discoverer', 'gupnp'], value: 'discoverer', option('gstreamer_backend', type: 'combo', choices: ['discoverer', 'gupnp'], value: 'discoverer',
description: 'When GStreamer is used, this enables one of the (discoverer, gupnp) GStreamer backends') 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', option('stemmer', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'no',
description: 'Enable stemming words while indexing') description: 'Enable stemming words while indexing')
option('unicode_support', type: 'combo', choices: ['icu', 'unistring', 'auto'], value: 'auto', option('unicode_support', type: 'combo', choices: ['icu', 'unistring', 'auto'], value: 'auto',
......
...@@ -24,9 +24,6 @@ src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.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-main.c
src/miners/rss/tracker-miner-rss.c src/miners/rss/tracker-miner-rss.c
src/miners/rss/tracker-miner-rss.desktop.in.in 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.Tracker1.Miner.EMails.service.in.in
src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
src/plugins/evolution/tracker-evolution-plugin.c src/plugins/evolution/tracker-evolution-plugin.c
......
...@@ -14,7 +14,6 @@ src/tracker-status-icon/tracker-status-icon.desktop.in ...@@ -14,7 +14,6 @@ src/tracker-status-icon/tracker-status-icon.desktop.in
src/tracker-store/tracker-main.c src/tracker-store/tracker-main.c
src/tracker-store/tracker-store.desktop.in src/tracker-store/tracker-store.desktop.in
src/tracker-extract/tracker-extract.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/apps/tracker-miner-apps.desktop.in
src/miners/fs/tracker-miner-fs.desktop.in src/miners/fs/tracker-miner-fs.desktop.in
src/miners/rss/tracker-miner-rss.desktop.in src/miners/rss/tracker-miner-rss.desktop.in
...@@ -103,7 +103,6 @@ tracker_locale_init (void) ...@@ -103,7 +103,6 @@ tracker_locale_init (void)
{ {
guint i; guint i;
/* Initialize those not retrieved from gconf, or if not in meegotouch */
for (i = 0; i < TRACKER_LOCALE_LAST; i++) { for (i = 0; i < TRACKER_LOCALE_LAST; i++) {
if (!current_locales[i]) { if (!current_locales[i]) {
const gchar *env_locale = NULL; const gchar *env_locale = NULL;
......
...@@ -108,11 +108,6 @@ tracker_collation_init (void) ...@@ -108,11 +108,6 @@ tracker_collation_init (void)
/* Get locale! */ /* Get locale! */
locale = tracker_locale_get (TRACKER_LOCALE_COLLATE); 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); g_debug ("[ICU collation] Initializing collator for locale '%s'", locale);
collator = ucol_open (locale, &status); collator = ucol_open (locale, &status);
if (!collator) { if (!collator) {
......
...@@ -56,12 +56,6 @@ libtracker_extract_la_SOURCES += \ ...@@ -56,12 +56,6 @@ libtracker_extract_la_SOURCES += \
tracker-encoding-enca.h tracker-encoding-enca.h
endif endif
if HAVE_MEEGOTOUCH
libtracker_extract_la_SOURCES += \
tracker-encoding-meegotouch.cpp \
tracker-encoding-meegotouch.h
endif
if HAVE_LIBICU_CHARSET_DETECTION if HAVE_LIBICU_CHARSET_DETECTION
libtracker_extract_la_SOURCES += \ libtracker_extract_la_SOURCES += \
tracker-encoding-libicu.c \ tracker-encoding-libicu.c \
......
...@@ -16,10 +16,6 @@ elif charset_library_name == 'icu' ...@@ -16,10 +16,6 @@ elif charset_library_name == 'icu'
libtracker_extract_sources += 'tracker-encoding-libicu.c' libtracker_extract_sources += 'tracker-encoding-libicu.c'
endif endif
if have_meegotouch
libtracker_extract_sources += 'tracker-encoding-meegotouch.cpp'
endif
tracker_extract_dependencies = [charset_library, gmodule] tracker_extract_dependencies = [charset_library, gmodule]
if exempi.found() if exempi.found()
......
/*
* Copyright (C) 2011 Nokia <ivan.frade@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include "config.h"
#include <MCharsetDetector>
#include <MCharsetMatch>
#include <glib.h>
#include <libtracker-common/tracker-locale.h>
#include "tracker-encoding-meegotouch.h"
/*
* See http://apidocs.meego.com/git-tip/mtf/class_m_charset_detector.html
*/
gchar *
tracker_encoding_guess_meegotouch (const gchar *buffer,
gsize size)
{
/* Initialize detector */
MCharsetDetector detector ((const char *)buffer, (int)size);
gchar *locale;
gchar *encoding = NULL;
if (detector.hasError ()) {
g_warning ("Charset detector error when creating: %s",
detector.errorString ().toUtf8 (). data ());
return NULL;
}
locale = tracker_locale_get (TRACKER_LOCALE_LANGUAGE);
detector.setDeclaredLocale (locale);
MCharsetMatch bestMatch = detector.detect ();
if (detector.hasError ()) {
g_warning ("Charset detector error when detecting: %s",
detector.errorString ().toUtf8 (). data ());
g_free (locale);
return NULL;
}
if (bestMatch.confidence () > 30) {
encoding = g_strdup (bestMatch.name ().toUtf8 ().data ());
#if 0
QList<MCharsetMatch> mCharsetMatchList = detector.detectAll();
if (detector.hasError ()) {
g_warning ("Charset detector error when detecting all: %s",
detector.errorString ().toUtf8 (). data ());
}
g_debug ("Detecting all charsets...");
for (gint i = 0; i < mCharsetMatchList.size (); ++i) {
g_debug (" Charset '%s' with %d%% confidence...",
mCharsetMatchList[i].name (). toUtf8 ().data (),
mCharsetMatchList[i].confidence ());
}
#endif
g_debug ("Guessing charset as '%s' with %d%% confidence",
encoding, bestMatch.confidence ());
} else {
g_debug ("Ignoring charset as '%s' with %d%% (< 30%%) confidence",
bestMatch.name ().toUtf8 ().data (),
bestMatch.confidence ());
}
g_free (locale);
return encoding;
}
/*
* Copyright (C) 2011 Nokia <ivan.frade@nokia.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __LIBTRACKER_EXTRACT_ENCODING_MEEGOTOUCH_H__
#define __LIBTRACKER_EXTRACT_ENCODING_MEEGOTOUCH_H__
#include <glib.h>
G_BEGIN_DECLS
G_GNUC_INTERNAL
gchar *tracker_encoding_guess_meegotouch (const gchar *buffer,
gsize size);
G_END_DECLS
#endif /* __LIBTRACKER_EXTRACT_ENCODING_MEEGOTOUCH_H__ */
...@@ -26,10 +26,6 @@ ...@@ -26,10 +26,6 @@
#include "tracker-encoding-enca.h" #include "tracker-encoding-enca.h"
#endif #endif
#ifdef HAVE_MEEGOTOUCH
#include "tracker-encoding-meegotouch.h"
#endif
#ifdef HAVE_LIBICU_CHARSET_DETECTION #ifdef HAVE_LIBICU_CHARSET_DETECTION
#include "tracker-encoding-libicu.h" #include "tracker-encoding-libicu.h"
#endif #endif
...@@ -37,7 +33,7 @@ ...@@ -37,7 +33,7 @@
gboolean gboolean
tracker_encoding_can_guess (void) 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; return TRUE;
#else #else
return FALSE; return FALSE;
...@@ -52,12 +48,7 @@ tracker_encoding_guess (const gchar *buffer, ...@@ -52,12 +48,7 @@ tracker_encoding_guess (const gchar *buffer,
gchar *encoding = NULL; gchar *encoding = NULL;
gdouble conf = 1; gdouble conf = 1;
#ifdef HAVE_MEEGOTOUCH
encoding = tracker_encoding_guess_meegotouch (buffer, size);
#endif /* HAVE_MEEGOTOUCH */
#ifdef HAVE_LIBICU_CHARSET_DETECTION #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 */ #endif /* HAVE_LIBICU_CHARSET_DETECTION */
......
...@@ -12,8 +12,4 @@ if HAVE_TRACKER_MINER_RSS ...@@ -12,8 +12,4 @@ if HAVE_TRACKER_MINER_RSS
SUBDIRS += rss SUBDIRS += rss
endif endif
if HAVE_TRACKER_MINER_USER_GUIDES
SUBDIRS += user-guides
endif
EXTRA_DIST = meson.build EXTRA_DIST = meson.build
...@@ -143,24 +143,6 @@ miner_applications_add_directories (TrackerMinerFS *fs) ...@@ -143,24 +143,6 @@ miner_applications_add_directories (TrackerMinerFS *fs)
if (user_data_dir) { if (user_data_dir) {
miner_applications_basedir_add (fs, 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 static void
...@@ -199,7 +181,7 @@ miner_finished_cb (TrackerMinerFS *fs, ...@@ -199,7 +181,7 @@ miner_finished_cb (TrackerMinerFS *fs,
/* If a reset is requested, we will remove from the store all items previously /* If a reset is requested, we will remove from the store all items previously
* inserted by the tracker-miner-applications, this is: * inserted by the tracker-miner-applications, this is:
* (a) all elements which are nfo:softwareIcon of a given nfo:Software * (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 * (c) all elements which are nfo:softwareCategoryIcon of a given nfo:SoftwareCategory
* (d) all nfo:SoftwareCategory in our graph * (d) all nfo:SoftwareCategory in our graph
*/ */
...@@ -227,7 +209,7 @@ miner_applications_reset (TrackerMiner *miner) ...@@ -227,7 +209,7 @@ miner_applications_reset (TrackerMiner *miner)
tracker_sparql_builder_object_variable (sparql, "software"); tracker_sparql_builder_object_variable (sparql, "software");
tracker_sparql_builder_where_close (sparql); 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_delete_open (sparql, TRACKER_OWN_GRAPH_URN);
tracker_sparql_builder_subject_variable (sparql, "software"); tracker_sparql_builder_subject_variable (sparql, "software");
tracker_sparql_builder_predicate (sparql, "a"); tracker_sparql_builder_predicate (sparql, "a");
...@@ -520,10 +502,6 @@ process_desktop_file (ProcessApplicationData *data, ...@@ -520,10 +502,6 @@ process_desktop_file (ProcessApplicationData *data,
gboolean is_software = TRUE; gboolean is_software = TRUE;
const gchar *parent_urn; const gchar *parent_urn;
gchar *lang; gchar *lang;
#ifdef HAVE_MEEGOTOUCH
gchar *logical_id = NULL;
gchar *translation_catalog = NULL;
#endif /* HAVE_MEEGOTOUCH */
sparql = data->sparql; sparql = data->sparql;
key_file = data->key_file; key_file = data->key_file;
...@@ -544,19 +522,6 @@ process_desktop_file (ProcessApplicationData *data, ...@@ -544,19 +522,6 @@ process_desktop_file (ProcessApplicationData *data,
/* NOTE: We sanitize categories later on when iterating them */ /* 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) { if (!name) {
/* Try to get the name with our desired LANG locale... */ /* 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); name = g_key_file_get_locale_string (key_file, GROUP_DESKTOP_ENTRY, "Name", lang, NULL);
...@@ -648,63 +613,6 @@ process_desktop_file (ProcessApplicationData *data, ...@@ -648,63 +613,6 @@ process_desktop_file (ProcessApplicationData *data,
g_warning ("Invalid desktop file: '%s'", uri); g_warning ("Invalid desktop file: '%s'", uri);
g_warning (" Type 'Link' requires a URL"); g_warning (" Type 'Link' requires a URL");
} }