aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog13
-rw-r--r--mail/component-factory.c2
-rw-r--r--mail/mail-summary.c14
-rw-r--r--mail/session.c2
4 files changed, 24 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 060ad4e0eb..333c74d944 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,16 @@
+2000-12-12 Christopher James Lahey <clahey@helixcode.com>
+
+ * mail-summary.c: Added #include "mail-summary.h". Commented out
+ folder_free, summary_free, and view_destroy_cb since they're not
+ used.
+ (do_changed): Added a cast.
+ (create_summary_view): Changed some types so that casting would be
+ easier.
+
+ * component-factory.c (create_view): Added a cast.
+
+ * session.c (mail_session_remember_password): Added a cast.
+
2000-12-12 Dan Winship <danw@helixcode.com>
* mail-summary.h: Fix to use the right .h instead of the
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 7cf16745bb..e67537bb9f 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -94,7 +94,7 @@ create_view (EvolutionShellComponent *shell_component,
}
if (!gtk_object_get_data (GTK_OBJECT (storage), "connected"))
- mail_do_scan_subfolders (store, storage);
+ mail_do_scan_subfolders (CAMEL_STORE(store), storage);
camel_object_unref (CAMEL_OBJECT (store));
control = folder_browser_factory_new_control ("", corba_shell);
diff --git a/mail/mail-summary.c b/mail/mail-summary.c
index cfbeea9ad5..308a1aa271 100644
--- a/mail/mail-summary.c
+++ b/mail/mail-summary.c
@@ -34,6 +34,7 @@
#include "mail-tools.h"
#include "mail-ops.h"
#include "mail-vfolder.h"
+#include "mail-summary.h"
#include "Evolution.h"
#include "evolution-storage.h"
@@ -133,6 +134,7 @@ check_compipes (void)
}
}
+#if 0
static void
folder_free (FolderSummary *folder)
{
@@ -165,6 +167,7 @@ view_destroy_cb (GtkObject *object,
summary_free (summary);
g_free (summary);
}
+#endif
static char *
generate_html_summary (MailSummary *summary)
@@ -208,7 +211,7 @@ do_changed (MailSummary *summary)
char *ret_html;
ret_html = generate_html_summary (summary);
- executive_summary_html_view_set_html(summary->view, (const char *) ret_html);
+ executive_summary_html_view_set_html(EXECUTIVE_SUMMARY_HTML_VIEW(summary->view), (const char *) ret_html);
g_free (ret_html);
}
@@ -385,7 +388,8 @@ BonoboObject *
create_summary_view (ExecutiveSummaryComponentFactory *_factory,
void *closure)
{
- BonoboObject *component, *view, *bag;
+ BonoboObject *component, *view;
+ BonoboPropertyBag *bag;
char *html;
MailSummary *summary;
@@ -410,17 +414,17 @@ create_summary_view (ExecutiveSummaryComponentFactory *_factory,
summary->view = view;
bag = bonobo_property_bag_new (get_property, NULL, summary);
- bonobo_property_bag_add (BONOBO_PROPERTY_BAG (bag),
+ bonobo_property_bag_add (bag,
"window_title", PROPERTY_TITLE,
BONOBO_ARG_STRING, NULL,
"The title of this component's window",
BONOBO_PROPERTY_READABLE);
- bonobo_property_bag_add (BONOBO_PROPERTY_BAG (bag),
+ bonobo_property_bag_add (bag,
"window_icon", PROPERTY_ICON,
BONOBO_ARG_STRING, NULL,
"The icon for this component's window",
BONOBO_PROPERTY_READABLE);
- bonobo_object_add_interface (component, bag);
+ bonobo_object_add_interface (component, BONOBO_OBJECT(bag));
g_free (html);
return component;
diff --git a/mail/session.c b/mail/session.c
index 185b72f9e8..508ea80ed3 100644
--- a/mail/session.c
+++ b/mail/session.c
@@ -152,7 +152,7 @@ maybe_remember_password (gpointer key, gpointer password, gpointer url)
void
mail_session_remember_password (const char *url)
{
- g_hash_table_foreach (passwords, maybe_remember_password, url);
+ g_hash_table_foreach (passwords, maybe_remember_password, (void *) url);
}