[gtk/gtk-3-24: 1/2] appchooserdialog: Don't show broken subtitles



commit f28c6d34a7b0553b7a012ae75c4d528999026162
Author: Florian Müllner <fmuellner gnome org>
Date:   Fri May 1 17:01:34 2020 +0200

    appchooserdialog: Don't show broken subtitles
    
    Commit 07beb6dba29 made GtkAppChooserWidget useful with no content-type,
    however when used in a GtkAppChooserDialog, this will lead to a confusing
    "Opening (null) files" subtitle.
    
    Fix this by omitting the subtitle altogether in that case.

 gtk/gtkappchooserdialog.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 0c922cd48f..b36fb88599 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -199,16 +199,18 @@ set_dialog_properties (GtkAppChooserDialog *self)
       unknown = g_content_type_is_unknown (self->priv->content_type);
     }
 
+  title = g_strdup (_("Select Application"));
+  subtitle = NULL;
+  string = NULL;
+
   if (name != NULL)
     {
-      title = g_strdup (_("Select Application"));
       /* Translators: %s is a filename */
       subtitle = g_strdup_printf (_("Opening “%s”."), name);
       string = g_strdup_printf (_("No applications found for “%s”"), name);
     }
-  else
+  else if (self->priv->content_type)
     {
-      title = g_strdup (_("Select Application"));
       /* Translators: %s is a file type description */
       subtitle = g_strdup_printf (_("Opening “%s” files."), 
                                   unknown ? self->priv->content_type : description);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]