aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--capplet/anjal-settings-main.c3
-rw-r--r--capplet/settings/mail-capplet-shell.c2
-rw-r--r--capplet/settings/mail-guess-servers.c5
3 files changed, 5 insertions, 5 deletions
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
index f704789521..bdb257a99b 100644
--- a/capplet/anjal-settings-main.c
+++ b/capplet/anjal-settings-main.c
@@ -160,7 +160,7 @@ create_default_shell (void)
{
main_window = mail_capplet_shell_new(socket_id, FALSE, TRUE);
if (!socket_id)
- gtk_widget_show (main_window);
+ gtk_widget_show (GTK_WIDGET (main_window));
g_idle_add ((GSourceFunc) idle_cb, remaining_args);
}
@@ -168,7 +168,6 @@ int
main (int argc, char *argv[])
{
GError *error = NULL;
- EShell *default_shell;
GConfClient *client;
UniqueApp *app;
diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c
index d1ccdf80ac..ea239ad832 100644
--- a/capplet/settings/mail-capplet-shell.c
+++ b/capplet/settings/mail-capplet-shell.c
@@ -246,7 +246,7 @@ static void
ms_show_post_druid (MailViewChild *mfv G_GNUC_UNUSED,
MailCappletShell *shell)
{
- gtk_widget_destroy(shell);
+ gtk_widget_destroy (GTK_WIDGET (shell));
/*
if (shell->priv->settings_view)
mail_view_switch_to_settings ((MailView *)shell->view, (MailViewChild *)shell->priv->settings_view);
diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
index 26fc630f16..ef656bf8a3 100644
--- a/capplet/settings/mail-guess-servers.c
+++ b/capplet/settings/mail-guess-servers.c
@@ -70,7 +70,7 @@ xml_to_gchar (xmlChar *xml, EmailProvider *provider)
if (!*sec_part)
sec_part = "";
- gxml = g_strdup_printf("%s%s%s", gxml ? gxml: xml, repl, sec_part);
+ gxml = g_strdup_printf("%s%s%s", gxml ? gxml : (char *)xml, repl, sec_part);
tmp = strstr (gxml, "\%EMAIL");
if(tmp) {
goto decodepart;
@@ -213,7 +213,8 @@ parse_msg (SoupMessage *msg, EmailProvider *provider)
gboolean
mail_guess_servers(EmailProvider *provider)
{
- const char *cafile = NULL, *url;
+ const char *cafile = NULL;
+ char *url;
SoupURI *proxy = NULL, *parsed;
int opt;
SoupMessage *msg;