[PackageKit-commit] packagekit: Branch 'master' - 13 commits

Richard Hughes hughsient at kemper.freedesktop.org
Fri Nov 28 05:15:56 PST 2008


 backends/yum/yumBackend.py                        |   38 +++++++++++++++-------
 backends/yum/yumComps.py                          |   10 +++++
 contrib/PackageKit.spec.in                        |   23 ++++++++++++-
 contrib/gstreamer-plugin/Makefile.am              |    4 ++
 contrib/gtk-module/Makefile.am                    |    6 +++
 contrib/gtk-module/PackageKitGtkModule.schemas.in |   17 ---------
 contrib/gtk-module/README                         |   18 +++++++++-
 contrib/gtk-module/pk-gtk-module.c                |   26 ++++++---------
 lib/python/packagekit/backend.py                  |   15 ++++++++
 man/pkgenpack.xml                                 |    4 +-
 src/pk-backend-spawn.c                            |    9 ++++-
 11 files changed, 123 insertions(+), 47 deletions(-)

New commits:
commit a65f691880d7a12dec3cdd79a2062057e7fb5170
Author: Anders F Bjorklund <afb at users.sourceforge.net>
Date:   Fri Nov 28 14:15:18 2008 +0100

    pk-generate-package-list is not used anymore

diff --git a/man/pkgenpack.xml b/man/pkgenpack.xml
index 5c19cdb..7c74d65 100644
--- a/man/pkgenpack.xml
+++ b/man/pkgenpack.xml
@@ -107,8 +107,8 @@ manpage.1: manpage.xml
         <listitem>
           <para>Set the filename of dependencies to be excluded.</para>
           <para>
-            Generally, the file list of packages is generated using
-            <command>pk-generate-package-list</command> on the target system.
+            Generally, the file list of packages is generated
+            when doing a PackageKit refresh on the target system.
             If not specified, <command>pkgenpack</command> uses
             <filename>/var/lib/PackageKit/system.package-list</filename> by default.
           </para>
commit 5879711c39d901e609caf510b5c08ca80308efc8
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Nov 28 10:35:23 2008 +0000

    yum: don't wait more than 15 seconds waiting for a socket to avoid hanging the daemon when the repo is down. Fixes rh#473379

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 7bd0023..414f468 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -43,6 +43,7 @@ import signal
 import time
 import os.path
 import logging
+import socket
 
 import tarfile
 import tempfile
@@ -192,6 +193,10 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
             if not self.comps.connect():
                 self.error(ERROR_GROUP_LIST_INVALID, 'comps categories could not be loaded')
 
+        # timeout a socket after this much time
+        timeout = 15.0
+        socket.setdefaulttimeout(timeout)
+
         # this is global so we can catch sigquit and closedown
         yumbase = self.yumbase
         self._setup_yum()
commit 4d5fcb8f7c3160c017f810a88dde95a585c5e2f4
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri Nov 28 10:20:35 2008 +0000

    trivial: fix exception in new backend code

diff --git a/lib/python/packagekit/backend.py b/lib/python/packagekit/backend.py
index 46d7e71..81c70a8 100644
--- a/lib/python/packagekit/backend.py
+++ b/lib/python/packagekit/backend.py
@@ -47,14 +47,14 @@ class PackageKitBaseBackend:
         # try to get LANG
         try:
             self.lang = os.environ['LANG']
-        except exceptions.KeyError, e:
+        except KeyError, e:
             print "Error: No LANG envp"
 
         # try to get NETWORK state
         try:
             if os.environ['NETWORK'] == 'TRUE':
                 self.has_network = True
-        except exceptions.KeyError, e:
+        except KeyError, e:
             print "Error: No NETWORK envp"
 
     def doLock(self):
commit ae351b0b8d757c5595e7aa609363a88a9dc50ace
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 18:17:39 2008 +0000

    yum: try harder to work from a cache when offline

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index b4cbe1a..7bd0023 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1957,6 +1957,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
         if not self.has_network:
             for repo in self.yumbase.repos.listEnabled():
                 repo.metadata_expire = -1  # never refresh
