From a4dbe47e1639697507c9ddc603c1f8d9f8dc559e Mon Sep 17 00:00:00 2001 From: Jens Georg Date: Sat, 25 May 2013 15:35:23 +0900 Subject: [PATCH] all: Remove Freedesktop interfaces from core They're used in two plug-ins only and are a pain in the donkey when doing gobject-introspection. Signed-off-by: Jens Georg --- .../librygel-core/gtkdoc/librygel-core-docs.xml | 3 -- src/librygel-core/filelist.am | 1 - src/librygel-server/filelist.am | 1 + .../rygel-free-desktop-interfaces.vala | 32 +++++++++++++++++++ src/plugins/external/Makefile.am | 3 +- .../external}/rygel-free-desktop-interfaces.vala | 16 +++++----- src/plugins/mpris/Makefile.am | 3 +- .../mpris/rygel-free-desktop-interfaces.vala | 37 ++++++++++++++++++++++ 8 files changed, 82 insertions(+), 14 deletions(-) create mode 100644 src/librygel-server/rygel-free-desktop-interfaces.vala rename src/{librygel-core => plugins/external}/rygel-free-desktop-interfaces.vala (70%) create mode 100644 src/plugins/mpris/rygel-free-desktop-interfaces.vala diff --git a/doc/reference/librygel-core/gtkdoc/librygel-core-docs.xml b/doc/reference/librygel-core/gtkdoc/librygel-core-docs.xml index 05f0fba..41d3f08 100644 --- a/doc/reference/librygel-core/gtkdoc/librygel-core-docs.xml +++ b/doc/reference/librygel-core/gtkdoc/librygel-core-docs.xml @@ -31,7 +31,6 @@ - @@ -46,8 +45,6 @@ librygel-core D-Bus API Reference - - diff --git a/src/librygel-core/filelist.am b/src/librygel-core/filelist.am index ecd8abd..94f2caf 100644 --- a/src/librygel-core/filelist.am +++ b/src/librygel-core/filelist.am @@ -18,7 +18,6 @@ LIBRYGEL_CORE_VAPI_SOURCE_FILES = \ rygel-media-device.vala \ rygel-configuration.vala \ rygel-base-configuration.vala \ - rygel-free-desktop-interfaces.vala \ rygel-state-machine.vala \ rygel-v1-hacks.vala diff --git a/src/librygel-server/filelist.am b/src/librygel-server/filelist.am index 4b2279f..4aa3fb9 100644 --- a/src/librygel-server/filelist.am +++ b/src/librygel-server/filelist.am @@ -38,6 +38,7 @@ LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES = \ rygel-content-directory.vala \ rygel-dbus-thumbnailer.vala \ rygel-engine-loader.vala \ + rygel-free-desktop-interfaces.vala \ rygel-http-byte-seek.vala \ rygel-http-get-handler.vala \ rygel-http-get.vala \ diff --git a/src/librygel-server/rygel-free-desktop-interfaces.vala b/src/librygel-server/rygel-free-desktop-interfaces.vala new file mode 100644 index 0000000..511e75c --- /dev/null +++ b/src/librygel-server/rygel-free-desktop-interfaces.vala @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2009,2010 Nokia Corporation. + * + * Author: Zeeshan Ali (Khattak) + * + * + * This file is part of Rygel. + * + * Rygel 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 of the License, or + * (at your option) any later version. + * + * Rygel 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 program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +namespace FreeDesktop { + internal const string DBUS_SERVICE = "org.freedesktop.DBus"; + internal const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus"; +} + +[DBus (name = "org.freedesktop.DBus")] +internal interface FreeDesktop.DBusObject: Object { + internal abstract async string[] list_activatable_names () throws DBusError; +} diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am index 3d28073..fa28188 100644 --- a/src/plugins/external/Makefile.am +++ b/src/plugins/external/Makefile.am @@ -13,7 +13,8 @@ librygel_external_la_SOURCES = \ rygel-external-interfaces.vala \ rygel-external-plugin-factory.vala \ rygel-external-icon-factory.vala \ - rygel-external-variant-util.vala + rygel-external-variant-util.vala \ + rygel-free-desktop-interfaces.vala librygel_external_la_VALAFLAGS = \ $(RYGEL_COMMON_LIBRYGEL_SERVER_VALAFLAGS) \ diff --git a/src/librygel-core/rygel-free-desktop-interfaces.vala b/src/plugins/external/rygel-free-desktop-interfaces.vala similarity index 70% rename from src/librygel-core/rygel-free-desktop-interfaces.vala rename to src/plugins/external/rygel-free-desktop-interfaces.vala index e4713ef..7bd20a6 100644 --- a/src/librygel-core/rygel-free-desktop-interfaces.vala +++ b/src/plugins/external/rygel-free-desktop-interfaces.vala @@ -22,22 +22,22 @@ */ namespace FreeDesktop { - public const string DBUS_SERVICE = "org.freedesktop.DBus"; - public const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus"; + internal const string DBUS_SERVICE = "org.freedesktop.DBus"; + internal const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus"; } [DBus (name = "org.freedesktop.DBus")] -public interface FreeDesktop.DBusObject: Object { - public abstract signal void name_owner_changed (string name, +internal interface FreeDesktop.DBusObject: Object { + internal abstract signal void name_owner_changed (string name, string old_owner, string new_owner); - public abstract async string[] list_names () throws DBusError; - public abstract async string[] list_activatable_names () throws DBusError; + internal abstract async string[] list_names () throws DBusError; + internal abstract async string[] list_activatable_names () throws DBusError; } [DBus (name = "org.freedesktop.DBus.Properties")] -public interface FreeDesktop.Properties: Object { - public abstract async HashTable get_all (string iface) +internal interface FreeDesktop.Properties: Object { + internal abstract async HashTable get_all (string iface) throws DBusError; } diff --git a/src/plugins/mpris/Makefile.am b/src/plugins/mpris/Makefile.am index c672e2b..45211f5 100644 --- a/src/plugins/mpris/Makefile.am +++ b/src/plugins/mpris/Makefile.am @@ -7,7 +7,8 @@ librygel_mpris_la_SOURCES = \ rygel-mpris-player.vala \ rygel-mpris-plugin.vala \ rygel-mpris-plugin-factory.vala \ - rygel-mpris-interfaces.vala + rygel-mpris-interfaces.vala \ + rygel-free-desktop-interfaces.vala librygel_mpris_la_VALAFLAGS = \ $(RYGEL_COMMON_LIBRYGEL_RENDERER_VALAFLAGS) \ diff --git a/src/plugins/mpris/rygel-free-desktop-interfaces.vala b/src/plugins/mpris/rygel-free-desktop-interfaces.vala new file mode 100644 index 0000000..d39e53d --- /dev/null +++ b/src/plugins/mpris/rygel-free-desktop-interfaces.vala @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2009,2010 Nokia Corporation. + * + * Author: Zeeshan Ali (Khattak) + * + * + * This file is part of Rygel. + * + * Rygel 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 of the License, or + * (at your option) any later version. + * + * Rygel 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 program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +namespace FreeDesktop { + internal const string DBUS_SERVICE = "org.freedesktop.DBus"; + internal const string DBUS_OBJECT_PATH = "/org/freedesktop/DBus"; +} + +[DBus (name = "org.freedesktop.DBus")] +internal interface FreeDesktop.DBusObject: Object { + internal abstract signal void name_owner_changed (string name, + string old_owner, + string new_owner); + + internal abstract async string[] list_names () throws DBusError; + internal abstract async string[] list_activatable_names () throws DBusError; +} -- 2.7.4