From 476e30f94d1701f956d54e132e4689721393ab69 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 7 Aug 2004 15:40:13 +0000 Subject: [PATCH] fix warnings (sync from HEAD) --- ChangeLog-gtk2.claws | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/partial_download.c | 6 +++--- src/folder.c | 4 ++-- src/folderview.c | 1 + src/gtk/prefswindow.c | 1 - src/pop.c | 4 ++-- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index ce7d67ccc..13b095051 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,9 @@ +2004-08-07 [colin] 0.9.12cvs50.1 + + * src/pop.c + * src/common/partial_download.c + fix warnings (sync from HEAD) + 2004-08-07 [colin] 0.9.12cvs48.1 * src/prefs_folder_item.c diff --git a/PATCHSETS b/PATCHSETS index 313541e74..3401b4c1d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -105,3 +105,4 @@ ( cvs diff -u -r 1.396.2.6 -r 1.396.2.7 ChangeLog; cvs diff -u -r 1.2504.2.9 -r 1.2504.2.10 ChangeLog.claws; cvs diff -u -r 1.391.2.6 -r 1.391.2.7 ChangeLog.jp; cvs diff -u -r 1.654.2.131 -r 1.654.2.132 configure.ac; cvs diff -u -r 1.1 -r 1.2 sylpheed-claws.pc.in; cvs diff -u -r 1.213.2.10 -r 1.213.2.11 src/folder.c; cvs diff -u -r 1.179.2.5 -r 1.179.2.6 src/imap.c; cvs diff -u -r 1.3.4.1 -r 1.3.4.2 src/localfolder.c; cvs diff -u -r 1.94.2.28 -r 1.94.2.29 src/messageview.c; cvs diff -u -r 1.83.2.15 -r 1.83.2.16 src/mimeview.c; cvs diff -u -r 1.20.2.1 -r 1.20.2.2 src/mimeview.h; cvs diff -u -r 1.16.2.8 -r 1.16.2.9 src/msgcache.c; cvs diff -u -r 1.101.2.5 -r 1.101.2.6 src/news.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/prefs_ext_prog.c; cvs diff -u -r 1.52.2.4 -r 1.52.2.5 src/prefs_folder_item.c; cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/prefs_fonts.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_msg_colors.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/prefs_spelling.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/prefs_themes.c; cvs diff -u -r 1.30.2.3 -r 1.30.2.4 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_wrapping.c; cvs diff -u -r 1.17.2.2 -r 1.17.2.3 src/procmime.h; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/common/defs.h; cvs diff -u -r 1.6.2.2 -r 1.6.2.3 src/common/nntp.c; cvs diff -u -r 1.23.2.3 -r 1.23.2.4 src/common/session.c; cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/common/session.h; cvs diff -u -r 1.13.2.6 -r 1.13.2.7 src/common/socket.c; cvs diff -u -r 1.20.2.5 -r 1.20.2.6 src/common/utils.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/common/xml.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/common/xml.h; cvs diff -u -r 1.12.2.5 -r 1.12.2.6 src/gtk/prefswindow.c; cvs diff -u -r 1.7 -r 1.8 src/gtk/prefswindow.h; cvs diff -u -r 1.9.2.2 -r 1.9.2.3 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/plugins/image_viewer/viewerprefs.c; cvs diff -u -r 1.23.2.2 -r 1.23.2.3 src/plugins/spamassassin/spamassassin_gtk.c; ) > 0.9.12cvs46.1.patchset ( cvs diff -u -r 1.382.2.39 -r 1.382.2.40 src/compose.c; ) > 0.9.12cvs47.1.patchset ( cvs diff -u -r 1.52.2.5 -r 1.52.2.6 src/prefs_folder_item.c; ) > 0.9.12cvs48.1.patchset +( cvs diff -u -r 1.56.2.24 -r 1.56.2.25 src/pop.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/common/partial_download.c; ) > 0.9.12cvs50.1.patchset diff --git a/configure.ac b/configure.ac index 794624564..583697013 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=48 +EXTRA_VERSION=50 EXTRA_RELEASE= EXTRA_GTK2_VERSION=.1 diff --git a/src/common/partial_download.c b/src/common/partial_download.c index 7520e0f16..1599d1a44 100644 --- a/src/common/partial_download.c +++ b/src/common/partial_download.c @@ -103,7 +103,7 @@ int partial_msg_in_uidl_list(MsgInfo *msginfo) recv_time = RECV_TIME_NONE; partial_recv = POP3_TOTALLY_RECEIVED; - if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, &tmp) < 2) { + if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, tmp) < 2) { if (sscanf(buf, "%s", uidl) != 1) continue; else { @@ -184,7 +184,7 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download) sprintf(partial_recv,"0"); if (sscanf(buf, "%s\t%ld\t%s", - uidl, &recv_time, &partial_recv) < 2) { + uidl, &recv_time, partial_recv) < 2) { if (sscanf(buf, "%s", uidl) != 1) continue; else { @@ -347,7 +347,7 @@ gchar *partial_get_filename(const gchar *server, const gchar *login, recv_time = RECV_TIME_NONE; partial_recv = POP3_TOTALLY_RECEIVED; - if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, &tmp) < 2) { + if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, tmp) < 2) { if (sscanf(buf, "%s", uidl) != 1) continue; else { diff --git a/src/folder.c b/src/folder.c index a9bcd92fa..7c4d9a74b 100644 --- a/src/folder.c +++ b/src/folder.c @@ -1096,8 +1096,8 @@ gchar *folder_get_identifier(Folder *folder) gchar *folder_item_get_identifier(FolderItem *item) { - gchar *id; - gchar *folder_id; + gchar *id = NULL; + gchar *folder_id = NULL; g_return_val_if_fail(item != NULL, NULL); g_return_val_if_fail(item->path != NULL, NULL); diff --git a/src/folderview.c b/src/folderview.c index 13f461394..0266e550c 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -1680,6 +1680,7 @@ static void folderview_property_cb(FolderView *folderview, guint action, if (folder_item_parent(item) == NULL && item->folder->account) account_open(item->folder->account); else { + printf("open prefs...\n"); prefs_folder_item_open(item); } } diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c index d37db26e6..6074f48f9 100644 --- a/src/gtk/prefswindow.c +++ b/src/gtk/prefswindow.c @@ -269,7 +269,6 @@ void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data) int i; struct name_search name_search; PrefsTreeNode *prefsnode; - for (i = 0; page->path[i] != NULL; i++) { part = page->path[i]; name_search.text = part; diff --git a/src/pop.c b/src/pop.c index 3d4b2ac92..f0c3cf903 100644 --- a/src/pop.c +++ b/src/pop.c @@ -266,7 +266,7 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data, partial_recv = (gint)g_hash_table_lookup( session->partial_recv_table, id); - if (!session->ac_prefs->getall && recv_time != RECV_TIME_NONE + if ((!session->ac_prefs->getall && recv_time != RECV_TIME_NONE) || partial_recv != POP3_TOTALLY_RECEIVED) { session->msg[num].received = (partial_recv != POP3_MUST_COMPLETE_RECV); @@ -582,7 +582,7 @@ void pop3_get_uidl_table(PrefsAccount *ac_prefs, Pop3Session *session) recv_time = RECV_TIME_NONE; partial_recv = POP3_TOTALLY_RECEIVED; - if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, &tmp) < 3) { + if (sscanf(buf, "%s\t%ld\t%s", uidl, &recv_time, tmp) < 3) { if (sscanf(buf, "%s\t%ld", uidl, &recv_time) != 2) { if (sscanf(buf, "%s", uidl) != 1) continue; -- 2.25.1