Merge lp:~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-set-message-label-type into lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk

Proposed by Olivier Martin
Status: Merged
Merged at revision: 291
Proposed branch: lp:~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-set-message-label-type
Merge into: lp:~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk
Diff against target: 93 lines (+14/-10)
1 file modified
src/lightdm-gtk-greeter.c (+14/-10)
To merge this branch: bzr merge lp:~olivier-martin/lightdm-gtk-greeter/lightdm-gtk-greeter-set-message-label-type
Reviewer Review Type Date Requested Status
LightDM Gtk+ Greeter Development Team Pending
Review via email: mp+224789@code.launchpad.net

Description of the change

set_message_label(): Extended to use the type of the message (ie: INFO or ERROR)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/lightdm-gtk-greeter.c'
2--- src/lightdm-gtk-greeter.c 2014-06-09 15:49:08 +0000
3+++ src/lightdm-gtk-greeter.c 2014-06-27 10:50:52 +0000
4@@ -791,8 +791,13 @@
5 }
6
7 static void
8-set_message_label (const gchar *text)
9+set_message_label (LightDMMessageType type, const gchar *text)
10 {
11+ if (type == LIGHTDM_MESSAGE_TYPE_INFO) {
12+ gtk_info_bar_set_message_type(info_bar, GTK_MESSAGE_INFO);
13+ } else {
14+ gtk_info_bar_set_message_type(info_bar, GTK_MESSAGE_ERROR);
15+ }
16 gtk_widget_set_visible (GTK_WIDGET (info_bar), g_strcmp0 (text, "") != 0);
17 gtk_label_set_text (message_label, text);
18 }
19@@ -1120,7 +1125,7 @@
20 {
21 cancelling = TRUE;
22 lightdm_greeter_cancel_authentication (greeter);
23- set_message_label ("");
24+ set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, "");
25 }
26
27 /* Make sure password entry is back to normal */
28@@ -1179,7 +1184,7 @@
29
30 if (!lightdm_greeter_start_session_sync (greeter, session, NULL))
31 {
32- set_message_label (_("Failed to start session"));
33+ set_message_label (LIGHTDM_MESSAGE_TYPE_ERROR, _("Failed to start session"));
34 start_authentication (lightdm_greeter_get_authentication_user (greeter));
35 }
36 g_free (session);
37@@ -1406,7 +1411,7 @@
38
39 g_free (user);
40 }
41- set_message_label ("");
42+ set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, "");
43 }
44
45 static const gchar*
46@@ -1448,7 +1453,7 @@
47 {
48 /* FIXME: this doesn't show multiple messages, but that was
49 * already the case before. */
50- set_message_label (message->text);
51+ set_message_label (message->type.message, message->text);
52 continue;
53 }
54
55@@ -1468,7 +1473,7 @@
56 str = g_strndup (str, strlen (str) - 2);
57 else if (g_str_has_suffix (str, ":"))
58 str = g_strndup (str, strlen (str) - 1);
59- set_message_label (str);
60+ set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, str);
61 if (str != message->text)
62 g_free (str);
63 }
64@@ -1494,7 +1499,7 @@
65
66 gtk_widget_set_sensitive (GTK_WIDGET (username_entry), FALSE);
67 gtk_widget_set_sensitive (GTK_WIDGET (password_entry), FALSE);
68- set_message_label ("");
69+ set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, "");
70 prompt_active = FALSE;
71
72 if (lightdm_greeter_get_is_authenticated (greeter))
73@@ -1580,11 +1585,11 @@
74 if (prompted)
75 {
76 if (get_message_label()[0] == 0)
77- set_message_label (_("Incorrect password, please try again"));
78+ set_message_label (LIGHTDM_MESSAGE_TYPE_ERROR, _("Incorrect password, please try again"));
79 start_authentication (lightdm_greeter_get_authentication_user (greeter));
80 }
81 else
82- set_message_label (_("Failed to authenticate"));
83+ set_message_label (LIGHTDM_MESSAGE_TYPE_ERROR, _("Failed to authenticate"));
84 }
85 }
86
87@@ -2753,7 +2758,6 @@
88 /* Add InfoBar via code for GTK+2 compatability */
89 infobar_compat = GTK_WIDGET(gtk_builder_get_object(builder, "infobar_compat"));
90 info_bar = GTK_INFO_BAR (gtk_info_bar_new());
91- gtk_info_bar_set_message_type(info_bar, GTK_MESSAGE_ERROR);
92 gtk_widget_set_name(GTK_WIDGET(info_bar), "greeter_infobar");
93 content_area = gtk_info_bar_get_content_area(info_bar);
94

Subscribers

People subscribed via source and target branches