Hello community, here is the log from the commit of package gnome-packagekit checked in at Sat May 31 12:20:34 CEST 2008. -------- --- GNOME/gnome-packagekit/gnome-packagekit.changes 2008-05-24 21:20:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-packagekit/gnome-packagekit.changes 2008-05-30 21:13:35.373626000 +0200 @@ -1,0 +2,6 @@ +Fri May 30 21:18:54 CEST 2008 - sreeves@suse.de + +- Fix for BNC#395445 - gpk-update-icon crash + Fix for BNC#390658 - don't show piwo + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.l28325/_old 2008-05-31 12:20:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l28325/_new 2008-05-31 12:20:21.000000000 +0200 @@ -13,7 +13,7 @@ Name: gnome-packagekit Url: http://packagekit.org/ Version: 0.2.1 -Release: 9 +Release: 12 License: GPL v2 or later Source: %{name}-%{version}.tar.bz2 Patch: gnome-packagekit_release.patch @@ -89,6 +89,9 @@ %files lang -f %{name}.lang %changelog +* Fri May 30 2008 sreeves@suse.de +- Fix for BNC#395445 - gpk-update-icon crash + Fix for BNC#390658 - don't show piwo * Sat May 24 2008 sreeves@suse.de - Fix for BNC#392064 - weird notifications * Tue May 13 2008 aj@suse.de ++++++ gnome-packagekit-fate303359.patch ++++++ --- /var/tmp/diff_new_pack.l28325/_old 2008-05-31 12:20:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l28325/_new 2008-05-31 12:20:21.000000000 +0200 @@ -1,21 +1,60 @@ diff --git a/src/gpk-update-icon.c b/src/gpk-update-icon.c -index 6dd369a..46f129a 100644 +index 6dd369a..995194e 100644 --- a/src/gpk-update-icon.c +++ b/src/gpk-update-icon.c -@@ -154,6 +154,16 @@ main (int argc, char *argv[]) - pk_debug_init (verbose); - gtk_init (&argc, &argv); +@@ -101,6 +101,46 @@ pk_dbus_connection_replaced_cb (LibGBus *libgbus, gpointer data) + gtk_main_quit (); + } ++static gboolean ++run_configure_idle_cb (gpointer data) ++{ ++ gboolean retval = g_spawn_command_line_sync ("gnomesu -- /sbin/yast2 piwo", NULL, NULL, NULL, NULL); ++ if (!retval) { ++ pk_debug ("Failure launching online config program"); ++ } ++ g_main_loop_quit ((GMainLoop*)data); ++ return FALSE; ++} ++ ++static void ++check_for_online_update_configured () ++{ + if (! g_file_test ("/var/lib/YaST2/registrationDidRun", G_FILE_TEST_EXISTS)) { -+ pk_debug ("Online update not configured - will launch"); -+ gboolean retval = g_spawn_command_line_sync ("gnomesu -- /sbin/yast2 piwo", NULL, NULL, NULL, NULL); -+ if (!retval) { -+ pk_debug ("Failure launching online config program"); ++ pk_debug ("Online update not configured - will launch after short delay"); ++ g_usleep (1000000 * 8); //sleep for x seconds so we dont show before the rest of the screen is done ++ GMainLoop * loop; ++ GtkWidget *dialog = gtk_message_dialog_new ( ++ NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Install latest updates?")); ++ gtk_window_set_title (GTK_WINDOW(dialog), _("openSUSE Updater")); ++ gtk_window_set_default_icon_name ("system-software-installer"); ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog), _("Do you want to check online for updates?")); ++ gint result = gtk_dialog_run (GTK_DIALOG(dialog)); ++ gtk_widget_destroy (dialog); ++ switch (result) { ++ case GTK_RESPONSE_YES: ++ loop = g_main_loop_new (NULL, FALSE); ++ g_idle_add_full (G_PRIORITY_LOW, run_configure_idle_cb, loop, NULL); ++ g_main_loop_run (loop); //do this so the first dialog goes away ++ g_main_loop_unref (loop); ++ break; ++ default: ++ break; + } + } + else + pk_debug ("Online update already configured"); -+ ++} ++ + /** + * main: + **/ +@@ -154,6 +194,8 @@ main (int argc, char *argv[]) + pk_debug_init (verbose); + gtk_init (&argc, &argv); + ++ check_for_online_update_configured (); ++ /* add application specific icons to search path */ gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), PK_DATA G_DIR_SEPARATOR_S "icons"); ++++++ gnome-packagekit-openSUSE-branch.patch ++++++ --- /var/tmp/diff_new_pack.l28325/_old 2008-05-31 12:20:21.000000000 +0200 +++ /var/tmp/diff_new_pack.l28325/_new 2008-05-31 12:20:21.000000000 +0200 @@ -1,5 +1,17 @@ +diff --git a/src/gpk-client.c b/src/gpk-client.c +index bee5c87..60c5f15 100644 +--- a/src/gpk-client.c ++++ b/src/gpk-client.c +@@ -1260,6 +1260,7 @@ gpk_client_get_updates (GpkClient *gclient, GError **error) + g_return_val_if_fail (GPK_IS_CLIENT (gclient), FALSE); + + /* reset */ ++ pk_debug ("Enter gpk_client_get_updates"); + ret = pk_client_reset (gclient->priv->client_action, &error_local); + if (!ret) { + gpk_client_error_msg (gclient, _("Failed to reset client"), _("Failed to reset get-updates")); diff --git a/src/gpk-notify.c b/src/gpk-notify.c -index 556341a..d4ec8bb 100644 +index 556341a..2265091 100644 --- a/src/gpk-notify.c +++ b/src/gpk-notify.c @@ -147,7 +147,7 @@ gpk_notify_about_dialog_url_cb (GtkAboutDialog *about, const char *address, gpoi @@ -87,7 +99,7 @@ /* get the most important icon */ value = pk_enums_contain_priority (infos, -@@ -529,30 +538,49 @@ gpk_notify_get_update_policy (GpkNotify *notify) +@@ -529,30 +538,50 @@ gpk_notify_get_update_policy (GpkNotify *notify) } /** @@ -112,12 +124,13 @@ const gchar *icon; + gchar **package_ids; + PkPackageList *list; -+ GError *error; ++ GError *error = NULL; - g_return_if_fail (GPK_IS_NOTIFY (notify)); + g_return_val_if_fail (GPK_IS_NOTIFY (notify), FALSE); -+ -+ if (pk_task_list_contains_role (notify->priv->tlist, PK_ROLE_ENUM_UPDATE_SYSTEM)) { + ++ if (pk_task_list_contains_role (notify->priv->tlist, PK_ROLE_ENUM_UPDATE_SYSTEM) || ++ pk_task_list_contains_role (notify->priv->tlist, PK_ROLE_ENUM_GET_UPDATES)) { + pk_debug ("Not checking for updates as already in progress"); + return FALSE; + } @@ -131,7 +144,7 @@ + g_error_free (error); + return FALSE; + } - ++ + /* we have updates to process */ status_security = g_string_new (""); status_tooltip = g_string_new (""); @@ -143,7 +156,7 @@ pk_debug ("length=%i", length); /* we have no updates */ -@@ -564,7 +592,7 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -564,7 +593,7 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r /* find the security updates */ for (i=0; i<length; i++) { @@ -152,7 +165,7 @@ pk_debug ("%s, %s, %s", pk_info_enum_to_text (item->info), item->package_id, item->summary); ident = pk_package_id_new_from_string (item->package_id); -@@ -577,9 +605,6 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -577,9 +606,6 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r pk_package_id_free (ident); } @@ -162,7 +175,7 @@ /* do we do the automatic updates? */ update = gpk_notify_get_update_policy (notify); if (update == PK_UPDATE_ENUM_UNKNOWN) { -@@ -588,7 +613,7 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -588,7 +614,7 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r } /* work out icon */ @@ -171,7 +184,7 @@ gpk_smart_icon_set_icon_name (notify->priv->sicon, icon); gpk_smart_icon_pulse (notify->priv->sicon); -@@ -624,10 +649,6 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -624,10 +650,6 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r /* just do security updates */ if (update == PK_UPDATE_ENUM_SECURITY) { @@ -182,7 +195,7 @@ if (security_array->len == 0) { pk_debug ("policy security, but none available"); goto out; -@@ -661,136 +682,15 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r +@@ -661,136 +683,15 @@ gpk_notify_query_updates_finished_cb (PkClient *client, PkExitEnum exit, guint r /* shouldn't happen */ pk_warning ("unknown update mode"); out: @@ -193,7 +206,7 @@ - /* get rid of the array, and free the contents */ g_ptr_array_free (security_array, TRUE); -} - +- -/** - * gpk_notify_error_code_cb: - **/ @@ -205,7 +218,7 @@ - g_return_if_fail (GPK_IS_NOTIFY (notify)); - - title = gpk_error_enum_to_localised_text (error_code); -- + - /* ignore some errors */ - if (error_code == PK_ERROR_ENUM_PROCESS_KILL || - error_code == PK_ERROR_ENUM_TRANSACTION_CANCELLED) { @@ -320,7 +333,7 @@ * gpk_notify_updates_changed_cb: **/ static void -@@ -847,10 +747,43 @@ gpk_notify_task_list_changed_cb (PkTaskList *tlist, GpkNotify *notify) +@@ -847,10 +748,43 @@ gpk_notify_task_list_changed_cb (PkTaskList *tlist, GpkNotify *notify) static void gpk_notify_auto_refresh_cache_cb (GpkAutoRefresh *arefresh, GpkNotify *notify) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org