]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Qt bindings: properly hand over prompt and message type
authorChristian Seiler <christian@iwakd.de>
Thu, 6 Feb 2014 18:47:08 +0000 (19:47 +0100)
committerChristian Seiler <christian@iwakd.de>
Thu, 6 Feb 2014 18:47:08 +0000 (19:47 +0100)
For the showPrompt/showMessage signals, properly hand over the prompt
and message types from the underlying glib signals.

liblightdm-qt/greeter.cpp

index 8fb287ff8c6b9af80536a895a538c98b22db5c8d..875cac06c738cfa02c34622b0e4442d5e364ebe0 100644 (file)
@@ -59,9 +59,8 @@ void GreeterPrivate::cb_showPrompt(LightDMGreeter *greeter, const gchar *text, L
     GreeterPrivate *that = static_cast<GreeterPrivate*>(data);
     QString message = QString::fromUtf8(text);
     
-    //FIXME prompt type
-
-    Q_EMIT that->q_func()->showPrompt(message, Greeter::PromptTypeSecret);
+    Q_EMIT that->q_func()->showPrompt(message, type == LIGHTDM_PROMPT_TYPE_QUESTION ?
+                                               Greeter::PromptTypeQuestion : Greeter::PromptTypeSecret);
 }
 
 void GreeterPrivate::cb_showMessage(LightDMGreeter *greeter, const gchar *text, LightDMMessageType type, gpointer data)
@@ -71,9 +70,8 @@ void GreeterPrivate::cb_showMessage(LightDMGreeter *greeter, const gchar *text,
     GreeterPrivate *that = static_cast<GreeterPrivate*>(data);
     QString message = QString::fromUtf8(text);
 
-    //FIXME prompt type
-
-    Q_EMIT that->q_func()->showMessage(message, Greeter::MessageTypeInfo);
+    Q_EMIT that->q_func()->showMessage(message, type == LIGHTDM_MESSAGE_TYPE_INFO ?
+                                                Greeter::MessageTypeInfo : Greeter::MessageTypeError);
 }
 
 void GreeterPrivate::cb_authenticationComplete(LightDMGreeter *greeter, gpointer data)