+            self.yumbase.conf.cache = 1
 
         # we don't care about freshest data
         elif lazy_cache:
commit 6451de03696b9f2922050b86d6965f25580b6f55
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 16:52:29 2008 +0000

    yum: remove two developer debugging statements left in by accident

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 42ac508..b4cbe1a 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -69,9 +69,7 @@ class GPGKeyNotImported(exceptions.Exception):
     pass
 
 def sigquit(signum, frame):
-    print >> sys.stderr, "Quit signal sent - exiting immediately"
     if yumbase:
-        print >> sys.stderr, "unlocking backend"
         yumbase.closeRpmDB()
         yumbase.doUnlock(YUM_PID_FILE)
     sys.exit(1)
commit 42ba539e859271074627988283b3fc82c35f19a4
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 15:26:12 2008 +0000

    trivial: remove extra debugging

diff --git a/contrib/gtk-module/pk-gtk-module.c b/contrib/gtk-module/pk-gtk-module.c
index 6e6dcc3..b87617b 100644
--- a/contrib/gtk-module/pk-gtk-module.c
+++ b/contrib/gtk-module/pk-gtk-module.c
@@ -240,7 +240,6 @@ pk_font_idle_cb (GPtrArray *array)
 
 	/* try to get the window XID */
 	list = gtk_window_list_toplevels ();
