Commit 1bca1a5c authored by Martyn James Russell's avatar Martyn James Russell

Fixed Makefiles so we include WARN_CFLAGS in all files. Some files were

	* docs/reference/libtracker-common/Makefile.am:
	* docs/reference/libtracker-module/Makefile.am:
	* src/libinotify/Makefile.am:
	* src/libstemmer/Makefile.am:
	* src/libtracker-common/Makefile.am:
	* src/libtracker-data/Makefile.am:
	* src/libtracker-db/Makefile.am:
	* src/libtracker-gtk/Makefile.am:
	* src/plugins/evolution/Makefile.am:
	* src/plugins/kmail/Makefile.am:
	* src/plugins/rss/Makefile.am:
	* src/tracker-applet/Makefile.am:
	* src/tracker-extract/Makefile.am:
	* src/tracker-fts/Makefile.am:
	* src/tracker-indexer/Makefile.am:
	* src/tracker-indexer/modules/Makefile.am:
	* src/tracker-preferences/Makefile.am:
	* src/tracker-search-tool/Makefile.am:
	* src/tracker-utils/Makefile.am:
	* src/trackerd/Makefile.am:
	* tests/common/Makefile.am:
	* tests/libtracker-common/Makefile.am:
	* tests/libtracker-db/Makefile.am:
	* tests/tracker-extract/Makefile.am:
	* tests/tracker-indexer/Makefile.am:
	* tests/trackerd/Makefile.am:
	* tests/trackerd/xesam/Makefile.am:
	* utils/qdbm/Makefile.am:
	* utils/tracker-fts/Makefile.am: Fixed Makefiles so we include
	WARN_CFLAGS in all files. Some files were missing this.

	* src/libtracker-common/tracker-albumart.[ch]: 
	* src/libtracker-common/tracker-thumbnailer.h: Fixed #define
	statements so they are not the same as the extractor header files.

	* src/libtracker-common/tracker-config.c:
	* src/tracker-extract/tracker-dbus.[ch]: 
	* src/tracker-extract/tracker-extract-albumart.c:
	* src/tracker-extract/tracker-extract-gstreamer.c:
	* src/tracker-extract/tracker-main.[ch]: 
	* src/trackerd/tracker-cleanup.c:
	* src/trackerd/tracker-dbus.c: 
	* src/trackerd/tracker-processor.c: 
	* src/trackerd/tracker-status.c: 
	* tests/tracker-extract/tracker-extract-gstreamer-test.c: 
	* tests/tracker-extract/tracker-extract-jpeg-test.c:
	* tests/tracker-extract/tracker-extract-mp3-test.c: 
	* tests/tracker-extract/tracker-extract-png-test.c: 
	* tests/tracker-extract/tracker-extract-test-utils.c:
	* tests/tracker-extract/tracker-extract-testsuite-avi.c:
	* tests/tracker-extract/tracker-extract-testsuite-jpeg.c:
	* tests/tracker-extract/tracker-extract-testsuite-jpeg.h:
	* tests/tracker-extract/tracker-extract-testsuite-mp3.c:
	* tests/tracker-extract/tracker-extract-testsuite-mp3.h:
	* tests/tracker-extract/tracker-extract-testsuite-png.c:
	* tests/tracker-extract/tracker-extract-testsuite-png.h:
	* tests/tracker-extract/tracker-extract-testsuite-tiff.c:
	* tests/tracker-extract/tracker-extract-testsuite-tiff.h:
	* tests/tracker-extract/tracker-extract-tiff-test.c: Fixed all the
	warnings produced by adding WARN_CFLAGS to the Makefile.am files.

