2006-04-06 [wwp] 2.1.0cvs11

	* src/folderview.c
	* src/prefs_themes.c
	* src/summaryview.c
		Fixed some compilation warnings.

diff --git a/ChangeLog b/ChangeLog
index c4ea137d562c95319780d76c686a36bb5de31609..f2e09e7faf5e5ba46c1506af300153e3cf924443 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-06 [wwp]       2.1.0cvs11
+
+       * src/folderview.c
+       * src/prefs_themes.c
+       * src/summaryview.c
+               Fixed some compilation warnings.
+
 2006-04-06 [colin]     2.1.0cvs10
 
        * manual/advanced.xml

diff --git a/PATCHSETS b/PATCHSETS
index 3799d443b68652dd07b0532e6028513e6a0d6214..c1cd75f0121c19844d5c88dc8498851db38a1316 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1382,3 +1382,4 @@
 ( cvs diff -u -r 1.96.2.107 -r 1.96.2.108 src/textview.c;  ) > 2.1.0cvs8.patchset
 ( cvs diff -u -r 1.207.2.92 -r 1.207.2.93 src/folderview.c;  ) > 2.1.0cvs9.patchset
 ( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 manual/advanced.xml;  ) > 2.1.0cvs10.patchset
+( cvs diff -u -r 1.207.2.93 -r 1.207.2.94 src/folderview.c;  cvs diff -u -r 1.3.2.41 -r 1.3.2.42 src/prefs_themes.c;  cvs diff -u -r 1.395.2.191 -r 1.395.2.192 src/summaryview.c;  ) > 2.1.0cvs11.patchset

diff --git a/configure.ac b/configure.ac
index bcc8de2fc85acf1d8a62edb0e1f0f0c70ff93df3..0ae73ca9365eb1f89b96fe2157d171688054fd74 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index eb324de09a48eb68bbd0369006538898d3b47342..71c6fa805a3b22a2d8fe7f83ae6e797ae1780bab 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -924,7 +924,9 @@ void folderview_append_item(FolderItem *item)
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
+#ifndef HAVE_LIBETPAN
        static gboolean missing_imap_warning = TRUE;
+#endif
        list = folder_get_list();
 
        for (; list != NULL; list = list->next) {

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 292e45cc1eac955bf8ca0589996ad69879ec7802..d65db8915d448db9ecf852f6b1f74323a0fcfa4a 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -131,7 +131,6 @@ StockPixmap prefs_themes_icons[PREVIEW_ICONS] = {
 static void prefs_themes_btn_use_clicked_cb    (GtkWidget *widget, gpointer data);
 static void prefs_themes_btn_remove_clicked_cb (GtkWidget *widget, gpointer data);
 static void prefs_themes_btn_install_clicked_cb        (GtkWidget *widget, gpointer data);
-static void prefs_themes_btn_more_clicked_cb   (GtkWidget *widget, gpointer data);
 static void prefs_themes_menu_item_activated_cb        (GtkWidget *widget, gpointer data);
 
 static void prefs_themes_update_buttons                (const ThemesData *tdata);
@@ -864,7 +863,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        gtk_box_pack_start (GTK_BOX (hbox3), btn_install, FALSE, FALSE, 0);
        GTK_WIDGET_SET_FLAGS (btn_install, GTK_CAN_DEFAULT);
 
-       btn_more = gtkut_get_link_btn(window, THEMES_URI, _("Get more..."));
+       btn_more = gtkut_get_link_btn((GtkWidget *)window, THEMES_URI, _("Get more..."));
        gtk_widget_show (btn_more);
        gtk_box_pack_start (GTK_BOX (hbox3), btn_more, FALSE, FALSE, 0);
 

diff --git a/src/summaryview.c b/src/summaryview.c
index e654ddd4d09e848698f48a8b88a6924c025f2380..f2c4afd6be739646de94db26576b7b8ed08d4d9f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3894,7 +3894,7 @@ gboolean summary_execute(SummaryView *summaryview)
                                        (summaryview, node);
                }
 
-               gtk_sctree_remove_node(ctree, node);
+               gtk_sctree_remove_node((GtkSCTree *)ctree, node);
        }
 
        folder_item_update_thaw();