callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Issue #4777: "New version available" after update.

Browse Source 
The About dialog refreshes the release information relatively to
currently running version before being displayed. No check of the remote
JSON file is done, it only verifies whether any stored released
version/revision is not same (or even lower) than the actually running
version. Indeed existence of a stored release means that a newer version
exists at check time only. On later run, this stored information may
have become deprecated.

(cherry picked from commit 5c89099f75)
This commit is contained in:
Jehan
2020-10-16 18:04:15 +02:00
parent 7f7fc3bb6c
commit bfc492fb1b
3 changed files with 211 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/dialogs/about-dialog.c
View File

@ -57,7 +57,8 @@ typedef struct
{
GtkWidget *dialog;
GtkWidget *update_frame;
GtkWidget *update_frame;
GimpCoreConfig *config;
GtkWidget *anim_area;
PangoLayout *layout;
@ -120,6 +121,7 @@ about_dialog_create (GimpCoreConfig *config)
gchar *version;
dialog.n_authors = G_N_ELEMENTS (authors) - 1;
dialog.config = config;
pixbuf = about_dialog_load_logo ();
@ -203,6 +205,8 @@ static void
about_dialog_map (GtkWidget *widget,
GimpAboutDialog *dialog)
{
gimp_update_refresh (dialog->config);
if (dialog->layout && dialog->timer == 0)
{
dialog->state = 0;
@ -297,6 +301,12 @@ about_dialog_add_update (GimpAboutDialog *dialog,
gchar *date;
gchar *text;
if (dialog->update_frame)
{
gtk_widget_destroy (dialog->update_frame);
dialog->update_frame = NULL;
}
/* Get the dialog vbox. */
container = gtk_dialog_get_content_area (GTK_DIALOG (dialog->dialog));
children = gtk_container_get_children (GTK_CONTAINER (container));
@ -463,6 +473,7 @@ about_dialog_add_update (GimpAboutDialog *dialog,
gtk_widget_show (frame);
dialog->update_frame = frame;
g_object_add_weak_pointer (G_OBJECT (frame), (gpointer) &dialog->update_frame);
/* Reconstruct the dialog when release info changes. */
g_signal_connect (config, "notify::last-known-release",
@ -849,12 +860,6 @@ about_dialog_last_release_changed (GimpCoreConfig *config,
if (! dialog->dialog)
return;
if (dialog->update_frame)
{
gtk_widget_destroy (dialog->update_frame);
dialog->update_frame = NULL;
}
about_dialog_add_update (dialog, config);
}