commit 621113b3c746ecdb33c4dcb9887d4016b8926f84
parent 18c1ee4a81e42aa15ac8c9f05e26f6adb583720c
Author: Paul Mangan <paul@claws-mail.org>
Date: Sun, 20 Jul 2008 07:53:03 +0000
2008-07-20 [paul] 3.5.0cvs28
* src/addrgather.c
remove more redundant code following cvs27
Diffstat:
4 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-20 [paul] 3.5.0cvs28
+
+ * src/addrgather.c
+ remove more redundant code following cvs27
+
2008-07-20 [paul] 3.5.0cvs27
* src/addrgather.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3439,3 +3439,4 @@
( cvs diff -u -r 1.61.2.79 -r 1.61.2.80 src/account.c; cvs diff -u -r 1.5.10.21 -r 1.5.10.22 src/addrgather.c; cvs diff -u -r 1.382.2.456 -r 1.382.2.457 src/compose.c; cvs diff -u -r 1.8.2.30 -r 1.8.2.31 src/editldap.c; cvs diff -u -r 1.1.4.28 -r 1.1.4.29 src/expldifdlg.c; cvs diff -u -r 1.14.2.17 -r 1.14.2.18 src/importldif.c; cvs diff -u -r 1.115.2.198 -r 1.115.2.199 src/main.c; cvs diff -u -r 1.274.2.253 -r 1.274.2.254 src/mainwindow.c; cvs diff -u -r 1.83.2.133 -r 1.83.2.134 src/mimeview.c; cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/noticeview.c; cvs diff -u -r 1.105.2.137 -r 1.105.2.138 src/prefs_account.c; cvs diff -u -r 1.60.2.58 -r 1.60.2.59 src/prefs_actions.c; cvs diff -u -r 1.3.2.19 -r 1.3.2.20 src/prefs_ext_prog.c; cvs diff -u -r 1.59.2.69 -r 1.59.2.70 src/prefs_filtering.c; cvs diff -u -r 1.52.2.64 -r 1.52.2.65 src/prefs_folder_item.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_image_viewer.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_logging.c; cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/prefs_other.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_send.c; cvs diff -u -r 1.5.2.35 -r 1.5.2.36 src/prefs_spelling.c; cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/prefs_summaries.c; cvs diff -u -r 1.12.2.63 -r 1.12.2.64 src/prefs_template.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/printing.c; cvs diff -u -r 1.8.2.35 -r 1.8.2.36 src/quote_fmt.c; cvs diff -u -r 1.15.2.53 -r 1.15.2.54 src/summary_search.c; cvs diff -u -r 1.395.2.373 -r 1.395.2.374 src/summaryview.c; cvs diff -u -r 1.43.2.101 -r 1.43.2.102 src/toolbar.c; cvs diff -u -r 1.1.2.70 -r 1.1.2.71 src/wizard.c; cvs diff -u -r 1.24.2.16 -r 1.24.2.17 src/common/Makefile.am; cvs diff -u -r 1.1.4.45 -r 1.1.4.46 src/gtk/gtksctree.c; cvs diff -u -r 1.4.2.40 -r 1.4.2.41 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.51 -r 1.5.2.52 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.2.82 -r 1.1.2.83 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.5.2.22 -r 1.5.2.23 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.23.2.48 -r 1.23.2.49 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.63 -r 1.14.2.64 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/trayicon/trayicon_prefs.c; ) > 3.5.0cvs25.patchset
( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/edittags.c; cvs diff -u -r 1.115.2.199 -r 1.115.2.200 src/main.c; cvs diff -u -r 1.83.2.134 -r 1.83.2.135 src/mimeview.c; cvs diff -u -r 1.20.2.24 -r 1.20.2.25 src/mimeview.h; cvs diff -u -r 1.5.2.75 -r 1.5.2.76 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.41 -r 1.4.2.42 src/gtk/gtkutils.h; cvs diff -u -r 1.5.2.28 -r 1.5.2.29 src/gtk/menu.c; cvs diff -u -r 1.4.2.12 -r 1.4.2.13 src/gtk/menu.h; ) > 3.5.0cvs26.patchset
( cvs diff -u -r 1.5.10.22 -r 1.5.10.23 src/addrgather.c; cvs diff -u -r 1.274.2.254 -r 1.274.2.255 src/mainwindow.c; cvs diff -u -r 1.39.2.48 -r 1.39.2.49 src/mainwindow.h; ) > 3.5.0cvs27.patchset
+( cvs diff -u -r 1.5.10.23 -r 1.5.10.24 src/addrgather.c; ) > 3.5.0cvs28.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=27
+EXTRA_VERSION=28
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/addrgather.c b/src/addrgather.c
@@ -495,7 +495,6 @@ static void addrgather_dlg_create(void)
AddressBookFile *addrgather_dlg_execute(FolderItem *folderItem, AddressIndex *addrIndex,
gboolean sourceInd, GList *msgList)
{
- gboolean errFlag;
gint i;
_harv_addressIndex_ = addrIndex;
@@ -508,36 +507,29 @@ AddressBookFile *addrgather_dlg_execute(FolderItem *folderItem, AddressIndex *ad
addrgather_dlg.done = FALSE;
- errFlag = TRUE;
- if (folderItem && folderItem->path) {
- gtk_notebook_set_current_page(GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FIELDS);
- addrgather_dlg.folderPath = folder_item_get_path(folderItem);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FIELDS);
+ addrgather_dlg.folderPath = folder_item_get_path(folderItem);
- /* Setup some default values */
- gtk_label_set_text(GTK_LABEL(addrgather_dlg.labelFolder), folderItem->path);
- gtk_entry_set_text(GTK_ENTRY(addrgather_dlg.entryBook), folderItem->path);
+ /* Setup some default values */
+ gtk_label_set_text(GTK_LABEL(addrgather_dlg.labelFolder), folderItem->path);
+ gtk_entry_set_text(GTK_ENTRY(addrgather_dlg.entryBook), folderItem->path);
- for (i = 0; i < NUM_FIELDS; i++) {
+ for (i = 0; i < NUM_FIELDS; i++) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
+ FALSE);
+ if (g_utf8_collate(_harv_headerNames_[i], HEADER_FROM) == 0)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
- FALSE);
- if (g_utf8_collate(_harv_headerNames_[i], HEADER_FROM) == 0)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(addrgather_dlg.checkHeader[i]),
- TRUE);
- }
-
- gtk_widget_set_sensitive(addrgather_dlg.btnOk, TRUE);
- gtk_widget_grab_default(addrgather_dlg.btnOk);
- errFlag = FALSE;
+ TRUE);
}
+ gtk_widget_set_sensitive(addrgather_dlg.btnOk, TRUE);
+ gtk_widget_grab_default(addrgather_dlg.btnOk);
+
/* Apply window title */
if (sourceInd) {
gtk_window_set_title(GTK_WINDOW(addrgather_dlg.window),
_("Collect email addresses from selected messages"));
gtk_widget_set_sensitive(addrgather_dlg.checkRecurse, FALSE);
- if (msgList == NULL) {
- errFlag = TRUE;
- }
} else {
gtk_window_set_title(GTK_WINDOW(addrgather_dlg.window),
_("Collect email addresses from folder"));
@@ -552,10 +544,8 @@ AddressBookFile *addrgather_dlg_execute(FolderItem *folderItem, AddressIndex *ad
manage_window_set_transient(GTK_WINDOW(addrgather_dlg.window));
gtk_main();
- if (!errFlag) {
- g_free(addrgather_dlg.folderPath);
- addrgather_dlg.folderPath = NULL;
- }
+ g_free(addrgather_dlg.folderPath);
+ addrgather_dlg.folderPath = NULL;
gtk_widget_hide(addrgather_dlg.window);
_harv_addressIndex_ = NULL;
