daemon: double check that the display is locked before speaking

[espeaktime] / src / applet.c

diff --git a/src/applet.c b/src/applet.c
index fccac88..a61ce26 100644 (file)
--- a/src/applet.c
+++ b/src/applet.c
@@ -36,13 +36,15 @@ static const struct voice {
        { "pt",         "Portuguese (Brazil)" },
        { "pt-pt",      "Portuguese (European)" },
        { "ro",         "Romanian" },
        { "pt",         "Portuguese (Brazil)" },
        { "pt-pt",      "Portuguese (European)" },
        { "ro",         "Romanian" },

+       { "ru",         "Russian [extra]" },

        { "sk",         "Slovak" },
        { "sr",         "Serbian" },
        { "sv",         "Swedish" },
        { "sw",         "Swahihi" },
        { "ta",         "Tamil" },
        { "tr",         "Turkish" },
        { "sk",         "Slovak" },
        { "sr",         "Serbian" },
        { "sv",         "Swedish" },
        { "sw",         "Swahihi" },
        { "ta",         "Tamil" },
        { "tr",         "Turkish" },

-       { "zh",         "Mandarin Chinese" },
+       { "zh",         "Chinese (Mandarin) [extra]" },
+       { "zh-yue",     "Chinese (Cantonese) [extra]" },

 };
 static const int num_voices = sizeof(voices) / sizeof(voices[0]);
 
 };
 static const int num_voices = sizeof(voices) / sizeof(voices[0]);
 

@@ -309,7 +311,7 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
        HildonEntry *text = HILDON_ENTRY(hildon_entry_new(HILDON_SIZE_AUTO));
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
        HildonEntry *text = HILDON_ENTRY(hildon_entry_new(HILDON_SIZE_AUTO));

-       gtk_entry_set_text(GTK_ENTRY(text), "%H:%M");
+       gtk_entry_set_text(GTK_ENTRY(text), cfg.text);

        gtk_box_pack_start(GTK_BOX(hbox),
                hildon_caption_new(title_group, "Speech string", GTK_WIDGET(text), NULL, HILDON_CAPTION_MANDATORY),
                TRUE, TRUE, 0);
        gtk_box_pack_start(GTK_BOX(hbox),
                hildon_caption_new(title_group, "Speech string", GTK_WIDGET(text), NULL, HILDON_CAPTION_MANDATORY),
                TRUE, TRUE, 0);