evolution r36165 - branches/mail-dbus-remoting/mail

[sragavan svn gnome org]

Author: sragavan
Date: Thu Aug 28 13:55:59 2008
New Revision: 36165
URL: http://svn.gnome.org/viewvc/evolution?rev=36165&view=rev

Log:
Use remote form of getting service store name.


Modified:
   branches/mail-dbus-remoting/mail/em-folder-tree.c
   branches/mail-dbus-remoting/mail/mail-component.c
   branches/mail-dbus-remoting/mail/mail-folder-cache.c
   branches/mail-dbus-remoting/mail/mail-ops.c
   branches/mail-dbus-remoting/mail/message-list.c

Modified: branches/mail-dbus-remoting/mail/em-folder-tree.c
==============================================================================
--- branches/mail-dbus-remoting/mail/em-folder-tree.c	(original)
+++ branches/mail-dbus-remoting/mail/em-folder-tree.c	Thu Aug 28 13:55:59 2008
@@ -1716,7 +1716,7 @@
 {
 	char *ret, *name;
 
-	name = camel_service_get_name((CamelService *)m->store, TRUE);
+	name = camel_store_get_service_name_remote((CamelService *)m->store, TRUE);
 	ret = g_strdup_printf(_("Scanning folders in \"%s\""), name);
 	g_free(name);
 	return ret;

Modified: branches/mail-dbus-remoting/mail/mail-component.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-component.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-component.c	Thu Aug 28 13:55:59 2008
@@ -179,7 +179,7 @@
 	si = g_malloc0(sizeof(*si));
 	si->ref_count = 1;
 	if (name == NULL)
-		si->name = camel_service_get_name((CamelService *)store, TRUE);
+		si->name = camel_store_get_service_name_remote((CamelService *)store, TRUE);
 	else
 		si->name = g_strdup(name);
 	si->store = store;

Modified: branches/mail-dbus-remoting/mail/mail-folder-cache.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-folder-cache.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-folder-cache.c	Thu Aug 28 13:55:59 2008
@@ -826,7 +826,7 @@
 static gchar *
 ping_store_desc (struct _ping_store_msg *m)
 {
-	char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE);
+	char *service_name = camel_store_get_service_name_remote (CAMEL_SERVICE (m->store), TRUE);
 	char *msg;
 
 	msg = g_strdup_printf (_("Pinging %s"), service_name);

Modified: branches/mail-dbus-remoting/mail/mail-ops.c
==============================================================================
--- branches/mail-dbus-remoting/mail/mail-ops.c	(original)
+++ branches/mail-dbus-remoting/mail/mail-ops.c	Thu Aug 28 13:55:59 2008
@@ -1057,7 +1057,7 @@
 {
 	char *ret, *name;
 
-	name = camel_service_get_name((CamelService *)m->store, TRUE);
+	name = camel_store_get_service_name_remote((CamelService *)m->store, TRUE);
 	ret = g_strdup_printf(_("Scanning folders in \"%s\""), name);
 	g_free(name);
 	return ret;
@@ -1272,7 +1272,7 @@
 static gchar *
 get_quota_desc (struct _get_quota_msg *m)
 {
-	return g_strdup_printf(_("Retrieving quota information for folder %s"), camel_folder_get_name (m->folder));
+	return g_strdup_printf(_("Retrieving quota information for folder %s"), camel_folder_get_name(m->folder));
 }
 
 static void
@@ -2314,7 +2314,7 @@
 static gchar *
 set_offline_desc (struct _set_offline_msg *m)
 {
-	char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE);
+	char *service_name = camel_store_get_service_name_remote(CAMEL_SERVICE (m->store), TRUE);
 	char *msg;
 
 	msg = g_strdup_printf(m->offline?_("Disconnecting from %s"):_("Reconnecting to %s"),
@@ -2410,7 +2410,7 @@
 static char *
 prepare_offline_desc (struct _set_offline_msg *m)
 {
-	char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE);
+	char *service_name = camel_store_get_service_name_remote(CAMEL_SERVICE (m->store), TRUE);
 	char *msg;
 
 	msg = g_strdup_printf (_("Preparing account '%s' for offline"), service_name);

Modified: branches/mail-dbus-remoting/mail/message-list.c
==============================================================================
--- branches/mail-dbus-remoting/mail/message-list.c	(original)
+++ branches/mail-dbus-remoting/mail/message-list.c	Thu Aug 28 13:55:59 2008
@@ -1845,7 +1845,7 @@
 			      "uniform_row_height", TRUE,
 			      NULL);
 
-		name = camel_service_get_name (CAMEL_SERVICE (message_list->folder->parent_store), TRUE);
+		name = camel_store_get_service_name_remote (CAMEL_SERVICE (message_list->folder->parent_store), TRUE);
 		d(printf ("folder name is '%s'\n", name));
 
 		path = mail_config_folder_to_cachename (message_list->folder, "et-expanded-");