From 40033ba41fabcb241a918fb78d64f7de3ac0a2e4 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 1 Sep 2004 16:04:19 +0000 Subject: [PATCH] 2004-09-01 [colin] 0.9.12cvs86.1 * src/filtering.c * src/folderview.c * src/imap.c * src/prefs_matcher.c * src/stock_pixmap.c * src/summary_search.c * src/summaryview.c * src/wizard.c * src/wizard.h Sync with HEAD + gtk2 specific warning fixes --- ChangeLog-gtk2.claws | 13 +++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/filtering.c | 2 +- src/folderview.c | 2 -- src/imap.c | 4 ++-- src/prefs_matcher.c | 2 +- src/stock_pixmap.c | 4 ++-- src/summary_search.c | 2 -- src/summaryview.c | 2 -- src/wizard.c | 6 ++---- src/wizard.h | 2 +- 12 files changed, 24 insertions(+), 18 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 41c82e9da..9933a833f 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,16 @@ +2004-09-01 [colin] 0.9.12cvs86.1 + + * src/filtering.c + * src/folderview.c + * src/imap.c + * src/prefs_matcher.c + * src/stock_pixmap.c + * src/summary_search.c + * src/summaryview.c + * src/wizard.c + * src/wizard.h + Sync with HEAD + gtk2 specific warning fixes + 2004-08-31 [colin] 0.9.12cvs85.1 * src/folder.c diff --git a/PATCHSETS b/PATCHSETS index 15995aa26..6e2d149b5 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -150,3 +150,4 @@ ( cvs diff -u -r 1.382.2.46 -r 1.382.2.47 src/compose.c; cvs diff -u -r 1.96.2.17 -r 1.96.2.18 src/textview.c; ) > 0.9.12cvs84.3.patchset ( cvs diff -u -r 1.15.2.8 -r 1.15.2.9 src/summary_search.c; ) > 0.9.12cvs84.4.patchset ( cvs diff -u -r 1.213.2.14 -r 1.213.2.15 src/folder.c; ) > 0.9.12cvs85.1.patchset +( cvs diff -u -r 1.60.2.2 -r 1.60.2.3 src/filtering.c; cvs diff -u -r 1.207.2.13 -r 1.207.2.14 src/folderview.c; cvs diff -u -r 1.179.2.7 -r 1.179.2.8 src/imap.c; cvs diff -u -r 1.43.2.9 -r 1.43.2.10 src/prefs_matcher.c; cvs diff -u -r 1.25.2.6 -r 1.25.2.7 src/stock_pixmap.c; cvs diff -u -r 1.15.2.9 -r 1.15.2.10 src/summary_search.c; cvs diff -u -r 1.395.2.28 -r 1.395.2.29 src/summaryview.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/wizard.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/wizard.h; ) > 0.9.12cvs86.1.patchset diff --git a/configure.ac b/configure.ac index 93e0b9f89..e7c0d5878 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=85 +EXTRA_VERSION=86 EXTRA_RELEASE= EXTRA_GTK2_VERSION=.1 diff --git a/src/filtering.c b/src/filtering.c index 7b68fa03d..85e8bbbd2 100644 --- a/src/filtering.c +++ b/src/filtering.c @@ -332,7 +332,7 @@ static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *inf static gboolean filtering_apply_rule(FilteringProp *filtering, MsgInfo *info, gboolean * final) { - gboolean result; + gboolean result = TRUE; gchar buf[50]; GSList * tmp; diff --git a/src/folderview.c b/src/folderview.c index 13f461394..ef8161e82 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -423,8 +423,6 @@ FolderView *folderview_create(void) void folderview_init(FolderView *folderview) { - static GdkFont *boldfont = NULL; - static GdkFont *normalfont = NULL; GtkWidget *ctree = folderview->ctree; GtkWidget *label_new; GtkWidget *label_unread; diff --git a/src/imap.c b/src/imap.c index 10588fe50..89e8549c4 100644 --- a/src/imap.c +++ b/src/imap.c @@ -2441,7 +2441,7 @@ static gint imap_set_message_flags(IMAPSession *session, { gchar *cmd; gchar *flag_str; - gint ok; + gint ok = 0; GSList *seq_list, *cur; IMAPSet imapset; @@ -3919,7 +3919,7 @@ GSList *imap_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list) startnum = lastnum = GPOINTER_TO_INT(sorted_list->data); for (elem = sorted_list;; elem = g_slist_next(elem)) { - guint num; + guint num = 0; if (elem) num = GPOINTER_TO_INT(elem->data); diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c index 01d30dad3..0f89e4ba8 100644 --- a/src/prefs_matcher.c +++ b/src/prefs_matcher.c @@ -1660,7 +1660,7 @@ static void prefs_matcher_ok(void) MatcherProp *matcherprop; AlertValue val; gchar *matcher_str = NULL; - gchar *str; + gchar *str = NULL; gint row = 1; matchers = prefs_matcher_get_list(); diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c index de0013f62..c40333bc1 100644 --- a/src/stock_pixmap.c +++ b/src/stock_pixmap.c @@ -422,8 +422,8 @@ static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventE { GdkDrawable *drawable = widget->window; GdkGC *gc_pix; - gint left; - gint top; + gint left = 0; + gint top = 0; g_return_val_if_fail(data->base_pixmap != NULL, FALSE); g_return_val_if_fail(data->base_mask != NULL, FALSE); diff --git a/src/summary_search.c b/src/summary_search.c index d3efcb167..c4e524aa8 100644 --- a/src/summary_search.c +++ b/src/summary_search.c @@ -247,7 +247,6 @@ static void summary_search_execute(GtkButton *button, gpointer data) gboolean body_matched; const gchar *body_str, *from_str, *to_str, *subj_str; char *(*findfunc) (const char *haystack, const char *needle); - GError *error = NULL; if (summary_is_locked(summaryview)) return; summary_lock(summaryview); @@ -389,7 +388,6 @@ static void summary_search_execute(GtkButton *button, gpointer data) break; } } -skip: node = backward ? gtkut_ctree_node_prev(ctree, node) : gtkut_ctree_node_next(ctree, node); } diff --git a/src/summaryview.c b/src/summaryview.c index 1fe32b6dd..c22da8a61 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -611,8 +611,6 @@ SummaryView *summary_create(void) void summary_init(SummaryView *summaryview) { - static GdkFont *boldfont = NULL; - static GdkFont *smallfont = NULL; GtkStyle *style; GtkWidget *pixmap; diff --git a/src/wizard.c b/src/wizard.c index 33a82d731..1acd9686e 100644 --- a/src/wizard.c +++ b/src/wizard.c @@ -99,7 +99,6 @@ static void wizard_write_config(WizardWindow *wizard) PrefsAccount *prefs_account = prefs_account_new(); GList *account_list = NULL; GtkWidget *menu, *menuitem; - int tmp; if (wizard->create_mailbox) { mailbox_ok = setup_write_mailbox_path(wizard->mainwin, @@ -132,11 +131,12 @@ static void wizard_write_config(WizardWindow *wizard) #ifdef USE_OPENSSL if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl))) prefs_account->ssl_smtp = SSL_TUNNEL; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl))) + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wizard->smtp_use_ssl))) { if (prefs_account->protocol == A_IMAP4) prefs_account->ssl_imap = SSL_TUNNEL; else prefs_account->ssl_pop = SSL_TUNNEL; + } #endif account_list = g_list_append(account_list, prefs_account); @@ -252,7 +252,6 @@ static GtkWidget* user_page (WizardWindow * wizard) static GtkWidget* mailbox_page (WizardWindow * wizard) { GtkWidget *table = gtk_table_new(1,2, FALSE); - gchar *text; gint i = 0; gtk_table_set_row_spacings(GTK_TABLE(table), 4); @@ -368,7 +367,6 @@ static GtkWidget* recv_page (WizardWindow * wizard) static GtkWidget* ssl_page (WizardWindow * wizard) { GtkWidget *table = gtk_table_new(2,2, FALSE); - gchar *text; gint i = 0; gtk_table_set_row_spacings(GTK_TABLE(table), 4); diff --git a/src/wizard.h b/src/wizard.h index 0d2c8c22c..499b9c113 100644 --- a/src/wizard.h +++ b/src/wizard.h @@ -27,6 +27,6 @@ #include "mainwindow.h" -gboolean wizard_run(MainWindow *, gboolean create_mailbox); +gboolean run_wizard(MainWindow *, gboolean create_mailbox); #endif -- 2.25.1