Hello community, here is the log from the commit of package gnome-packagekit checked in at Tue Oct 14 17:52:45 CEST 2008. -------- --- GNOME/gnome-packagekit/gnome-packagekit.changes 2008-10-09 00:56:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-packagekit/gnome-packagekit.changes 2008-10-14 03:22:00.841879000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 13 22:41:39 CEST 2008 - sreeves@suse.de + +- Match PackageKit version - 0.3.7 + Fix the bug where GetUpdates is unconditionally run at startup. + Watch for GConf keys to change so we can reassess actions based on policy + Fix for BNC #422176 - non useful error notifications + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gnome-packagekit-0.3.6.tar.bz2 New: ---- bnc422176.patch gnome-packagekit-0.3.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.T14625/_old 2008-10-14 17:52:29.000000000 +0200 +++ /var/tmp/diff_new_pack.T14625/_new 2008-10-14 17:52:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gnome-packagekit (Version 0.3.6) +# spec file for package gnome-packagekit (Version 0.3.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gnome-packagekit Url: http://packagekit.org/ -Version: 0.3.6 +Version: 0.3.7 Release: 1 License: GPL v2 or later Source: %{name}-%{version}.tar.bz2 @@ -28,6 +28,7 @@ Patch1: gnome-packagekit_release.patch #PATCH-FEATURE-OPENSUSE gnome-packagekit-fate303359.patch fate 303359 Patch2: gnome-packagekit-fate303359.patch +Patch3: bnc422176.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PackageKit-devel PolicyKit-gnome-devel cairo-devel dbus-1-devel desktop-file-utils gconf2-devel gettext-devel gnome-doc-utils-devel gtk-doc gtk2-devel intltool libglade2-devel libnotify-devel libsexy-devel libtool sqlite-devel update-desktop-files Requires: gnome-icon-theme @@ -54,6 +55,7 @@ %setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p0 +%patch3 -p1 #replace the old po files with lcn ones rm po/*.po rm po/LINGUAS @@ -82,6 +84,7 @@ %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/gnome/autostart/gpk-update-icon.desktop %suse_update_desktop_file gpk-install-file %suse_update_desktop_file gpk-install-catalog +%suse_update_desktop_file gpk-service-pack mkdir $RPM_BUILD_ROOT/usr/sbin %clean @@ -106,6 +109,11 @@ %files lang -f %{name}.lang %changelog +* Tue Oct 14 2008 sreeves@suse.de +- Match PackageKit version - 0.3.7 + Fix the bug where GetUpdates is unconditionally run at startup. + Watch for GConf keys to change so we can reassess actions based on policy + Fix for BNC #422176 - non useful error notifications * Thu Oct 09 2008 sreeves@suse.de - Move to 0.3.6 Bug fix release (from the release news...) ++++++ bnc422176.patch ++++++ diff --git a/src/gpk-client.c b/src/gpk-client.c index 1887c62..2f55b20 100644 --- a/src/gpk-client.c +++ b/src/gpk-client.c @@ -103,6 +103,7 @@ struct _GpkClientPrivate guint timestamp; gchar *parent_title; gchar *parent_icon_name; + gchar *error_details; GMainLoop *loop; }; @@ -202,6 +203,8 @@ gpk_client_libnotify_cb (NotifyNotification *notification, gchar *action, gpoint } else if (egg_strequal (action, "do-not-show-update-started")) { egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_UPDATE_STARTED); gconf_client_set_bool (gclient->priv->gconf_client, GPK_CONF_NOTIFY_UPDATE_STARTED, FALSE, NULL); + } else if (egg_strequal (action, "show-error-details")) { + gpk_error_dialog (_("Error details"), _("Package Manager error details"), gclient->priv->error_details); } else if (egg_strequal (action, "cancel")) { /* try to cancel */ ret = pk_client_cancel (gclient->priv->client_action, &error); @@ -489,10 +492,16 @@ gpk_client_error_code_cb (PkClient *client, PkErrorCodeEnum code, const gchar *d return; } + /* save this globally */ + g_free (gclient->priv->error_details); + gclient->priv->error_details = g_markup_escape_text (details, -1); + /* do the bubble */ notification = notify_notification_new (title, message, "help-browser", NULL); notify_notification_set_timeout (notification, 15000); notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + notify_notification_add_action (notification, "show-error-details", + _("Show details"), gpk_client_libnotify_cb, gclient, NULL); ret = notify_notification_show (notification, &error); if (!ret) { egg_warning ("error: %s", error->message); @@ -3219,6 +3228,7 @@ gpk_client_init (GpkClient *gclient) gclient->priv->parent_window = NULL; gclient->priv->parent_title = NULL; gclient->priv->parent_icon_name = NULL; + gclient->priv->error_details = NULL; gclient->priv->using_secondary_client = FALSE; gclient->priv->exit = PK_EXIT_ENUM_FAILED; gclient->priv->show_confirm = TRUE; @@ -3313,6 +3323,7 @@ gpk_client_finalize (GObject *object) g_free (gclient->priv->parent_title); g_free (gclient->priv->parent_icon_name); + g_free (gclient->priv->error_details); g_ptr_array_foreach (gclient->priv->upgrade_array, (GFunc) pk_distro_upgrade_obj_free, NULL); g_ptr_array_free (gclient->priv->upgrade_array, TRUE); g_strfreev (gclient->priv->files_array); diff --git a/src/gpk-watch.c b/src/gpk-watch.c index 095dde8..43115fc 100644 --- a/src/gpk-watch.c +++ b/src/gpk-watch.c @@ -283,7 +283,7 @@ gpk_watch_libnotify_cb (NotifyNotification *notification, gchar *action, gpointe gconf_client_set_bool (watch->priv->gconf_client, GPK_CONF_NOTIFY_COMPLETED, FALSE, NULL); } else if (egg_strequal (action, "show-error-details")) { - gpk_error_dialog (_("Error details"), NULL, watch->priv->error_details); + gpk_error_dialog (_("Error details"), _("Package Manager error details"), watch->priv->error_details); } else { egg_warning ("unknown action id: %s", action); ++++++ gnome-packagekit-0.3.6.tar.bz2 -> gnome-packagekit-0.3.7.tar.bz2 ++++++ ++++ 22695 lines of diff (skipped) ++++++ gnome-packagekit_release.patch ++++++ --- /var/tmp/diff_new_pack.T14625/_old 2008-10-14 17:52:31.000000000 +0200 +++ /var/tmp/diff_new_pack.T14625/_new 2008-10-14 17:52:31.000000000 +0200 @@ -58,3 +58,11 @@ +OnlyShowIn=GNOME; StartupNotify=true +--- gnome-packagekit-0.3.7/data/gpk-service-pack.desktop.in ++++ gnome-packagekit-0.3.7/data/gpk-service-pack.desktop.in +@@ -9,4 +9,5 @@ + Type=Application + Categories=GNOME;GTK;System;X-Red-Hat-Base; + StartupNotify=true ++OnlyShowIn=GNOME; + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de