Diablo: disable autocap/predictive text for the other_browser_cmd entry

The Fremantle UI introduced in commit 18bad5e9... ("Revise GUI for
Fremantle to be more finger-friendly") disables autocapitalization and
predictive text/dictionary features for the other_browser_cmd entry --
those input method features are for natural language text only, and get
in the way here.  Now do the same for the Diablo UI (and make a style
cleanup along the way).

diff --git a/config-ui/browser-switchboard-cp.c b/config-ui/browser-switchboard-cp.c
index 1846a46..54d590f 100644 (file)
--- a/config-ui/browser-switchboard-cp.c
+++ b/config-ui/browser-switchboard-cp.c
@@ -374,9 +374,10 @@ static GtkDialog *swb_config_dialog(gpointer cp_window) {
                           default_browser_selector_button, FALSE, FALSE, 0);
 
        cw.other_browser_cmd_entry = hildon_entry_new(_HILDON_SIZE_DEFAULT);
                           default_browser_selector_button, FALSE, FALSE, 0);
 
        cw.other_browser_cmd_entry = hildon_entry_new(_HILDON_SIZE_DEFAULT);

+       /* Disable autocapitalization and dictionary features for the entry */

        input_mode = hildon_gtk_entry_get_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry));
        input_mode = hildon_gtk_entry_get_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry));

-       input_mode &= ~HILDON_GTK_INPUT_MODE_AUTOCAP;
-       input_mode &= ~HILDON_GTK_INPUT_MODE_DICTIONARY;
+       input_mode &= ~(HILDON_GTK_INPUT_MODE_AUTOCAP |
+                       HILDON_GTK_INPUT_MODE_DICTIONARY);

        hildon_gtk_entry_set_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry), input_mode);
 
        cw.other_browser_cmd_entry_label = hildon_caption_new(NULL,
        hildon_gtk_entry_set_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry), input_mode);
 
        cw.other_browser_cmd_entry_label = hildon_caption_new(NULL,

@@ -418,6 +419,9 @@ static GtkDialog *swb_config_dialog(gpointer cp_window) {
        GtkWidget *default_browser_combo_label;
        GtkWidget *continuous_mode_label;
        int i;
        GtkWidget *default_browser_combo_label;
        GtkWidget *continuous_mode_label;
        int i;

+#ifdef HILDON
+       HildonGtkInputMode input_mode;
+#endif

 
        dialog = gtk_dialog_new_with_buttons(
                "Browser Switchboard",
 
        dialog = gtk_dialog_new_with_buttons(
                "Browser Switchboard",

@@ -459,6 +463,13 @@ static GtkDialog *swb_config_dialog(gpointer cp_window) {
                        5, 0);
 
        cw.other_browser_cmd_entry = gtk_entry_new();
                        5, 0);
 
        cw.other_browser_cmd_entry = gtk_entry_new();

+#ifdef HILDON
+       /* Disable autocapitalization and dictionary features for the entry */
+       input_mode = hildon_gtk_entry_get_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry));
+       input_mode &= ~(HILDON_GTK_INPUT_MODE_AUTOCAP |
+                       HILDON_GTK_INPUT_MODE_DICTIONARY);
+       hildon_gtk_entry_set_input_mode(GTK_ENTRY(cw.other_browser_cmd_entry), input_mode);
+#endif

        cw.other_browser_cmd_entry_label = gtk_label_new("Command (%s for URI):");
        gtk_misc_set_alignment(GTK_MISC(cw.other_browser_cmd_entry_label), 1, 0.5);
        gtk_widget_set_sensitive(cw.other_browser_cmd_entry, FALSE);
        cw.other_browser_cmd_entry_label = gtk_label_new("Command (%s for URI):");
        gtk_misc_set_alignment(GTK_MISC(cw.other_browser_cmd_entry_label), 1, 0.5);
        gtk_widget_set_sensitive(cw.other_browser_cmd_entry, FALSE);