Skip to content

Commit 66634a4

Browse files
danirabbitzeebok
danirabbit
and
zeebok
authored
Drop support for old EDS (#848)
* Drop support for old EDS * drop empty soup dep --------- Co-authored-by: Ryan Kornheisl <ryan@skarva.tech>
1 parent c67a0c6 commit 66634a4

7 files changed

Lines changed: 3 additions & 54 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ You'll need the following dependencies:
1111
* libchamplain-gtk-0.12-dev
1212
* libclutter-1.0-dev
1313
* libecal1.2-dev
14-
* libedataserverui1.2-dev
14+
* libedataserverui1.2-dev >=3.46
1515
* libfolks-dev
1616
* libgee-0.8-dev
1717
* libgeocode-glib-dev

‎core/meson.build‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ core_deps = [
3535
libedataserver_dep,
3636
libedataserverui_dep,
3737
libical_dep,
38-
libsoup_dep,
3938
gmodule_dep
4039
]
4140

‎meson.build‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,8 @@ granite_dep = dependency('granite', version: '>=6.2.0')
2828
gtk_dep = dependency('gtk+-3.0', version: '>=3.22')
2929
handy_dep = dependency('libhandy-1', version: '>=0.90.0')
3030
libedataserver_dep = dependency('libedataserver-1.2', version: '>=3.8.0')
31-
libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.8.0')
32-
if (libedataserver_dep.version().version_compare ('>=3.46'))
33-
libsoup_dep = []
34-
geocode_glib_dep = dependency('geocode-glib-2.0')
35-
add_project_arguments('--define', 'HAS_EDS_3_46', language: 'vala')
36-
else
37-
geocode_glib_dep = dependency('geocode-glib-1.0')
38-
libsoup_dep = dependency('libsoup-2.4')
39-
endif
31+
libedataserverui_dep = dependency('libedataserverui-1.2', version: '>=3.46')
32+
geocode_glib_dep = dependency('geocode-glib-2.0')
4033
gmodule_dep = dependency('gmodule-2.0')
4134
champlain_dep = dependency('champlain-0.12', fallback: ['libchamplain', 'libchamplain_dep'], default_options: ['default_library=static', 'introspection=false', 'vapi=false'])
4235
champlain_gtk_dep = dependency('champlain-gtk-0.12', fallback: ['libchamplain', 'libchamplain_gtk_dep'], default_options: ['default_library=static', 'introspection=false', 'vapi=false'])

‎plugins/CalDAV/CalDAVBackend.vala‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,7 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
7373
collection.add (url_entry);
7474
if (to_edit != null) {
7575
E.SourceWebdav webdav = (E.SourceWebdav)to_edit.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
76-
#if HAS_EDS_3_46
7776
var uri = webdav.dup_uri ();
78-
#else
79-
var uri = webdav.dup_soup_uri ();
80-
#endif
8177
if (uri.get_port () != 80) {
8278
((Gtk.Entry)url_entry.widget).text = "%s://%s:%u%s".printf (uri.get_scheme (), uri.get_host (), uri.get_port (), uri.get_path ());
8379
} else {
@@ -151,11 +147,7 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
151147
foreach (var widget in widgets) {
152148
switch (widget.ref_name) {
153149
case "url_entry":
154-
#if HAS_EDS_3_46
155150
webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
156-
#else
157-
webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
158-
#endif
159151
break;
160152
case "user_entry":
161153
auth.user = ((Gtk.Entry)widget.widget).text;
@@ -198,11 +190,7 @@ public class Maya.CalDavBackend : GLib.Object, Maya.Backend {
198190
foreach (var widget in widgets) {
199191
switch (widget.ref_name) {
200192
case "url_entry":
201-
#if HAS_EDS_3_46
202193
webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
203-
#else
204-
webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
205-
#endif
206194
break;
207195
case "user_entry":
208196
auth.user = ((Gtk.Entry)widget.widget).text;

‎plugins/Google/GoogleBackend.vala‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
8383
}
8484

8585
auth.user = decoded_user;
86-
#if HAS_EDS_3_46
8786
webdav.uri = GLib.Uri.build (
8887
GLib.UriFlags.NONE,
8988
"https",
@@ -94,14 +93,6 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
9493
null,
9594
null
9695
);
97-
#else
98-
var soup_uri = new Soup.URI (null);
99-
soup_uri.set_host ("www.google.com");
100-
soup_uri.set_scheme ("https");
101-
soup_uri.set_user (decoded_user);
102-
soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
103-
webdav.soup_uri = soup_uri;
104-
#endif
10596
break;
10697
case "keep_copy":
10798
offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
@@ -141,7 +132,6 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
141132
}
142133

143134
auth.user = decoded_user;
144-
#if HAS_EDS_3_46
145135
webdav.uri = GLib.Uri.build (
146136
GLib.UriFlags.NONE,
147137
"https",
@@ -152,14 +142,6 @@ public class Maya.GoogleBackend : GLib.Object, Maya.Backend {
152142
null,
153143
null
154144
);
155-
#else
156-
var soup_uri = new Soup.URI (null);
157-
soup_uri.set_host ("www.google.com");
158-
soup_uri.set_scheme ("https");
159-
soup_uri.set_user (decoded_user);
160-
soup_uri.set_path ("/calendar/dav/%s/events".printf (decoded_user));
161-
webdav.soup_uri = soup_uri;
162-
#endif
163145
break;
164146
case "keep_copy":
165147
offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);

‎plugins/Web/WebBackend.vala‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ public class Maya.WebBackend : GLib.Object, Maya.Backend {
6060
collection.add (url_entry);
6161
if (to_edit != null) {
6262
E.SourceWebdav webdav = (E.SourceWebdav)to_edit.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND);
63-
#if HAS_EDS_3_46
6463
var uri = webdav.dup_uri ();
65-
#else
66-
var uri = webdav.dup_soup_uri ();
67-
#endif
6864
if (uri.get_port () != 80) {
6965
((Gtk.Entry)url_entry.widget).text = "%s://%s:%u%s".printf (uri.get_scheme (), uri.get_host (), uri.get_port (), uri.get_path ());
7066
} else {
@@ -91,11 +87,7 @@ public class Maya.WebBackend : GLib.Object, Maya.Backend {
9187
foreach (var widget in widgets) {
9288
switch (widget.ref_name) {
9389
case "url_entry":
94-
#if HAS_EDS_3_46
9590
webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
96-
#else
97-
webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
98-
#endif
9991
break;
10092
case "keep_copy":
10193
offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);
@@ -130,11 +122,7 @@ public class Maya.WebBackend : GLib.Object, Maya.Backend {
130122
foreach (var widget in widgets) {
131123
switch (widget.ref_name) {
132124
case "url_entry":
133-
#if HAS_EDS_3_46
134125
webdav.uri = GLib.Uri.parse (((Gtk.Entry)widget.widget).text, GLib.UriFlags.NONE);
135-
#else
136-
webdav.soup_uri = new Soup.URI (((Gtk.Entry)widget.widget).text);
137-
#endif
138126
break;
139127
case "keep_copy":
140128
offline.set_stay_synchronized (((Gtk.CheckButton)widget.widget).active);

‎src/meson.build‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ calendar_deps = [
4949
libedataserver_dep,
5050
libedataserverui_dep,
5151
libical_dep,
52-
libsoup_dep,
5352
gmodule_dep,
5453
m_dep,
5554
champlain_dep,

0 commit comments

Comments
 (0)