[balsa] gtkspell-enabled build requires enchant now. Fix --enable-touch-ui build.

[Pawel Salek <pawels src gnome org>]

commit d93f073708d3b91ac2614b8dc0aaa51967ec2b56
Author: Pawel Salek <pawsa damage localdomain>
Date:   Wed Dec 30 18:07:11 2009 +0100

    gtkspell-enabled build requires enchant now. Fix --enable-touch-ui build.

 ChangeLog            |    6 ++++++
 balsa.spec.in        |    1 +
 configure.in         |    4 ++--
 src/main-window.c    |    8 ++++++--
 src/sendmsg-window.c |    8 +++++---
 5 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a89a795..00f0296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-30  Pawel Salek
+
+	* configure.in: gtkspell build requires enchant now as well.\
+	* src/main-window.c:
+	* src/sendmsg-window.c: compile with --enable-touch-ui
+
 2009-12-30  Peter Bloomfield
 
 	* src/sendmsg-window.c (create_lang_menu): use
diff --git a/balsa.spec.in b/balsa.spec.in
index 0ea7a4a..370d8df 100644
--- a/balsa.spec.in
+++ b/balsa.spec.in
@@ -35,6 +35,7 @@ BuildRequires: gnome-vfs2-devel
 BuildRequires: gtk2-devel
 BuildRequires: gtkhtml2-devel
 BuildRequires: gtkspell-devel
+BuildRequires: enchant-devel
 BuildRequires: intltool
 BuildRequires: libesmtp-devel >= 1.0.4
 BuildRequires: libgnome-devel
diff --git a/configure.in b/configure.in
index aa26828..d8bd8d1 100644
--- a/configure.in
+++ b/configure.in
@@ -135,7 +135,7 @@ AC_ARG_WITH([gtksourceview],
 
 AC_ARG_WITH([gtkspell],
    AC_HELP_STRING([--with-gtkspell],
-                  [Use GtkSpell if available (default=no)]),
+                  [Use GtkSpell/enchant if available (default=no)]),
 		  [with_gtkspell=$withval],[with_gtkspell=no])
 
 AC_ARG_WITH(iconv,      
@@ -828,7 +828,7 @@ dnl #####################################################################
 # Spell check detection.
 #
 if test x$with_gtkspell != xno; then
-    PKG_CHECK_MODULES(SPELL, [ gtkspell-2.0 ])
+    PKG_CHECK_MODULES(SPELL, [ gtkspell-2.0 enchant ])
     AC_DEFINE(HAVE_GTKSPELL,1,[Defined when GtkSpell can be used.])
     BALSA_CFLAGS="$BALSA_CFLAGS $SPELL_CFLAGS"
     BALSA_LIBS="$BALSA_LIBS $SPELL_LIBS"
diff --git a/src/main-window.c b/src/main-window.c
index 292fce8..de85352 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -395,7 +395,7 @@ static const GtkActionEntry entries[] = {
      G_CALLBACK(mailbox_conf_add_mbox_cb)},
     {"NewMaildir", GTK_STOCK_ADD, N_("New \"Maildir\" mailbox..."), NULL,
      N_("Add a new Maildir style mailbox"),
-     G_CALLBACK(bw_mailbox_conf_add_maildir_cb)},
+     G_CALLBACK(mailbox_conf_add_maildir_cb)},
     {"NewMH", GTK_STOCK_ADD, N_("New \"MH\" mailbox..."), NULL,
      N_("Add a new MH style mailbox"), G_CALLBACK(mailbox_conf_add_mh_cb)},
 #endif /* ENABLE_TOUCH_UI */
@@ -1627,12 +1627,14 @@ balsa_window_new()
     GtkWidget *hbox;
     static const gchar *const header_options[] =
         { "NoHeaders", "SelectedHeaders", "AllHeaders" };
+#if !defined(ENABLE_TOUCH_UI)
     static const gchar *const threading_options[] =
         { "FlatIndex", "SimpleThreading", "JWZThreading" };
-    guint i;
+#endif
 #if HAVE_MACOSX_DESKTOP
     IgeMacMenuGroup *group;
 #endif
+    guint i;
 
     /* Call to register custom balsa pixmaps with GNOME_STOCK_PIXMAPS
      * - allows for grey out */
@@ -4379,6 +4381,7 @@ bw_find_again_cb(GtkAction * action,gpointer data)
 	bw_find_real(window, BALSA_INDEX(bindex), TRUE);
 }
 
+#if !defined(ENABLE_TOUCH_UI)
 static void
 bw_find_in_message_cb(GtkAction * action,gpointer data)
 {
@@ -4386,6 +4389,7 @@ bw_find_in_message_cb(GtkAction * action,gpointer data)
     if (balsa_app.previewpane)
         balsa_message_find_in_message(BALSA_MESSAGE(window->preview));
 }
+#endif /* ENABLE_TOUCH_UI */
 
 static void
 bw_filter_dlg_cb(GtkAction * action, gpointer data)
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 26a2206..4074948 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -7057,6 +7057,7 @@ bsmsg_check_format_compatibility(GtkWindow *parent, const gchar *filename)
         { ".gnumeric", "Gnumeric", ".xls", "Microsoft Excel" }
     };
     GtkDialog *dialog;
+    GtkBox *vbox;
     GtkWidget *label, *checkbox = NULL;
     unsigned i, fn_len = strlen(filename);
     int response;
@@ -7102,14 +7103,15 @@ bsmsg_check_format_compatibility(GtkWindow *parent, const gchar *filename)
          compatibility_table[i].other_program,
          compatibility_table[i].other_program,
          compatibility_table[i].other_extension);
-    gtk_box_set_spacing(GTK_BOX(dialog->vbox), 10);
-    gtk_box_pack_start(GTK_BOX(dialog->vbox), label = gtk_label_new(str),
+    vbox = GTK_BOX(gtk_dialog_get_content_area(dialog));
+    gtk_box_set_spacing(vbox, 10);
+    gtk_box_pack_start(vbox, label = gtk_label_new(str),
                        TRUE, TRUE, 0);
     gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
     g_free(str);
     checkbox = gtk_check_button_new_with_mnemonic
         ("_Do not show this dialog any more.");
-    gtk_box_pack_start(GTK_BOX(dialog->vbox), checkbox, TRUE, TRUE, 0);
+    gtk_box_pack_start(vbox, checkbox, TRUE, TRUE, 0);
     gtk_widget_show(checkbox);
     gtk_widget_show(label);
     response = gtk_dialog_run(dialog);