From ea0fdf21ece0f81b6bbe3c08e1c21da76280acd4 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 17 Apr 2011 13:13:55 -0400
Subject: Adapt to sealed up CamelService.

---
 mail/em-composer-utils.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'mail/em-composer-utils.c')

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 752a78af07..b916e15d29 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2042,11 +2042,16 @@ reply_get_composer (EShell *shell,
 
 		if (folder) {
 			CamelStore *parent_store;
+			CamelService *service;
+			CamelURL *url;
 
 			parent_store = camel_folder_get_parent_store (folder);
+
+			service = CAMEL_SERVICE (parent_store);
+			url = camel_service_get_camel_url (service);
+
 			store_url = camel_url_to_string (
-				CAMEL_SERVICE (parent_store)->url,
-				CAMEL_URL_HIDE_ALL);
+				url, CAMEL_URL_HIDE_ALL);
 			if (store_url[strlen (store_url) - 1] == '/')
 				store_url[strlen (store_url)-1] = '\0';
 		}
-- 
cgit 

tw44/cgit/cgit.cgi/'><img src='/~lantw44/cgit-data/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/~lantw44/cgit/cgit.cgi/'>index</a> : <a title='freebsd-ports' href='/~lantw44/cgit/cgit.cgi/freebsd-ports/'>freebsd-ports</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='aeb82f20ffa842c8bb1d377d76fa973391ff008a'/><select name='h' onchange='this.form.submit();'>
<option value='2014Q1'>2014Q1</option>
<option value='2014Q2'>2014Q2</option>
<option value='2014Q3'>2014Q3</option>
<option value='2014Q4'>2014Q4</option>
<option value='2015Q1'>2015Q1</option>
<option value='2015Q2'>2015Q2</option>
<option value='2015Q3'>2015Q3</option>
<option value='2015Q4'>2015Q4</option>
<option value='2016Q1'>2016Q1</option>
<option value='2016Q2'>2016Q2</option>
<option value='2016Q3'>2016Q3</option>
<option value='2016Q4'>2016Q4</option>
<option value='2017Q1'>2017Q1</option>
<option value='2017Q2'>2017Q2</option>
<option value='2017Q3'>2017Q3</option>
<option value='2017Q4'>2017Q4</option>
<option value='2018Q1'>2018Q1</option>
<option value='2018Q2'>2018Q2</option>
<option value='2018Q3'>2018Q3</option>
<option value='2018Q4'>2018Q4</option>
<option value='2019Q1'>2019Q1</option>
<option value='2019Q2'>2019Q2</option>
<option value='2019Q3'>2019Q3</option>
<option value='2019Q4'>2019Q4</option>
<option value='2020Q1'>2020Q1</option>
<option value='2020Q2'>2020Q2</option>
<option value='2020Q3'>2020Q3</option>
<option value='2020Q4'>2020Q4</option>
<option value='2021Q1'>2021Q1</option>
<option value='2021Q2'>2021Q2</option>
<option value='2021Q3'>2021Q3</option>
<option value='2021Q4'>2021Q4</option>
<option value='2022Q1'>2022Q1</option>
<option value='2022Q2'>2022Q2</option>
<option value='2022Q3'>2022Q3</option>
<option value='2022Q4'>2022Q4</option>
<option value='2023Q1'>2023Q1</option>
<option value='2023Q2'>2023Q2</option>
<option value='2023Q3'>2023Q3</option>
<option value='2023Q4'>2023Q4</option>
<option value='2024Q1'>2024Q1</option>
<option value='2024Q2'>2024Q2</option>
<option value='2024Q3'>2024Q3</option>
<option value='2024Q4'>2024Q4</option>
<option value='2025Q1'>2025Q1</option>
<option value='2025Q2'>2025Q2</option>
<option value='2025Q3'>2025Q3</option>
<option value='branches/2014Q1'>branches/2014Q1</option>
<option value='branches/2014Q2'>branches/2014Q2</option>
<option value='branches/2014Q3'>branches/2014Q3</option>
<option value='branches/2014Q4'>branches/2014Q4</option>
<option value='branches/2015Q1'>branches/2015Q1</option>
<option value='branches/2015Q2'>branches/2015Q2</option>
<option value='branches/2015Q3'>branches/2015Q3</option>
<option value='branches/2015Q4'>branches/2015Q4</option>
<option value='branches/2016Q1'>branches/2016Q1</option>
<option value='branches/2016Q2'>branches/2016Q2</option>
<option value='branches/2016Q3'>branches/2016Q3</option>
<option value='branches/2016Q4'>branches/2016Q4</option>
<option value='branches/2017Q1'>branches/2017Q1</option>
<option value='branches/2017Q2'>branches/2017Q2</option>
<option value='branches/2017Q3'>branches/2017Q3</option>
<option value='branches/2017Q4'>branches/2017Q4</option>
<option value='branches/2018Q1'>branches/2018Q1</option>
<option value='branches/2018Q2'>branches/2018Q2</option>
<option value='branches/2018Q3'>branches/2018Q3</option>
<option value='branches/2018Q4'>branches/2018Q4</option>
<option value='branches/2019Q1'>branches/2019Q1</option>
<option value='branches/2019Q2'>branches/2019Q2</option>
<option value='branches/2019Q3'>branches/2019Q3</option>
<option value='branches/2019Q4'>branches/2019Q4</option>
<option value='branches/2020Q1'>branches/2020Q1</option>
<option value='branches/2020Q2'>branches/2020Q2</option>
<option value='branches/2020Q3'>branches/2020Q3</option>
<option value='branches/2020Q4'>branches/2020Q4</option>
<option value='branches/2021Q1'>branches/2021Q1</option>
<option value='branches/RELEASE_8_4_0'>branches/RELEASE_8_4_0</option>
<option value='branches/RELENG_2_1_0'>branches/RELENG_2_1_0</option>
<option value='branches/RELENG_2_2'>branches/RELENG_2_2</option>
<option value='branches/RELENG_9_1_0'>branches/RELENG_9_1_0</option>
<option value='branches/RELENG_9_2_0'>branches/RELENG_9_2_0</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3' selected='selected'>dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/lodash-4.17.15'>dependabot/npm_and_yarn/devel/electron4/files/lodash-4.17.15</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/lodash.merge-4.6.2'>dependabot/npm_and_yarn/devel/electron4/files/lodash.merge-4.6.2</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/lodash.template-4.5.0'>dependabot/npm_and_yarn/devel/electron4/files/lodash.template-4.5.0</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/minimist-1.2.2'>dependabot/npm_and_yarn/devel/electron4/files/minimist-1.2.2</option>
<option value='dependabot/npm_and_yarn/devel/electron4/files/mixin-deep-1.3.2'>dependabot/npm_and_yarn/devel/electron4/files/mixin-deep-1.3.2</option>
<option value='main'>main</option>
<option value='master'>master</option>
<option value='svn_head'>svn_head</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>FreeBSD Ports (https://github.com/freebsd/freebsd-ports)</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/about/?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'>about</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'>summary</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/refs/?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&amp;id=aeb82f20ffa842c8bb1d377d76fa973391ff008a'>refs</a><a class='active' href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/net/frickin?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'>log</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/tree/net/frickin?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&amp;id=aeb82f20ffa842c8bb1d377d76fa973391ff008a'>tree</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/commit/net/frickin?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&amp;id=aeb82f20ffa842c8bb1d377d76fa973391ff008a'>commit</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/diff/net/frickin?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&amp;id=aeb82f20ffa842c8bb1d377d76fa973391ff008a'>diff</a><a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/stats/net/frickin?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'>stats</a></td><td class='form'><form class='right' method='get' action='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/net/frickin'>
<input type='hidden' name='h' value='dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3'/><input type='hidden' name='id' value='aeb82f20ffa842c8bb1d377d76fa973391ff008a'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&amp;id=aeb82f20ffa842c8bb1d377d76fa973391ff008a'>root</a>/<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/net?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&amp;id=aeb82f20ffa842c8bb1d377d76fa973391ff008a'>net</a>/<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/net/frickin?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&amp;id=aeb82f20ffa842c8bb1d377d76fa973391ff008a'>frickin</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/~lantw44/cgit/cgit.cgi/freebsd-ports/log/net/frickin?h=dependabot/npm_and_yarn/devel/electron4/files/eslint-utils-1.4.3&amp;id=aeb82f20ffa842c8bb1d377d76fa973391ff008a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th><th class='left'>Age</th><th class='left'>Files</th><th class='left'>Lines</th></tr>