fixed to build with -DG_DISABLE_DEPRECATED

svn path=/trunk/; revision=19209

8 files changed, 20 insertions, 50 deletions

diff --git a/mail/Makefile.am b/mail/Makefile.am
index c819ad4310..196e6396cf 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -30,6 +30,7 @@ INCLUDES = \
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"	\
 	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\"	\
+	-DG_DISABLE_DEPRECATED				\
 	-DG_LOG_DOMAIN=\"evolution-mail\"
 
 EVOLUTION_MAIL_CORBA_GENERATED = \
diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c
index 057b9453b2..88850f7584 100644
--- a/mail/mail-account-editor.c
+++ b/mail/mail-account-editor.c
@@ -97,7 +97,7 @@ apply_changes (MailAccountEditor *editor)
 		page = 3;
 	
 	if (page != -1) {
-		gtk_notebook_set_page (editor->notebook, page);
+		gtk_notebook_set_current_page (editor->notebook, page);
 		gtk_widget_grab_focus (incomplete);
 		e_notice (NULL, GTK_MESSAGE_ERROR, _("You have not filled in all of the required information."));
 		return FALSE;
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 7595067df5..12f2509537 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -1253,7 +1253,7 @@ sig_switch_to_list (GtkWidget *w, MailAccountGui *gui)
 {
 	gtk_window_set_transient_for (GTK_WINDOW (gtk_widget_get_toplevel (w)), NULL);
 	gdk_window_raise (GTK_WIDGET (gui->dialog)->window);
-	gtk_notebook_set_page (GTK_NOTEBOOK (glade_xml_get_widget (gui->dialog->gui, "notebook")), 3);
+	gtk_notebook_set_current_page (GTK_NOTEBOOK (glade_xml_get_widget (gui->dialog->gui, "notebook")), 3);
 }
 
 static void
diff --git a/mail/mail-display.c b/mail/mail-display.c
index c9da2e4ed9..3769b83586 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -66,8 +66,9 @@
 #include "folder-browser-factory.h"
 #include "mail-display-stream.h"
 #include "folder-browser.h"
-#include "mail-display.h"
 #include "mail-config.h"
+#include "mail-display.h"
+#include "mail-format.h"
 #include "mail-ops.h"
 #include "mail-mt.h"
 #include "mail.h"
diff --git a/mail/mail-format.c b/mail/mail-format.c
index f2f2c3d01f..fefa9ef721 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -48,6 +48,7 @@
 #include "mail.h"
 #include "mail-tools.h"
 #include "mail-display.h"
+#include "mail-format.h"
 #include "mail-mt.h"
 #include "mail-crypto.h"
 
diff --git a/mail/mail-local.c b/mail/mail-local.c
index 490514be9d..af32b45fa2 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -1458,34 +1458,34 @@ reconfigure_got_folder(char *uri, CamelFolder *folder, void *data)
 	m->newtype = NULL;
 	m->folder = folder;
 	camel_object_ref(folder);
-
+	
 	/* dynamically create the folder type list from camel */
 	/* we assume the list is static and never freed */
 	currentformat = MAIL_LOCAL_FOLDER (folder)->meta->format;
-	p = camel_session_list_providers(session, TRUE);
-	menu = gtk_menu_new();
+	p = camel_session_list_providers (session, TRUE);
+	menu = gtk_menu_new ();
 	while (p) {
 		CamelProvider *cp = p->data;
-
+		
 		/* we only want local providers */
 		if (cp->flags & CAMEL_PROVIDER_IS_LOCAL) {
 			GtkWidget *item;
 			char *label;
-
-			if (strcmp(cp->protocol, currentformat) == 0)
+			
+			if (!strcmp (cp->protocol, currentformat))
 				history = index;
-
+			
 			label = g_strdup_printf("%s (%s)", cp->protocol, _(cp->name));
-			item = gtk_menu_item_new_with_label(label);
-			g_free(label);
-			g_object_set_data(G_OBJECT(item), "type", cp->protocol);
-			gtk_widget_show(item);
-			gtk_menu_append(GTK_MENU(menu), item);
+			item = gtk_menu_item_new_with_label (label);
+			g_free (label);
+			g_object_set_data ((GObject *) item, "type", cp->protocol);
+			gtk_widget_show (item);
+			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 			index++;
 		}
 		p = p->next;
 	}
-	gtk_option_menu_remove_menu (GTK_OPTION_MENU(m->optionlist));
+	gtk_option_menu_remove_menu (GTK_OPTION_MENU (m->optionlist));
 	gtk_option_menu_set_menu (GTK_OPTION_MENU(m->optionlist), menu);
 	gtk_option_menu_set_history(GTK_OPTION_MENU(m->optionlist), history);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m->check_index_body), MAIL_LOCAL_FOLDER (folder)->meta->indexed);
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 2877a7786a..43b47032a9 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -428,7 +428,7 @@ mail_vfolder_delete_uri(CamelStore *store, const char *uri)
 								      0, NULL, rule_changed, vf);
 				vfolder_rule_remove_source ((VfolderRule *)rule, source);
 				g_signal_connect (rule, "changed", G_CALLBACK(rule_changed), vf);
-				g_string_sprintfa (changed, "    %s\n", rule->name);
+				g_string_append_printf (changed, "    %s\n", rule->name);
 				source = NULL;
 			}
 		}
diff --git a/mail/mail.h b/mail/mail.h
index 627ca3526d..082403d173 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -35,39 +35,6 @@
 
 extern char *evolution_dir;
 
-/* mail-format */
-GByteArray *mail_format_get_data_wrapper_text (CamelDataWrapper *data,
-					       MailDisplay *mail_display);
-
-void mail_format_mime_message (CamelMimeMessage *mime_message,
-			       MailDisplay *md, MailDisplayStream *stream);
-void mail_format_raw_message (CamelMimeMessage *mime_message,
-			      MailDisplay *md, MailDisplayStream *stream);
-
-gboolean mail_content_loaded (CamelDataWrapper *wrapper,
-			      MailDisplay *display,
-			      gboolean redisplay,
-			      const gchar *url,
-			      GtkHTML *html,
-			      GtkHTMLStream *handle);
-
-typedef gboolean (*MailMimeHandlerFn) (CamelMimePart *part, const char *mime_type,
-				       MailDisplay *md, MailDisplayStream *stream);
-typedef struct {
-	gboolean generic;
-	Bonobo_ServerInfo *component;
-	GList *applications;
-	MailMimeHandlerFn builtin;
-} MailMimeHandler;
-
-MailMimeHandler *mail_lookup_handler (const char *mime_type);
-
-gboolean mail_part_is_inline (CamelMimePart *part);
-gboolean mail_part_is_displayed_inline (CamelMimePart *part, MailDisplay *md);
-void     mail_part_toggle_displayed (CamelMimePart *part, MailDisplay *md);
-
-char *mail_get_message_body (CamelDataWrapper *data, gboolean want_plain, gboolean cite);
-
 /* mail-identify */
 char *mail_identify_mime_part (CamelMimePart *part, MailDisplay *md);