-	g_warning ("number of windows = %i", g_list_length (list));
 	g_list_foreach (list, (GFunc) pk_font_find_window, &active);
 	if (active != NULL) {
 		window = gtk_widget_get_window (GTK_WIDGET(active));
commit 6074d5df2ba97d02f26e2521134e369aec193259
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 15:23:26 2008 +0000

    trivial: use the window XID in the gtk-module

diff --git a/contrib/gtk-module/pk-gtk-module.c b/contrib/gtk-module/pk-gtk-module.c
index f077cae..6e6dcc3 100644
--- a/contrib/gtk-module/pk-gtk-module.c
+++ b/contrib/gtk-module/pk-gtk-module.c
@@ -29,6 +29,7 @@
 #include <pango/pangocairo.h>
 #include <dbus/dbus-glib.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 static GPtrArray *array = NULL;
 
@@ -43,16 +44,15 @@ typedef struct {
 	gboolean found;
 } FonsetForeachClosure;
 
-#if 0
 /**
  * pk_font_find_window:
  **/
 static void
 pk_font_find_window (GtkWindow *window, GtkWindow **active)
 {
-	g_message ("%p=%i", window, gtk_window_has_toplevel_focus (window));
+	if (gtk_window_has_toplevel_focus (window))
+		*active = window;
 }
-#endif
 
 /**
  * pk_font_ptr_array_to_strv:
@@ -223,9 +223,12 @@ pk_font_idle_cb (GPtrArray *array)
 	guint i;
 	DBusGConnection *connection;
 	DBusGProxy *proxy = NULL;
-	guint xid;
+	guint xid = 0;
 	gchar **fonts = NULL;
 	GError *error = NULL;
+	GtkWindow *active = NULL;
+	GdkWindow *window;
+	GList *list;
 
 	/* nothing to do */
 	if (array->len == 0)
@@ -235,15 +238,14 @@ pk_font_idle_cb (GPtrArray *array)
 	for (i=0; i< array->len; i++)
 		g_message ("array[%i]: %s", i, (const gchar *) g_ptr_array_index (array, i));
 
-#if 0
-	GtkWindow *active;
-	GList *list;
-
-	/* FIXME: try to get the window XID */
+	/* try to get the window XID */
 	list = gtk_window_list_toplevels ();
 	g_warning ("number of windows = %i", g_list_length (list));
 	g_list_foreach (list, (GFunc) pk_font_find_window, &active);
-#endif
+	if (active != NULL) {
+		window = gtk_widget_get_window (GTK_WIDGET(active));
+		xid = (guint) GDK_WINDOW_XID(window);
+	}
 
 	/* get bus */
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
@@ -266,9 +268,6 @@ pk_font_idle_cb (GPtrArray *array)
 	/* don't timeout, as dbus-glib sets the timeout ~25 seconds */
 	dbus_g_proxy_set_default_timeout (proxy, INT_MAX);
 
-	/* FIXME: get the xid from the calling application */
-	xid = 0;
-
 	/* invoke the method */
 	fonts = pk_font_ptr_array_to_strv (array);
 	DBusGProxyCall *call;
commit bbb4a7789313cffa8911be486ed84f896c752cc5
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 14:38:18 2008 +0000

    yum: use the NETWORK environment variable to change the way we access the repos

diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 365dc30..42ac508 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -187,7 +187,6 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
         signal.signal(signal.SIGQUIT, sigquit)
         PackageKitBaseBackend.__init__(self, args)
         self.yumbase = PackageKitYumBase(self)
-        self._lang = os.environ['LANG']
         self.package_summary_cache = {}
         self.comps = yumComps(self.yumbase)
         if not self.comps.connect():
@@ -280,7 +279,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
         Implement the {backend}-set-locale functionality
         Needed to be implemented in a sub class
         '''
-        self._lang = code
+        self.lang = code
 
     def _do_search(self, searchlist, filters, key):
         '''
@@ -425,7 +424,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
             self.error(ERROR_NO_CACHE, _to_unicode(e))
         else:
             if grp:
-                name = grp.nameByLang(self._lang)
+                name = grp.nameByLang(self.lang)
                 if grp.installed:
                     if show_inst:
                         self.package(package_id, INFO_COLLECTION_INSTALLED, name)
@@ -598,8 +597,8 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
         for cat in cats:
             cat_id = cat.categoryid
             # yum >= 3.2.10
-            # name = cat.nameByLang(self._lang)
-            # summary = cat.descriptionByLang(self._lang)
+            # name = cat.nameByLang(self.lang)
+            # summary = cat.descriptionByLang(self.lang)
             name = cat.name
             summary = cat.description
             fn = "/usr/share/pixmaps/comps/%s.png" % cat_id
@@ -629,8 +628,8 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
             for grp in sorted(grps):
                 grp_id = grp.groupid
                 cat_id_name = "@%s" % (grp_id)
-                name = grp.nameByLang(self._lang)
-                summary = grp.descriptionByLang(self._lang)
+                name = grp.nameByLang(self.lang)
+                summary = grp.descriptionByLang(self.lang)
                 icon = "image-missing"
                 fn = "/usr/share/pixmaps/comps/%s.png" % grp_id
                 if os.access(fn, os.R_OK):
@@ -1117,6 +1116,10 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
         self.percentage(0)
         self.status(STATUS_REFRESH_CACHE)
 
+        # we are working offline
+        if not self.has_network:
+            self.error(ERROR_NO_NETWORK, "cannot refresh cache when offline")
+
         pct = 0
         try:
             if len(self.yumbase.repos.listEnabled()) == 0:
@@ -1597,7 +1600,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
             grp = self._is_meta_package(package)
             if grp:
                 package_id = "%s;;;meta" % grp.groupid
-                desc = grp.descriptionByLang(self._lang)
+                desc = grp.descriptionByLang(self.lang)
                 desc = desc.replace('\n\n', ';')
                 desc = desc.replace('\n', ' ')
                 group = GROUP_COLLECTIONS
@@ -1951,10 +1954,19 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
 
     def _check_init(self, lazy_cache=False, repo_setup=True):
         '''Just does the caching tweaks'''
-        if lazy_cache:
+
+        # we are working offline
+        if not self.has_network:
+            for repo in self.yumbase.repos.listEnabled():
+                repo.metadata_expire = -1  # never refresh
+
+        # we don't care about freshest data
+        elif lazy_cache:
             for repo in self.yumbase.repos.listEnabled():
                 repo.metadata_expire = 60 * 60 * 24  # 24 hours
                 repo.mdpolicy = "group:all"
+
+        # default
         else:
             for repo in self.yumbase.repos.listEnabled():
                 repo.metadata_expire = 60 * 60 * 1.5 # 1.5 hours, the default
commit 94cbf6299b1a84a51322cdfaf6016f9e81b517ec
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 14:34:30 2008 +0000

    feature: get the lang and network state in the generic spawned backend

diff --git a/lib/python/packagekit/backend.py b/lib/python/packagekit/backend.py
index fc4fd2e..46d7e71 100644
--- a/lib/python/packagekit/backend.py
+++ b/lib/python/packagekit/backend.py
@@ -41,6 +41,21 @@ class PackageKitBaseBackend:
         installExceptionHandler(self)
         self.cmds = cmds
         self._locked = False
+        self.lang = "C"
+        self.has_network = False
+
+        # try to get LANG
+        try:
+            self.lang = os.environ['LANG']
+        except exceptions.KeyError, e:
+            print "Error: No LANG envp"
+
+        # try to get NETWORK state
+        try:
+            if os.environ['NETWORK'] == 'TRUE':
+                self.has_network = True
+        except exceptions.KeyError, e:
+            print "Error: No NETWORK envp"
 
     def doLock(self):
         ''' Generic locking, overide and extend in child class'''
commit 33bff8aee2d8ae8a1b38fdf04b773d90d154adf7
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 14:28:35 2008 +0000

    yum: add a few more entries into the comps groups mapping

diff --git a/backends/yum/yumComps.py b/backends/yum/yumComps.py
index bbc1054..fedc171 100755
--- a/backends/yum/yumComps.py
+++ b/backends/yum/yumComps.py
@@ -26,6 +26,7 @@ groupMap = {
 'desktops;gnome-desktop'                      : GROUP_DESKTOP_GNOME,
 'desktops;window-managers'                    : GROUP_DESKTOP_OTHER,
 'desktops;sugar-desktop'                      : GROUP_DESKTOP_OTHER,
+'desktops;lxde-desktop'                       : GROUP_DESKTOP_OTHER,
 'desktops;kde-desktop'                        : GROUP_DESKTOP_KDE,
 'desktops;xfce-desktop'                       : GROUP_DESKTOP_XFCE,
 'apps;authoring-and-publishing'               : GROUP_PUBLISHING,
@@ -38,6 +39,7 @@ groupMap = {
 'apps;text-internet'                          : GROUP_INTERNET,
 'apps;graphical-internet'                     : GROUP_INTERNET,
 'apps;education'                              : GROUP_EDUCATION,
+'development;haskell'                         : GROUP_PROGRAMMING,
 'development;kde-software-development'        : GROUP_PROGRAMMING,
 'development;gnome-software-development'      : GROUP_PROGRAMMING,
 'development;development-tools'               : GROUP_PROGRAMMING,
@@ -63,6 +65,7 @@ groupMap = {
 'servers;mail-server'                         : GROUP_SERVERS,
 'servers;network-server'                      : GROUP_SERVERS,
 'servers;legacy-network-server'               : GROUP_SERVERS,
+'base-system;input-methods'                   : GROUP_LOCALIZATION,
 'base-system;java'                            : GROUP_SYSTEM,
 'base-system;base-x'                          : GROUP_SYSTEM,
 'base-system;system-tools'                    : GROUP_ADMIN_TOOLS,
@@ -169,6 +172,13 @@ groupMap = {
 'language-support;macedonian-support'         : GROUP_LOCALIZATION,
 'language-support;walloon-support'            : GROUP_LOCALIZATION,
 'language-support;kashubian-support'          : GROUP_LOCALIZATION,
+'language-support;kashmiri-support'           : GROUP_LOCALIZATION,
+'language-support;konkani-support'            : GROUP_LOCALIZATION,
+'language-support;tajik-support'              : GROUP_LOCALIZATION,
+'language-support;sindhi-support'             : GROUP_LOCALIZATION,
+'language-support;uzbek-support'              : GROUP_LOCALIZATION,
+'language-support;burmese-support'            : GROUP_LOCALIZATION,
+'language-support;maithili-support'           : GROUP_LOCALIZATION,
 'rpmfusion_free;kde-desktop'                  : GROUP_DESKTOP_KDE,
 'rpmfusion_free;misc-libs'                    : GROUP_OTHER,
 'rpmfusion_free;games'                        : GROUP_GAMES,
commit d416e2d94e54c1f6a4f6d60004e4571c6d7cd293
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 13:31:10 2008 +0000

    feature: set the environment variable NETWORK for the spawned backends

diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index 1450d72..86b4fc2 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -525,6 +525,7 @@ pk_backend_spawn_get_envp (PkBackendSpawn *backend_spawn)
 	gchar *value;
 	gchar *line;
 	GPtrArray *array;
+	gboolean ret;
 
 	array = g_ptr_array_new ();
 
@@ -546,7 +547,7 @@ pk_backend_spawn_get_envp (PkBackendSpawn *backend_spawn)
 	}
 	g_free (value);
 
-	/* ftp_proxy */
+	/* LANG */
 	value = pk_backend_get_locale (backend_spawn->priv->backend);
 	if (!egg_strzero (value)) {
 		line = g_strdup_printf ("%s=%s", "LANG", value);
@@ -555,6 +556,12 @@ pk_backend_spawn_get_envp (PkBackendSpawn *backend_spawn)
 	}
 	g_free (value);
 
+	/* NETWORK */
+	ret = pk_backend_is_online (backend_spawn->priv->backend);
+	line = g_strdup_printf ("%s=%s", "NETWORK", ret ? "TRUE" : "FALSE");
+	egg_debug ("setting evp '%s'", line);
+	g_ptr_array_add (array, line);
+
 	envp = pk_ptr_array_to_strv (array);
 	g_ptr_array_foreach (array, (GFunc) g_free, NULL);
 	g_ptr_array_free (array, TRUE);
commit 5e4079c78cdb5a71437fe787efabbce1a96f9bd4
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 13:25:16 2008 +0000

    trivial: add some more gtk-modules to the tarball and update fedora spec file

diff --git a/contrib/PackageKit.spec.in b/contrib/PackageKit.spec.in
index 842d6dc..3d5be3f 100644
--- a/contrib/PackageKit.spec.in
+++ b/contrib/PackageKit.spec.in
@@ -12,7 +12,7 @@ Version:   #VERSION#
 Release:   0.#BUILD#%{?alphatag}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Libraries
-URL:       http://packagekit.freedesktop.org
+URL:       http://www.packagekit.org
 Source0:   http://www.packagekit.org/releases/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,6 +20,7 @@ Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: PackageKit-glib = %{version}-%{release}
 Requires: PackageKit-udev-helper = %{version}-%{release}
+Requires: PackageKit-gtk-module = %{version}-%{release}
 Requires: PackageKit-yum-plugin = %{version}-%{release}
 Requires: PackageKit-yum = %{version}-%{release}
 Requires: shared-mime-info
@@ -49,6 +50,8 @@ BuildRequires: gstreamer-devel
 BuildRequires: gstreamer-plugins-base-devel
 BuildRequires: qt4-devel
 BuildRequires: cppunit-devel
+BuildRequires: pango-devel
+BuildRequires: fontconfig-devel
 
 %description
 PackageKit is a D-Bus abstraction layer that allows the session user
@@ -188,6 +191,16 @@ Provides: codeina = 0.10.1-10
 The PackageKit GStreamer plugin allows any Gstreamer application to install
 codecs from configured repositories using PackageKit.
 
+%package gtk-module
+Summary: Install fonts automatically using PackageKit
+Group: Development/Libraries
+Requires: pango
+Requires: PackageKit-glib = %{version}-%{release}
+
+%description gtk-module
+The PackageKit GTK+ module allows any Pango application to install
+fonts from configured repositories using PackageKit.
+
 %prep
 %setup -q
 
@@ -206,6 +219,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/packagekit-backend/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/packagekit-plugin.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/pk-gtk-module.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/pk-gtk-module.la
+
 chmod 755 $RPM_BUILD_ROOT%{_libexecdir}/PackageKitDbusTest.py
 touch $RPM_BUILD_ROOT%{_localstatedir}/cache/PackageKit/groups.sqlite
 
@@ -343,6 +359,11 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_libexecdir}/pk-gstreamer-install
 %{_libexecdir}/gst-install-plugins-helper
 
+%files gtk-module
+%defattr(-,root,root,-)
+%doc README AUTHORS NEWS COPYING
+%{_libdir}/gtk-2.0/modules/pk-gtk-module.so
+
 %files glib-devel
 %defattr(-,root,root,-)
 %doc README AUTHORS NEWS COPYING
diff --git a/contrib/gstreamer-plugin/Makefile.am b/contrib/gstreamer-plugin/Makefile.am
index b9917fd..fce0a4f 100644
--- a/contrib/gstreamer-plugin/Makefile.am
+++ b/contrib/gstreamer-plugin/Makefile.am
@@ -31,6 +31,10 @@ pk_gstreamer_install_LDADD =				\
 clean-local:
 	rm -f *~
 
+EXTRA_DIST =						\
+	README						\
+	$(NULL)
+
 MAINTAINERCLEANFILES =					\
 	*~			      			\
 	Makefile.in					\
diff --git a/contrib/gtk-module/Makefile.am b/contrib/gtk-module/Makefile.am
index 28138a3..f2fb679 100644
--- a/contrib/gtk-module/Makefile.am
+++ b/contrib/gtk-module/Makefile.am
@@ -1,3 +1,4 @@
+NULL =
 APP = gedit --new-window GLASS.txt
 
 moduledir = $(LIBDIR)/gtk-2.0/modules
@@ -13,6 +14,11 @@ clean-local:
 local: all
 	GTK_MODULES="$$GTK_MODULES:$$PWD/.libs/pk-gtk-module.so" $(APP)
 
+EXTRA_DIST =						\
+	README						\
+	GLASS.txt					\
+	$(NULL)
+
 MAINTAINERCLEANFILES =					\
 	*~			      			\
 	Makefile.in					\
diff --git a/contrib/gtk-module/README b/contrib/gtk-module/README
index cf4ac2a..063b7ef 100644
--- a/contrib/gtk-module/README
+++ b/contrib/gtk-module/README
@@ -1,2 +1,18 @@
-/usr/lib/gtk-2.0/modules/
+The GTK+ module is designed to be loaded using gnoms-settings-daemon by the
+gnome-packagekit package.
+
+It can however be lauched for testing using:
+
+GTK_MODULES="$GTK_MODULES:/usr/lib/gtk-2.0/modules/pk-gtk-module.so" application
+
+Pango will callback with any languages which need installing, and these
+are queued up. In an idle callback these are emitted as a asyncronous DBUS
+method to the session InstallFonts() method.
+
+If configured to do so, this will prompt the user to install new fonts.
+
+Notes:
+
+ * At the moment the window XID is not sent, which means focus stealing
+   prevention may not work properly. We're working on this.
 
commit 33bce2462248ea549e1a3a59c484d51de9daa5cf
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Nov 27 12:26:35 2008 +0000

    trivial: remove the unused schema file, this belongs in gnome-packagekit

diff --git a/contrib/gtk-module/PackageKitGtkModule.schemas.in b/contrib/gtk-module/PackageKitGtkModule.schemas.in
deleted file mode 100644
index 8900bd5..0000000
--- a/contrib/gtk-module/PackageKitGtkModule.schemas.in
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/gnome_settings_daemon/gtk-modules/PackageKit-gtk-module</key>
-      <applyto>/apps/gnome_settings_daemon/gtk-modules/PackageKit-gtk-module</applyto>
-      <owner>PackageKit</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>GTK+ module for font installation</short>
-        <long>This key determines if PackageKit should prompt for font installs.</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
-


More information about the PackageKit-commit mailing list