evolution r36209 - branches/mail-dbus-remoting/mail

[sragavan svn gnome org]

Author: sragavan
Date: Fri Aug 29 19:58:13 2008
New Revision: 36209
URL: http://svn.gnome.org/viewvc/evolution?rev=36209&view=rev

Log:
Urls fixed and func defs


Modified:
   branches/mail-dbus-remoting/mail/mail-tools.c
   branches/mail-dbus-remoting/mail/mail-tools.h

Modified: branches/mail-dbus-remoting/mail/mail-tools.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-tools.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-tools.c	Fri Aug 29 19:58:13 2008
@@ -384,19 +384,20 @@
 
 /* FIXME: This should be a property on CamelFolder */
 char *
-mail_tools_folder_to_url (CamelFolder *folder)
+mail_tools_folder_to_url (CamelObjectRemote *folder)
 {
 	CamelURL *url;
 	char *out;
+	CamelObjectRemote *store = camel_folder_remote_get_parent_store (folder);
+	char *full_name = camel_folder_remote_get_full_name (folder);
 
-	url = camel_url_new ();
-	url = camel_url_copy(((CamelService *)folder->parent_store)->url);
-	if (((CamelService *)folder->parent_store)->provider->url_flags  & CAMEL_URL_FRAGMENT_IS_PATH) {
-		camel_url_set_fragment(url, folder->full_name);
+	url = camel_url_new (camel_store_get_url_remote (store), NULL);
+	if (camel_store_get_url_flags_remote(store)  & CAMEL_URL_FRAGMENT_IS_PATH) {
+		camel_url_set_fragment(url, full_name);
 	} else {
-		char *name = g_alloca(strlen(folder->full_name)+2);
+		char *name = g_alloca(strlen(full_name)+2);
 
-		sprintf(name, "/%s", folder->full_name);
+		sprintf(name, "/%s", full_name);
 		camel_url_set_path(url, name);
 	}
 

Modified: branches/mail-dbus-remoting/mail/mail-tools.h
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-tools.h	(original)
+++ branches/mail-dbus-remoting/mail/mail-tools.h	Fri Aug 29 19:58:13 2008
@@ -24,7 +24,7 @@
 #define MAIL_TOOLS_H
 
 #include <glib.h>
-
+#include "camel-object-remote.h"
 struct _CamelFolder;
 struct _CamelException;
 struct _CamelMimeMessage;
@@ -57,6 +57,6 @@
 
 struct _CamelFolder *mail_tools_x_evolution_message_parse (char *in, unsigned int inlen, GPtrArray **uids);
 
-char *mail_tools_folder_to_url (struct _CamelFolder *folder);
+char *mail_tools_folder_to_url (CamelObjectRemote *folder);
 
 #endif