Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/oholy/gtkmountoperation-newline' into 'master'

Browse Source 
gtkmountoperation: Drop the new line character when splitting a message

See merge request GNOME/gtk!2397
This commit is contained in:
Matthias Clasen
2020-08-07 12:51:46 +00:00
parent 8cd2f615ad 517a34bdc8
commit 4dfd413e0b
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkmountoperation.c
View File

@@ -576,7 +576,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
gboolean can_anonymous;
guint rows;
char *primary;
const char *secondary;
const char *secondary = NULL;
PangoAttrList *attrs;
gboolean use_header;
@@ -625,17 +625,14 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
gtk_box_append (GTK_BOX (hbox), main_vbox);
secondary = strstr (message, "\n");
if (secondary != NULL)
primary = strstr (message, "\n");
if (primary)
{
primary = g_strndup (message, secondary - message + 1);
}
else
{
primary = g_strdup (message);
secondary = primary + 1;
primary = g_strndup (message, primary - message);
}
label = gtk_label_new (primary);
label = gtk_label_new (primary != NULL ? primary : message);
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
gtk_label_set_wrap (GTK_LABEL (label), TRUE);