1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305
|
From 309a949338b39fa7fc0cdcfd13e45fd58519c734 Mon Sep 17 00:00:00 2001
From: Roi <roi616@proton.me>
Date: Sun, 27 Apr 2025 22:25:30 +0200
Subject: [PATCH] Fix crash on searching package Added scroll to top on log
window once the data has been loaded.
---
src/gpk-application.c | 52 +++++++++++++++++++++----------------------
src/gpk-log.c | 25 ++++++++++++++++-----
2 files changed, 46 insertions(+), 31 deletions(-)
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -120,8 +120,8 @@
static void gpk_application_perform_search (GpkApplicationPrivate *priv);
-static void gpk_application_get_requires_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv);
-static void gpk_application_get_depends_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv);
+static void gpk_application_get_requires_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv);
+static void gpk_application_get_depends_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv);
static gboolean
_g_strzero (const gchar *text)
@@ -466,7 +466,7 @@
}
static void
-gpk_application_get_files_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv)
+gpk_application_get_files_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv)
{
gboolean ret;
g_auto(GStrv) files = NULL;
@@ -483,7 +483,7 @@
g_autoptr(PkResults) results = NULL;
/* get the results */
- results = pk_client_generic_finish (client, res, &error);
+ results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
g_warning ("failed to get files: %s", error->message);
return;
@@ -660,7 +660,7 @@
/* set correct view */
package_ids = pk_package_ids_from_id (package_id_selected);
- pk_client_get_files_async (PK_CLIENT (priv->task), package_ids, priv->cancellable,
+ pk_task_get_files_async (PK_TASK (priv->task), package_ids, priv->cancellable,
(PkProgressCallback) gpk_application_progress_cb, priv,
(GAsyncReadyCallback) gpk_application_get_files_cb, priv);
}
@@ -737,7 +737,7 @@
}
static void
-gpk_application_get_requires_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv)
+gpk_application_get_requires_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv)
{
g_autoptr(PkResults) results = NULL;
g_autoptr(GError) error = NULL;
@@ -753,7 +753,7 @@
gboolean ret;
/* get the results */
- results = pk_client_generic_finish (client, res, &error);
+ results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
g_warning ("failed to get requires: %s", error->message);
return;
@@ -836,7 +836,7 @@
/* get the requires */
package_ids = pk_package_ids_from_id (package_id_selected);
- pk_client_depends_on_async (PK_CLIENT (priv->task),
+ pk_task_depends_on_async (PK_TASK (priv->task),
pk_bitfield_value (PK_FILTER_ENUM_NONE),
package_ids, TRUE, priv->cancellable,
(PkProgressCallback) gpk_application_progress_cb, priv,
@@ -844,7 +844,7 @@
}
static void
-gpk_application_get_depends_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv)
+gpk_application_get_depends_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv)
{
g_autoptr(PkResults) results = NULL;
g_autoptr(GError) error = NULL;
@@ -860,7 +860,7 @@
gboolean ret;
/* get the results */
- results = pk_client_generic_finish (client, res, &error);
+ results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
g_warning ("failed to get depends: %s", error->message);
return;
@@ -943,7 +943,7 @@
/* get the depends */
package_ids = pk_package_ids_from_id (package_id_selected);
- pk_client_required_by_async (PK_CLIENT (priv->task),
+ pk_task_required_by_async (PK_TASK (priv->task),
pk_bitfield_value (PK_FILTER_ENUM_NONE),
package_ids, TRUE, priv->cancellable,
(PkProgressCallback) gpk_application_progress_cb, priv,
@@ -1185,7 +1185,7 @@
}
static void
-gpk_application_search_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv)
+gpk_application_search_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv)
{
g_autoptr(PkResults) results = NULL;
g_autoptr(GError) error = NULL;
@@ -1197,7 +1197,7 @@
GtkWindow *window;
/* get the results */
- results = pk_client_generic_finish (client, res, &error);
+ results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
g_warning ("failed to search: %s", error->message);
goto out;
@@ -1339,12 +1339,12 @@
if (priv->search_mode == GPK_MODE_GROUP) {
g_auto(GStrv) search_groups = NULL;
search_groups = g_strsplit (priv->search_group, " ", -1);
- pk_client_search_groups_async (PK_CLIENT(priv->task),
+ pk_task_search_groups_async (PK_TASK(priv->task),
priv->filters_current, search_groups, priv->cancellable,
(PkProgressCallback) gpk_application_progress_cb, priv,
(GAsyncReadyCallback) gpk_application_search_cb, priv);
} else {
- pk_client_get_packages_async (PK_CLIENT(priv->task),
+ pk_task_get_packages_async (PK_TASK(priv->task),
priv->filters_current, priv->cancellable,
(PkProgressCallback) gpk_application_progress_cb, priv,
(GAsyncReadyCallback) gpk_application_search_cb, priv);
@@ -1787,7 +1787,7 @@
}
static void
-gpk_application_get_details_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv)
+gpk_application_get_details_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv)
{
g_autoptr(PkResults) results = NULL;
g_autoptr(GError) error = NULL;
@@ -1808,7 +1808,7 @@
guint64 size;
/* get the results */
- results = pk_client_generic_finish (client, res, &error);
+ results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
g_warning ("failed to get list of categories: %s", error->message);
return;
@@ -1984,7 +1984,7 @@
/* get the details */
package_ids = pk_package_ids_from_id (package_id);
- pk_client_get_details_async (PK_CLIENT(priv->task), package_ids, priv->cancellable,
+ pk_task_get_details_async (PK_TASK(priv->task), package_ids, priv->cancellable,
(PkProgressCallback) gpk_application_progress_cb, priv,
(GAsyncReadyCallback) gpk_application_get_details_cb, priv);
}
@@ -2242,7 +2242,7 @@
}
static void
-gpk_application_refresh_cache_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv)
+gpk_application_refresh_cache_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv)
{
g_autoptr(PkResults) results = NULL;
g_autoptr(GError) error = NULL;
@@ -2250,7 +2250,7 @@
GtkWindow *window;
/* get the results */
- results = pk_client_generic_finish (client, res, &error);
+ results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
g_warning ("failed to refresh: %s", error->message);
return;
@@ -2383,7 +2383,7 @@
}
static void
-gpk_application_get_categories_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv)
+gpk_application_get_categories_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv)
{
g_autoptr(PkResults) results = NULL;
g_autoptr(GError) error = NULL;
@@ -2398,7 +2398,7 @@
GtkWindow *window;
/* get the results */
- results = pk_client_generic_finish (client, res, &error);
+ results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
g_warning ("failed to get list of categories: %s", error->message);
return;
@@ -2491,7 +2491,7 @@
g_cancellable_reset (priv->cancellable);
/* get categories supported */
- pk_client_get_categories_async (PK_CLIENT(priv->task), priv->cancellable,
+ pk_task_get_categories_async (PK_TASK(priv->task), priv->cancellable,
(PkProgressCallback) gpk_application_progress_cb, priv,
(GAsyncReadyCallback) gpk_application_get_categories_cb, priv);
}
@@ -2648,7 +2648,7 @@
}
static void
-gpk_application_get_repo_list_cb (PkClient *client, GAsyncResult *res, GpkApplicationPrivate *priv)
+gpk_application_get_repo_list_cb (PkTask *task, GAsyncResult *res, GpkApplicationPrivate *priv)
{
g_autoptr(PkResults) results = NULL;
g_autoptr(GError) error = NULL;
@@ -2659,7 +2659,7 @@
GtkWindow *window;
/* get the results */
- results = pk_client_generic_finish (client, res, &error);
+ results = pk_task_generic_finish (task, res, &error);
if (results == NULL) {
g_warning ("failed to get list of repos: %s", error->message);
return;
@@ -2892,7 +2892,7 @@
G_CALLBACK (gpk_application_groups_treeview_changed_cb), priv);
/* get repos, so we can show the full name in the package source box */
- pk_client_get_repo_list_async (PK_CLIENT (priv->task),
+ pk_task_get_repo_list_async (PK_TASK (priv->task),
pk_bitfield_value (PK_FILTER_ENUM_NONE),
priv->cancellable,
(PkProgressCallback) gpk_application_progress_cb, priv,
--- a/src/gpk-log.c
+++ b/src/gpk-log.c
@@ -134,7 +134,7 @@
}
/* TRANSLATORS: strftime formatted please */
- return g_date_time_format (date_time, _("%d %B %Y"));
+ return g_date_time_format (date_time, _("%d %B %Y - %H:%M:%S"));
}
static gchar *
@@ -264,13 +264,16 @@
renderer = gtk_cell_renderer_text_new ();
g_object_set (renderer, "yalign", 0.0, NULL);
g_object_set (renderer, "wrap-mode", PANGO_WRAP_WORD, NULL);
- g_object_set (renderer, "wrap-width", 400, NULL);
+ g_object_set (renderer, "wrap-width", 600, NULL);
+
g_signal_connect (treeview, "size-allocate", G_CALLBACK (gpk_log_treeview_size_allocate_cb), renderer);
+
/* TRANSLATORS: column for what packages were upgraded */
column = gtk_tree_view_column_new_with_attributes (_("Details"), renderer,
"markup", GPK_LOG_COLUMN_DETAILS, NULL);
gtk_tree_view_append_column (treeview, column);
gtk_tree_view_column_set_expand (column, TRUE);
+ gtk_tree_view_column_set_fixed_width (column, 600);
/* TRANSLATORS: column for the user name, e.g. Richard Hughes */
column = gtk_tree_view_column_new_with_attributes (_("User name"), renderer,
@@ -369,6 +372,13 @@
}
static void
+gpk_log_scroll_top_tree_view(GtkTreeView* treeView)
+{
+ GtkTreePath *path = gtk_tree_path_new_first ();
+ gtk_tree_view_scroll_to_cell(treeView, path, NULL, FALSE, 0, 0);
+}
+
+static void
gpk_log_add_item (PkTransactionPast *item)
{
GtkTreeIter iter;
@@ -500,6 +510,7 @@
/* remove the items that are not used */
gpk_log_remove_nonactive (model);
+ gpk_log_scroll_top_tree_view (treeview);
}
static void
@@ -596,7 +607,7 @@
gtk_window_set_application (window, application);
/* set a size, as the screen allows */
- gpk_window_set_size_request (window, 1200, 1200);
+ gpk_window_set_size_request (window, 1325, 800);
/* if command line arguments are set, then setup UI */
if (filter != NULL) {
@@ -633,7 +644,6 @@
/* add columns to the tree view */
pk_treeview_add_general_columns (GTK_TREE_VIEW (widget));
- gtk_tree_view_columns_autosize (GTK_TREE_VIEW (widget));
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (list_store),
GPK_LOG_COLUMN_TIMESPEC, GTK_SORT_DESCENDING);
|