Commit 08781f96 authored by Sven Herzberg's avatar Sven Herzberg Committed by Martyn Russell

prefix the dbus related API with "_"

This prefix prevents the functions from matching the regular expression
of the filter for exported symbols.

* data/dbus/tracker-miner.xml,
* src/libtracker-miner/Makefile.am,
* src/libtracker-miner/tracker-dbus.c,
* src/libtracker-miner/tracker-dbus.h,
* src/libtracker-miner/tracker-miner-dbus.h,
* src/libtracker-miner/tracker-miner-object.c,
* src/libtracker-miner/tracker-miner-web-dbus.h,
* src/libtracker-miner/tracker-miner-web.c: prefix private API with
  "_tracker_"
parent cf360bb4
......@@ -2,7 +2,7 @@
<node name="/">
<interface name="org.freedesktop.Tracker1.Miner">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="tracker_miner_dbus"/>
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="_tracker_miner_dbus"/>
<method name="GetStatus">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
<arg type="s" name="status" direction="out" />
......
......@@ -124,13 +124,13 @@ tracker-miner-web-glue.h: $(top_srcdir)/data/dbus/tracker-miner-web.xml $(top_sr
echo '<node name="/">' >> $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
cat $^ | grep -v -e '<node' -e '<?xml' -e '</node>' >> $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
echo '</node>' >> $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=tracker_miner_web_dbus $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=_tracker_miner_web_dbus $(top_builddir)/src/libtracker-miner/tracker-miner-web-full.xml
%-glue.h: $(top_srcdir)/data/dbus/%.xml
$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=_$(subst -,_,$*) $^
%-client.h: $(top_srcdir)/data/dbus/%.xml
$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
$(AM_V_GEN)$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=_$(subst -,_,$*) $^
BUILT_SOURCES = $(dbus_sources) $(marshal_sources)
......
......@@ -217,8 +217,8 @@ dbus_data_create (TrackerMiner *miner,
}
void
tracker_miner_dbus_init (TrackerMiner *miner,
const DBusGObjectInfo *info)
_tracker_miner_dbus_init (TrackerMiner *miner,
const DBusGObjectInfo *info)
{
DBusData *data;
gchar *name;
......@@ -261,7 +261,7 @@ tracker_miner_dbus_init (TrackerMiner *miner,
}
void
tracker_miner_dbus_shutdown (TrackerMiner *miner)
_tracker_miner_dbus_shutdown (TrackerMiner *miner)
{
g_return_if_fail (TRACKER_IS_MINER (miner));
......@@ -273,9 +273,9 @@ tracker_miner_dbus_shutdown (TrackerMiner *miner)
}
void
tracker_miner_dbus_add_name_watch (TrackerMiner *miner,
const gchar *name,
TrackerMinerDBusNameFunc func)
_tracker_miner_dbus_add_name_watch (TrackerMiner *miner,
const gchar *name,
TrackerMinerDBusNameFunc func)
{
DBusData *data;
......
......@@ -32,11 +32,11 @@ typedef void (* TrackerMinerDBusNameFunc) (TrackerMiner *miner,
const gchar *name,
gboolean available);
void tracker_miner_dbus_init (TrackerMiner *miner,
const DBusGObjectInfo *info);
void tracker_miner_dbus_shutdown (TrackerMiner *miner);
void tracker_miner_dbus_add_name_watch (TrackerMiner *miner,
const gchar *name,
TrackerMinerDBusNameFunc func);
void _tracker_miner_dbus_init (TrackerMiner *miner,
const DBusGObjectInfo *info);
void _tracker_miner_dbus_shutdown (TrackerMiner *miner);
void _tracker_miner_dbus_add_name_watch (TrackerMiner *miner,
const gchar *name,
TrackerMinerDBusNameFunc func);
#endif /* __LIBTRACKER_MINER_DBUS_H__ */
......@@ -35,34 +35,34 @@ G_BEGIN_DECLS
#define TRACKER_MINER_DBUS_NAME_PREFIX "org.freedesktop.Tracker1.Miner."
#define TRACKER_MINER_DBUS_PATH_PREFIX "/org/freedesktop/Tracker1/Miner/"
void tracker_miner_dbus_get_name (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_dbus_get_description (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_dbus_get_status (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_dbus_get_progress (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_dbus_get_pause_details (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_dbus_pause (TrackerMiner *miner,
const gchar *application,
const gchar *name,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_dbus_resume (TrackerMiner *miner,
gint cookie,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_dbus_ignore_next_update (TrackerMiner *miner,
const GStrv subjects,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_dbus_get_name (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_dbus_get_description (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_dbus_get_status (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_dbus_get_progress (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_dbus_get_pause_details (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_dbus_pause (TrackerMiner *miner,
const gchar *application,
const gchar *name,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_dbus_resume (TrackerMiner *miner,
gint cookie,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_dbus_ignore_next_update (TrackerMiner *miner,
const GStrv subjects,
DBusGMethodInvocation *context,
GError **error);
G_END_DECLS
......
......@@ -418,7 +418,7 @@ miner_finalize (GObject *object)
g_hash_table_unref (miner->private->pauses);
g_ptr_array_free (miner->private->async_calls, TRUE);
tracker_miner_dbus_shutdown (miner);
_tracker_miner_dbus_shutdown (miner);
G_OBJECT_CLASS (tracker_miner_parent_class)->finalize (object);
}
......@@ -428,9 +428,9 @@ miner_constructed (GObject *object)
{
TrackerMiner *miner = TRACKER_MINER (object);
tracker_miner_dbus_init (miner, &dbus_glib_tracker_miner_object_info);
tracker_miner_dbus_add_name_watch (miner, "org.freedesktop.Tracker1",
store_name_monitor_cb);
_tracker_miner_dbus_init (miner, &dbus_glib__tracker_miner_object_info);
_tracker_miner_dbus_add_name_watch (miner, "org.freedesktop.Tracker1",
store_name_monitor_cb);
}
static void
......@@ -1116,9 +1116,9 @@ tracker_miner_resume (TrackerMiner *miner,
/* DBus methods */
void
tracker_miner_dbus_get_status (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_dbus_get_status (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error)
{
guint request_id;
......@@ -1133,9 +1133,9 @@ tracker_miner_dbus_get_status (TrackerMiner *miner,
}
void
tracker_miner_dbus_get_progress (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_dbus_get_progress (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error)
{
guint request_id;
......@@ -1151,9 +1151,9 @@ tracker_miner_dbus_get_progress (TrackerMiner *miner,
}
void
tracker_miner_dbus_get_pause_details (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_dbus_get_pause_details (TrackerMiner *miner,
DBusGMethodInvocation *context,
GError **error)
{
GSList *applications, *reasons;
GStrv applications_strv, reasons_strv;
......@@ -1195,11 +1195,11 @@ tracker_miner_dbus_get_pause_details (TrackerMiner *miner,
}
void
tracker_miner_dbus_pause (TrackerMiner *miner,
const gchar *application,
const gchar *reason,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_dbus_pause (TrackerMiner *miner,
const gchar *application,
const gchar *reason,
DBusGMethodInvocation *context,
GError **error)
{
GError *local_error = NULL;
guint request_id;
......@@ -1238,10 +1238,10 @@ tracker_miner_dbus_pause (TrackerMiner *miner,
}
void
tracker_miner_dbus_resume (TrackerMiner *miner,
gint cookie,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_dbus_resume (TrackerMiner *miner,
gint cookie,
DBusGMethodInvocation *context,
GError **error)
{
GError *local_error = NULL;
guint request_id;
......@@ -1276,10 +1276,10 @@ tracker_miner_dbus_resume (TrackerMiner *miner,
}
void
tracker_miner_dbus_ignore_next_update (TrackerMiner *miner,
const GStrv urls,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_dbus_ignore_next_update (TrackerMiner *miner,
const GStrv urls,
DBusGMethodInvocation *context,
GError **error)
{
guint request_id;
......
......@@ -31,19 +31,19 @@
G_BEGIN_DECLS
void tracker_miner_web_dbus_authenticate (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_web_dbus_get_association_data (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_web_dbus_associate (TrackerMinerWeb *miner,
GHashTable *association_data,
DBusGMethodInvocation *context,
GError **error);
void tracker_miner_web_dbus_dissociate (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_web_dbus_authenticate (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_web_dbus_get_association_data (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_web_dbus_associate (TrackerMinerWeb *miner,
GHashTable *association_data,
DBusGMethodInvocation *context,
GError **error);
void _tracker_miner_web_dbus_dissociate (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error);
G_END_DECLS
......
......@@ -127,8 +127,8 @@ miner_web_get_property (GObject *object,
static void
miner_web_constructed (GObject *object)
{
tracker_miner_dbus_init (TRACKER_MINER (object),
&dbus_glib_tracker_miner_web_dbus_object_info);
_tracker_miner_dbus_init (TRACKER_MINER (object),
&dbus_glib__tracker_miner_web_dbus_object_info);
G_OBJECT_CLASS (tracker_miner_web_parent_class)->constructed (object);
}
......@@ -147,9 +147,9 @@ tracker_miner_web_error_quark (void)
/* DBus methods */
void
tracker_miner_web_dbus_authenticate (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_web_dbus_authenticate (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error)
{
GError *local_error = NULL;
......@@ -166,9 +166,9 @@ tracker_miner_web_dbus_authenticate (TrackerMinerWeb *miner,
}
void
tracker_miner_web_dbus_get_association_data (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_web_dbus_get_association_data (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error)
{
GHashTable *association_data;
GError *local_error = NULL;
......@@ -187,10 +187,10 @@ tracker_miner_web_dbus_get_association_data (TrackerMinerWeb *miner,
}
void
tracker_miner_web_dbus_associate (TrackerMinerWeb *miner,
GHashTable *association_data,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_web_dbus_associate (TrackerMinerWeb *miner,
GHashTable *association_data,
DBusGMethodInvocation *context,
GError **error)
{
GError *local_error = NULL;
......@@ -208,9 +208,9 @@ tracker_miner_web_dbus_associate (TrackerMinerWeb *miner,
}
void
tracker_miner_web_dbus_dissociate (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error)
_tracker_miner_web_dbus_dissociate (TrackerMinerWeb *miner,
DBusGMethodInvocation *context,
GError **error)
{
GError *local_error = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment