2007-08-08 [wwp] 2.10.0cvs104
authorTristan Chabredier <wwp@claws-mail.org>
Wed, 8 Aug 2007 22:25:39 +0000 (22:25 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Wed, 8 Aug 2007 22:25:39 +0000 (22:25 +0000)
* src/prefs_folder_item.c
Better fix, group variables declarations (USE_ASPELL).

ChangeLog
PATCHSETS
configure.ac
src/prefs_folder_item.c

index 151fd9942a0283c9b3cdafbad2b9410b10bb4595..4beb802e8c564e9330d54672b8284ac47d3d85cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-08 [wwp]       2.10.0cvs104
+
+       * src/prefs_folder_item.c
+               Better fix, group variables declarations (USE_ASPELL).
+
 2007-08-08 [wwp]       2.10.0cvs103
 
        * src/prefs_folder_item.c
index 9f53b73768a81d712394796a056f4a12d841d79b..f63c8eae816fd8a376fb89692cf9991c5e9ff5cf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.179.2.179 -r 1.179.2.180 src/imap.c;  cvs diff -u -r 1.1.4.80 -r 1.1.4.81 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/etpan/imap-thread.h;  ) > 2.10.0cvs101.patchset
 ( cvs diff -u -r 1.52.2.43 -r 1.52.2.44 src/prefs_folder_item.c;  ) > 2.10.0cvs102.patchset
 ( cvs diff -u -r 1.52.2.44 -r 1.52.2.45 src/prefs_folder_item.c;  ) > 2.10.0cvs103.patchset
+( cvs diff -u -r 1.52.2.45 -r 1.52.2.46 src/prefs_folder_item.c;  ) > 2.10.0cvs104.patchset
index 00047cbe4f5c3546a757336a21d7e0a8f8003239..da729b2f7cec366ad4a4434b3c85ea6ce77016da 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=103
+EXTRA_VERSION=104
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 2ab89dab6a455fbe84a79b5ff65d3ec3911bdf65..97e270a04593d63faba8d5f4178f9a65a756bcc2 100644 (file)
@@ -705,26 +705,22 @@ static void prefs_folder_item_compose_create_widget_func(PrefsPage * page_,
        GtkWidget *optmenu_default_dictionary = NULL;
        GtkWidget *checkbtn_enable_default_alt_dictionary = NULL;
        GtkWidget *optmenu_default_alt_dictionary = NULL;
+       GtkWidget *default_dictionary_rec_checkbtn = NULL;
+       GtkWidget *default_alt_dictionary_rec_checkbtn = NULL;
+       gchar *dictionary;
+       GtkOptionMenu *optmenu;
+       GtkWidget *menu;
+       GtkWidget *menuitem;
 #endif
        GtkWidget *request_return_receipt_rec_checkbtn = NULL;
        GtkWidget *save_copy_to_folder_rec_checkbtn = NULL;
        GtkWidget *default_to_rec_checkbtn = NULL;
        GtkWidget *default_reply_to_rec_checkbtn = NULL;
        GtkWidget *default_account_rec_checkbtn = NULL;\f
-#if USE_ASPELL
-       GtkWidget *default_dictionary_rec_checkbtn = NULL;
-       GtkWidget *default_alt_dictionary_rec_checkbtn = NULL;
-#endif
 
        GList *cur_ac;
        GList *account_list;
-#if USE_ASPELL
-       gchar *dictionary;
-#endif
        PrefsAccount *ac_prefs;
-       GtkOptionMenu *optmenu;
-       GtkWidget *menu;
-       GtkWidget *menuitem;
 
        page->item         = item;
 
@@ -995,7 +991,9 @@ static void prefs_folder_item_compose_destroy_widget_func(PrefsPage *page_)
 static void compose_save_folder_prefs(FolderItem *folder, FolderItemComposePage *page)
 {
        FolderItemPrefs *prefs = folder->prefs;
+#if USE_ASPELL
        GtkWidget *menu;
+#endif
        gboolean all = FALSE;
 
        if (folder->path == NULL)