svn path=/trunk/; revision=2942
parent b9f6ead9
2009-02-18 Martyn Russell <martyn@imendio.com>
* docs/reference/libtracker-common/Makefile.am:
* docs/reference/libtracker-module/Makefile.am:
* src/libinotify/Makefile.am:
* src/libstemmer/Makefile.am:
* src/libtracker-common/Makefile.am:
* src/libtracker-data/Makefile.am:
* src/libtracker-db/Makefile.am:
* src/libtracker-gtk/Makefile.am:
* src/plugins/evolution/Makefile.am:
* src/plugins/kmail/Makefile.am:
* src/plugins/rss/Makefile.am:
* src/tracker-applet/Makefile.am:
* src/tracker-extract/Makefile.am:
* src/tracker-fts/Makefile.am:
* src/tracker-indexer/Makefile.am:
* src/tracker-indexer/modules/Makefile.am:
* src/tracker-preferences/Makefile.am:
* src/tracker-search-tool/Makefile.am:
* src/tracker-utils/Makefile.am:
* src/trackerd/Makefile.am:
* tests/common/Makefile.am:
* tests/libtracker-common/Makefile.am:
* tests/libtracker-db/Makefile.am:
* tests/tracker-extract/Makefile.am:
* tests/tracker-indexer/Makefile.am:
* tests/trackerd/Makefile.am:
* tests/trackerd/xesam/Makefile.am:
* utils/qdbm/Makefile.am:
* utils/tracker-fts/Makefile.am: Fixed Makefiles so we include
WARN_CFLAGS in all files. Some files were missing this.
* src/libtracker-common/tracker-albumart.[ch]:
* src/libtracker-common/tracker-thumbnailer.h: Fixed #define
statements so they are not the same as the extractor header files.
* src/libtracker-common/tracker-config.c:
* src/tracker-extract/tracker-dbus.[ch]:
* src/tracker-extract/tracker-extract-albumart.c:
* src/tracker-extract/tracker-extract-gstreamer.c:
* src/tracker-extract/tracker-main.[ch]:
* src/trackerd/tracker-cleanup.c:
* src/trackerd/tracker-dbus.c:
* src/trackerd/tracker-processor.c:
* src/trackerd/tracker-status.c:
* tests/tracker-extract/tracker-extract-gstreamer-test.c:
* tests/tracker-extract/tracker-extract-jpeg-test.c:
* tests/tracker-extract/tracker-extract-mp3-test.c:
* tests/tracker-extract/tracker-extract-png-test.c:
* tests/tracker-extract/tracker-extract-test-utils.c:
* tests/tracker-extract/tracker-extract-testsuite-avi.c:
* tests/tracker-extract/tracker-extract-testsuite-jpeg.c:
* tests/tracker-extract/tracker-extract-testsuite-jpeg.h:
* tests/tracker-extract/tracker-extract-testsuite-mp3.c:
* tests/tracker-extract/tracker-extract-testsuite-mp3.h:
* tests/tracker-extract/tracker-extract-testsuite-png.c:
* tests/tracker-extract/tracker-extract-testsuite-png.h:
* tests/tracker-extract/tracker-extract-testsuite-tiff.c:
* tests/tracker-extract/tracker-extract-testsuite-tiff.h:
* tests/tracker-extract/tracker-extract-tiff-test.c: Fixed all the
warnings produced by adding WARN_CFLAGS to the Makefile.am files.
2009-02-18 Martyn Russell <martyn@imendio.com>
* src/libtracker-common/tracker-config.c:
......
......@@ -26,23 +26,23 @@ IGNORE_HFILES=
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(HAL_CFLAGS) \
$(DBUS_CFLAGS) \
$(UNAC_CFLAGS) \
$(PANGO_CFLAGS) \
$(GIO_CFLAGS) \
$(GLIB2_CFLAGS)
GTKDOC_LIBS = \
INCLUDES = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(GLIB2_CFLAGS) \
$(GIO_CFLAGS) \
$(PANGO_CFLAGS) \
$(HAL_CFLAGS) \
$(DBUS_CFLAGS) \
$(UNAC_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(HAL_LIBS) \
$(DBUS_LIBS) \
$(UNAC_LIBS) \
$(PANGO_LIBS) \
$(GIO_LIBS) \
$(HAL_LIBS) \
$(DBUS_LIBS) \
$(UNAC_LIBS) \
$(PANGO_LIBS) \
$(GIO_LIBS) \
$(GLIB2_LIBS)
......
......@@ -42,9 +42,9 @@ IGNORE_HFILES= \
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
-I$(top_srcdir)/src \
$(DBUS_CFLAGS) \
$(GMODULE_CFLAGS) \
$(PANGO_CFLAGS) \
$(GMODULE_CFLAGS)
$(DBUS_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-db/libtracker-db.la \
......
......@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.decl
INCLUDES = \
-DG_LOG_DOMAIN=\"libinotify\" \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS)
noinst_LTLIBRARIES = libinotify.la
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-DSHAREDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"Tracker\" \
-I$(top_srcdir)/src
INCLUDES = \
-DSHAREDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"Tracker\" \
-I$(top_srcdir)/src \
$(WARN_CFLAGS)
libstemmerdir = $(libdir)/tracker
libstemmer_LTLIBRARIES = libstemmer.la
......
......@@ -6,13 +6,13 @@ INCLUDES = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GDKPIXBUF_CFLAGS) \
$(GIO_CFLAGS) \
$(PANGO_CFLAGS) \
$(HAL_CFLAGS) \
$(DBUS_CFLAGS) \
$(UNAC_CFLAGS) \
$(PANGO_CFLAGS) \
$(GIO_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GDKPIXBUF_CFLAGS)
$(UNAC_CFLAGS)
libtracker_commondir = $(libdir)/tracker
libtracker_commonincludedir=$(includedir)/tracker-1.0/libtracker-common/
......
......@@ -645,10 +645,10 @@ tracker_albumart_get_path (const gchar *a,
}
void
tracker_albumart_request_download (gchar *album,
gchar *artist,
gchar *local_uri,
gchar *art_path)
tracker_albumart_request_download (const gchar *album,
const gchar *artist,
const gchar *local_uri,
const gchar *art_path)
{
GetFileInfo *info;
......
......@@ -21,8 +21,8 @@
* Authors: Philip Van Hoof <philip@codeminded.be>
*/
#ifndef __TRACKER_ALBUMART_H__
#define __TRACKER_ALBUMART_H__
#ifndef __LIBTRACKER_COMMON_ALBUMART_H__
#define __LIBTRACKER_COMMON_ALBUMART_H__
G_BEGIN_DECLS
......@@ -40,11 +40,11 @@ void tracker_albumart_get_path (const gchar *a,
const gchar *uri,
gchar **path,
gchar **local);
void tracker_albumart_request_download (gchar *album,
gchar *artist,
gchar *local_uri,
gchar *art_path);
void tracker_albumart_request_download (const gchar *album,
const gchar *artist,
const gchar *local_uri,
const gchar *art_path);
G_END_DECLS
#endif /* __TRACKER_THUMBNAILER_H__ */
#endif /* __LIBTRACKER_COMMON_THUMBNAILER_H__ */
......@@ -818,7 +818,7 @@ config_create_with_defaults (const gchar *filename,
/* Watches */
g_key_file_set_string_list (key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS,
watch_directory_roots,
g_strv_length (watch_directory_roots));
g_strv_length ((gchar**) watch_directory_roots));
g_key_file_set_comment (key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS,
" List of directory roots to index and watch (separator=;)",
NULL);
......
......@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
#ifndef __TRACKER_THUMBNAILER_H__
#define __TRACKER_THUMBNAILER_H__
#ifndef __LIBTRACKER_COMMON_THUMBNAILER_H__
#define __LIBTRACKER_COMMON_THUMBNAILER_H__
#include <libtracker-common/tracker-config.h>
......@@ -41,4 +41,4 @@ void tracker_thumbnailer_cleanup (const gchar *uri_prefix);
G_END_DECLS
#endif /* __TRACKER_THUMBNAILER_H__ */
#endif /* __LIBTRACKER_COMMON_THUMBNAILER_H__ */
......@@ -6,9 +6,9 @@ INCLUDES = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(DBUS_CFLAGS) \
$(RAPTOR_CFLAGS) \
$(GLIB2_CFLAGS)
$(RAPTOR_CFLAGS)
libtracker_datadir = $(libdir)/tracker
libtracker_data_LTLIBRARIES = libtracker-data.la
......
......@@ -6,10 +6,10 @@ INCLUDES = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(QDBM_CFLAGS) \
$(GLIB2_CFLAGS) \
$(DBUS_CFLAGS) \
$(GLIB2_CFLAGS)
$(SQLITE3_CFLAGS) \
$(QDBM_CFLAGS)
libtracker_dbdir = $(libdir)/tracker
libtracker_db_LTLIBRARIES = libtracker-db.la
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir)/src/libtracker \
INCLUDES = \
-I$(top_srcdir)/src/libtracker \
$(WARN_CFLAGS) \
$(LIBTRACKERGTK_CFLAGS)
libtracker_gtkincdir = $(includedir)/libtracker-gtk
lib_LTLIBRARIES = libtracker-gtk.la
libtracker_gtkinc_HEADERS = \
tracker-gtk.h \
tracker-utils.h \
tracker-ui.h \
tracker-metadata-tile.h \
tracker-tag-bar.h \
libtracker_gtkinc_HEADERS = \
tracker-gtk.h \
tracker-utils.h \
tracker-ui.h \
tracker-metadata-tile.h \
tracker-tag-bar.h \
tracker-keyword-store.h
libtracker_gtk_la_SOURCES = \
tracker-utils.c \
tracker-ui.c \
tracker-metadata-tile.c \
tracker-tag-bar.c \
libtracker_gtk_la_SOURCES = \
tracker-utils.c \
tracker-ui.c \
tracker-metadata-tile.c \
tracker-tag-bar.c \
tracker-keyword-store.c
libtracker_gtk_la_LIBADD = \
$(top_builddir)/src/libtracker/libtrackerclient.la \
libtracker_gtk_la_LIBADD = \
$(top_builddir)/src/libtracker/libtrackerclient.la \
$(LIBTRACKERGTK_LIBS)
libtracker_gtk_la_LDFLAGS = -version-info 0:0:0
......
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-I$(top_srcdir)/src \
-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
-DLOCALEDIR="\"$(LOCALEDIR)\"" \
-DTRACKER_COMPILATION \
$(DBUS_CFLAGS) \
$(GMIME_CFLAGS) \
INCLUDES = \
-I$(top_srcdir)/src \
-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
-DLOCALEDIR="\"$(LOCALEDIR)\"" \
-DTRACKER_COMPILATION \
$(WARN_CFLAGS) \
$(DBUS_CFLAGS) \
$(GMIME_CFLAGS) \
$(EVOLUTION_PLUGIN_CFLAGS)
%.eplug.in: %.eplug.xml
LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
%.eplug: %.eplug.in
sed -e "s%+PLUGIN_INSTALL_DIR+%$(EVOLUTION_PLUGIN_INSTALL_DIR)%" \
-e "s%+GETTEXT_PACKAGE+%$(GETTEXT_PACKAGE)%" \
-e "s%+LOCALEDIR+%$(LOCALEDIR)%" \
sed -e "s%+PLUGIN_INSTALL_DIR+%$(EVOLUTION_PLUGIN_INSTALL_DIR)%"\
-e "s%+GETTEXT_PACKAGE+%$(GETTEXT_PACKAGE)%" \
-e "s%+LOCALEDIR+%$(LOCALEDIR)%" \
$< > $@
eplugindir = $(EVOLUTION_PLUGIN_INSTALL_DIR)
......@@ -93,7 +94,8 @@ BUILT_SOURCES = \
$(dbus_sources) \
$(eplugin_DATA)
CLEANFILES = $(BUILT_SOURCES) \
CLEANFILES = \
$(BUILT_SOURCES) \
org-freedesktop-Tracker-evolution-plugin.eplug
EXTRA_DIST = \
......
include $(top_srcdir)/Makefile.decl
INCLUDES = -I$(top_srcdir)/src \
-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
-DLOCALEDIR="\"$(LOCALEDIR)\"" \
-DTRACKER_COMPILATION \
$(DBUS_CFLAGS) \
INCLUDES = -I$(top_srcdir)/src \
-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
-DLOCALEDIR="\"$(LOCALEDIR)\"" \
-DTRACKER_COMPILATION \
$(WARN_CFLAGS) \
$(DBUS_CFLAGS) \
$(GMIME_CFLAGS)
module_flags = -module -avoid-version -no-undefined
......@@ -15,16 +16,16 @@ pushi_modulesdir = $(libdir)/tracker/push-modules/indexer
pushd_modules_LTLIBRARIES = libtracker-module_kmail-daemon-module.la
pushi_modules_LTLIBRARIES = libtracker-module_kmail-indexer-module.la
libtracker_module_kmail_indexer_module_la_SOURCES = \
tracker-kmail-indexer.c \
tracker-kmail-indexer.h \
tracker-kmail-registrar-glue.h \
libtracker_module_kmail_indexer_module_la_SOURCES = \
tracker-kmail-indexer.c \
tracker-kmail-indexer.h \
tracker-kmail-registrar-glue.h \
tracker-kmail-common.h
libtracker_module_kmail_daemon_module_la_SOURCES = \
tracker-kmail-registrar.c \
tracker-kmail-registrar.h \
tracker-kmail-common.h \
libtracker_module_kmail_daemon_module_la_SOURCES = \
tracker-kmail-registrar.c \
tracker-kmail-registrar.h \
tracker-kmail-common.h \
tracker-kmail-registrar-glue.h
libtracker_module_kmail_daemon_module_la_LDFLAGS = $(module_flags)
......
include $(top_srcdir)/Makefile.decl
INCLUDES = -I$(top_srcdir)/src \
-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
-DLOCALEDIR="\"$(LOCALEDIR)\"" \
-DTRACKER_COMPILATION \
$(DBUS_CFLAGS) \
INCLUDES = -I$(top_srcdir)/src \
-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
-DLOCALEDIR="\"$(LOCALEDIR)\"" \
-DTRACKER_COMPILATION \
$(WARN_CFLAGS) \
$(DBUS_CFLAGS) \
$(GMIME_CFLAGS)
module_flags = -module -avoid-version -no-undefined
......@@ -15,16 +16,16 @@ pushi_modulesdir = $(libdir)/tracker/push-modules/indexer
pushd_modules_LTLIBRARIES = libtracker-module-rss-daemon-module.la
pushi_modules_LTLIBRARIES = libtracker-module-rss-indexer-module.la
libtracker_module_rss_indexer_module_la_SOURCES = \
tracker-rss-indexer.c \
tracker-rss-indexer.h \
tracker-rss-registrar-glue.h \
libtracker_module_rss_indexer_module_la_SOURCES = \
tracker-rss-indexer.c \
tracker-rss-indexer.h \
tracker-rss-registrar-glue.h \
tracker-rss-common.h
libtracker_module_rss_daemon_module_la_SOURCES = \
tracker-rss-registrar.c \
tracker-rss-registrar.h \
tracker-rss-common.h \
libtracker_module_rss_daemon_module_la_SOURCES = \
tracker-rss-registrar.c \
tracker-rss-registrar.h \
tracker-rss-common.h \
tracker-rss-registrar-glue.h
libtracker_module_rss_daemon_module_la_LDFLAGS = $(module_flags)
......@@ -60,6 +61,8 @@ dbus_sources = tracker-rss-registrar-glue.h
$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
BUILT_SOURCES = $(dbus_sources)
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(BUILT_SOURCES)
include $(top_srcdir)/Makefile.decl
INCLUDES = \
-D_XOPEN_SOURCE_EXTENDED=1 \
-D_GNU_SOURCE=1 \
-D__EXTENSIONS__=1 \
-D_HPUX_SOURCE=1 \
-D_POSIX_MAPPED_FILES=1 \
-D_POSIX_SYNCHRONIZED_IO=1 \
-DPIC=1 \
-D_THREAD_SAFE=1 \
-D_REENTRANT=1 \
-DNDEBUG \
INCLUDES = \
-D_XOPEN_SOURCE_EXTENDED=1 \
-D_GNU_SOURCE=1 \
-D__EXTENSIONS__=1 \
-D_HPUX_SOURCE=1 \
-D_POSIX_MAPPED_FILES=1 \
-D_POSIX_SYNCHRONIZED_IO=1 \
-DPIC=1 \
-D_THREAD_SAFE=1 \
-D_REENTRANT=1 \
-DNDEBUG \
-DMYNOMMAP
noinst_LTLIBRARIES = libqdbm-private.la
libqdbm_private_la_SOURCES = \
depot.c \
depot.h \
myconf.c \
libqdbm_private_la_SOURCES = \
depot.c \
depot.h \
myconf.c \
myconf.h
......@@ -6,8 +6,8 @@ INCLUDES = \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(TRACKER_APPLET_CFLAGS) \
$(LIBGLADE_CFLAGS)
$(LIBGLADE_CFLAGS) \
$(TRACKER_APPLET_CFLAGS)
bin_PROGRAMS = tracker-applet
......
......@@ -9,6 +9,11 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GDKPIXBUF_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
$(EXEMPI_CFLAGS) \
$(LIBJPEG_CFLAGS) \
$(LIBTIFF_CFLAGS) \
......@@ -19,10 +24,6 @@ INCLUDES = \
$(POPPLER_GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(XINE_CFLAGS) \
$(GDKPIXBUF_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_CFLAGS) \
$(GLIB2_CFLAGS) \
$(TOTEM_PL_PARSER_CFLAGS)
modules_LTLIBRARIES = \
......@@ -96,7 +97,7 @@ xmp_sources = \
albumart_libs =
albumart_flags =
albumart_sources = \
tracker-extract-albumart.c \
tracker-extract-albumart.c \
tracker-extract-albumart.h
if HAVE_GDKPIXBUF
......
......@@ -79,13 +79,6 @@ dbus_register_object (DBusGConnection *lconnection,
dbus_g_connection_register_g_object (lconnection, path, object);
}
static void
dbus_name_owner_changed (gpointer data,
GClosure *closure)
{
g_object_unref (data);
}
static gboolean
dbus_register_names (void)
{
......
......@@ -28,9 +28,10 @@
G_BEGIN_DECLS
gboolean tracker_dbus_init (void);
void tracker_dbus_shutdown (void);
gboolean tracker_dbus_register_object (void);
gboolean tracker_dbus_init (void);
void tracker_dbus_shutdown (void);
gboolean tracker_dbus_register_objects (void);
GObject *tracker_dbus_get_object (GType type);
G_END_DECLS
......
......@@ -42,8 +42,6 @@
#include "tracker-extract-albumart.h"
#ifdef HAVE_GDKPIXBUF
static gboolean
......@@ -121,22 +119,25 @@ tracker_process_albumart (const unsigned char *buffer,
gchar *filename_uri;
gboolean lcopied = FALSE;
if (strchr (filename, ':'))
if (strchr (filename, ':')) {
filename_uri = g_strdup (filename);
else
} else {
filename_uri = g_filename_to_uri (filename, NULL, NULL);
}
tracker_albumart_get_path (artist, album, "album", filename_uri,
&art_path, &local_uri);
tracker_albumart_get_path (artist,
album,
"album",
filename_uri,
&art_path,
&local_uri);
if (!g_file_test (art_path, G_FILE_TEST_EXISTS)) {
#ifdef HAVE_GDKPIXBUF
/* If we have embedded album art */
if (buffer && len) {
retval = set_albumart (buffer, len,
retval = set_albumart (buffer,
len,
artist,
album,
filename);
......@@ -145,9 +146,7 @@ tracker_process_albumart (const unsigned char *buffer,
} else {
#endif /* HAVE_GDK_PIXBUF */
/* If not, we perform a heuristic on the dir */
if (!tracker_albumart_heuristic (artist, album,
trackercnt_str,
filename,
......@@ -156,7 +155,6 @@ tracker_process_albumart (const unsigned char *buffer,
/* If the heuristic failed, we request the download
* of the media-art to the media-art downloaders */
lcopied = TRUE;
tracker_albumart_request_download (artist,
album,
......@@ -164,9 +162,7 @@ tracker_process_albumart (const unsigned char *buffer,
art_path);
}
#ifdef HAVE_GDKPIXBUF
}
#endif /* HAVE_GDKPIXBUF */
/* If the heuristic didn't copy from the .mediaartlocal, then
......
......@@ -59,6 +59,8 @@
#include <string.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <gst/gst.h>
#include <gst/tag/tag.h>
......@@ -986,7 +988,7 @@ tracker_extract_gstreamer (const gchar *uri,
if (!g_hash_table_lookup (metadata, "Image:Date")) {
struct stat st;
if (g_lstat(uri, &st) >= 0) {
if (g_lstat (uri, &st) >= 0) {
gchar *date;
date = tracker_date_to_string (st.st_mtime);
......
......@@ -34,6 +34,9 @@
#include <sys/resource.h>
#endif
#include <libtracker-common/tracker-log.h>
#include <libtracker-common/tracker-config.h>
#include <libtracker-common/tracker-dbus.h>
#include <libtracker-common/tracker-os-dependant.h>
#include <libtracker-common/tracker-thumbnailer.h>
......@@ -124,7 +127,6 @@ main (int argc, char *argv[])
{
GOptionContext *context;
GError *error = NULL;
gchar *summary;
TrackerConfig *config;
gchar *log_filename;
......
......@@ -47,12 +47,12 @@ struct TrackerExtractData {
};
/* This is defined in each extract */
TrackerExtractData *tracker_get_extract_data (void);
TrackerExtractData *tracker_get_extract_data (void);
/* This is used to not shutdown after the default of 30 seconds if we
* get more work to do.
*/
void tracker_main_shutdown_timeout_reset (void);
void tracker_main_quit_timeout_reset (void);
G_END_DECLS
......
include $(top_srcdir)/Makefile.decl
module_flags = -module -avoid-version -no-undefined
tracker_fts_modulesdir = $(libdir)
INCLUDES = \
-g \
-I$(top_srcdir)/src \
$(GLIB2_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(PANGO_CFLAGS) \
INCLUDES = \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(PANGO_CFLAGS) \
$(SQLITE3_CFLAGS) \
-DSTORE_CATEGORY=1
module_flags = -module -avoid-version -no-undefined
tracker_fts_modulesdir = $(libdir)
tracker_fts_modules_LTLIBRARIES = tracker-fts.la
tracker_fts_la_SOURCES = \
tracker-fts.c \
tracker-fts-hash.c
tracker_fts_la_SOURCES = \
tracker-fts.c \
tracker-fts-hash.c
tracker_fts_la_LDFLAGS = $(module_flags)
tracker_fts_la_LIBADD = \
$(top_builddir)/src/libtracker-db/libtracker-db.la \
$(SQLITE3_LIBS) \
$(GTHREAD_LIBS) \
$(PANGO_LIBS) \
tracker_fts_la_LIBADD = \
$(top_builddir)/src/libtracker-db/libtracker-db.la \
$(SQLITE3_LIBS) \
$(GTHREAD_LIBS) \
$(PANGO_LIBS) \
$(GLIB2_LIBS)
......@@ -13,11 +13,11 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \