Merge branch 'feature/upstream' into develop

48 files changed, 84 insertions, 94 deletions

diff --git a/NEWS b/NEWS
index ff885dd..d05f550 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Shotwell 0.30.7 - 20 Aug 2019
+  * Fix compatibility with Vala 0.46
+
+Shotwell 0.30.6 - 20 Aug 2019
+  * Fix issue with Flickr authentication introduced in 0.30.5
+
 Shotwell 0.30.5 - 14 Aug 2019
   * Update appdata release information
   * Fix crash in Piwigo if system certificate store is empty
diff --git a/meson.build b/meson.build
index 1b8e72e..ebc9847 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('shotwell', ['vala', 'c'],
-        version : '0.30.5',
+        version : '0.30.7',
         meson_version : '>= 0.43.0',
         default_options : ['buildtype=debugoptimized'])
 
diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
index ea4d9ce..82448e2 100644
--- a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
@@ -51,6 +51,10 @@ namespace Publishing.Authenticator.Shotwell.Flickr {
 
             var ctx = WebKit.WebContext.get_default();
             ctx.register_uri_scheme("shotwell-auth", this.on_shotwell_auth_request_cb);
+
+            var mgr = ctx.get_security_manager();
+            mgr.register_uri_scheme_as_secure("shotwell-auth");
+            mgr.register_uri_scheme_as_cors_enabled("shotwell-auth");
         }
 
         public override void on_page_load() {
diff --git a/plugins/authenticator/shotwell/OAuth1Authenticator.vala b/plugins/authenticator/shotwell/OAuth1Authenticator.vala
index 399b66f..39752ec 100644
--- a/plugins/authenticator/shotwell/OAuth1Authenticator.vala
+++ b/plugins/authenticator/shotwell/OAuth1Authenticator.vala
@@ -12,7 +12,7 @@ namespace Publishing.Authenticator.Shotwell.OAuth1 {
         protected Publishing.RESTSupport.OAuth1.Session session;
         protected Spit.Publishing.PluginHost host;
 
-        public Authenticator(string api_key, string api_secret, Spit.Publishing.PluginHost host) {
+        protected Authenticator(string api_key, string api_secret, Spit.Publishing.PluginHost host) {
             base();
             this.host = host;
 
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index 5cd3768..0d0a3fb 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -31,7 +31,7 @@ public abstract class Session {
     public signal void authenticated();
     public signal void authentication_failed(Spit.Publishing.PublishingError err);
 
-    public Session(string? endpoint_url = null) {
+    protected Session(string? endpoint_url = null) {
         this.endpoint_url = endpoint_url;
         soup_session = new Soup.Session ();
         this.soup_session.ssl_use_system_ca_file = true;
@@ -685,7 +685,7 @@ public abstract class BatchUploader {
     public signal void upload_complete(int num_photos_published);
     public signal void upload_error(Spit.Publishing.PublishingError err);
 
-    public BatchUploader(Session session, Spit.Publishing.Publishable[] publishables) {
+    protected BatchUploader(Session session, Spit.Publishing.Publishable[] publishables) {
         this.publishables = publishables;
         this.session = session;
     }
diff --git a/plugins/common/WebAuthenticationPane.vala b/plugins/common/WebAuthenticationPane.vala
index 1704780..43afe65 100644
--- a/plugins/common/WebAuthenticationPane.vala
+++ b/plugins/common/WebAuthenticationPane.vala
@@ -43,6 +43,11 @@ namespace Shotwell.Plugins.Common {
         }
 
         private bool on_page_load_failed (WebKit.LoadEvent load_event, string uri, Error error) {
+            // OAuth call-back scheme. Produces a load error because it is not HTTP(S)
+            // Do not set the load_error, but continue the error handling
+            if (uri.has_prefix ("shotwell-auth://"))
+                return false;
+
             critical ("Failed to load uri %s: %s", uri, error.message);
             this.load_error = error;
 
diff --git a/plugins/shotwell-publishing/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
index c979b26..1633269 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -1002,7 +1002,7 @@ internal class GraphSession {
         public weak GraphSession host_session;
         public int bytes_so_far;
         
-        public GraphMessageImpl(GraphSession host_session, Publishing.RESTSupport.HttpMethod method,
+        protected GraphMessageImpl(GraphSession host_session, Publishing.RESTSupport.HttpMethod method,
             string relative_uri, string access_token, Endpoint endpoint = Endpoint.DEFAULT) {
             this.method = method;
             this.access_token = access_token;
diff --git a/plugins/shotwell-transitions/shotwell-transitions.vala b/plugins/shotwell-transitions/shotwell-transitions.vala
index 7673414..1d2344f 100644
--- a/plugins/shotwell-transitions/shotwell-transitions.vala
+++ b/plugins/shotwell-transitions/shotwell-transitions.vala
@@ -56,7 +56,7 @@ public abstract class ShotwellTransitionDescriptor : Object, Spit.Pluggable, Spi
 
     private static Gdk.Pixbuf[] icon_pixbuf_set = null;
     
-    public ShotwellTransitionDescriptor(GLib.File resource_directory) {
+    protected ShotwellTransitionDescriptor(GLib.File resource_directory) {
         if (icon_pixbuf_set == null)
             icon_pixbuf_set =
                 Resources.load_from_resource(Resources.RESOURCE_PATH + "/" + ICON_FILENAME);
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 5c1496e..a5b27a4 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -283,7 +283,7 @@ public abstract class PageWindow : Gtk.ApplicationWindow {
     protected virtual void switched_pages(Page? old_page, Page? new_page) {
     }
     
-    public PageWindow() {
+    protected PageWindow() {
         Object (application: Application.get_instance().get_system_app ());
 
         // the current page needs to know when modifier keys are pressed
@@ -407,7 +407,7 @@ public abstract class AppWindow : PageWindow {
     protected int pos_x = 0;
     protected int pos_y = 0;
     
-    public AppWindow() {
+    protected AppWindow() {
         base();
 
         // although there are multiple AppWindow types, only one may exist per-process
diff --git a/src/CheckerboardLayout.vala b/src/CheckerboardLayout.vala
index c2d1a52..70e3b5c 100644
--- a/src/CheckerboardLayout.vala
+++ b/src/CheckerboardLayout.vala
@@ -138,7 +138,7 @@ public abstract class CheckerboardItem : ThumbnailView {
     private int row = -1;
     private int horizontal_trinket_offset = 0;
     
-    public CheckerboardItem(ThumbnailSource source, Dimensions initial_pixbuf_dim, string title, string? comment,
+    protected CheckerboardItem(ThumbnailSource source, Dimensions initial_pixbuf_dim, string title, string? comment,
         bool marked_up = false, Pango.Alignment alignment = Pango.Alignment.LEFT) {
         base(source);
         
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index 4206ec8..ac05f8b 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -29,7 +29,7 @@ public abstract class CollectionPage : MediaPage {
     private ExporterUI exporter = null;
     private CollectionSearchViewFilter search_filter = new CollectionSearchViewFilter();
     
-    public CollectionPage(string page_name) {
+    protected CollectionPage(string page_name) {
         base (page_name);
         
         get_view().items_altered.connect(on_photos_altered);
diff --git a/src/ColorTransformation.vala b/src/ColorTransformation.vala
index 8595e96..6a1f822 100644
--- a/src/ColorTransformation.vala
+++ b/src/ColorTransformation.vala
@@ -268,8 +268,8 @@ public abstract class PixelTransformation {
     private PixelTransformationType type;
     private PixelFormat preferred_format;
     
-    public PixelTransformation(PixelTransformationType type,
-                               PixelFormat preferred_format) {
+    protected PixelTransformation(PixelTransformationType type,
+                                  PixelFormat preferred_format) {
         this.type = type;
         this.preferred_format = preferred_format;
     }
@@ -476,7 +476,7 @@ public class RGBTransformation : PixelTransformation {
 public abstract class HSVTransformation : PixelTransformation {
     protected float remap_table[256];
 
-    public HSVTransformation(PixelTransformationType type) {
+    protected HSVTransformation(PixelTransformationType type) {
         base(type, PixelFormat.HSV);
     }
 
diff --git a/src/CommandManager.vala b/src/CommandManager.vala
index c7e40ab..398dc46 100644
--- a/src/CommandManager.vala
+++ b/src/CommandManager.vala
@@ -29,7 +29,7 @@ public abstract class Command : Object, CommandDescription {
     private string explanation;
     private weak CommandManager manager = null;
     
-    public Command(string name, string explanation) {
+    protected Command(string name, string explanation) {
         this.name = name;
         this.explanation = explanation;
     }
diff --git a/src/Commands.vala b/src/Commands.vala
index 6924f82..2b9eac1 100644
--- a/src/Commands.vala
+++ b/src/Commands.vala
@@ -12,7 +12,7 @@ public abstract class PageCommand : Command {
     private Photo library_photo = null;
     private CollectionPage collection_page = null;
     
-    public PageCommand(string name, string explanation) {
+    protected PageCommand(string name, string explanation) {
         base (name, explanation);
         
         page = AppWindow.get_instance().get_current_page();
@@ -103,7 +103,7 @@ public abstract class PageCommand : Command {
 public abstract class SingleDataSourceCommand : PageCommand {
     protected DataSource source;
     
-    public SingleDataSourceCommand(DataSource source, string name, string explanation) {
+    protected SingleDataSourceCommand(DataSource source, string name, string explanation) {
         base(name, explanation);
         
         this.source = source;
@@ -130,7 +130,7 @@ public abstract class SimpleProxyableCommand : PageCommand {
     private SourceProxy proxy;
     private Gee.HashSet<SourceProxy> proxies = new Gee.HashSet<SourceProxy>();
     
-    public SimpleProxyableCommand(Proxyable proxyable, string name, string explanation) {
+    protected SimpleProxyableCommand(Proxyable proxyable, string name, string explanation) {
         base (name, explanation);
         
         proxy = proxyable.get_proxy();
@@ -183,7 +183,7 @@ public abstract class SimpleProxyableCommand : PageCommand {
 public abstract class SinglePhotoTransformationCommand : SingleDataSourceCommand {
     private PhotoTransformationState state;
     
-    public SinglePhotoTransformationCommand(Photo photo, string name, string explanation) {
+    protected SinglePhotoTransformationCommand(Photo photo, string name, string explanation) {
         base(photo, name, explanation);
         
         state = photo.save_transformation_state();
@@ -207,7 +207,7 @@ public abstract class GenericPhotoTransformationCommand : SingleDataSourceComman
     private PhotoTransformationState original_state = null;
     private PhotoTransformationState transformed_state = null;
     
-    public GenericPhotoTransformationCommand(Photo photo, string name, string explanation) {
+    protected GenericPhotoTransformationCommand(Photo photo, string name, string explanation) {
         base(photo, name, explanation);
     }
     
@@ -282,7 +282,7 @@ public abstract class MultipleDataSourceCommand : PageCommand {
     private Gee.ArrayList<DataSource> acted_upon = new Gee.ArrayList<DataSource>();
     private Gee.HashSet<SourceCollection> hooked_collections = new Gee.HashSet<SourceCollection>();
     
-    public MultipleDataSourceCommand(Gee.Iterable<DataView> iter, string progress_text,
+    protected MultipleDataSourceCommand(Gee.Iterable<DataView> iter, string progress_text,
         string undo_progress_text, string name, string explanation) {
         base(name, explanation);
         
@@ -414,7 +414,7 @@ public abstract class MultipleDataSourceAtOnceCommand : PageCommand {
     private Gee.HashSet<DataSource> sources = new Gee.HashSet<DataSource>();
     private Gee.HashSet<SourceCollection> hooked_collections = new Gee.HashSet<SourceCollection>();
     
-    public MultipleDataSourceAtOnceCommand(Gee.Collection<DataSource> sources, string name,
+    protected MultipleDataSourceAtOnceCommand(Gee.Collection<DataSource> sources, string name,
         string explanation) {
         base (name, explanation);
         
@@ -490,7 +490,7 @@ public abstract class MultiplePhotoTransformationCommand : MultipleDataSourceCom
     private Gee.HashMap<Photo, PhotoTransformationState> map = new Gee.HashMap<
         Photo, PhotoTransformationState>();
     
-    public MultiplePhotoTransformationCommand(Gee.Iterable<DataView> iter, string progress_text,
+    protected MultiplePhotoTransformationCommand(Gee.Iterable<DataView> iter, string progress_text,
         string undo_progress_text, string name, string explanation) {
         base(iter, progress_text, undo_progress_text, name, explanation);
         
@@ -963,7 +963,7 @@ public abstract class MovePhotosCommand : Command {
 
     protected RealMovePhotosCommand real_command;
     
-    public MovePhotosCommand(string name, string explanation) {
+    protected MovePhotosCommand(string name, string explanation) {
         base(name, explanation);
     }
     
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index d99ac9f..dc9f5a0 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -612,7 +612,7 @@ internal void save_import_results(Gtk.Window? chooser_dialog_parent, string resu
 public abstract class TextEntryDialogMediator {
     private TextEntryDialog dialog;
     
-    public TextEntryDialogMediator(string title, string label, string? initial_text = null,
+    protected TextEntryDialogMediator(string title, string label, string? initial_text = null,
         Gee.Collection<string>? completion_list = null, string? completion_delimiter = null) {
         dialog = new TextEntryDialog();
         dialog.setup(on_modify_validate, title, label, initial_text, completion_list, completion_delimiter);
@@ -630,7 +630,7 @@ public abstract class TextEntryDialogMediator {
 public abstract class MultiTextEntryDialogMediator {
     private MultiTextEntryDialog dialog;
     
-    public MultiTextEntryDialogMediator(string title, string label, string? initial_text = null) {
+    protected MultiTextEntryDialogMediator(string title, string label, string? initial_text = null) {
         dialog = new MultiTextEntryDialog();
         dialog.setup(on_modify_validate, title, label, initial_text);
     }
@@ -822,7 +822,7 @@ public void multiple_object_error_dialog(Gee.ArrayList<DataObject> objects, stri
 }
 
 public abstract class TagsDialog : TextEntryDialogMediator {
-    public TagsDialog(string title, string label, string? initial_text = null) {
+    protected TagsDialog(string title, string label, string? initial_text = null) {
         base (title, label, initial_text, HierarchicalTagIndex.get_global_index().get_all_tags(),
             ",");
     }
diff --git a/src/MediaDataRepresentation.vala b/src/MediaDataRepresentation.vala
index f4b9f7d..6e6af00 100644
--- a/src/MediaDataRepresentation.vala
+++ b/src/MediaDataRepresentation.vala
@@ -36,7 +36,7 @@ public abstract class MediaSource : ThumbnailSource, Indexable {
     private Event? event = null;
     private string? indexable_keywords = null;
     
-    public MediaSource(int64 object_id = INVALID_OBJECT_ID) {
+    protected MediaSource(int64 object_id = INVALID_OBJECT_ID) {
         base (object_id);
     }
     
@@ -381,7 +381,7 @@ public abstract class MediaSourceCollection : DatabaseSourceCollection {
     public virtual signal void flagged_contents_altered() {
     }
     
-    public MediaSourceCollection(string name, GetSourceDatabaseKey source_key_func) {
+    protected MediaSourceCollection(string name, GetSourceDatabaseKey source_key_func) {
         base(name, source_key_func);
         
         trashcan = create_trashcan();
diff --git a/src/MediaInterfaces.vala b/src/MediaInterfaces.vala
index 37209cf..1a352a2 100644
--- a/src/MediaInterfaces.vala
+++ b/src/MediaInterfaces.vala
@@ -51,9 +51,6 @@
 public abstract class TransactionController {
     private int count = 0;
     
-    public TransactionController() {
-    }
-    
     ~TransactionController() {
         lock (count) {
             assert(count == 0);
diff --git a/src/MediaMetadata.vala b/src/MediaMetadata.vala
index 68f7251..b2ba1b7 100644
--- a/src/MediaMetadata.vala
+++ b/src/MediaMetadata.vala
@@ -5,9 +5,6 @@
  */
 
 public abstract class MediaMetadata {
-    public MediaMetadata() {
-    }
-    
     public abstract void read_from_file(File file) throws Error;
     
     public abstract MetadataDateTime? get_creation_date_time();
diff --git a/src/MediaMonitor.vala b/src/MediaMonitor.vala
index a36f689..9c9d62d 100644
--- a/src/MediaMonitor.vala
+++ b/src/MediaMonitor.vala
@@ -115,7 +115,7 @@ public abstract class MediaMonitor : Object {
         MonitorableUpdates>();
     private uint pending_updates_timer_id = 0;
     
-    public MediaMonitor(MediaSourceCollection sources, Cancellable cancellable) {
+    protected MediaMonitor(MediaSourceCollection sources, Cancellable cancellable) {
         this.sources = sources;
         this.cancellable = cancellable;
         
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index 8316906..f849ac3 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -161,7 +161,7 @@ public abstract class MediaPage : CheckerboardPage {
     private DragAndDropHandler dnd_handler = null;
     private MediaViewTracker tracker;
     
-    public MediaPage(string page_name) {
+    protected MediaPage(string page_name) {
         base (page_name);
         
         tracker = new MediaViewTracker(get_view());
diff --git a/src/Page.vala b/src/Page.vala
index b92eaa0..65b263b 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -1243,7 +1243,7 @@ public abstract class CheckerboardPage : Page {
         public bool super_pressed;
     }
 
-    public CheckerboardPage(string page_name) {
+    protected CheckerboardPage(string page_name) {
         base (page_name);
         
         layout = new CheckerboardLayout(get_view());
@@ -1989,7 +1989,7 @@ public abstract class SinglePhotoPage : Page {
     private bool has_saved_zoom_state = false;
     private uint32 last_nav_key = 0;
     
-    public SinglePhotoPage(string page_name, bool scale_up_to_viewport) {
+    protected SinglePhotoPage(string page_name, bool scale_up_to_viewport) {
         base(page_name);
         
         this.scale_up_to_viewport = scale_up_to_viewport;
diff --git a/src/Photo.vala b/src/Photo.vala
index ae0f489..41b6f1d 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -69,9 +69,6 @@ public abstract class PhotoTransformationState : Object {
         is_broke = true;
     }
     
-    protected PhotoTransformationState() {
-    }
-    
     public bool is_broken() {
         return is_broke;
     }
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index af1d50c..bced0ea 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -417,7 +417,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
     private ZoomBuffer? zoom_buffer = null;
     private Gee.HashMap<string, int> last_locations = new Gee.HashMap<string, int>();
     
-    public EditingHostPage(SourceCollection sources, string name) {
+    protected EditingHostPage(SourceCollection sources, string name) {
         base(name, false);
         
         this.sources = sources;
diff --git a/src/PixbufCache.vala b/src/PixbufCache.vala
index 6ab4426..6ff740e 100644
--- a/src/PixbufCache.vala
+++ b/src/PixbufCache.vala
@@ -25,7 +25,7 @@ public class PixbufCache : Object {
         public Gdk.Pixbuf pixbuf = null;
         public Error err = null;
         
-        public FetchJob(PixbufCache owner, BackgroundJob.JobPriority priority, Photo photo, 
+        protected FetchJob(PixbufCache owner, BackgroundJob.JobPriority priority, Photo photo, 
             Scaling scaling, CompletionCallback callback) {
             base(owner, callback, new Cancellable(), null, new Semaphore());
             
diff --git a/src/Properties.vala b/src/Properties.vala
index 2a07bb0..ad0a041 100644
--- a/src/Properties.vala
+++ b/src/Properties.vala
@@ -7,7 +7,7 @@
 private abstract class Properties : Gtk.Grid {
     uint line_count = 0;
 
-    public Properties() {
+    protected Properties() {
         row_spacing = 6;
         column_spacing = 12;
     }
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index 857a901..533dfe6 100644
--- a/src/VideoSupport.vala
+++ b/src/VideoSupport.vala
@@ -232,7 +232,11 @@ public class VideoReader {
         debug("Thumbnailer timer called");
         if (thumbnailer_pid != 0) {
             debug("Killing thumbnailer process: %d", thumbnailer_pid);
+#if VALA_0_40
+            Posix.kill(thumbnailer_pid, Posix.Signal.KILL);
+#else
             Posix.kill(thumbnailer_pid, Posix.SIGKILL);
+#endif
         }
         return false; // Don't call again.
     }
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 0839590..3f70f08 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -25,7 +25,7 @@ abstract class ImportSource : ThumbnailSource, Indexable {
     private Gdk.Pixbuf? preview = null;
     private string? indexable_keywords = null;
     
-    public ImportSource(string camera_name, GPhoto.Camera camera, int fsid, string folder,
+    protected ImportSource(string camera_name, GPhoto.Camera camera, int fsid, string folder,
         string filename, ulong file_size, time_t modification_time) {
         this.camera_name = camera_name;
         this.camera = camera;
diff --git a/src/core/ContainerSourceCollection.vala b/src/core/ContainerSourceCollection.vala
index cf6218a..0b231dc 100644
--- a/src/core/ContainerSourceCollection.vala
+++ b/src/core/ContainerSourceCollection.vala
@@ -35,7 +35,7 @@ public abstract class ContainerSourceCollection : DatabaseSourceCollection {
         Gee.Collection<DataSource> sources) {
     }
     
-    public ContainerSourceCollection(string backlink_name, string name,
+    protected ContainerSourceCollection(string backlink_name, string name,
         GetSourceDatabaseKey source_key_func) {
         base (name, source_key_func);
         
diff --git a/src/core/DataObject.vala b/src/core/DataObject.vala
index 3c98e9e..62241b5 100644
--- a/src/core/DataObject.vala
+++ b/src/core/DataObject.vala
@@ -35,7 +35,7 @@ public abstract class DataObject : Object {
     
     // NOTE: Supplying an object ID should *only* be used when reconstituting the object (generally
     // only done by DataSources).
-    public DataObject(int64 object_id = INVALID_OBJECT_ID) {
+    protected DataObject(int64 object_id = INVALID_OBJECT_ID) {
         this.object_id = (object_id == INVALID_OBJECT_ID) ? object_id_generator++ : object_id;
     }
     
diff --git a/src/core/DataSource.vala b/src/core/DataSource.vala
index 352ac54..3f2eb22 100644
--- a/src/core/DataSource.vala
+++ b/src/core/DataSource.vala
@@ -60,7 +60,7 @@ public abstract class DataSource : DataObject {
     public virtual signal void destroyed() {
     }
     
-    public DataSource(int64 object_id = INVALID_OBJECT_ID) {
+    protected DataSource(int64 object_id = INVALID_OBJECT_ID) {
         base (object_id);
     }
     
@@ -568,7 +568,7 @@ public abstract class SourceProxy {
     public virtual signal void broken() {
     }
     
-    public SourceProxy(DataSource source) {
+    protected SourceProxy(DataSource source) {
         object_id = source.get_object_id();
         source_string = source.to_string();
         
diff --git a/src/core/DataSourceTypes.vala b/src/core/DataSourceTypes.vala
index 6d8479e..a79264f 100644
--- a/src/core/DataSourceTypes.vala
+++ b/src/core/DataSourceTypes.vala
@@ -12,7 +12,7 @@ public abstract class ThumbnailSource : DataSource {
     public virtual signal void thumbnail_altered() {
     }
     
-    public ThumbnailSource(int64 object_id = INVALID_OBJECT_ID) {
+    protected ThumbnailSource(int64 object_id = INVALID_OBJECT_ID) {
         base (object_id);
     }
     
@@ -51,7 +51,7 @@ public abstract class ThumbnailSource : DataSource {
 }
 
 public abstract class PhotoSource : MediaSource {
-    public PhotoSource(int64 object_id = INVALID_OBJECT_ID) {
+    protected PhotoSource(int64 object_id = INVALID_OBJECT_ID) {
         base (object_id);
     }
 
@@ -68,7 +68,7 @@ public abstract class VideoSource : MediaSource {
 //
 
 public abstract class EventSource : ThumbnailSource {
-    public EventSource(int64 object_id = INVALID_OBJECT_ID) {
+    protected EventSource(int64 object_id = INVALID_OBJECT_ID) {
         base (object_id);
     }
     
diff --git a/src/core/DatabaseSourceCollection.vala b/src/core/DatabaseSourceCollection.vala
index fec6825..2808307 100644
--- a/src/core/DatabaseSourceCollection.vala
+++ b/src/core/DatabaseSourceCollection.vala
@@ -17,7 +17,7 @@ public abstract class DatabaseSourceCollection : SourceCollection {
     private Gee.HashMap<int64?, DataSource> map = new Gee.HashMap<int64?, DataSource>(int64_hash, 
         int64_equal);
         
-    public DatabaseSourceCollection(string name, GetSourceDatabaseKey source_key_func) {
+    protected DatabaseSourceCollection(string name, GetSourceDatabaseKey source_key_func) {
         base (name);
         
         this.source_key_func = source_key_func;
diff --git a/src/core/SourceCollection.vala b/src/core/SourceCollection.vala
index 066b813..6eaf86c 100644
--- a/src/core/SourceCollection.vala
+++ b/src/core/SourceCollection.vala
@@ -47,7 +47,7 @@ public abstract class SourceCollection : DataCollection {
     
     private Gee.MultiMap<SourceBacklink, DataSource>? backlinks = null;
     
-    public SourceCollection(string name) {
+    protected SourceCollection(string name) {
         base (name);
     }
     
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index f92b4a2..02e366a 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -31,7 +31,7 @@ public abstract class EditingToolWindow : Gtk.Window {
     private Gtk.Frame layout_frame = new Gtk.Frame(null);
     private bool user_moved = false;
 
-    public EditingToolWindow(Gtk.Window container) {
+    protected EditingToolWindow(Gtk.Window container) {
         set_decorated(false);
         set_transient_for(container);
 
@@ -110,7 +110,7 @@ public abstract class PhotoCanvas {
     private Gdk.Pixbuf scaled_pixbuf;
     private Gdk.Rectangle scaled_position;
 
-    public PhotoCanvas(Gtk.Window container, Gdk.Window drawing_window, Photo photo,
+    protected PhotoCanvas(Gtk.Window container, Gdk.Window drawing_window, Photo photo,
         Cairo.Context default_ctx, Dimensions surface_dim, Gdk.Pixbuf scaled, Gdk.Rectangle scaled_position) {
         this.container = container;
         this.drawing_window = drawing_window;
@@ -465,7 +465,7 @@ public abstract class EditingTool {
 
     public signal void aborted();
 
-    public EditingTool(string name) {
+    protected EditingTool(string name) {
         this.name = name;
     }
 
@@ -2317,7 +2317,7 @@ public class AdjustTool : EditingTool {
     private abstract class AdjustToolCommand : Command {
         protected weak AdjustTool owner;
 
-        public AdjustToolCommand(AdjustTool owner, string name, string explanation) {
+        protected AdjustToolCommand(AdjustTool owner, string name, string explanation) {
             base (name, explanation);
 
             this.owner = owner;
diff --git a/src/events/EventsBranch.vala b/src/events/EventsBranch.vala
index 8980d60..097a664 100644
--- a/src/events/EventsBranch.vala
+++ b/src/events/EventsBranch.vala
@@ -372,9 +372,6 @@ public class Events.Branch : Sidebar.Branch {
 }
 
 public abstract class Events.DirectoryEntry : Sidebar.SimplePageEntry, Sidebar.ExpandableEntry {
-    public DirectoryEntry() {
-    }
-    
     public override string? get_sidebar_icon() {
         return Events.Branch.icon;
     }
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index 2384a2b..e88b1a7 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -42,7 +42,7 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
     
     private EventsDirectorySearchViewFilter search_filter = new EventsDirectorySearchViewFilter();
 
-    public EventsDirectoryPage(string page_name, ViewManager view_manager,
+    protected EventsDirectoryPage(string page_name, ViewManager view_manager,
         Gee.Collection<Event>? initial_events) {
         base (page_name);
         
diff --git a/src/faces/FaceShape.vala b/src/faces/FaceShape.vala
index c14b43b..21e85a9 100644
--- a/src/faces/FaceShape.vala
+++ b/src/faces/FaceShape.vala
@@ -27,7 +27,7 @@ public abstract class FaceShape : Object {
     
     private weak FacesTool.FaceWidget face_widget = null;
     
-    public FaceShape(EditingTools.PhotoCanvas canvas) {
+    protected FaceShape(EditingTools.PhotoCanvas canvas) {
         this.canvas = canvas;
         this.canvas.new_surface.connect(prepare_ctx);
         
diff --git a/src/library/LibraryBranch.vala b/src/library/LibraryBranch.vala
index f9113f5..622162e 100644
--- a/src/library/LibraryBranch.vala
+++ b/src/library/LibraryBranch.vala
@@ -121,9 +121,6 @@ public abstract class Library.HideablePageEntry : Sidebar.SimplePageEntry {
             visibility_changed(value);
         }
     }
-
-    public HideablePageEntry() {
-    }
 }
 
 public class Library.MainPage : CollectionPage {
diff --git a/src/meson.build b/src/meson.build
index c452a98..e252a82 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -244,7 +244,6 @@ executable('shotwell',
            vala_args : ['--pkg', 'libgphoto2',
                         '--pkg', 'libraw',
                         '--pkg', 'libexif',
-                        '--pkg', 'misc',
                         '--gresources',
                         join_paths(meson.source_root(),
                           'org.gnome.Shotwell.gresource.xml')
diff --git a/src/photos/GdkSupport.vala b/src/photos/GdkSupport.vala
index 2fd1926..f7e18d5 100644
--- a/src/photos/GdkSupport.vala
+++ b/src/photos/GdkSupport.vala
@@ -5,7 +5,7 @@
  */
 
 public abstract class GdkReader : PhotoFileReader {
-    public GdkReader(string filepath, PhotoFileFormat file_format) {
+    protected GdkReader(string filepath, PhotoFileFormat file_format) {
         base (filepath, file_format);
     }
     
@@ -30,7 +30,7 @@ public abstract class GdkSniffer : PhotoFileSniffer {
     private bool size_ready = false;
     private bool area_prepared = false;
     
-    public GdkSniffer(File file, PhotoFileSniffer.Options options) {
+    protected GdkSniffer(File file, PhotoFileSniffer.Options options) {
         base (file, options);
     }
     
diff --git a/src/photos/PhotoFileAdapter.vala b/src/photos/PhotoFileAdapter.vala
index df49edb..ca7c662 100644
--- a/src/photos/PhotoFileAdapter.vala
+++ b/src/photos/PhotoFileAdapter.vala
@@ -22,7 +22,7 @@ public abstract class PhotoFileAdapter {
     private PhotoFileFormat file_format;
     private File file = null;
     
-    public PhotoFileAdapter(string filepath, PhotoFileFormat file_format) {
+    protected PhotoFileAdapter(string filepath, PhotoFileFormat file_format) {
         this.filepath = filepath;
         this.file_format = file_format;
     }
diff --git a/src/photos/PhotoFileSniffer.vala b/src/photos/PhotoFileSniffer.vala
index 3ea1b9d..7442fde 100644
--- a/src/photos/PhotoFileSniffer.vala
+++ b/src/photos/PhotoFileSniffer.vala
@@ -39,7 +39,7 @@ public abstract class PhotoFileSniffer {
     protected Options options;
     protected bool calc_md5;
     
-    public PhotoFileSniffer(File file, Options options) {
+    protected PhotoFileSniffer(File file, Options options) {
         this.file = file;
         this.options = options;
         
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index 288a362..fdda0e6 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -96,11 +96,11 @@ public class ACDSeeKeywordTransformer : KeywordTransformer {
             return;
         }
 
-        Workaround.markup_collect_attributes (name,
-                                              attribute_names,
-                                              attribute_values,
-                                              Markup.CollectType.BOOLEAN,
-                                              "Assigned", out assigned);
+        Markup.collect_attributes (name,
+                                   attribute_names,
+                                   attribute_values,
+                                   Markup.CollectType.BOOLEAN,
+                                   "Assigned", out assigned);
     }
 
     private void on_end (MarkupParseContext ctx, string name)
@@ -164,7 +164,7 @@ public abstract class PhotoPreview {
     private string mime_type;
     private string extension;
     
-    public PhotoPreview(string name, Dimensions dimensions, uint32 size, string mime_type, string extension) {
+    protected PhotoPreview(string name, Dimensions dimensions, uint32 size, string mime_type, string extension) {
         this.name = name;
         this.dimensions = dimensions;
         this.size = size;
diff --git a/src/sidebar/common.vala b/src/sidebar/common.vala
index 0467ce3..ebdba51 100644
--- a/src/sidebar/common.vala
+++ b/src/sidebar/common.vala
@@ -55,9 +55,6 @@ public abstract class Sidebar.SimplePageEntry : Object, Sidebar.Entry, Sidebar.S
     Sidebar.PageRepresentative, Sidebar.Contextable {
     private Page? page = null;
     
-    public SimplePageEntry() {
-    }
-    
     public abstract string get_sidebar_name();
     
     public virtual string? get_sidebar_tooltip() {
diff --git a/src/threads/BackgroundJob.vala b/src/threads/BackgroundJob.vala
index 5d259e7..1c83ced 100644
--- a/src/threads/BackgroundJob.vala
+++ b/src/threads/BackgroundJob.vala
@@ -110,7 +110,7 @@ public abstract class BackgroundJob {
     private int completion_priority = Priority.HIGH;
     private int notification_priority = Priority.DEFAULT_IDLE;
     
-    public BackgroundJob(Object? owner = null, CompletionCallback? callback = null,
+    protected BackgroundJob(Object? owner = null, CompletionCallback? callback = null,
         Cancellable? cancellable = null, CancellationCallback? cancellation = null,
         AbstractSemaphore? completion_semaphore = null) {
         this.owner = owner;
diff --git a/src/threads/Semaphore.vala b/src/threads/Semaphore.vala
index 05b1f13..dcb9e6e 100644
--- a/src/threads/Semaphore.vala
+++ b/src/threads/Semaphore.vala
@@ -27,7 +27,7 @@ public abstract class AbstractSemaphore {
     private Mutex mutex = Mutex();
     private Cond monitor = Cond();
     
-    public AbstractSemaphore(Type type) {
+    protected AbstractSemaphore(Type type) {
         assert(type == Type.SERIAL || type == Type.BROADCAST);
         
         this.type = type;
diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi
index 4141f6b..bd7c4fc 100644
--- a/vapi/libgdata.vapi
+++ b/vapi/libgdata.vapi
@@ -436,8 +436,6 @@ namespace GData {
 		public void set_user_defined_field (string name, string? value);
 		public string billing_information { get; set; }
 		[NoAccessorMethod]
-		public GLib.Date birthday { get; set; }
-		[NoAccessorMethod]
 		public bool birthday_has_year { get; set; }
 		[NoAccessorMethod]
 		public bool deleted { get; }
@@ -1328,9 +1326,9 @@ namespace GData {
 		[CCode (has_construct_function = false)]
 		protected Parsable ();
 		[CCode (has_construct_function = false)]
-		public Parsable.from_json (GLib.Type parsable_type, string json, int length) throws GLib.Error;
+		protected Parsable.from_json (GLib.Type parsable_type, string json, int length) throws GLib.Error;
 		[CCode (has_construct_function = false)]
-		public Parsable.from_xml (GLib.Type parsable_type, string xml, int length) throws GLib.Error;
+		protected Parsable.from_xml (GLib.Type parsable_type, string xml, int length) throws GLib.Error;
 		[NoWrapper]
 		public virtual void get_json (Json.Builder builder);
 		[CCode (cname = "gdata_parsable_get_json")]
diff --git a/vapi/misc.vapi b/vapi/misc.vapi
deleted file mode 100644
index 805f73e..0000000
--- a/vapi/misc.vapi
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Workaround {
-[CCode (cheader_filename = "glib.h", cname = "g_markup_collect_attributes", sentinel = "G_MARKUP_COLLECT_INVALID")]
-extern bool markup_collect_attributes(string element_name,
-        [CCode (array_length = false, array_null_terminated = true)]
-        string[] attribute_names,
-        [CCode (array_length = false, array_null_terminated = true)]
-        string[] attribute_values, ...) throws GLib.MarkupError;
-}