[gnome-packagekit] Move the D-Bus interface to gnome-software
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-packagekit] Move the D-Bus interface to gnome-software
- Date: Mon, 16 Feb 2015 20:27:15 +0000 (UTC)
commit 83c6f8590a80333ccda56d727adb2bb13598b748
Author: Richard Hughes <richard hughsie com>
Date: Mon Feb 16 09:55:36 2015 +0000
Move the D-Bus interface to gnome-software
configure.ac | 5 -
contrib/gnome-packagekit.spec.in | 10 -
data/Makefile.am | 9 -
data/gpk-dbus-service.desktop.in | 10 -
data/org.freedesktop.PackageKit.service.in | 4 -
docs/Makefile.am | 1 -
docs/dbus/.gitignore | 3 -
docs/dbus/Makefile.am | 17 -
docs/dbus/dbus-introspect-docs.dtd | 32 -
docs/dbus/spec-to-docbook.xsl | 436 ----
man/Makefile.am | 4 -
man/gpk-dbus-service.sgml | 77 -
man/gpk-install-local-file.sgml | 77 -
src/Makefile.am | 46 -
src/gpk-application.c | 2 -
src/gpk-dbus-service.c | 184 --
src/gpk-dbus-task.c | 3273 ----------------------------
src/gpk-dbus-task.h | 161 --
src/gpk-dbus.c | 590 -----
src/gpk-dbus.h | 124 --
src/gpk-install-local-file.c | 139 --
src/gpk-self-test.c | 80 -
src/gpk-session.c | 361 ---
src/gpk-session.h | 69 -
src/gpk-update-viewer.c | 9 -
src/gpk-x11.c | 250 ---
src/gpk-x11.h | 63 -
src/org.freedesktop.PackageKit.xml | 506 -----
28 files changed, 0 insertions(+), 6542 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ce3eae6..813937a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,10 +92,6 @@ PKG_CHECK_MODULES(GLIB, \
gobject-2.0
gio-2.0 >= 2.25.9
gio-unix-2.0)
-PKG_CHECK_MODULES(DBUS, \
- dbus-glib-1 >= 0.73 \
- dbus-1 >= 1.1.2 \
- gthread-2.0)
PKG_CHECK_MODULES(GTK, \
gtk+-3.0 >= 3.15.3 gdk-3.0 fontconfig)
PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= 0.10)
@@ -207,7 +203,6 @@ po/Makefile.in
data/Makefile
data/appdata/Makefile
docs/Makefile
-docs/dbus/Makefile
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/22x22/Makefile
diff --git a/contrib/gnome-packagekit.spec.in b/contrib/gnome-packagekit.spec.in
index c11b51d..bf8db55 100644
--- a/contrib/gnome-packagekit.spec.in
+++ b/contrib/gnome-packagekit.spec.in
@@ -10,7 +10,6 @@ URL: http://www.packagekit.org
Source0: http://download.gnome.org/sources/gnome-packagekit/3.11/%{name}-%{version}.tar.xz
Requires: adwaita-icon-theme
-Requires: dbus-x11%{?_isa} >= 1.1.2
Requires: PackageKit%{?_isa} >= 0.5.0
Requires: PackageKit-libs >= 0.5.0
Requires: shared-mime-info
@@ -22,8 +21,6 @@ Provides: PackageKit-session-service
BuildRequires: glib2-devel >= 2.25.8
BuildRequires: gtk3-devel
-BuildRequires: dbus-devel
-BuildRequires: dbus-glib-devel
BuildRequires: libnotify-devel >= 0.7.0
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -100,8 +97,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files -f %{name}.lang
%doc AUTHORS COPYING NEWS README
-%{_bindir}/gpk-dbus-service
-%{_bindir}/gpk-install-local-file
%{_bindir}/gpk-log
%{_bindir}/gpk-prefs
%dir %{_datadir}/gnome-packagekit
@@ -119,15 +114,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/gnome-packagekit/icons/hicolor/scalable/*/*.svg*
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/icons/hicolor/scalable/*/*.svg*
-%{_datadir}/man/man1/gpk-dbus-service.1.gz
-%{_datadir}/man/man1/gpk-install-local-file.1.gz
%{_datadir}/man/man1/gpk-log.1.gz
%{_datadir}/man/man1/gpk-prefs.1.gz
-%{_datadir}/applications/gpk-dbus-service.desktop
-%{_datadir}/applications/gpk-install-local-file.desktop
%{_datadir}/applications/gpk-log.desktop
%{_datadir}/applications/gpk-prefs.desktop
-%{_datadir}/dbus-1/services/org.freedesktop.PackageKit.service
%{_datadir}/glib-2.0/schemas/org.gnome.packagekit.gschema.xml
%{_datadir}/GConf/gsettings/org.gnome.packagekit.gschema.migrate
diff --git a/data/Makefile.am b/data/Makefile.am
index b24a4d3..4f79fb6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,7 +9,6 @@ dist_migration_DATA = org.gnome.packagekit.gschema.migrate
desktopdir = $(datadir)/applications
desktop_in_files = \
gpk-install-local-file.desktop.in \
- gpk-dbus-service.desktop.in \
gpk-prefs.desktop.in \
gpk-application.desktop.in \
gpk-update-viewer.desktop.in \
@@ -31,13 +30,6 @@ pkgdata_DATA = \
gpk-client.ui \
$(NULL)
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.freedesktop.PackageKit.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
- @sed -e "s|\ servicedir\@|$(bindir)|" $< > $@
-
@GSETTINGS_RULES@
gsettings_SCHEMAS = org.gnome.packagekit.gschema.xml
@@ -56,7 +48,6 @@ DISTCLEANFILES = \
gpk-prefs.desktop \
gpk-update-viewer.desktop \
gpk-install-local-file.desktop \
- gpk-dbus-service.desktop \
gpk-log.desktop \
gpk-application.desktop \
org.freedesktop.PackageKit.service \
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2b95778..8b13789 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,2 +1 @@
-SUBDIRS = dbus
diff --git a/man/Makefile.am b/man/Makefile.am
index 485dcf7..6abdf1c 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,7 +1,5 @@
EXTRA_DIST = \
gpk-application.sgml \
- gpk-dbus-service.sgml \
- gpk-install-local-file.sgml \
gpk-log.sgml \
gpk-prefs.sgml \
gpk-update-viewer.sgml
@@ -9,8 +7,6 @@ EXTRA_DIST = \
if HAVE_DOCBOOK2MAN
man_MANS = \
gpk-application.1 \
- gpk-dbus-service.1 \
- gpk-install-local-file.1 \
gpk-log.1 \
gpk-prefs.1 \
gpk-update-viewer.1
diff --git a/src/Makefile.am b/src/Makefile.am
index b9a6364..01dfed3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,6 @@ AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
$(GTK_CFLAGS) \
- $(DBUS_CFLAGS) \
$(NOTIFY_CFLAGS) \
$(PACKAGEKIT_CFLAGS) \
$(GUDEV_CFLAGS) \
@@ -31,10 +30,8 @@ AM_CPPFLAGS = \
bin_PROGRAMS = \
gpk-application \
gpk-prefs \
- gpk-install-local-file \
gpk-update-viewer \
gpk-log \
- gpk-dbus-service \
$(NULL)
noinst_LIBRARIES = libgpkshared.a
@@ -47,12 +44,8 @@ libgpkshared_a_SOURCES = \
gpk-debug.h \
gpk-enum.c \
gpk-enum.h \
- gpk-x11.c \
- gpk-x11.h \
gpk-marshal.c \
gpk-marshal.h \
- gpk-session.c \
- gpk-session.h \
gpk-animated-icon.c \
gpk-animated-icon.h \
gpk-dialog.c \
@@ -86,7 +79,6 @@ endif
shared_LIBS = \
$(GLIB_LIBS) \
$(GIO_LIBS) \
- $(DBUS_LIBS) \
$(GTK_LIBS) \
$(GUDEV_LIBS) \
$(NOTIFY_LIBS) \
@@ -94,29 +86,6 @@ shared_LIBS = \
$(PACKAGEKIT_LIBS) \
$(GNOME_MENUS_LIBS) \
$(CANBERRA_LIBS) \
- $(X11_LIBS) \
- $(NULL)
-
-gpk_install_local_file_SOURCES = \
- gpk-install-local-file.c \
- $(NULL)
-
-gpk_install_local_file_LDADD = \
- libgpkshared.a \
- $(shared_LIBS) \
- $(NULL)
-
-gpk_dbus_service_SOURCES = \
- gpk-dbus-service.c \
- gpk-dbus.c \
- gpk-dbus.h \
- gpk-dbus-task.c \
- gpk-dbus-task.h \
- $(NULL)
-
-gpk_dbus_service_LDADD = \
- libgpkshared.a \
- $(shared_LIBS) \
$(NULL)
gpk_application_SOURCES = \
@@ -174,7 +143,6 @@ gpk_log_LDADD = \
BUILT_SOURCES = \
gpk-marshal.c \
gpk-marshal.h \
- org.freedesktop.PackageKit.h \
$(NULL)
gpk-marshal.c: gpk-marshal.list
@@ -184,13 +152,6 @@ gpk-marshal.c: gpk-marshal.list
gpk-marshal.h: gpk-marshal.list
glib-genmarshal $< --prefix=gpk_marshal --header > $@
-org.freedesktop.PackageKit.h: org.freedesktop.PackageKit.xml
- $(LIBTOOL) --mode=execute dbus-binding-tool \
- --prefix=gpk_dbus \
- --mode=glib-server \
- --output=org.freedesktop.PackageKit.h \
- $(srcdir)/org.freedesktop.PackageKit.xml
-
if EGG_BUILD_TESTS
check_PROGRAMS = \
@@ -217,16 +178,10 @@ gpk_self_test_SOURCES = \
gpk-language.h \
gpk-modal-dialog.c \
gpk-modal-dialog.h \
- gpk-dbus.c \
- gpk-dbus.h \
- gpk-dbus-task.c \
- gpk-dbus-task.h \
gpk-animated-icon.c \
gpk-animated-icon.h \
gpk-gnome.c \
gpk-gnome.h \
- gpk-x11.c \
- gpk-x11.h \
gpk-vendor.c \
gpk-vendor.h \
gpk-task.c \
@@ -253,7 +208,6 @@ endif
EXTRA_DIST = \
gpk-marshal.list \
- org.freedesktop.PackageKit.xml \
$(NULL)
clean-local:
diff --git a/src/gpk-application.c b/src/gpk-application.c
index aefa3f3..1f0f7be 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -21,7 +21,6 @@
#include "config.h"
-#include <dbus/dbus-glib.h>
#include <errno.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
@@ -3486,7 +3485,6 @@ main (int argc, char *argv[])
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- dbus_g_thread_init ();
gtk_init (&argc, &argv);
context = g_option_context_new (NULL);
diff --git a/src/gpk-self-test.c b/src/gpk-self-test.c
index e796125..181d7b4 100644
--- a/src/gpk-self-test.c
+++ b/src/gpk-self-test.c
@@ -25,8 +25,6 @@
#include "egg-markdown.h"
#include "gpk-common.h"
-#include "gpk-dbus.h"
-#include "gpk-dbus-task.h"
#include "gpk-enum.h"
#include "gpk-error.h"
#include "gpk-language.h"
@@ -337,71 +335,6 @@ gpk_test_language_func (void)
}
static void
-gpk_test_dbus_task_func (void)
-{
- GpkDbusTask *dtask;
- gchar *lang;
- gchar *language;
- gchar *package;
- gboolean ret;
-// const gchar *fonts[] = { ":lang=mn", NULL };
-// GError *error;
-
- /* get GpkDbusTask object */
- dtask = gpk_dbus_task_new ();
- g_assert (dtask);
-
- /* convert tag to lang */
- lang = gpk_dbus_task_font_tag_to_lang (":lang=mn");
- g_assert_cmpstr (lang, ==, "mn");
- g_free (lang);
-
- /* convert tag to language */
- language = gpk_dbus_task_font_tag_to_localised_name (dtask, ":lang=mn");
- g_assert_cmpstr (language, ==, "Mongolian");
- g_free (language);
-
- /* test trusted path */
-// ret = gpk_dbus_task_path_is_trusted ("/usr/libexec/gst-install-plugins-helper");
-// g_assert (ret);
-
- /* test trusted path */
- ret = gpk_dbus_task_path_is_trusted ("/usr/bin/totem");
- g_assert (!ret);
-
- /* get package for exec */
- package = gpk_dbus_task_get_package_for_exec (dtask, "/usr/bin/totem");
- g_assert_cmpstr (package, ==, "totem");
- g_free (package);
-
- /* set exec */
- ret = gpk_dbus_task_set_exec (dtask, "/usr/bin/totem");
- g_assert (ret);
-#if 0
- /* install fonts (no UI) */
- error = NULL;
- gpk_dbus_task_set_interaction (dtask, GPK_CLIENT_INTERACT_NEVER);
- ret = gpk_dbus_task_install_fontconfig_resources (dtask, (gchar**)fonts, NULL, &error);
- g_assert_no_error (error);
- g_assert (ret);
-
- /* install fonts (if found) */
- error = NULL;
- gpk_dbus_task_set_interaction (dtask, pk_bitfield_from_enums (GPK_CLIENT_INTERACT_CONFIRM_SEARCH,
GPK_CLIENT_INTERACT_FINISHED, -1));
- ret = gpk_dbus_task_install_fontconfig_resources (dtask, (gchar**)fonts, NULL, &error);
- g_assert_no_error (error);
- g_assert (ret);
-
- /* install fonts (always) */
- error = NULL;
- gpk_dbus_task_set_interaction (dtask, GPK_CLIENT_INTERACT_ALWAYS);
- ret = gpk_dbus_task_install_fontconfig_resources (dtask, (gchar**)fonts, NULL, &error);
- g_assert_no_error (error);
- g_assert (ret);
-#endif
-}
-
-static void
gpk_test_error_func (void)
{
gboolean ret;
@@ -415,17 +348,6 @@ gpk_test_error_func (void)
}
static void
-gpk_test_dbus_func (void)
-{
- GpkDbus *dbus = NULL;
-
- /* get GpkDbus object */
- dbus = gpk_dbus_new ();
- g_assert (dbus);
- g_object_unref (dbus);
-}
-
-static void
gpk_test_common_func (void)
{
gchar *text;
@@ -770,8 +692,6 @@ main (int argc, char **argv)
g_test_add_func ("/gnome-packagekit/common", gpk_test_common_func);
g_test_add_func ("/gnome-packagekit/language", gpk_test_language_func);
g_test_add_func ("/gnome-packagekit/markdown", gpk_test_markdown_func);
- g_test_add_func ("/gnome-packagekit/dbus", gpk_test_dbus_func);
- g_test_add_func ("/gnome-packagekit/dbus-task", gpk_test_dbus_task_func);
if (g_test_thorough ()) {
g_test_add_func ("/gnome-packagekit/modal-dialog", gpk_test_modal_dialog_func);
g_test_add_func ("/gnome-packagekit/error", gpk_test_error_func);
diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
index c75acdd..edcfe1e 100644
--- a/src/gpk-update-viewer.c
+++ b/src/gpk-update-viewer.c
@@ -21,7 +21,6 @@
#include "config.h"
-#include <dbus/dbus-glib.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#include <glib/gi18n.h>
@@ -44,7 +43,6 @@
#include "gpk-enum.h"
#include "gpk-error.h"
#include "gpk-gnome.h"
-#include "gpk-session.h"
#include "gpk-task.h"
#include "gpk-debug.h"
@@ -276,12 +274,6 @@ gpk_update_viewer_check_restart (void)
g_error_free (error);
}
#endif
- } else if (restart_update == PK_RESTART_ENUM_SESSION) {
- GpkSession *session;
- session = gpk_session_new ();
- /* use gnome-session to log out */
- gpk_session_logout (session);
- g_object_unref (session);
}
out:
return ret;
@@ -3404,7 +3396,6 @@ main (int argc, char *argv[])
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- dbus_g_thread_init ();
gtk_init (&argc, &argv);
context = g_option_context_new (NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
