From 72e3d4c55a6569d966059f762824c38d06055871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?=
Date: Sat, 29 Oct 2016 23:24:31 +0200
Subject: New upstream version 0.25.0
---
ChangeLog | 669 +-
Makefile.am | 2 +
Makefile.in | 207 +-
NEWS | 69 +-
common.am | 3 +-
configure | 98 +-
configure.ac | 12 +-
help/cs/cs.po | 4 +-
misc/org.yorba.shotwell.gschema.xml | 80 +-
misc/shotwell.appdata.xml.in | 2 +-
plugins/common/RESTSupport.c | 6315 ++++----
plugins/common/RESTSupport.vala | 116 +-
plugins/common/WebAuthenticationPane.c | 575 +
plugins/common/WebAuthenticationPane.vala | 75 +
plugins/shotwell-plugin-common.h | 34 +-
plugins/shotwell-plugin-common.vapi | 18 +
.../shotwell-publishing-extras/GalleryConnector.c | 8 +-
.../GalleryConnector.vala | 6 +-
.../shotwell-publishing-extras/RajcePublishing.c | 4 +-
.../RajcePublishing.vala | 4 +-
.../shotwell-publishing-extras/TumblrPublishing.c | 12 +-
.../TumblrPublishing.vala | 16 +-
.../shotwell-publishing-extras/YandexPublishing.c | 3384 ++--
.../YandexPublishing.vala | 69 +-
.../gallery3_authentication_pane.ui | 4 +-
.../rajce_authentication_pane.ui | 2 +-
.../tumblr_authentication_pane.ui | 2 +-
plugins/shotwell-publishing/FacebookPublishing.c | 5706 ++++---
.../shotwell-publishing/FacebookPublishing.vala | 84 +-
plugins/shotwell-publishing/FlickrPublishing.c | 18 +-
plugins/shotwell-publishing/FlickrPublishing.vala | 18 +-
plugins/shotwell-publishing/PicasaPublishing.c | 18 +-
plugins/shotwell-publishing/PicasaPublishing.vala | 14 +-
plugins/shotwell-publishing/PiwigoPublishing.c | 7606 +++++----
plugins/shotwell-publishing/PiwigoPublishing.vala | 119 +-
plugins/shotwell-publishing/YouTubePublishing.c | 6 +-
plugins/shotwell-publishing/YouTubePublishing.vala | 4 +-
.../org.gnome.Shotwell.Publishing.gresource.xml | 1 +
.../piwigo_authentication_pane.ui | 2 +-
.../shotwell-publishing/piwigo_ssl_failure_pane.ui | 111 +
plugins/shotwell-transitions/CircleEffect.vala | 2 +-
po/POTFILES.in | 1 +
po/ca.gmo | Bin 85440 -> 81866 bytes
po/ca.po | 1544 +-
po/cs.gmo | Bin 126333 -> 130059 bytes
po/cs.po | 1330 +-
po/de.gmo | Bin 124496 -> 124543 bytes
po/de.po | 241 +-
po/es.gmo | Bin 113804 -> 114467 bytes
po/es.po | 1468 +-
po/hu.gmo | Bin 125680 -> 129446 bytes
po/hu.po | 1460 +-
po/pl.gmo | Bin 128762 -> 132435 bytes
po/pl.po | 1331 +-
po/pt_BR.gmo | Bin 122405 -> 124917 bytes
po/pt_BR.po | 1107 +-
po/shotwell.pot | 1270 +-
publish.am | 5 +
shotwell.am | 2 +-
src/AppDirs.c | 82 +-
src/AppWindow.c | 80 +-
src/AppWindow.vala | 4 +-
src/Application.c | 8 +-
src/BatchImport.c | 114 +-
src/CheckerboardLayout.c | 10 +-
src/CollectionPage.c | 34 +-
src/ColorTransformation.c | 8980 +++++------
src/ColorTransformation.vala | 47 +-
src/Commands.c | 54 +-
src/Commands.vala | 2 +-
src/Debug.c | 8 +-
src/DesktopIntegration.c | 36 +-
src/Dialogs.c | 15424 ++++++++++---------
src/Dialogs.vala | 94 +-
src/DirectoryMonitor.c | 42 +-
src/Event.c | 64 +-
src/Exporter.c | 20 +-
src/Exporter.vala | 2 +-
src/LibraryFiles.c | 56 +-
src/LibraryMonitor.c | 40 +-
src/MediaDataRepresentation.c | 40 +-
src/MediaInterfaces.c | 22 +-
src/MediaMonitor.c | 8 +-
src/MediaPage.c | 28 +-
src/MediaPage.vala | 2 +-
src/MetadataWriter.c | 48 +-
src/Page.c | 16 +-
src/Photo.c | 6613 ++++----
src/PhotoMonitor.c | 64 +-
src/PhotoPage.c | 118 +-
src/PixbufCache.c | 16 +-
src/Printing.c | 48 +-
src/Printing.vala | 30 +-
src/Properties.c | 18 +-
src/Resources.c | 122 +-
src/Resources.vala | 80 +-
src/SearchFilter.c | 8 +-
src/SlideshowPage.c | 8 +-
src/Tag.c | 64 +-
src/ThumbnailCache.c | 50 +-
src/Tombstone.c | 48 +-
src/Upgrades.c | 18 +-
src/VideoMetadata.c | 90 +-
src/VideoSupport.c | 5294 +++----
src/VideoSupport.vala | 30 +-
src/camera/CameraTable.c | 34 +-
src/camera/GPhoto.c | 26 +-
src/camera/ImportPage.c | 108 +-
src/camera/ImportPage.vala | 14 +-
src/config/Config.c | 123 +-
src/config/ConfigurationInterfaces.c | 10879 +++++++------
src/config/ConfigurationInterfaces.vala | 144 +
src/config/GSettingsEngine.c | 4471 +++---
src/config/GSettingsEngine.vala | 62 +-
src/core/DataSource.c | 8 +-
src/core/SourceCollection.c | 8 +-
src/data_imports/DataImportSource.c | 32 +-
src/data_imports/DataImportsPluginHost.c | 4 +-
src/data_imports/DataImportsPluginHost.vala | 4 +-
src/db/DatabaseTable.c | 325 +-
src/db/DatabaseTable.vala | 2 +-
src/direct/DirectPhoto.c | 28 +-
src/direct/DirectPhotoPage.c | 22 +-
src/direct/DirectPhotoPage.vala | 2 +-
src/editing_tools/EditingTools.c | 5312 ++++---
src/editing_tools/EditingTools.vala | 103 +-
src/events/EventDirectoryItem.c | 16 +-
src/events/EventPage.c | 4 +-
src/events/EventsDirectoryPage.c | 4 +-
src/folders/Branch.c | 902 +-
src/folders/Branch.vala | 5 +-
src/library/ImportQueuePage.c | 4 +-
src/library/ImportQueuePage.vala | 4 +-
src/library/ImportQueueSidebarEntry.c | 2 +-
src/library/LibraryWindow.c | 52 +-
src/library/LibraryWindow.vala | 18 +-
src/library/OfflinePage.c | 2 +-
src/library/OfflinePage.vala | 2 +-
src/main.c | 70 +-
src/main.vala | 18 +-
src/photos/GRaw.c | 10 +-
src/photos/GdkSupport.c | 16 +-
src/photos/PhotoMetadata.c | 7807 ++++++----
src/photos/PhotoMetadata.vala | 167 +-
src/photos/RawSupport.c | 22 +-
src/plugins/ManifestWidget.c | 8 +-
src/plugins/Plugins.c | 18 +-
src/plugins/Plugins.vala | 2 +-
src/publishing/APIGlue.c | 28 +-
src/publishing/PublishingPluginHost.c | 10 +-
src/publishing/PublishingPluginHost.vala | 2 +-
src/publishing/PublishingUI.c | 4 +-
src/publishing/PublishingUI.vala | 4 +-
src/searches/Branch.c | 10 +-
src/searches/Branch.vala | 2 +-
src/searches/SavedSearchPage.c | 4 +-
src/searches/SearchBoolean.c | 40 +-
src/sidebar/Tree.c | 12 +-
src/sidebar/Tree.vala | 4 +-
src/tags/Branch.c | 18 +-
src/tags/HierarchicalTagUtilities.c | 12 +-
src/tags/HierarchicalTagUtilities.vala | 2 +-
src/tags/TagPage.c | 2 +-
src/util/image.c | 261 +-
src/util/image.vala | 4 +-
thumbnailer/shotwell-video-thumbnailer.c | 785 +-
thumbnailer/shotwell-video-thumbnailer.vala | 16 +-
ui/direct.ui | 2 +-
ui/events_directory.ui | 2 +-
ui/import.ui | 2 +-
ui/import_queue.ui | 2 +-
ui/media.ui | 2 +-
ui/offline.ui | 2 +-
ui/photo.ui | 2 +-
ui/shotwell.ui | 2 +-
ui/trash.ui | 2 +-
vapi/libraw.vapi | 3 +-
177 files changed, 56457 insertions(+), 48990 deletions(-)
create mode 100644 plugins/common/WebAuthenticationPane.c
create mode 100644 plugins/common/WebAuthenticationPane.vala
create mode 100644 plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
diff --git a/ChangeLog b/ChangeLog
index f19d3b5..2186070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,15 @@
-commit c52724c3d00e0aecaf98402c83b51e0cd5c9a6be
+commit 0a348fe98b77bf17b4cbe8a257eecffc966acbd7
Author: Jens Georg
-Date: Sun Oct 16 22:32:17 2016 +0200
+Date: Mon Oct 24 20:09:08 2016 +0200
- Prepare Shotwell 0.24.1
+ Prepare 0.25.0 release
Signed-off-by: Jens Georg
M NEWS
-M configure.ac
M debian/changelog
-commit 0be5c1be430cdc6b4ee7af0d0e52e10888b07a55
+commit ece15b26e968e76a9165ba4fdacfcde5a425fc38
Author: Jens Georg
Date: Sun Oct 16 22:20:14 2016 +0200
@@ -20,7 +19,79 @@ Date: Sun Oct 16 22:20:14 2016 +0200
M src/db/DatabaseTable.vala
-commit f79f3dd46473655b17bcf52ca3a8fadcf58502a5
+commit 68d021e037a95e77cea4afdd850378f1c52cd36e
+Author: Jens Georg
+Date: Wed Oct 19 21:02:36 2016 +0200
+
+ Hide "Folder" sidebar when empty
+
+ Signed-off-by: Jens Georg
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=719127
+
+M src/folders/Branch.vala
+
+commit 1f07d737505a2c4ecc7c2ed0e415a9f8b9f4bd26
+Author: Jens Georg
+Date: Tue Oct 18 22:28:33 2016 +0200
+
+ Blacklist vaapi decoder
+
+ That makes things actually slow since it start-up isn't the best in
+ the world
+ and doesn't like to be triggered from multiple threads, causing
+ the abort.
+
+ Signed-off-by: Jens Georg
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=762416
+
+M src/VideoSupport.vala
+M thumbnailer/shotwell-video-thumbnailer.vala
+
+commit ec20147df422a340e7741586a193e50840bcb268
+Author: Rico Tzschichholz
+Date: Tue Oct 18 10:40:54 2016 +0200
+
+ Remove superfluous parentheses
+
+M plugins/shotwell-transitions/CircleEffect.vala
+
+commit 156a835a878a89767414dd12421af73a06c77c92
+Author: Marek Černocký
+Date: Sun Oct 16 22:01:01 2016 +0200
+
+ Updated Czech translation
+
+M po/cs.po
+
+commit 2db8881d70cd53fa2d26860a2598054798a06706
+Author: Gábor Kelemen
+Date: Tue Oct 11 07:45:50 2016 +0000
+
+ Update Hungarian translation
+
+M po/hu.po
+
+commit be57cf35c101c8a3901d4a166e20cb2e1baa7fdb
+Author: Jordi Mas
+Date: Sun Oct 9 20:02:48 2016 +0200
+
+ Update Catalan translation
+
+M po/ca.po
+
+commit b7b9736c93ec86cc5d14ac7994b3ad18b10594b0
+Author: Jens Georg
+Date: Sun Oct 9 18:53:48 2016 +0200
+
+ libraw.vapi: Remove member added by accident
+
+ Signed-off-by: Jens Georg
+
+M vapi/libraw.vapi
+
+commit 0b56e8c667739120eba0eeee74cf7d2bbc4b5447
Author: Jens Georg
Date: Sun Oct 9 18:42:17 2016 +0200
@@ -35,7 +106,35 @@ Date: Sun Oct 9 18:42:17 2016 +0200
M plugins/shotwell-publishing/PiwigoPublishing.vala
-commit 42a2189a53163391f4776ba6e6c433d1aabbdf5e
+commit b3debfb7bf14d01afb008a9debd28160a8100071
+Author: Jens Georg
+Date: Sun Oct 9 18:25:12 2016 +0200
+
+ libraw.vapi: Improve thumbnail binding
+
+ Signed-off-by: Jens Georg
+
+M vapi/libraw.vapi
+
+commit aade605b107272bd5a2c189f2dfec7f4ce6eb227
+Author: Jens Georg
+Date: Sat Oct 8 21:41:43 2016 +0200
+
+ Fix typo in settings schema
+
+ Signed-off-by: Jens Georg
+
+M misc/org.yorba.shotwell.gschema.xml
+
+commit 3d55565cd36130cd9a3fcfc49a925fa9d13a06b2
+Author: Piotr Drąg
+Date: Sun Oct 9 08:55:32 2016 +0200
+
+ Update Polish translation
+
+M po/pl.po
+
+commit 91f0804130cb87aaf0cdfe1c58b2740c4748fedd
Author: Rico Tzschichholz
Date: Sat Oct 8 17:27:59 2016 +0200
@@ -47,7 +146,117 @@ Date: Sat Oct 8 17:27:59 2016 +0200
M src/photos/PhotoMetadata.vala
-commit e8c60ee6ca74977bc28e1d5650f9c9d5c09e5e71
+commit 826f2947caefe311006bc45e9420ed325002ad00
+Author: Jens Georg
+Date: Sat Oct 8 16:50:36 2016 +0200
+
+ Port to new SoupSession API
+
+ Signed-off-by: Jens Georg
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=767126
+
+M configure.ac
+M plugins/common/RESTSupport.vala
+M plugins/shotwell-publishing/FacebookPublishing.vala
+
+commit 2782abad7798f48a4c6c032eafba3f19bc829767
+Author: Jens Georg
+Date: Sat Oct 1 00:26:26 2016 +0200
+
+ Make export dialog deprecated free
+
+ Signed-off-by: Jens Georg
+
+M src/Dialogs.vala
+
+commit e3c78dc5689d2f02efa70871521b71efafcb319c
+Author: Jens Georg
+Date: Tue Oct 4 23:32:51 2016 +0200
+
+ Use GSettings default for export dialog
+
+ Signed-off-by: Jens Georg
+
+M misc/org.yorba.shotwell.gschema.xml
+M src/Dialogs.vala
+M src/config/ConfigurationInterfaces.vala
+M src/config/GSettingsEngine.vala
+
+commit 8b95f0de193e63fc7e87d1121d3ef8b26dceb86c
+Author: Jens Georg
+Date: Tue Oct 4 22:33:14 2016 +0200
+
+ Persist export dialog settings
+
+ Based on original patch by Jonas Bushart.
+
+ Signed-off-by: Jens Georg
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=716259
+
+M misc/org.yorba.shotwell.gschema.xml
+M src/Dialogs.vala
+M src/config/ConfigurationInterfaces.vala
+M src/config/GSettingsEngine.vala
+
+commit 1b73d9e16be8a73193062507c01877a937b305fc
+Author: Jens Georg
+Date: Tue Oct 4 22:29:45 2016 +0200
+
+ Remove deprecated GSettings calls
+
+ Signed-off-by: Jens Georg
+
+M common.am
+M configure.ac
+M src/config/GSettingsEngine.vala
+
+commit cb225f8db79e7b234447a37fc52e00f6e8a26903
+Author: Jens Georg
+Date: Sat Oct 8 14:26:21 2016 +0200
+
+ Update git.mk
+
+ Signed-off-by: Jens Georg
+
+M git.mk
+
+commit b2b95c292d5440812e5c92ee4869727e1dbf71d0
+Author: Rafael Fontenelle
+Date: Thu Oct 6 11:47:55 2016 +0000
+
+ Updated Brazilian Portuguese translation
+
+M po/pt_BR.po
+
+commit 8d823173ee9df9745c851556b7617e495c54a44d
+Author: Jens Georg
+Date: Tue Oct 4 21:35:38 2016 +0200
+
+ Remove old GTK+ work-around
+
+ Signed-off-by: Jens Georg
+
+M src/Dialogs.vala
+
+commit ba8801a1e47d8e329b47db39678ebab6e02eef2a
+Author: Marek Černocký
+Date: Tue Oct 4 14:22:12 2016 +0200
+
+ Updated Czech translation
+
+M po/cs.po
+
+commit 58e1e1b744226654692a742064577c3452995d9b
+Author: Gábor Kelemen
+Date: Tue Oct 4 08:43:19 2016 +0000
+
+ Updated Hungarian translation
+
+M po/hu.po
+
+commit 6afddeff92a119f5198c5c671e8431952bdd36ab
Author: Jens Georg
Date: Mon Oct 3 22:12:01 2016 +0200
@@ -57,7 +266,212 @@ Date: Mon Oct 3 22:12:01 2016 +0200
M plugins/shotwell-publishing/PiwigoPublishing.vala
-commit 0dd5368e0b33c22e3fb196b2776d56988aca0572
+commit fbee9252109833a0d63311408b114a01273aced7
+Author: Piotr Drąg
+Date: Mon Oct 3 15:19:08 2016 +0200
+
+ Update POTFILES.in
+
+M po/POTFILES.in
+
+commit 8560752d671dfa4991dbdba3a4b57afb356efcc5
+Author: Jens Georg
+Date: Mon Oct 3 14:39:24 2016 +0200
+
+ piwigo: Add option to show the certificate
+
+ So the user can inspect the certificate before proceeding
+
+ Signed-off-by: Jens Georg
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=767473
+
+M configure.ac
+M plugins/common/RESTSupport.vala
+M plugins/shotwell-publishing/PiwigoPublishing.vala
+M plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
+M publish.am
+
+commit 9c2aa03dde6538800ab3916635444c343058f462
+Author: Jens Georg
+Date: Sun Oct 2 19:41:48 2016 +0200
+
+ piwigo: Add option to override the SSL verification
+
+ Signed-off-by: Jens Georg
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=767473
+
+M plugins/common/RESTSupport.vala
+M plugins/shotwell-publishing/PiwigoPublishing.vala
+M
+plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+A plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui
+
+commit 73007e5797dbcf4003d771ac0c4725989db513f1
+Author: Piotr Drąg
+Date: Mon Oct 3 13:23:23 2016 +0200
+
+ Updated Polish translation
+
+M po/pl.po
+
+commit 1a76ac6f4210c0f3707dcc5e719377279ad85ddb
+Author: Piotr Drąg
+Date: Mon Oct 3 13:21:13 2016 +0200
+
+ Remove one more instance of double spaces
+
+M src/Dialogs.vala
+
+commit b173946ec6ed21f6ec264b0e87dcdac8654e6c0c
+Author: Gábor Kelemen
+Date: Mon Oct 3 09:50:53 2016 +0000
+
+ Updated Hungarian translation
+
+M po/hu.po
+
+commit ec738035daf4a7dd3373fd280a11f575a5985ec6
+Author: Marek Černocký
+Date: Mon Oct 3 11:39:46 2016 +0200
+
+ Updated Czech translation
+
+M po/cs.po
+
+commit 7ee95d4059c6f4ec8b5ee1583a73864d8b412540
+Author: Piotr Drąg
+Date: Sun Oct 2 18:17:47 2016 +0200
+
+ Remove double spaces from translatable strings
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=772339
+
+M plugins/shotwell-publishing/FlickrPublishing.vala
+M src/AppWindow.vala
+M src/Dialogs.vala
+M src/Exporter.vala
+M src/camera/ImportPage.vala
+M src/main.vala
+
+commit 3d2acfe4204629df7fe62098e2c1810949776dca
+Author: Piotr Drąg
+Date: Sun Oct 2 18:12:57 2016 +0200
+
+ Fix spelling of "YouTube"
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=772339
+
+M plugins/shotwell-publishing/YouTubePublishing.vala
+
+commit 96a2343b3673c25fb398972cf1036ced664e3162
+Author: Piotr Drąg
+Date: Sun Oct 2 18:11:51 2016 +0200
+
+ Fix spelling of "log in"
+
+ "Log in" is the verb, "login" is the noun.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=772339
+
+M plugins/shotwell-publishing-extras/RajcePublishing.vala
+M plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
+M plugins/shotwell-publishing-extras/rajce_authentication_pane.ui
+M plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui
+M plugins/shotwell-publishing/FlickrPublishing.vala
+M plugins/shotwell-publishing/PicasaPublishing.vala
+M plugins/shotwell-publishing/piwigo_authentication_pane.ui
+M ui/shotwell.ui
+
+commit 7c0ad89676d662965388080f61d61359fd65fe35
+Author: Piotr Drąg
+Date: Sun Oct 2 18:05:33 2016 +0200
+
+ Use Unicode in translatable strings
+
+ See https://developer.gnome.org/hig/stable/typography.html
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=772339
+
+M misc/org.yorba.shotwell.gschema.xml
+M misc/shotwell.appdata.xml.in
+M plugins/shotwell-publishing-extras/GalleryConnector.vala
+M plugins/shotwell-publishing-extras/RajcePublishing.vala
+M plugins/shotwell-publishing-extras/TumblrPublishing.vala
+M plugins/shotwell-publishing/FacebookPublishing.vala
+M plugins/shotwell-publishing/FlickrPublishing.vala
+M plugins/shotwell-publishing/PicasaPublishing.vala
+M plugins/shotwell-publishing/PiwigoPublishing.vala
+M plugins/shotwell-publishing/YouTubePublishing.vala
+M src/AppWindow.vala
+M src/Commands.vala
+M src/Dialogs.vala
+M src/MediaPage.vala
+M src/Printing.vala
+M src/Resources.vala
+M src/camera/ImportPage.vala
+M src/data_imports/DataImportsPluginHost.vala
+M src/editing_tools/EditingTools.vala
+M src/main.vala
+M src/publishing/PublishingPluginHost.vala
+
+commit 9d2cf3536841ac0334c2ae6226fa3ed708a5b82b
+Author: Piotr Drąg
+Date: Sun Oct 2 13:15:26 2016 +0200
+
+ Updated Polish translation
+
+M po/pl.po
+
+commit 63f541a70fa8cee7b2e4e5db1f14951175aa9e42
+Author: Gábor Kelemen
+Date: Sun Oct 2 08:07:14 2016 +0000
+
+ Updated Hungarian translation
+
+M po/hu.po
+
+commit 71f3951a5c9263b73e579435e7d738776679ba2f
+Author: Jens Georg
+Date: Sat Oct 1 18:16:14 2016 +0200
+
+ Introduce common class for WebKit authenticator
+
+ This was implemented/copied three times...
+
+ Signed-off-by: Jens Georg
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=772295
+
+M Makefile.am
+M plugins/common/RESTSupport.vala
+A plugins/common/WebAuthenticationPane.vala
+M plugins/shotwell-publishing-extras/YandexPublishing.vala
+M plugins/shotwell-publishing/FacebookPublishing.vala
+
+commit 5270d097485c7ca2f4729adc598d381c85491988
+Author: Jens Georg
+Date: Sat Oct 1 17:50:10 2016 +0200
+
+ build: Silence some C warnings
+
+ Signed-off-by: Jens Georg
+
+M Makefile.am
+M common.am
+
+commit cbb516968f97762cc3e80cc47a7a4904e8062772
+Author: Jens Georg
+Date: Sat Oct 1 16:11:55 2016 +0200
+
+ Remove deprecated call from util/image.vala
+
+ Signed-off-by: Jens Georg
+
+M src/util/image.vala
+
+commit 389e23b763a851a93cb6b2b8e4bd0165e754d7c5
Author: Rico Tzschichholz
Date: Fri Sep 30 18:58:54 2016 +0200
@@ -65,7 +479,101 @@ Date: Fri Sep 30 18:58:54 2016 +0200
M src/Tag.vala
-commit 15fb6e8945c27915d1d3b934f2a3ee81daaea63d
+commit c5b028b808a0f35344872677a0bcd1ae2b625a5d
+Author: Daniel Mustieles
+Date: Fri Sep 30 10:19:59 2016 +0000
+
+ Updated Spanish translation
+
+M po/es.po
+
+commit 9dae1046df856f922419e57048d87ad878979f41
+Author: Mario Blättermann
+Date: Fri Sep 30 07:05:07 2016 +0000
+
+ Updated German translation
+
+M po/de.po
+
+commit 87dfca02f666fb9e903dd8cdcc3fd6ac98111841
+Author: Marek Černocký
+Date: Fri Sep 30 07:40:58 2016 +0200
+
+ Updated Czech translation
+
+M po/cs.po
+
+commit 5f569b1bcf3c387243e3f63326413a7d7f572bad
+Author: Jens Georg
+Date: Thu Sep 29 23:06:43 2016 +0200
+
+ Fix copy-paste error
+
+ Signed-off-by: Jens Georg
+
+M src/photos/PhotoMetadata.vala
+
+commit cb79cb4e5681a5069fb66e655b747cece133a004
+Author: Jens Georg
+Date: Thu Sep 29 13:12:38 2016 +0200
+
+ Replace ... with …
+
+ Signed-off-by: Jens Georg
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=765149
+
+M src/AppWindow.vala
+M src/Dialogs.vala
+M src/Printing.vala
+M src/Resources.vala
+M src/camera/ImportPage.vala
+M src/direct/DirectPhotoPage.vala
+M src/library/ImportQueuePage.vala
+M src/library/LibraryWindow.vala
+M src/library/OfflinePage.vala
+M src/main.vala
+M src/plugins/Plugins.vala
+M src/publishing/PublishingUI.vala
+M src/searches/Branch.vala
+M src/sidebar/Tree.vala
+M src/tags/HierarchicalTagUtilities.vala
+M ui/direct.ui
+M ui/events_directory.ui
+M ui/import.ui
+M ui/import_queue.ui
+M ui/media.ui
+M ui/offline.ui
+M ui/photo.ui
+M ui/trash.ui
+
+commit 515e311ca1f0bcef525e5beee7075a4474b87676
+Author: Jens Georg
+Date: Thu Sep 29 08:55:48 2016 +0200
+
+ Bump gexiv2 requirement to 0.10.4
+
+ Necessary for a bugfix required for proper ACDSEE tag support
+
+ Signed-off-by: Jens Georg
+
+M configure.ac
+
+commit 9218b13bd7ef86e8f3f7de7e98b6ac64f6dd162a
+Author: Jens Georg
+Date: Tue Sep 20 21:19:31 2016 +0200
+
+ Support acdsee tags
+
+ Signed-off-by: Jens Georg
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=718586
+
+M shotwell.am
+M src/photos/PhotoMetadata.vala
+A vapi/misc.vapi
+
+commit 912cd8b707bf4fbe91c99314bd17fa928da23cf2
Author: Jens Georg
Date: Wed Sep 28 23:32:01 2016 +0200
@@ -75,7 +583,7 @@ Date: Wed Sep 28 23:32:01 2016 +0200
M src/Resources.vala
-commit a9104c1cf1ab2c586f1639536a50823019d026eb
+commit d821a4a49f357005bab6c71f0fb7116491d2bf96
Author: Jens Georg
Date: Wed Sep 28 23:11:32 2016 +0200
@@ -87,7 +595,7 @@ Date: Wed Sep 28 23:11:32 2016 +0200
M src/AppWindow.vala
-commit 147b6c87a0a6be6fa0d0e7b93313a13679ba2614
+commit f343d9a359e2924e2498c7287222f79e3e2d867c
Author: Jens Georg
Date: Sat Sep 17 08:33:23 2016 +0200
@@ -102,7 +610,83 @@ M src/Tag.vala
M src/core/ContainerSourceCollection.vala
M src/core/ViewCollection.vala
-commit 7424c5ddadfaee627641cd884423a32fa5afc330
+commit bddc2ea7151c81e8979b3342fc89921600d4b45d
+Author: Mario Blättermann
+Date: Sun Sep 25 17:16:35 2016 +0000
+
+ Updated German translation
+ (cherry picked from commit 230a0b28eb7b0a671ac549e85329beefddbc06eb)
+
+M help/de/de.po
+
+commit 3a25208a2aa69a347a0d8a915dd8b8dd6c72614f
+Author: Piotr Drąg
+Date: Sat Sep 24 22:20:06 2016 +0200
+
+ Updated Polish translation
+
+M po/pl.po
+
+commit 968da8e0998ff561d29d6e8324461779618725ad
+Author: Benedikt M. Thoma
+Date: Fri Sep 23 17:11:56 2016 +0000
+
+ Updated German translation
+
+M po/de.po
+
+commit 4e2911b6fa27b272552ea9f5d39ed85c55461010
+Author: Rafael Fontenelle
+Date: Fri Sep 23 00:35:09 2016 +0000
+
+ Updated Brazilian Portuguese translation
+
+M po/pt_BR.po
+
+commit 3c9f707f29e5cee407603ef9128e843e35d42969
+Author: Rafael Fontenelle
+Date: Fri Sep 23 00:32:10 2016 +0000
+
+ Updated Brazilian Portuguese translation
+ (cherry picked from commit f4b68102e46f3fa896438db753b39f4b413107bb)
+
+M po/pt_BR.po
+
+commit c056c251eb469e70d488c013b46b2a8f7875f038
+Author: Balázs Meskó
+Date: Thu Sep 22 18:26:05 2016 +0000
+
+ Updated Hungarian translation
+
+M po/hu.po
+
+commit 0ebdf12e12fc12899e72db4b59edf8d65d0e0e23
+Author: Jordi Mas
+Date: Thu Sep 22 19:55:58 2016 +0200
+
+ Fix in Catalan translation
+
+M po/ca.po
+
+commit 270f26ce715c1f178fd707e7a648ad4433ee87cc
+Author: Jens Georg
+Date: Wed Sep 21 21:44:42 2016 +0200
+
+ Fix mixup when clicking Reset
+
+ Signed-off-by: Jens Georg
+
+M src/editing_tools/EditingTools.vala
+
+commit 15bf3742ff2fd23605713d092d3d961fee58ab72
+Author: Marek Černocký
+Date: Wed Sep 21 21:35:44 2016 +0200
+
+ Updated Czech translation
+
+M po/cs.po
+
+commit dbe7eed4fe3e088319903385e0a07ed46154f512
Author: Jens Georg
Date: Wed Sep 21 21:00:47 2016 +0200
@@ -114,7 +698,7 @@ Date: Wed Sep 21 21:00:47 2016 +0200
M src/main.vala
-commit 7c1872f9353b1c0c067c1599f74460571db35145
+commit 0046657c9f16706231be2194ed3d085ccb543c05
Author: Jens Georg
Date: Wed Sep 21 20:56:07 2016 +0200
@@ -128,31 +712,38 @@ Date: Wed Sep 21 20:56:07 2016 +0200
M src/Event.vala
-commit 230a0b28eb7b0a671ac549e85329beefddbc06eb
-Author: Mario Blättermann
-Date: Sun Sep 25 17:16:35 2016 +0000
+commit 36d0265618b504d1c1d6187bf04709dd60d0a9ce
+Author: Josh Freeman
+Date: Sun Jul 3 20:44:04 2016 +0200
- Updated German translation
+ Add contrast adjustments to settings
-M help/de/de.po
+ Signed-off-by: Jens Georg
-commit f4b68102e46f3fa896438db753b39f4b413107bb
-Author: Rafael Fontenelle
-Date: Fri Sep 23 00:32:10 2016 +0000
+ https://bugzilla.gnome.org/show_bug.cgi?id=716660
- Updated Brazilian Portuguese translation
+M src/ColorTransformation.vala
+M src/editing_tools/EditingTools.vala
-M po/pt_BR.po
+commit bb1fa45a0de8cffda51363db0b6d5b4bbaf3592d
+Author: Jens Georg
+Date: Tue Sep 20 21:10:15 2016 +0200
+
+ Post-release version bump
+
+ Signed-off-by: Jens Georg
+
+M configure.ac
-commit 3fca18c23cb133590be1b472cc4b22f8effc81a7
+commit b6d70e14df54f4cf39f050682271f5cdd7b52aa8
Author: Anders Jonsson
-Date: Wed Sep 21 11:30:53 2016 +0000
+Date: Wed Sep 21 11:26:55 2016 +0000
Updated Swedish translation
M help/sv/sv.po
-commit 332173cf4a3e7110afc2a42b127f9e8c37b33369
+commit c6d5fe9bb77d97c534f8239c6331dc1f41df324b
Author: Jens Georg
Date: Tue Sep 20 21:02:10 2016 +0200
@@ -163,7 +754,7 @@ Date: Tue Sep 20 21:02:10 2016 +0200
M NEWS
M configure.ac
-commit 4b1dd6efebe919772914bffd8e6597e7780d378c
+commit 2d300134b66139f3dc18577bedf83266a3e0b13c
Author: Jens Georg
Date: Sun Sep 18 20:02:34 2016 +0200
@@ -173,33 +764,43 @@ Date: Sun Sep 18 20:02:34 2016 +0200
M src/core/DataObject.vala
-commit 728b17e779c2c27941ecfa74037beb1025f85fe6
+commit 14b8ae055f24b81b802ec83fcd2487c03a17630f
Author: Bernd Homuth
Date: Mon Sep 19 15:00:09 2016 +0000
Updated German translation
+ (cherry picked from commit 728b17e779c2c27941ecfa74037beb1025f85fe6)
M po/de.po
-commit 792debb70a038c4a4ae0ef7c68999aace045c516
+commit 611ccd55e58b40ab6a4a718a154ea0d001d8e433
Author: Marek Černocký
-Date: Mon Sep 19 08:52:56 2016 +0200
+Date: Mon Sep 19 08:50:33 2016 +0200
Updated Czech translation
M po/cs.po
-commit 0f346cc9cc410ede68f8b8d6abe113792f87a3e1
+commit c569aec6cd42816b39c81c0da65c5e8790915bd5
Author: Christian Kirbach
Date: Sun Sep 18 19:11:29 2016 +0000
Updated German translation
+ (cherry picked from commit 0f346cc9cc410ede68f8b8d6abe113792f87a3e1)
M po/de.po
-commit 5ffc5577fddd4bcfab878ec06df7b980afd0a3fc
+commit 998f2217574d2afbbe54cd17e473eb6b511adc1b
+Author: Daniel Mustieles
+Date: Tue Sep 13 20:25:15 2016 +0200
+
+ Updated Spanish translation
+
+M po/es.po
+
+commit 15e7e747cddb9f38631a3f8f658d7201c3c7969a
Author: Marek Černocký
-Date: Tue Sep 13 11:17:14 2016 +0200
+Date: Tue Sep 13 11:17:45 2016 +0200
Updated Czech translation
diff --git a/Makefile.am b/Makefile.am
index 624642b..e47126b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,7 @@ lib_LTLIBRARIES = \
plugins_common_libshotwell_plugin_common_la_SOURCES = \
plugins/common/RESTSupport.vala \
plugins/common/Resources.vala \
+ plugins/common/WebAuthenticationPane.vala \
plugins/shotwell-plugin-dev-1.0.vapi
$(top_srcdir)/plugins/shotwell-plugin-common.vapi plugins/shotwell-plugin-common.h: \
@@ -73,6 +74,7 @@ plugins_common_libshotwell_plugin_common_la_VALAFLAGS = \
plugins_common_libshotwell_plugin_common_la_CFLAGS = \
$(PLUGIN_CFLAGS) \
+ -Wno-incompatible-pointer-types -Wno-discarded-qualifiers \
-DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
-I $(top_srcdir)/plugins -I$(top_builddir)/plugins
diff --git a/Makefile.in b/Makefile.in
index 7768d35..a980264 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -175,7 +175,8 @@ plugins_common_libshotwell_plugin_common_la_DEPENDENCIES = \
$(am__DEPENDENCIES_1)
am__dirstamp = $(am__leading_dot)dirstamp
am_plugins_common_libshotwell_plugin_common_la_OBJECTS = plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo \
- plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo
+ plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo \
+ plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo
plugins_common_libshotwell_plugin_common_la_OBJECTS = \
$(am_plugins_common_libshotwell_plugin_common_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
@@ -583,6 +584,7 @@ am__dist_noinst_DATA_DIST = plugins/shotwell-publishing/facebook.png \
plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
plugins/shotwell-publishing/piwigo_authentication_pane.ui \
plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
+ plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui \
plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml \
plugins/shotwell-publishing-extras/gallery3.png \
@@ -660,6 +662,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
plugins/common/RESTSupport.c plugins/common/Resources.c \
+ plugins/common/WebAuthenticationPane.c \
plugins/shotwell-data-imports/FSpotDatabase.c \
plugins/shotwell-data-imports/FSpotDatabaseBehavior.c \
plugins/shotwell-data-imports/FSpotDatabaseTable.c \
@@ -1051,6 +1054,7 @@ lib_LTLIBRARIES = \
plugins_common_libshotwell_plugin_common_la_SOURCES = \
plugins/common/RESTSupport.vala \
plugins/common/Resources.vala \
+ plugins/common/WebAuthenticationPane.vala \
plugins/shotwell-plugin-dev-1.0.vapi
plugins_common_libshotwell_plugin_common_la_VALAFLAGS = \
@@ -1067,6 +1071,7 @@ plugins_common_libshotwell_plugin_common_la_VALAFLAGS = \
plugins_common_libshotwell_plugin_common_la_CFLAGS = \
$(PLUGIN_CFLAGS) \
+ -Wno-incompatible-pointer-types -Wno-discarded-qualifiers \
-DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
-I $(top_srcdir)/plugins -I$(top_builddir)/plugins
@@ -1123,6 +1128,7 @@ dist_noinst_DATA = $(NULL) plugins/shotwell-publishing/facebook.png \
plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
plugins/shotwell-publishing/piwigo_authentication_pane.ui \
plugins/shotwell-publishing/piwigo_publishing_options_pane.ui \
+ plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui \
plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml \
$(am__append_4) \
@@ -1140,10 +1146,11 @@ MOSTLYCLEANFILES = $(NULL) plugins/shotwell-publishing/resource.c \
# --enable-checking needs to come first to not trigger
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18734
-COMMON_VALAFLAGS = --enable-checking --target-glib=2.32 --thread \
+COMMON_VALAFLAGS = --enable-checking --target-glib=2.40 --thread \
--fatal-warnings --enable-experimental --enable-deprecated \
$(am__append_2)
COMMON_CFLAGS = -I$(top_srcdir)/vapi -D_PREFIX='"$(prefix)"' \
+ -Wno-incompatible-pointer-types -Wno-discarded-qualifiers \
-D_VERSION='"$(VERSION)"' \
-DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
-D_LANG_SUPPORT_DIR='"$(prefix)/share/locale"' \
@@ -1167,7 +1174,7 @@ shotwell_VALAFLAGS = $(COMMON_VALAFLAGS) \
--vapidir $(abs_top_srcdir)/vapi \
--pkg libgphoto2 --pkg posix --pkg libraw --pkg gexiv2 \
--pkg libexif --pkg gudev-1.0 --pkg gstreamer-1.0 \
- --pkg gstreamer-pbutils-1.0 \
+ --pkg gstreamer-pbutils-1.0 --pkg misc \
$(UNITY_VALAFLAGS) \
$(COMMON_VALAFLAGS_POST)
@@ -1395,12 +1402,16 @@ plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS = \
--pkg shotwell-plugin-dev-1.0 \
--pkg libxml-2.0 \
--pkg webkit2gtk-4.0 \
+ --pkg gcr-3 \
+ --pkg gcr-ui-3 \
--vapidir $(abs_top_srcdir)/plugins
plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS = \
-DPLUGIN_RESOURCE_PATH='"/org/gnome/Shotwell/Publishing"' \
$(PLUGIN_CFLAGS) \
$(COMMON_CFLAGS) \
+ -DGCR_API_SUBJECT_TO_CHANGE \
+ $(PUBLISHING_CFLAGS) \
-I $(top_srcdir)/plugins
plugins_shotwell_publishing_shotwell_publishing_la_LDFLAGS = \
@@ -1686,6 +1697,9 @@ plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo: \
plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo: \
plugins/common/$(am__dirstamp) \
plugins/common/$(DEPDIR)/$(am__dirstamp)
+plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo: \
+ plugins/common/$(am__dirstamp) \
+ plugins/common/$(DEPDIR)/$(am__dirstamp)
plugins/common/libshotwell-plugin-common.la: $(plugins_common_libshotwell_plugin_common_la_OBJECTS) $(plugins_common_libshotwell_plugin_common_la_DEPENDENCIES) $(EXTRA_plugins_common_libshotwell_plugin_common_la_DEPENDENCIES) plugins/common/$(am__dirstamp)
$(AM_V_CCLD)$(plugins_common_libshotwell_plugin_common_la_LINK) -rpath $(libdir) $(plugins_common_libshotwell_plugin_common_la_OBJECTS) $(plugins_common_libshotwell_plugin_common_la_LIBADD) $(LIBS)
@@ -2629,6 +2643,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-RESTSupport.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-Resources.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabase.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseTable.Plo@am__quote@
@@ -2904,6 +2919,13 @@ plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo: plugins
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo `test -f 'plugins/common/Resources.c' || echo '$(srcdir)/'`plugins/common/Resources.c
+plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo: plugins/common/WebAuthenticationPane.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -MT plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo -MD -MP -MF plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.Tpo -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo `test -f 'plugins/common/WebAuthenticationPane.c' || echo '$(srcdir)/'`plugins/common/WebAuthenticationPane.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.Tpo plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='plugins/common/WebAuthenticationPane.c' object='plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_common_libshotwell_plugin_common_la_CFLAGS) $(CFLAGS) -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo `test -f 'plugins/common/WebAuthenticationPane.c' || echo '$(srcdir)/'`plugins/common/WebAuthenticationPane.c
+
plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo: plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plugins_shotwell_data_imports_shotwell_data_imports_la_CFLAGS) $(CFLAGS) -MT plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo -MD -MP -MF plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Tpo -c -o plugins/shotwell-data-imports/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.lo `test -f 'plugins/shotwell-data-imports/FSpotDatabaseBehavior.c' || echo '$(srcdir)/'`plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Tpo plugins/shotwell-data-imports/$(DEPDIR)/plugins_shotwell_data_imports_shotwell_data_imports_la-FSpotDatabaseBehavior.Plo
@@ -6867,6 +6889,35 @@ $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp: thumbnailer/shotwel
$(AM_V_at)rm -f $@ && echo stamp > $@-t
$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(thumbnailer_shotwell_video_thumbnailer_VALAFLAGS) $(VALAFLAGS) -C thumbnailer/shotwell-video-thumbnailer.vala
$(AM_V_at)mv -f $@-t $@
+$(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+ @if test -f $@; then :; else \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ fi
+$(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+ @if test -f $@; then :; else \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ fi
+$(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+ @if test -f $@; then :; else \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ fi
+$(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+ @if test -f $@; then :; else \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ fi
+$(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+ @if test -f $@; then :; else \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ fi
+$(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
+ $(AM_V_at)rm -f $@ && echo stamp > $@-t
+ $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
+ $(AM_V_at)mv -f $@-t $@
$(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c: $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp
@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp; fi
@if test -f $@; then :; else \
@@ -6951,68 +7002,48 @@ $(srcdir)/plugins/common/Resources.c: $(srcdir)/plugins_common_libshotwell_plugi
@if test -f $@; then :; else \
$(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
fi
-$(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/shotwell-plugin-dev-1.0.vapi
- $(AM_V_at)rm -f $@ && echo stamp > $@-t
- $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/shotwell-plugin-dev-1.0.vapi
- $(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
- @if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
- fi
-$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
- @if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
- fi
-$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
- @if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
- fi
-$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
- @if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
- fi
-$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/common/WebAuthenticationPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/shotwell-plugin-dev-1.0.vapi
+ $(AM_V_at)rm -f $@ && echo stamp > $@-t
+ $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/shotwell-plugin-dev-1.0.vapi
+ $(AM_V_at)mv -f $@-t $@
+$(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
fi
-$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
+$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi
$(AM_V_at)rm -f $@ && echo stamp > $@-t
- $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
+ $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi
$(AM_V_at)mv -f $@-t $@
$(srcdir)/src/plugins/SpitInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
@@ -7038,68 +7069,64 @@ $(srcdir)/src_plugins_libplugin_la_vala.stamp: src/plugins/SpitInterfaces.vala s
$(AM_V_at)rm -f $@ && echo stamp > $@-t
$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_plugins_libplugin_la_VALAFLAGS) $(VALAFLAGS) -C src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
$(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-publishing-extras/RajcePublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-publishing-extras/TumblrPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-publishing-extras/YandexPublishing.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp: plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
- $(AM_V_at)rm -f $@ && echo stamp > $@-t
- $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing-extras/GalleryConnector.vala plugins/shotwell-publishing-extras/RajcePublishing.vala plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala plugins/shotwell-publishing-extras/TumblrPublishing.vala plugins/shotwell-publishing-extras/YandexPublishing.vala plugins/shotwell-plugin-common.vapi
- $(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-publishing/PicasaPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-publishing/YouTubePublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
- @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
+$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+ @if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
@if test -f $@; then :; else \
- $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
fi
-$(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp: plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi
+$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
$(AM_V_at)rm -f $@ && echo stamp > $@-t
- $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi
+ $(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
$(AM_V_at)mv -f $@-t $@
mostlyclean-libtool:
@@ -7535,6 +7562,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
-rm -f $(srcdir)/plugins/common/RESTSupport.c
-rm -f $(srcdir)/plugins/common/Resources.c
+ -rm -f $(srcdir)/plugins/common/WebAuthenticationPane.c
-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotDatabase.c
-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
-rm -f $(srcdir)/plugins/shotwell-data-imports/FSpotDatabaseTable.c
@@ -7777,6 +7805,7 @@ maintainer-clean-generic:
-rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp
-rm -f plugins/common/RESTSupport.c
-rm -f plugins/common/Resources.c
+ -rm -f plugins/common/WebAuthenticationPane.c
-rm -f plugins/shotwell-data-imports/FSpotDatabase.c
-rm -f plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
-rm -f plugins/shotwell-data-imports/FSpotDatabaseTable.c
diff --git a/NEWS b/NEWS
index a3984ca..1cb5b35 100644
--- a/NEWS
+++ b/NEWS
@@ -1,33 +1,72 @@
-Shotwell 0.24.1 - 16 Oct 2016
- * Add debug output when shifting day of event
- * Add debug output of Shotwell's current timezone
- * Fix Vala generic handling with recent Vala compiler
- * Fix focus handling when in fullscreen (#771969)
- * Remove obsolete CSS style
- * Prevent a critical in Piwigo uploader
- * Fix issue with accessability in recent Vala compiler
- * Fix album creation with Piwigo uploader (#772648)
- * Add option to enable SQL debugging without recompilation
- * Translation updates
+Shotwell 0.25.0 - 24 Oct 2016
+ * Add contrast to improvements
+ * Add a log when shifting events
+ * Add a debug output of the current timezone
+ * Fix compilation with recent Vala compiler
+ * Fix focus handling of full-screen viewer
+ * Remove obsolete CSS style property
+ * Support ACDSEE tags
+ * Use unicode characters
+ * Remove deprecated calls
+ * Silence two C warnings that are usually caused by valac
+ * Refactor web authenticator
+ * Spelling fixes
+ * Piwigo: Add option to override SSL certificate handling
+ * Piwigo: Add option to show the SSL certificate
+ * Remove an old GTK+ work-around
+ * Remove deprecated GSettings calls
+ * Persist export dialog settings
+ * Remove deprecated elements from export dialog
+ * Port web plugins to new libsoup API
+ * Fix libraw binding
+ * Piwigo: Fix new album creation
+ * Blacklist vaapi decoder to prevent crashes in video meta data extraction
+ * Hide "Folder" side-bar when empty
+ * Enable SQL debugging through environment variable
+
+Added/Updated requirements:
+ GExiv2 >= 0.10.4
+ GCR-3
+ GLib >= 2.40
+ GTK+ >= 3.14
Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=716259
+ - https://bugzilla.gnome.org/show_bug.cgi?id=716660
+ - https://bugzilla.gnome.org/show_bug.cgi?id=718586
+ - https://bugzilla.gnome.org/show_bug.cgi?id=719127
+ - https://bugzilla.gnome.org/show_bug.cgi?id=762416
+ - https://bugzilla.gnome.org/show_bug.cgi?id=765149
+ - https://bugzilla.gnome.org/show_bug.cgi?id=767126
+ - https://bugzilla.gnome.org/show_bug.cgi?id=767473
- https://bugzilla.gnome.org/show_bug.cgi?id=771969
+ - https://bugzilla.gnome.org/show_bug.cgi?id=772295
+ - https://bugzilla.gnome.org/show_bug.cgi?id=772339
- https://bugzilla.gnome.org/show_bug.cgi?id=772648
All contributors to this release:
- Jens Georg
- - Rico Tzschichholz
+ - Piotr Drąg
- Marek Černocký
+ - Gábor Kelemen
+ - Rico Tzschichholz
- Rafael Fontenelle
- Mario Blättermann
- - Christian Kirbach
- - Bernd Homuth
+ - Jordi Mas
+ - Josh Freeman
+ - Daniel Mustieles
+ - Benedikt M. Thoma
+ - Balázs Meskó
- Anders Jonsson
Added/updated translations
+ - ca, courtesy of Jordi Mas
- cs, courtesy of Marek Černocký
- - de, courtesy of Bernd Homuth
- de, courtesy of Christian Kirbach
+ - de, courtesy of Mario Blättermann
+ - es, courtesy of Daniel Mustieles
+ - hu, courtesy of Meskó Balázs
+ - pl, courtesy of Piotr Drąg
- pt_BR, courtesy of Rafael Fontenelle
- sv, courtesy of Anders Jonsson
diff --git a/common.am b/common.am
index 6129cf1..20a66c6 100644
--- a/common.am
+++ b/common.am
@@ -1,12 +1,13 @@
# --enable-checking needs to come first to not trigger
# https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18734
COMMON_VALAFLAGS = \
- --enable-checking --target-glib=2.32 --thread --fatal-warnings \
+ --enable-checking --target-glib=2.40 --thread --fatal-warnings \
--enable-experimental --enable-deprecated
COMMON_CFLAGS = \
-I$(top_srcdir)/vapi \
-D_PREFIX='"$(prefix)"' \
+ -Wno-incompatible-pointer-types -Wno-discarded-qualifiers \
-D_VERSION='"$(VERSION)"' \
-DGETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \
-D_LANG_SUPPORT_DIR='"$(prefix)/share/locale"' \
diff --git a/configure b/configure
index 207a3d9..539f1e8 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for shotwell 0.24.1.
+# Generated by GNU Autoconf 2.69 for shotwell 0.25.0.
#
# Report bugs to .
#
@@ -650,8 +650,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='shotwell'
PACKAGE_TARNAME='shotwell'
-PACKAGE_VERSION='0.24.1'
-PACKAGE_STRING='shotwell 0.24.1'
+PACKAGE_VERSION='0.25.0'
+PACKAGE_STRING='shotwell 0.25.0'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell'
PACKAGE_URL=''
@@ -1486,7 +1486,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures shotwell 0.24.1 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.25.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1557,7 +1557,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of shotwell 0.24.1:";;
+ short | recursive ) echo "Configuration of shotwell 0.25.0:";;
esac
cat <<\_ACEOF
@@ -1720,7 +1720,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-shotwell configure 0.24.1
+shotwell configure 0.25.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +1998,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by shotwell $as_me 0.24.1, which was
+It was created by shotwell $as_me 0.25.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2457,14 +2457,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
MAJOR_VERSION=0
-MINOR_VERSION=24
+MINOR_VERSION=25
-MICRO_VERSION=1
+MICRO_VERSION=0
API_VERSION=0
-GITVER=fe5852f0f0767240c61872b0fdc3994f2dd23f63
+GITVER=0a348fe98b77bf17b4cbe8a257eecffc966acbd7
if test "x$GITVER" != "x"; then
@@ -2962,7 +2962,7 @@ fi
# Define the identity of the package.
PACKAGE='shotwell'
- VERSION='0.24.1'
+ VERSION='0.25.0'
cat >>confdefs.h <<_ACEOF
@@ -8024,9 +8024,9 @@ if test -n "$SHOTWELL_CFLAGS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -8037,16 +8037,16 @@ if test -n "$SHOTWELL_CFLAGS"; then
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
\""; } >&5
($PKG_CONFIG --exists --print-errors "
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -8057,7 +8057,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
@@ -8067,9 +8067,9 @@ if test -n "$SHOTWELL_CFLAGS"; then
test $ac_status = 0; }; then
pkg_cv_SHOTWELL_CFLAGS=`$PKG_CONFIG --cflags "
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -8080,7 +8080,7 @@ if test -n "$SHOTWELL_CFLAGS"; then
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
@@ -8098,9 +8098,9 @@ if test -n "$SHOTWELL_LIBS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -8111,16 +8111,16 @@ if test -n "$SHOTWELL_LIBS"; then
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
\""; } >&5
($PKG_CONFIG --exists --print-errors "
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -8131,7 +8131,7 @@ if test -n "$SHOTWELL_LIBS"; then
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
@@ -8141,9 +8141,9 @@ if test -n "$SHOTWELL_LIBS"; then
test $ac_status = 0; }; then
pkg_cv_SHOTWELL_LIBS=`$PKG_CONFIG --libs "
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -8154,7 +8154,7 @@ if test -n "$SHOTWELL_LIBS"; then
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
@@ -8181,9 +8181,9 @@ fi
if test $_pkg_short_errors_supported = yes; then
SHOTWELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -8194,7 +8194,7 @@ fi
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
@@ -8202,9 +8202,9 @@ fi
else
SHOTWELL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -8215,7 +8215,7 @@ fi
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
@@ -8226,9 +8226,9 @@ fi
as_fn_error $? "Package requirements (
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -8239,7 +8239,7 @@ fi
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
@@ -8580,16 +8580,16 @@ if test -n "$PUBLISHING_CFLAGS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0\""; } >&5
+ webkit2gtk-4.0 gcr-3 gcr-ui-3\""; } >&5
($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0") 2>&5
+ webkit2gtk-4.0 gcr-3 gcr-ui-3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PUBLISHING_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0" 2>/dev/null`
+ webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -8603,16 +8603,16 @@ if test -n "$PUBLISHING_LIBS"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0\""; } >&5
+ webkit2gtk-4.0 gcr-3 gcr-ui-3\""; } >&5
($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0") 2>&5
+ webkit2gtk-4.0 gcr-3 gcr-ui-3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PUBLISHING_LIBS=`$PKG_CONFIG --libs "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0" 2>/dev/null`
+ webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -8635,18 +8635,18 @@ fi
if test $_pkg_short_errors_supported = yes; then
PUBLISHING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0" 2>&1`
+ webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>&1`
else
PUBLISHING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0" 2>&1`
+ webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$PUBLISHING_PKG_ERRORS" >&5
as_fn_error $? "Package requirements (gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0) were not met:
+ webkit2gtk-4.0 gcr-3 gcr-ui-3) were not met:
$PUBLISHING_PKG_ERRORS
@@ -17615,7 +17615,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by shotwell $as_me 0.24.1, which was
+This file was extended by shotwell $as_me 0.25.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17681,7 +17681,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-shotwell config.status 0.24.1
+shotwell config.status 0.25.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index febc024..c641f72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ dnl ***********************************************************************
dnl Define Versioning Information
dnl ***********************************************************************
m4_define([major_version],[0])
-m4_define([minor_version],[24])
-m4_define([micro_version],[1])
+m4_define([minor_version],[25])
+m4_define([micro_version],[0])
m4_define([package_version],[major_version.minor_version.micro_version])
m4_define([bug_report_url],[https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell])
m4_define([api_version],[major_version])
@@ -85,9 +85,9 @@ dnl Check for required packages
dnl ***********************************************************************
PKG_CHECK_MODULES(SHOTWELL, [
gee-0.8 >= 0.8.5
- gexiv2 >= 0.4.90
+ gexiv2 >= 0.10.4
gio-unix-2.0 >= 2.20
- glib-2.0 >= 2.30.0
+ glib-2.0 >= 2.40.0
gmodule-2.0 >= 2.24.0
gstreamer-1.0 >= 1.0.0
gstreamer-base-1.0 >= 1.0.0
@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(SHOTWELL, [
libexif >= 0.6.16
libgphoto2 >= 2.5.0
libraw >= 0.13.2
- libsoup-2.4 >= 2.26.0
+ libsoup-2.4 >= 2.42.0
libxml-2.0 >= 2.6.32
sqlite3 >= 3.5.9
webkit2gtk-4.0
@@ -113,7 +113,7 @@ PKG_CHECK_MODULES(IMPORT, [gee-0.8 >= 0.8.5 glib-2.0 gio-2.0 sqlite3])
PKG_CHECK_MODULES(PUBLISHING, [gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
- webkit2gtk-4.0])
+ webkit2gtk-4.0 gcr-3 gcr-ui-3])
PKG_CHECK_MODULES(TRANSITIONS, [gobject-2.0 cairo gio-2.0 gdk-pixbuf-2.0
gdk-3.0])
diff --git a/help/cs/cs.po b/help/cs/cs.po
index 5041148..c5a71d8 100644
--- a/help/cs/cs.po
+++ b/help/cs/cs.po
@@ -5,8 +5,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: shotwell shotwell-0.24\n"
-"POT-Creation-Date: 2016-09-12 19:32+0000\n"
+"Project-Id-Version: shotwell master\n"
+"POT-Creation-Date: 2016-09-04 08:44+0000\n"
"PO-Revision-Date: 2016-09-13 11:15+0200\n"
"Last-Translator: Marek Černocký \n"
"Language-Team: čeština \n"
diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml
index 16ba868..ce3b815 100644
--- a/misc/org.yorba.shotwell.gschema.xml
+++ b/misc/org.yorba.shotwell.gschema.xml
@@ -14,6 +14,7 @@
+
@@ -74,7 +75,7 @@
true
display photo ratings
- True if a photo's rating should be displayed as overlaid trinket, false otherwise.
+ True if a photo’s rating should be displayed as overlaid trinket, false otherwise.
@@ -163,8 +164,8 @@
false
- Selection state of "hide photos" option
- Last used selection state of the "hide photos already imported" option in the import page.
+ Selection state of “hide photos” option
+ Last used selection state of the “hide photos already imported” option in the import page.
@@ -290,12 +291,12 @@
1
- Most-recently-used crop custom aspect ratio's numerator.
+ Most-recently-used crop custom aspect ratio’s numerator.
A nonzero, positive integer representing the width part of the last custom crop ratio the user entered.
1
- Most-recently-used crop custom aspect ratio's denominator.
+ Most-recently-used crop custom aspect ratio’s denominator.
A nonzero, positive integer representing the height part of the last custom crop ratio the user entered.
@@ -314,6 +315,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'ORIGINAL'
+ Setting in export dialog: how to trim images
+ Setting in export dialog: how to trim images
+
+
+
+ true
+ export metadata
+ Setting in export dialog: option to export metadata
+
+
+
+ 'CURRENT'
+ format setting, special value
+ Setting in export dialog: format setting, special value
+
+
+
+ 'JFIF'
+ format setting, type value
+ Setting in export dialog: format setting, type value
+
+
+
+ 'HIGH'
+ JPEG quality option
+ Setting in export dialog: jpeg quality option
+
+
+
+ 1200
+ maximal size of image
+ Setting in export dialog: maximal size of image
+
+
+
""
diff --git a/misc/shotwell.appdata.xml.in b/misc/shotwell.appdata.xml.in
index 955ec1c..15a8e92 100644
--- a/misc/shotwell.appdata.xml.in
+++ b/misc/shotwell.appdata.xml.in
@@ -12,7 +12,7 @@
Shotwell is an easy-to-use, fast photo organizer designed for the GNOME desktop.
It allows you to import photos from your camera or disk, organize them by date and subject
matter, even ratings. It also offers basic photo editing, like crop, red-eye correction,
- color adjustments, and straighten. Shotwell's non-destructive photo editor does not alter
+ color adjustments, and straighten. Shotwell’s non-destructive photo editor does not alter
your master photos, making it easy to experiment and correct errors.
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index ea543cb..382d4fe 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -15,16 +15,14 @@
#include "shotwell-plugin-dev-1.0.h"
#include
#include
-#include
#include
+#include
#include
#include
#include
#include
#include
#include
-#include
-#include
#include
#define _g_hmac_unref0(var) ((var == NULL) ? NULL : (var = (g_hmac_unref (var), NULL)))
@@ -69,6 +67,7 @@ typedef struct _PublishingRESTSupportTransaction PublishingRESTSupportTransactio
typedef struct _PublishingRESTSupportTransactionClass PublishingRESTSupportTransactionClass;
typedef struct _PublishingRESTSupportTransactionPrivate PublishingRESTSupportTransactionPrivate;
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
#define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
typedef struct _PublishingRESTSupportParamSpecTransaction PublishingRESTSupportParamSpecTransaction;
@@ -98,7 +97,6 @@ typedef struct _PublishingRESTSupportXmlDocumentClass PublishingRESTSupportXmlDo
typedef struct _PublishingRESTSupportXmlDocumentPrivate PublishingRESTSupportXmlDocumentPrivate;
#define _publishing_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (var), NULL)))
typedef struct _PublishingRESTSupportParamSpecXmlDocument PublishingRESTSupportParamSpecXmlDocument;
-#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
#define PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER (publishing_rest_support_batch_uploader_get_type ())
#define PUBLISHING_REST_SUPPORT_BATCH_UPLOADER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader))
@@ -146,6 +144,16 @@ typedef struct _PublishingRESTSupportGooglePublisherPrivate PublishingRESTSuppor
typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImpl PublishingRESTSupportGooglePublisherGoogleSessionImpl;
typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImplClass PublishingRESTSupportGooglePublisherGoogleSessionImplClass;
+#define SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE (shotwell_plugins_common_web_authentication_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+
+typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommonWebAuthenticationPane;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
+
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE (publishing_rest_support_google_publisher_web_authentication_pane_get_type ())
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane))
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass))
@@ -197,6 +205,7 @@ typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClas
typedef struct _PublishingRESTSupportGooglePublisherUsernameFetchTransaction PublishingRESTSupportGooglePublisherUsernameFetchTransaction;
typedef struct _PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
typedef struct _PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate;
typedef struct _PublishingRESTSupportGooglePublisherGetAccessTokensTransactionPrivate PublishingRESTSupportGooglePublisherGetAccessTokensTransactionPrivate;
typedef struct _PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionPrivate PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionPrivate;
@@ -388,19 +397,23 @@ struct _PublishingRESTSupportGooglePublisherGoogleSessionImplClass {
PublishingRESTSupportGoogleSessionClass parent_class;
};
-struct _PublishingRESTSupportGooglePublisherWebAuthenticationPane {
+struct _ShotwellPluginsCommonWebAuthenticationPane {
GObject parent_instance;
- PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate * priv;
+ ShotwellPluginsCommonWebAuthenticationPanePrivate * priv;
};
-struct _PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass {
+struct _ShotwellPluginsCommonWebAuthenticationPaneClass {
GObjectClass parent_class;
+ void (*on_page_load) (ShotwellPluginsCommonWebAuthenticationPane* self);
+};
+
+struct _PublishingRESTSupportGooglePublisherWebAuthenticationPane {
+ ShotwellPluginsCommonWebAuthenticationPane parent_instance;
+ PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate * priv;
};
-struct _PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate {
- WebKitWebView* webview;
- GtkBox* pane_widget;
- gchar* auth_sequence_start_url;
+struct _PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass {
+ ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
};
struct _PublishingRESTSupportGooglePublisherGetAccessTokensTransaction {
@@ -452,7 +465,6 @@ static gpointer publishing_rest_support_google_publisher_google_session_impl_par
static gpointer publishing_rest_support_google_publisher_web_authentication_pane_parent_class = NULL;
static gboolean publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty;
static gboolean publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty = FALSE;
-static SpitPublishingDialogPaneIface* publishing_rest_support_google_publisher_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
static gpointer publishing_rest_support_google_publisher_get_access_tokens_transaction_parent_class = NULL;
static gpointer publishing_rest_support_google_publisher_refresh_access_token_transaction_parent_class = NULL;
static gpointer publishing_rest_support_google_publisher_authenticated_transaction_parent_class = NULL;
@@ -483,6 +495,7 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self);
void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message);
static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self);
+void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self);
static void publishing_rest_support_session_finalize (PublishingRESTSupportSession* obj);
GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
@@ -524,6 +537,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
static void publishing_rest_support_transaction_on_message_unqueued (PublishingRESTSupportTransaction* self, SoupMessage* message);
void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error);
gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTransaction* self);
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert);
gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSupportTransaction* self);
PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length);
@@ -623,6 +637,7 @@ static void publishing_rest_support_google_session_real_deauthenticate (Publishi
PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type);
GType publishing_rest_support_google_publisher_get_type (void) G_GNUC_CONST;
static GType publishing_rest_support_google_publisher_google_session_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
+GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
static GType publishing_rest_support_google_publisher_web_authentication_pane_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisherPrivate))
enum {
@@ -692,20 +707,11 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token (PublishingRESTSupportGoogleSession* base);
static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base);
static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession* obj);
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate))
enum {
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
};
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self, WebKitLoadEvent load_event);
-static void _publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self);
-static gboolean __lambda4_ (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self);
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self);
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_page_load (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self);
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_load_started (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self);
-static SpitPublishingDialogPaneGeometryOptions publishing_rest_support_google_publisher_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static GtkWidget* publishing_rest_support_google_publisher_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
+WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
static void publishing_rest_support_google_publisher_web_authentication_pane_finalize (GObject* obj);
enum {
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION_DUMMY_PROPERTY
@@ -771,13 +777,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
if (result_length1) {
#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
-#line 774 "RESTSupport.c"
+#line 780 "RESTSupport.c"
}
#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 780 "RESTSupport.c"
+#line 786 "RESTSupport.c"
}
@@ -839,7 +845,7 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
_g_hmac_unref0 (mac);
#line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 842 "RESTSupport.c"
+#line 848 "RESTSupport.c"
}
@@ -847,7 +853,7 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o
PublishingRESTSupportSession* self = NULL;
const gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
- SoupSessionAsync* _tmp2_ = NULL;
+ SoupSession* _tmp2_ = NULL;
SoupSession* _tmp3_ = NULL;
#line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportSession*) g_type_create_instance (object_type);
@@ -860,18 +866,18 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o
#line 35 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->endpoint_url = _tmp1_;
#line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = (SoupSessionAsync*) soup_session_async_new ();
+ _tmp2_ = soup_session_new ();
#line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->soup_session);
#line 36 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->soup_session = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, soup_session_get_type (), SoupSession);
+ self->priv->soup_session = _tmp2_;
#line 37 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = self->priv->soup_session;
#line 37 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
#line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 874 "RESTSupport.c"
+#line 880 "RESTSupport.c"
}
@@ -885,7 +891,7 @@ void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRES
_tmp0_ = message;
#line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "wire-message-unqueued", _tmp0_);
-#line 888 "RESTSupport.c"
+#line 894 "RESTSupport.c"
}
@@ -894,7 +900,7 @@ void publishing_rest_support_session_notify_authenticated (PublishingRESTSupport
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
#line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "authenticated");
-#line 897 "RESTSupport.c"
+#line 903 "RESTSupport.c"
}
@@ -906,7 +912,7 @@ void publishing_rest_support_session_notify_authentication_failed (PublishingRES
_tmp0_ = err;
#line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "authentication-failed", _tmp0_);
-#line 909 "RESTSupport.c"
+#line 915 "RESTSupport.c"
}
@@ -915,7 +921,7 @@ static gboolean publishing_rest_support_session_real_is_authenticated (Publishin
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return FALSE;
-#line 918 "RESTSupport.c"
+#line 924 "RESTSupport.c"
}
@@ -924,7 +930,7 @@ gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupport
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE);
#line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self);
-#line 927 "RESTSupport.c"
+#line 933 "RESTSupport.c"
}
@@ -942,7 +948,7 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
result = _tmp1_;
#line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 945 "RESTSupport.c"
+#line 951 "RESTSupport.c"
}
@@ -956,7 +962,7 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
_tmp0_ = self->priv->soup_session;
#line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_session_abort (_tmp0_);
-#line 959 "RESTSupport.c"
+#line 965 "RESTSupport.c"
}
@@ -971,14 +977,14 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
result = _tmp0_;
#line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 974 "RESTSupport.c"
+#line 980 "RESTSupport.c"
}
static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg);
-#line 981 "RESTSupport.c"
+#line 987 "RESTSupport.c"
}
@@ -999,7 +1005,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
if (_tmp0_) {
#line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 1002 "RESTSupport.c"
+#line 1008 "RESTSupport.c"
}
#line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->soup_session;
@@ -1017,14 +1023,31 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE);
#line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
-#line 1020 "RESTSupport.c"
+#line 1026 "RESTSupport.c"
+}
+
+
+void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self) {
+ SoupSession* _tmp0_ = NULL;
+ SoupSession* _tmp1_ = NULL;
+#line 77 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
+#line 78 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = self->priv->soup_session;
+#line 78 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_set (_tmp0_, "ssl-use-system-ca-file", FALSE, NULL);
+#line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = self->priv->soup_session;
+#line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_object_set (_tmp1_, "ssl-strict", FALSE, NULL);
+#line 1043 "RESTSupport.c"
}
static void publishing_rest_support_value_session_init (GValue* value) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1027 "RESTSupport.c"
+#line 1050 "RESTSupport.c"
}
@@ -1033,7 +1056,7 @@ static void publishing_rest_support_value_session_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (value->data[0].v_pointer);
-#line 1036 "RESTSupport.c"
+#line 1059 "RESTSupport.c"
}
}
@@ -1043,11 +1066,11 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
if (src_value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer);
-#line 1046 "RESTSupport.c"
+#line 1069 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1050 "RESTSupport.c"
+#line 1073 "RESTSupport.c"
}
}
@@ -1055,37 +1078,37 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1058 "RESTSupport.c"
+#line 1081 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 1065 "RESTSupport.c"
+#line 1088 "RESTSupport.c"
PublishingRESTSupportSession* object;
object = collect_values[0].v_pointer;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1072 "RESTSupport.c"
+#line 1095 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1076 "RESTSupport.c"
+#line 1099 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 1080 "RESTSupport.c"
+#line 1103 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1084 "RESTSupport.c"
+#line 1107 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1088 "RESTSupport.c"
+#line 1111 "RESTSupport.c"
}
@@ -1096,25 +1119,25 @@ static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* v
if (!object_p) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1099 "RESTSupport.c"
+#line 1122 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 1105 "RESTSupport.c"
+#line 1128 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 1109 "RESTSupport.c"
+#line 1132 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1113 "RESTSupport.c"
+#line 1136 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1117 "RESTSupport.c"
+#line 1140 "RESTSupport.c"
}
@@ -1128,7 +1151,7 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const
G_PARAM_SPEC (spec)->value_type = object_type;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 1131 "RESTSupport.c"
+#line 1154 "RESTSupport.c"
}
@@ -1137,7 +1160,7 @@ gpointer publishing_rest_support_value_get_session (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1140 "RESTSupport.c"
+#line 1163 "RESTSupport.c"
}
@@ -1157,17 +1180,17 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object
value->data[0].v_pointer = v_object;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1160 "RESTSupport.c"
+#line 1183 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1164 "RESTSupport.c"
+#line 1187 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (old);
-#line 1170 "RESTSupport.c"
+#line 1193 "RESTSupport.c"
}
}
@@ -1186,17 +1209,17 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 1189 "RESTSupport.c"
+#line 1212 "RESTSupport.c"
} else {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1193 "RESTSupport.c"
+#line 1216 "RESTSupport.c"
}
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_unref (old);
-#line 1199 "RESTSupport.c"
+#line 1222 "RESTSupport.c"
}
}
@@ -1216,7 +1239,7 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("authentication_failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1219 "RESTSupport.c"
+#line 1242 "RESTSupport.c"
}
@@ -1231,7 +1254,7 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport
self->priv->transactions_stopped = FALSE;
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 1234 "RESTSupport.c"
+#line 1257 "RESTSupport.c"
}
@@ -1245,7 +1268,7 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi
_g_free0 (self->priv->endpoint_url);
#line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->soup_session);
-#line 1248 "RESTSupport.c"
+#line 1271 "RESTSupport.c"
}
@@ -1270,7 +1293,7 @@ gpointer publishing_rest_support_session_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1273 "RESTSupport.c"
+#line 1296 "RESTSupport.c"
}
@@ -1283,59 +1306,59 @@ void publishing_rest_support_session_unref (gpointer instance) {
PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self);
#line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1286 "RESTSupport.c"
+#line 1309 "RESTSupport.c"
}
}
gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self) {
gchar* result = NULL;
-#line 84 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
switch (self) {
-#line 84 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET:
-#line 1297 "RESTSupport.c"
+#line 1320 "RESTSupport.c"
{
gchar* _tmp0_ = NULL;
-#line 86 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_strdup ("GET");
-#line 86 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
-#line 86 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1306 "RESTSupport.c"
+#line 1329 "RESTSupport.c"
}
-#line 84 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1310 "RESTSupport.c"
+#line 1333 "RESTSupport.c"
{
gchar* _tmp1_ = NULL;
-#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = g_strdup ("PUT");
-#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1319 "RESTSupport.c"
+#line 1342 "RESTSupport.c"
}
-#line 84 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1323 "RESTSupport.c"
+#line 1346 "RESTSupport.c"
{
gchar* _tmp2_ = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_strdup ("POST");
-#line 92 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 92 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1332 "RESTSupport.c"
+#line 1355 "RESTSupport.c"
}
default:
{
-#line 95 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_error ("RESTSupport.vala:95: unrecognized HTTP method enumeration value");
-#line 1338 "RESTSupport.c"
+#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
+#line 1361 "RESTSupport.c"
}
}
}
@@ -1344,46 +1367,46 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str) {
PublishingRESTSupportHttpMethod result = 0;
const gchar* _tmp0_ = NULL;
-#line 99 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (str != NULL, 0);
-#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = str;
-#line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp0_, "GET") == 0) {
-#line 101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET;
-#line 101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1357 "RESTSupport.c"
+#line 1380 "RESTSupport.c"
} else {
const gchar* _tmp1_ = NULL;
-#line 102 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = str;
-#line 102 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp1_, "PUT") == 0) {
-#line 103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT;
-#line 103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1368 "RESTSupport.c"
+#line 1391 "RESTSupport.c"
} else {
const gchar* _tmp2_ = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = str;
-#line 104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp2_, "POST") == 0) {
-#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST;
-#line 105 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1379 "RESTSupport.c"
+#line 1402 "RESTSupport.c"
} else {
const gchar* _tmp3_ = NULL;
-#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = str;
-#line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_error ("RESTSupport.vala:107: unrecognized HTTP method name: %s", _tmp3_);
-#line 1386 "RESTSupport.c"
+#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_);
+#line 1409 "RESTSupport.c"
}
}
}
@@ -1408,38 +1431,38 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
gchar* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (key != NULL, NULL);
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (value != NULL, NULL);
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportArgument*) g_type_create_instance (object_type);
-#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = key;
-#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->key);
-#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->key = _tmp1_;
-#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = value;
-#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup (_tmp2_);
-#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->value);
-#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->value = _tmp3_;
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1435 "RESTSupport.c"
+#line 1458 "RESTSupport.c"
}
PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) {
-#line 116 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value);
-#line 1442 "RESTSupport.c"
+#line 1465 "RESTSupport.c"
}
@@ -1451,43 +1474,43 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
PublishingRESTSupportArgument* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
gint _tmp5_ = 0;
-#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg1), 0);
-#line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (arg2), 0);
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_strcmp0;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = arg1;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_->key;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = arg2;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = _tmp3_->key;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _tmp0_ (_tmp2_, _tmp4_);
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp5_;
-#line 122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1474 "RESTSupport.c"
+#line 1497 "RESTSupport.c"
}
static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
gint result;
result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1483 "RESTSupport.c"
+#line 1506 "RESTSupport.c"
}
static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 1490 "RESTSupport.c"
+#line 1513 "RESTSupport.c"
}
@@ -1502,70 +1525,70 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
gpointer* _tmp7_ = NULL;
PublishingRESTSupportArgument** _tmp8_ = NULL;
gint _tmp8__length1 = 0;
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = gee_tree_set_new (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, (GBoxedCopyFunc) publishing_rest_support_argument_ref, publishing_rest_support_argument_unref, _publishing_rest_support_argument_compare_gcompare_data_func, NULL, NULL);
-#line 126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
sorted_args = _tmp0_;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = inputArray;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1__length1 = inputArray_length1;
-#line 1513 "RESTSupport.c"
+#line 1536 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
gint _arg_collection_size_ = 0;
gint arg_it = 0;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg_collection = _tmp1_;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg_collection_length1 = _tmp1__length1;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1525 "RESTSupport.c"
+#line 1548 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp2_ = NULL;
PublishingRESTSupportArgument* arg = NULL;
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg = _tmp2_;
-#line 1532 "RESTSupport.c"
+#line 1555 "RESTSupport.c"
{
GeeTreeSet* _tmp3_ = NULL;
PublishingRESTSupportArgument* _tmp4_ = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = sorted_args;
-#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = arg;
-#line 129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
-#line 128 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 1544 "RESTSupport.c"
+#line 1567 "RESTSupport.c"
}
}
}
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = sorted_args;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = gee_collection_to_array (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection), &_tmp6_);
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _tmp7_;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8__length1 = _tmp6_;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (result_length1) {
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp8__length1;
-#line 1560 "RESTSupport.c"
+#line 1583 "RESTSupport.c"
}
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp8_;
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (sorted_args);
-#line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1568 "RESTSupport.c"
+#line 1591 "RESTSupport.c"
}
@@ -1574,229 +1597,229 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument
const gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
-#line 134 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_ARGUMENT (self), NULL);
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->key;
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->value;
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_strdup_printf ("%s=%s", _tmp0_, _tmp1_);
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 1589 "RESTSupport.c"
+#line 1612 "RESTSupport.c"
}
static void publishing_rest_support_value_argument_init (GValue* value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1596 "RESTSupport.c"
+#line 1619 "RESTSupport.c"
}
static void publishing_rest_support_value_argument_free_value (GValue* value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (value->data[0].v_pointer);
-#line 1605 "RESTSupport.c"
+#line 1628 "RESTSupport.c"
}
}
static void publishing_rest_support_value_argument_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer);
-#line 1615 "RESTSupport.c"
+#line 1638 "RESTSupport.c"
} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1619 "RESTSupport.c"
+#line 1642 "RESTSupport.c"
}
}
static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1627 "RESTSupport.c"
+#line 1650 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 1634 "RESTSupport.c"
+#line 1657 "RESTSupport.c"
PublishingRESTSupportArgument* object;
object = collect_values[0].v_pointer;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1641 "RESTSupport.c"
+#line 1664 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1645 "RESTSupport.c"
+#line 1668 "RESTSupport.c"
}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1649 "RESTSupport.c"
+#line 1672 "RESTSupport.c"
} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1653 "RESTSupport.c"
+#line 1676 "RESTSupport.c"
}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1657 "RESTSupport.c"
+#line 1680 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
PublishingRESTSupportArgument** object_p;
object_p = collect_values[0].v_pointer;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1668 "RESTSupport.c"
+#line 1691 "RESTSupport.c"
}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 1674 "RESTSupport.c"
+#line 1697 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 1678 "RESTSupport.c"
+#line 1701 "RESTSupport.c"
} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1682 "RESTSupport.c"
+#line 1705 "RESTSupport.c"
}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 1686 "RESTSupport.c"
+#line 1709 "RESTSupport.c"
}
GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
PublishingRESTSupportParamSpecArgument* spec;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 1700 "RESTSupport.c"
+#line 1723 "RESTSupport.c"
}
gpointer publishing_rest_support_value_get_argument (const GValue* value) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 1709 "RESTSupport.c"
+#line 1732 "RESTSupport.c"
}
void publishing_rest_support_value_set_argument (GValue* value, gpointer v_object) {
PublishingRESTSupportArgument* old;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1729 "RESTSupport.c"
+#line 1752 "RESTSupport.c"
} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1733 "RESTSupport.c"
+#line 1756 "RESTSupport.c"
}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (old);
-#line 1739 "RESTSupport.c"
+#line 1762 "RESTSupport.c"
}
}
void publishing_rest_support_value_take_argument (GValue* value, gpointer v_object) {
PublishingRESTSupportArgument* old;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 1758 "RESTSupport.c"
+#line 1781 "RESTSupport.c"
} else {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 1762 "RESTSupport.c"
+#line 1785 "RESTSupport.c"
}
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_unref (old);
-#line 1768 "RESTSupport.c"
+#line 1791 "RESTSupport.c"
}
}
static void publishing_rest_support_argument_class_init (PublishingRESTSupportArgumentClass * klass) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize;
-#line 1778 "RESTSupport.c"
+#line 1801 "RESTSupport.c"
}
static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 1785 "RESTSupport.c"
+#line 1808 "RESTSupport.c"
}
static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgument* obj) {
PublishingRESTSupportArgument * self;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, PublishingRESTSupportArgument);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_destroy (self);
-#line 113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->key);
-#line 114 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->value);
-#line 1799 "RESTSupport.c"
+#line 1822 "RESTSupport.c"
}
@@ -1817,32 +1840,32 @@ GType publishing_rest_support_argument_get_type (void) {
gpointer publishing_rest_support_argument_ref (gpointer instance) {
PublishingRESTSupportArgument* self;
self = instance;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 1824 "RESTSupport.c"
+#line 1847 "RESTSupport.c"
}
void publishing_rest_support_argument_unref (gpointer instance) {
PublishingRESTSupportArgument* self;
self = instance;
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self);
-#line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1837 "RESTSupport.c"
+#line 1860 "RESTSupport.c"
}
}
static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1845 "RESTSupport.c"
+#line 1868 "RESTSupport.c"
}
@@ -1860,60 +1883,60 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct
gchar* _tmp9_ = NULL;
SoupMessage* _tmp10_ = NULL;
SoupMessage* _tmp11_ = NULL;
-#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
-#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = parent_session;
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_session_get_endpoint_url (_tmp0_);
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_;
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp2_ != NULL, "parent_session.get_endpoint_url() != null");
-#line 156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp2_);
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = parent_session;
-#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->parent_session = _tmp3_;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = method;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = publishing_rest_support_http_method_to_string (_tmp4_);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp5_;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = parent_session;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = publishing_rest_support_session_get_endpoint_url (_tmp7_);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = _tmp8_;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = soup_message_new (_tmp6_, _tmp9_);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->message = _tmp10_;
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp9_);
-#line 160 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp6_);
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = self->priv->message;
-#line 161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1909 "RESTSupport.c"
+#line 1932 "RESTSupport.c"
}
PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
-#line 153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1916 "RESTSupport.c"
+#line 1939 "RESTSupport.c"
}
@@ -1927,50 +1950,50 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
gchar* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
SoupMessage* _tmp7_ = NULL;
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (parent_session), NULL);
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportTransaction*) g_type_create_instance (object_type);
-#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = parent_session;
-#line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->parent_session = _tmp0_;
-#line 167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = endpoint_url;
-#line 167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
-#line 167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->endpoint_url = _tmp2_;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = method;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_http_method_to_string (_tmp3_);
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _tmp4_;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = endpoint_url;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = soup_message_new (_tmp5_, _tmp6_);
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->message = _tmp7_;
-#line 168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp5_);
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 1966 "RESTSupport.c"
+#line 1989 "RESTSupport.c"
}
PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method);
-#line 1973 "RESTSupport.c"
+#line 1996 "RESTSupport.c"
}
@@ -1982,36 +2005,36 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
SoupMessage* _tmp4_ = NULL;
SoupMessageBody* _tmp5_ = NULL;
gint64 _tmp6_ = 0LL;
-#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (written_data != NULL);
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->bytes_written;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = written_data;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_->length;
-#line 172 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->bytes_written = _tmp0_ + ((gint) _tmp2_);
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = self->priv->bytes_written;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = self->priv->message;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _tmp4_->request_body;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp5_->length;
-#line 173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "chunk-transmitted", _tmp3_, (gint) _tmp6_);
-#line 2007 "RESTSupport.c"
+#line 2030 "RESTSupport.c"
}
static gpointer _g_error_copy0 (gpointer self) {
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_error_copy (self) : NULL;
-#line 2014 "RESTSupport.c"
+#line 2037 "RESTSupport.c"
}
@@ -2019,40 +2042,40 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
SoupMessage* _tmp0_ = NULL;
SoupMessage* _tmp1_ = NULL;
GError * _inner_error_ = NULL;
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->message;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = message;
-#line 177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_ != _tmp1_) {
-#line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2034 "RESTSupport.c"
+#line 2057 "RESTSupport.c"
}
{
SoupMessage* _tmp2_ = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = message;
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_check_response (self, _tmp2_, &_inner_error_);
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2046 "RESTSupport.c"
+#line 2069 "RESTSupport.c"
goto __catch0_spit_publishing_publishing_error;
}
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2055 "RESTSupport.c"
+#line 2078 "RESTSupport.c"
}
}
goto __finally0;
@@ -2065,50 +2088,345 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
gchar* _tmp6_ = NULL;
GError* _tmp7_ = NULL;
GError* _tmp8_ = NULL;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = err;
-#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = _tmp3_->message;
-#line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_warning ("RESTSupport.vala:183: Publishing error: %s", _tmp4_);
-#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_warning ("RESTSupport.vala:188: Publishing error: %s", _tmp4_);
+#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = publishing_rest_support_transaction_get_response (self);
-#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp5_;
-#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_warning ("RESTSupport.vala:184: response validation failed. bad response = '%s'.", _tmp6_);
-#line 184 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_warning ("RESTSupport.vala:189: response validation failed. bad response = '%s'.", _tmp6_);
+#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp6_);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = err;
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _g_error_copy0 (_tmp7_);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (self->priv->err);
-#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->err = _tmp8_;
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 2096 "RESTSupport.c"
+#line 2119 "RESTSupport.c"
}
__finally0:
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 180 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2107 "RESTSupport.c"
+#line 2130 "RESTSupport.c"
}
}
+static gpointer _g_object_ref0 (gpointer self) {
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ return self ? g_object_ref (self) : NULL;
+#line 2138 "RESTSupport.c"
+}
+
+
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert) {
+ GTlsCertificate* _vala_cert = NULL;
+ gchar* result = NULL;
+ GTlsCertificateFlags tls_errors = 0;
+ SoupMessage* _tmp0_ = NULL;
+ GTlsCertificate* _tmp1_ = NULL;
+ GTlsCertificateFlags _tmp2_ = 0;
+ GTlsCertificate* _tmp3_ = NULL;
+ GeeArrayList* list = NULL;
+ GeeArrayList* _tmp4_ = NULL;
+ GTlsCertificateFlags _tmp5_ = 0;
+ GTlsCertificateFlags _tmp8_ = 0;
+ GTlsCertificateFlags _tmp11_ = 0;
+ GTlsCertificateFlags _tmp14_ = 0;
+ GTlsCertificateFlags _tmp17_ = 0;
+ GTlsCertificateFlags _tmp20_ = 0;
+ GTlsCertificateFlags _tmp23_ = 0;
+ GString* builder = NULL;
+ GString* _tmp26_ = NULL;
+ GeeArrayList* _tmp27_ = NULL;
+ gint _tmp28_ = 0;
+ gint _tmp29_ = 0;
+ GString* _tmp47_ = NULL;
+ const gchar* _tmp48_ = NULL;
+ gchar* _tmp49_ = NULL;
+#line 195 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = self->priv->message;
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ soup_message_get_https_status (_tmp0_, &_tmp1_, &_tmp2_);
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_object_unref0 (_vala_cert);
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = _g_object_ref0 (_tmp1_);
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _vala_cert = _tmp3_;
+#line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ tls_errors = _tmp2_;
+#line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+#line 199 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ list = _tmp4_;
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = tls_errors;
+#line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
+#line 2189 "RESTSupport.c"
+ GeeArrayList* _tmp6_ = NULL;
+ const gchar* _tmp7_ = NULL;
+#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = list;
+#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = _ ("⚫ This website presented identification that belongs to a different we" \
+"bsite.");
+#line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
+#line 2198 "RESTSupport.c"
+ }
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = tls_errors;
+#line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if ((_tmp8_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
+#line 2204 "RESTSupport.c"
+ GeeArrayList* _tmp9_ = NULL;
+ const gchar* _tmp10_ = NULL;
+#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp9_ = list;
+#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp10_ = _ ("⚫ This website’s identification is too old to trust. Check the date on" \
+" your computer’s calendar.");
+#line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
+#line 2213 "RESTSupport.c"
+ }
+#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp11_ = tls_errors;
+#line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if ((_tmp11_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
+#line 2219 "RESTSupport.c"
+ GeeArrayList* _tmp12_ = NULL;
+ const gchar* _tmp13_ = NULL;
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp12_ = list;
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp13_ = _ ("⚫ This website’s identification was not issued by a trusted organizati" \
+"on.");
+#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
+#line 2228 "RESTSupport.c"
+ }
+#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp14_ = tls_errors;
+#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if ((_tmp14_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
+#line 2234 "RESTSupport.c"
+ GeeArrayList* _tmp15_ = NULL;
+ const gchar* _tmp16_ = NULL;
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp15_ = list;
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp16_ = _ ("⚫ This website’s identification could not be processed. It may be corr" \
+"upted.");
+#line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
+#line 2243 "RESTSupport.c"
+ }
+#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp17_ = tls_errors;
+#line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if ((_tmp17_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
+#line 2249 "RESTSupport.c"
+ GeeArrayList* _tmp18_ = NULL;
+ const gchar* _tmp19_ = NULL;
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp18_ = list;
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp19_ = _ ("⚫ This website’s identification has been revoked by the trusted organi" \
+"zation that issued it.");
+#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
+#line 2258 "RESTSupport.c"
+ }
+#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp20_ = tls_errors;
+#line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if ((_tmp20_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
+#line 2264 "RESTSupport.c"
+ GeeArrayList* _tmp21_ = NULL;
+ const gchar* _tmp22_ = NULL;
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp21_ = list;
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp22_ = _ ("⚫ This website’s identification cannot be trusted because it uses very" \
+" weak encryption.");
+#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
+#line 2273 "RESTSupport.c"
+ }
+#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp23_ = tls_errors;
+#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if ((_tmp23_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
+#line 2279 "RESTSupport.c"
+ GeeArrayList* _tmp24_ = NULL;
+ const gchar* _tmp25_ = NULL;
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp24_ = list;
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp25_ = _ ("⚫ This website’s identification is only valid for future dates. Check " \
+"the date on your computer’s calendar.");
+#line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
+#line 2288 "RESTSupport.c"
+ }
+#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp26_ = g_string_new ("");
+#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ builder = _tmp26_;
+#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp27_ = list;
+#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp28_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp29_ = _tmp28_;
+#line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp29_ == 1) {
+#line 2302 "RESTSupport.c"
+ GString* _tmp30_ = NULL;
+ GeeArrayList* _tmp31_ = NULL;
+ gpointer _tmp32_ = NULL;
+ gchar* _tmp33_ = NULL;
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp30_ = builder;
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp31_ = list;
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp32_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp33_ = (gchar*) _tmp32_;
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_string_append (_tmp30_, _tmp33_);
+#line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (_tmp33_);
+#line 2319 "RESTSupport.c"
+ } else {
+ {
+ GeeArrayList* _entry_list = NULL;
+ GeeArrayList* _tmp34_ = NULL;
+ GeeArrayList* _tmp35_ = NULL;
+ gint _entry_size = 0;
+ GeeArrayList* _tmp36_ = NULL;
+ gint _tmp37_ = 0;
+ gint _tmp38_ = 0;
+ gint _entry_index = 0;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp34_ = list;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp35_ = _g_object_ref0 (_tmp34_);
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _entry_list = _tmp35_;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp36_ = _entry_list;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp38_ = _tmp37_;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _entry_size = _tmp38_;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _entry_index = -1;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ while (TRUE) {
+#line 2348 "RESTSupport.c"
+ gint _tmp39_ = 0;
+ gint _tmp40_ = 0;
+ gint _tmp41_ = 0;
+ gchar* entry = NULL;
+ GeeArrayList* _tmp42_ = NULL;
+ gint _tmp43_ = 0;
+ gpointer _tmp44_ = NULL;
+ GString* _tmp45_ = NULL;
+ const gchar* _tmp46_ = NULL;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp39_ = _entry_index;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _entry_index = _tmp39_ + 1;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp40_ = _entry_index;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp41_ = _entry_size;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (!(_tmp40_ < _tmp41_)) {
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ break;
+#line 2370 "RESTSupport.c"
+ }
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp42_ = _entry_list;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp43_ = _entry_index;
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp44_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp43_);
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ entry = (gchar*) _tmp44_;
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp45_ = builder;
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp46_ = entry;
+#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_string_append_printf (_tmp45_, "%s\n", _tmp46_);
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_free0 (entry);
+#line 2388 "RESTSupport.c"
+ }
+#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_object_unref0 (_entry_list);
+#line 2392 "RESTSupport.c"
+ }
+ }
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp47_ = builder;
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp48_ = _tmp47_->str;
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp49_ = g_strdup (_tmp48_);
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ result = _tmp49_;
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_string_free0 (builder);
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_object_unref0 (list);
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (cert) {
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ *cert = _vala_cert;
+#line 2411 "RESTSupport.c"
+ } else {
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_object_unref0 (_vala_cert);
+#line 2415 "RESTSupport.c"
+ }
+#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ return result;
+#line 2419 "RESTSupport.c"
+}
+
+
void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error) {
SoupMessage* _tmp0_ = NULL;
guint _tmp1_ = 0U;
@@ -2119,33 +2437,33 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
guint8* _tmp45_ = NULL;
gint _tmp45__length1 = 0;
GError * _inner_error_ = NULL;
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 189 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = message;
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp0_, "status-code", &_tmp1_, NULL);
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_;
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
switch (_tmp2_) {
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_OK:
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CREATED:
-#line 2138 "RESTSupport.c"
+#line 2449 "RESTSupport.c"
{
-#line 194 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2142 "RESTSupport.c"
+#line 2453 "RESTSupport.c"
}
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE:
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2148 "RESTSupport.c"
+#line 2459 "RESTSupport.c"
{
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
@@ -2154,46 +2472,46 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
guint _tmp7_ = 0U;
GError* _tmp8_ = NULL;
GError* _tmp9_ = NULL;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = _tmp3_;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = message;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp5_, "status-code", &_tmp6_, NULL);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp4_, _tmp7_);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = _tmp8_;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp4_);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp9_;
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2181 "RESTSupport.c"
+#line 2492 "RESTSupport.c"
} else {
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 198 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2189 "RESTSupport.c"
+#line 2500 "RESTSupport.c"
}
}
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT:
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2196 "RESTSupport.c"
+#line 2507 "RESTSupport.c"
{
gchar* _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
@@ -2202,76 +2520,76 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
guint _tmp14_ = 0U;
GError* _tmp15_ = NULL;
GError* _tmp16_ = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = _tmp10_;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = message;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp12_, "status-code", &_tmp13_, NULL);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = _tmp13_;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp11_, _tmp14_);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = _tmp15_;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp11_);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp16_;
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2229 "RESTSupport.c"
+#line 2540 "RESTSupport.c"
} else {
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 203 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2237 "RESTSupport.c"
+#line 2548 "RESTSupport.c"
}
}
-#line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
case SOUP_STATUS_SSL_FAILED:
-#line 2242 "RESTSupport.c"
+#line 2553 "RESTSupport.c"
{
gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
GError* _tmp19_ = NULL;
GError* _tmp20_ = NULL;
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = _tmp17_;
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SSL_FAILED, "Unable to connect to %s: Secure connection failed", _tmp18_);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = _tmp19_;
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp18_);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp20_;
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2266 "RESTSupport.c"
+#line 2577 "RESTSupport.c"
} else {
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 206 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2274 "RESTSupport.c"
+#line 2585 "RESTSupport.c"
}
}
default:
@@ -2279,15 +2597,15 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
SoupMessage* _tmp21_ = NULL;
guint _tmp22_ = 0U;
guint _tmp23_ = 0U;
-#line 211 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = message;
-#line 211 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp21_, "status-code", &_tmp22_, NULL);
-#line 211 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = _tmp22_;
-#line 211 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp23_ >= ((guint) 100)) {
-#line 2290 "RESTSupport.c"
+#line 2601 "RESTSupport.c"
gchar* _tmp24_ = NULL;
gchar* _tmp25_ = NULL;
SoupMessage* _tmp26_ = NULL;
@@ -2299,49 +2617,49 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
gchar* _tmp32_ = NULL;
GError* _tmp33_ = NULL;
GError* _tmp34_ = NULL;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = _tmp24_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = message;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp26_, "status-code", &_tmp27_, NULL);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = _tmp27_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = message;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp29_, "reason-phrase", &_tmp30_, NULL);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp31_ = _tmp30_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp32_ = _tmp31_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp33_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp25_, _tmp28_, _tmp32_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp34_ = _tmp33_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp32_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp25_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp34_;
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2336 "RESTSupport.c"
+#line 2647 "RESTSupport.c"
} else {
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2344 "RESTSupport.c"
+#line 2655 "RESTSupport.c"
}
} else {
gchar* _tmp35_ = NULL;
@@ -2351,107 +2669,107 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
guint _tmp39_ = 0U;
GError* _tmp40_ = NULL;
GError* _tmp41_ = NULL;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp36_ = _tmp35_;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp37_ = message;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp37_, "status-code", &_tmp38_, NULL);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp39_ = _tmp38_;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp40_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp36_, _tmp39_);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp41_ = _tmp40_;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp36_);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp41_;
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2378 "RESTSupport.c"
+#line 2689 "RESTSupport.c"
} else {
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2386 "RESTSupport.c"
+#line 2697 "RESTSupport.c"
}
}
}
}
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp43_ = message;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp44_ = _tmp43_->response_body;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp45_ = _tmp44_->data;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp45__length1 = (gint) _tmp44_->length;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp45_ == NULL) {
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = TRUE;
-#line 2403 "RESTSupport.c"
+#line 2714 "RESTSupport.c"
} else {
SoupMessage* _tmp46_ = NULL;
SoupMessageBody* _tmp47_ = NULL;
guint8* _tmp48_ = NULL;
gint _tmp48__length1 = 0;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp46_ = message;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp47_ = _tmp46_->response_body;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp48_ = _tmp47_->data;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp48__length1 = (gint) _tmp47_->length;
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = _tmp48__length1 == 0;
-#line 2419 "RESTSupport.c"
+#line 2730 "RESTSupport.c"
}
-#line 221 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp42_) {
-#line 2423 "RESTSupport.c"
+#line 2734 "RESTSupport.c"
gchar* _tmp49_ = NULL;
gchar* _tmp50_ = NULL;
GError* _tmp51_ = NULL;
GError* _tmp52_ = NULL;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp49_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp50_ = _tmp49_;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp51_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp50_);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp52_ = _tmp51_;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp50_);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp52_;
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2446 "RESTSupport.c"
+#line 2757 "RESTSupport.c"
} else {
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2454 "RESTSupport.c"
+#line 2765 "RESTSupport.c"
}
}
}
@@ -2460,21 +2778,21 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportArgument** self, int length) {
PublishingRESTSupportArgument** result;
int i;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 2467 "RESTSupport.c"
+#line 2778 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp0_ = NULL;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 2473 "RESTSupport.c"
+#line 2784 "RESTSupport.c"
}
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2477 "RESTSupport.c"
+#line 2788 "RESTSupport.c"
}
@@ -2486,31 +2804,31 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
gint _tmp1__length1 = 0;
PublishingRESTSupportArgument** _tmp2_ = NULL;
gint _tmp2__length1 = 0;
-#line 226 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->arguments;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->arguments_length1;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup1 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1__length1 = _tmp0__length1;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2__length1 = _tmp1__length1;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (result_length1) {
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp2__length1;
-#line 2507 "RESTSupport.c"
+#line 2818 "RESTSupport.c"
}
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2513 "RESTSupport.c"
+#line 2824 "RESTSupport.c"
}
@@ -2526,56 +2844,56 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
gint _tmp5__length1 = 0;
PublishingRESTSupportArgument** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
-#line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_transaction_get_arguments (self, &_tmp0_);
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2__length1 = _tmp0_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_argument_sort (_tmp2_, _tmp0_, &_tmp3_);
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _tmp4_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5__length1 = _tmp3_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = (_vala_array_free (_tmp2_, _tmp2__length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp5_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6__length1 = _tmp5__length1;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (result_length1) {
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*result_length1 = _tmp6__length1;
-#line 2553 "RESTSupport.c"
+#line 2864 "RESTSupport.c"
}
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp6_;
-#line 231 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2559 "RESTSupport.c"
+#line 2870 "RESTSupport.c"
}
void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportTransaction* self, gboolean is_executed) {
gboolean _tmp0_ = FALSE;
-#line 234 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = is_executed;
-#line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = _tmp0_;
-#line 2571 "RESTSupport.c"
+#line 2882 "RESTSupport.c"
}
static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) {
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2578 "RESTSupport.c"
+#line 2889 "RESTSupport.c"
}
@@ -2591,78 +2909,78 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
GError* _tmp8_ = NULL;
GError* _tmp10_ = NULL;
GError * _inner_error_ = NULL;
-#line 238 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->parent_session;
-#line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect (_tmp0_, "wire-message-unqueued", (GCallback) _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued, self);
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->message;
-#line 240 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect (_tmp1_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 241 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->parent_session;
-#line 241 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = self->priv->message;
-#line 241 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_session_send_wire_message (_tmp2_, _tmp3_);
-#line 243 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = self->priv->parent_session;
-#line 243 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("wire-message-unqueued", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp5_, NULL, FALSE);
-#line 243 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued, self);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = self->priv->message;
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp7_, NULL, FALSE);
-#line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
-#line 246 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->err;
-#line 246 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 2626 "RESTSupport.c"
+#line 2937 "RESTSupport.c"
GError* _tmp9_ = NULL;
-#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->err;
-#line 247 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "network-error", _tmp9_);
-#line 2632 "RESTSupport.c"
+#line 2943 "RESTSupport.c"
} else {
-#line 249 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "completed");
-#line 2636 "RESTSupport.c"
+#line 2947 "RESTSupport.c"
}
-#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = self->priv->err;
-#line 251 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp10_ != NULL) {
-#line 2642 "RESTSupport.c"
+#line 2953 "RESTSupport.c"
GError* _tmp11_ = NULL;
GError* _tmp12_ = NULL;
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = self->priv->err;
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = _g_error_copy0 (_tmp11_);
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp12_;
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2657 "RESTSupport.c"
+#line 2968 "RESTSupport.c"
} else {
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2665 "RESTSupport.c"
+#line 2976 "RESTSupport.c"
}
}
}
@@ -2676,27 +2994,27 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
gchar* _tmp3_ = NULL;
PublishingRESTSupportHttpMethod _tmp4_ = 0;
PublishingRESTSupportHttpMethod _tmp5_ = 0;
-#line 255 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->message;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp0_, "method", &_tmp1_, NULL);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _tmp2_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_http_method_from_string (_tmp3_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _tmp4_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp3_);
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp5_;
-#line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2699 "RESTSupport.c"
+#line 3010 "RESTSupport.c"
}
@@ -2705,30 +3023,30 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
SoupMessageHeaders* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
-#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (key != NULL);
-#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (value != NULL);
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->message;
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _tmp0_->request_headers;
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = key;
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = value;
-#line 260 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 2722 "RESTSupport.c"
+#line 3033 "RESTSupport.c"
}
void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransaction* self, const gchar* key, const gchar* value) {
-#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 259 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 2731 "RESTSupport.c"
+#line 3042 "RESTSupport.c"
}
@@ -2746,111 +3064,104 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
guint8* _tmp12_ = NULL;
gint _tmp12__length1 = 0;
gulong _tmp13_ = 0UL;
-#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 271 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (payload_content_type != NULL);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = publishing_rest_support_transaction_get_method (self);
-#line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp0_ != PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "get_method() != HttpMethod.GET");
-#line 275 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = custom_payload;
-#line 275 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ == NULL) {
-#line 276 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->use_custom_payload = FALSE;
-#line 277 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2765 "RESTSupport.c"
+#line 3076 "RESTSupport.c"
}
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = payload_length;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp3_ > ((gulong) 0)) {
-#line 2771 "RESTSupport.c"
+#line 3082 "RESTSupport.c"
gulong _tmp4_ = 0UL;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = payload_length;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp4_;
-#line 2777 "RESTSupport.c"
+#line 3088 "RESTSupport.c"
} else {
const gchar* _tmp5_ = NULL;
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = custom_payload;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = strlen (_tmp5_);
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_;
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = (gulong) _tmp7_;
-#line 2790 "RESTSupport.c"
+#line 3101 "RESTSupport.c"
}
-#line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
length = _tmp2_;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->message;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = payload_content_type;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = custom_payload;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = string_get_data (_tmp10_, &_tmp11__length1);
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = _tmp11_;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12__length1 = _tmp11__length1;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = length;
-#line 281 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0));
-#line 283 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->use_custom_payload = TRUE;
-#line 2812 "RESTSupport.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return self ? g_object_ref (self) : NULL;
-#line 2819 "RESTSupport.c"
+#line 3123 "RESTSupport.c"
}
void publishing_rest_support_transaction_set_message (PublishingRESTSupportTransaction* self, SoupMessage* message) {
SoupMessage* _tmp0_ = NULL;
SoupMessage* _tmp1_ = NULL;
-#line 291 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 291 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (SOUP_IS_MESSAGE (message));
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = message;
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
-#line 292 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->message = _tmp1_;
-#line 2838 "RESTSupport.c"
+#line 3142 "RESTSupport.c"
}
gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupportTransaction* self) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
-#line 295 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), FALSE);
-#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->is_executed;
-#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
-#line 296 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2853 "RESTSupport.c"
+#line 3157 "RESTSupport.c"
}
@@ -2860,30 +3171,30 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport
SoupMessage* _tmp1_ = NULL;
guint _tmp2_ = 0U;
guint _tmp3_ = 0U;
-#line 299 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), 0U);
-#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 300 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp0_, "get_is_executed()");
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->message;
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_object_get (_tmp1_, "status-code", &_tmp2_, NULL);
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _tmp2_;
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp3_;
-#line 301 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 2879 "RESTSupport.c"
+#line 3183 "RESTSupport.c"
}
static void _vala_SoupURI_free (SoupURI* self) {
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_uri_get_type (), self);
-#line 2886 "RESTSupport.c"
+#line 3190 "RESTSupport.c"
}
@@ -2897,69 +3208,69 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
gboolean _tmp19_ = FALSE;
PublishingRESTSupportHttpMethod _tmp20_ = 0;
GError * _inner_error_ = NULL;
-#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->use_custom_payload;
-#line 308 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = TRUE;
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_send (self, &_inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2916 "RESTSupport.c"
+#line 3220 "RESTSupport.c"
} else {
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2924 "RESTSupport.c"
+#line 3228 "RESTSupport.c"
}
}
-#line 312 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 2929 "RESTSupport.c"
+#line 3233 "RESTSupport.c"
}
-#line 316 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_transaction_get_method (self);
-#line 316 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 2935 "RESTSupport.c"
+#line 3239 "RESTSupport.c"
PublishingRESTSupportArgument** _tmp2_ = NULL;
gint _tmp2__length1 = 0;
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->arguments;
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2__length1 = self->priv->arguments_length1;
-#line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 2944 "RESTSupport.c"
+#line 3248 "RESTSupport.c"
}
-#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup ("");
-#line 320 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
formdata_string = _tmp3_;
-#line 2950 "RESTSupport.c"
+#line 3254 "RESTSupport.c"
{
gint i = 0;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = 0;
-#line 2955 "RESTSupport.c"
+#line 3259 "RESTSupport.c"
{
gboolean _tmp4_ = FALSE;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = TRUE;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 2962 "RESTSupport.c"
+#line 3266 "RESTSupport.c"
gint _tmp6_ = 0;
PublishingRESTSupportArgument** _tmp7_ = NULL;
gint _tmp7__length1 = 0;
@@ -2974,102 +3285,102 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
gint _tmp15_ = 0;
PublishingRESTSupportArgument** _tmp16_ = NULL;
gint _tmp16__length1 = 0;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 2979 "RESTSupport.c"
+#line 3283 "RESTSupport.c"
gint _tmp5_ = 0;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = i;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = _tmp5_ + 1;
-#line 2985 "RESTSupport.c"
+#line 3289 "RESTSupport.c"
}
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = FALSE;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = i;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = self->priv->arguments;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7__length1 = self->priv->arguments_length1;
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!(_tmp6_ < _tmp7__length1)) {
-#line 321 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 2999 "RESTSupport.c"
+#line 3303 "RESTSupport.c"
}
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = formdata_string;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->arguments;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9__length1 = self->priv->arguments_length1;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = i;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = _tmp9_[_tmp10_];
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = publishing_rest_support_argument_to_string (_tmp11_);
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = _tmp12_;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = g_strconcat (_tmp8_, _tmp13_, NULL);
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
formdata_string = _tmp14_;
-#line 322 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp13_);
-#line 323 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = i;
-#line 323 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = self->priv->arguments;
-#line 323 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16__length1 = self->priv->arguments_length1;
-#line 323 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3031 "RESTSupport.c"
+#line 3335 "RESTSupport.c"
const gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
-#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = formdata_string;
-#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = g_strconcat (_tmp17_, "&", NULL);
-#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 324 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
formdata_string = _tmp18_;
-#line 3042 "RESTSupport.c"
+#line 3346 "RESTSupport.c"
}
}
}
}
-#line 330 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 388 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old_url = NULL;
-#line 331 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
url_with_query = NULL;
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = publishing_rest_support_transaction_get_method (self);
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3055 "RESTSupport.c"
+#line 3359 "RESTSupport.c"
PublishingRESTSupportArgument** _tmp21_ = NULL;
gint _tmp21__length1 = 0;
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = self->priv->arguments;
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21__length1 = self->priv->arguments_length1;
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = _tmp21__length1 > 0;
-#line 3064 "RESTSupport.c"
+#line 3368 "RESTSupport.c"
} else {
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = FALSE;
-#line 3068 "RESTSupport.c"
+#line 3372 "RESTSupport.c"
}
-#line 332 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp19_) {
-#line 3072 "RESTSupport.c"
+#line 3376 "RESTSupport.c"
SoupMessage* _tmp22_ = NULL;
SoupURI* _tmp23_ = NULL;
gchar* _tmp24_ = NULL;
@@ -3083,49 +3394,49 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
const gchar* _tmp32_ = NULL;
SoupURI* _tmp33_ = NULL;
SoupURI* _tmp34_ = NULL;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = self->priv->message;
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = soup_message_get_uri (_tmp22_);
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = soup_uri_to_string (_tmp23_, FALSE);
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
-#line 333 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old_url = _tmp24_;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = publishing_rest_support_transaction_get_endpoint_url (self);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = _tmp25_;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp27_ = g_strconcat (_tmp26_, "?", NULL);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = _tmp27_;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = formdata_string;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp30_ = g_strconcat (_tmp28_, _tmp29_, NULL);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
url_with_query = _tmp30_;
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp28_);
-#line 334 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp26_);
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp31_ = self->priv->message;
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp32_ = url_with_query;
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp33_ = soup_uri_new (_tmp32_);
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp34_ = _tmp33_;
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_set_uri (_tmp31_, _tmp34_);
-#line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupURI_free0 (_tmp34_);
-#line 3128 "RESTSupport.c"
+#line 3432 "RESTSupport.c"
} else {
SoupMessage* _tmp35_ = NULL;
const gchar* _tmp36_ = NULL;
@@ -3133,122 +3444,122 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
gint _tmp37__length1 = 0;
guint8* _tmp38_ = NULL;
gint _tmp38__length1 = 0;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = self->priv->message;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp36_ = formdata_string;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp37_ = string_get_data (_tmp36_, &_tmp37__length1);
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp38_ = _tmp37_;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp38__length1 = _tmp37__length1;
-#line 337 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1);
-#line 3148 "RESTSupport.c"
+#line 3452 "RESTSupport.c"
}
-#line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = TRUE;
-#line 3152 "RESTSupport.c"
+#line 3456 "RESTSupport.c"
{
SoupMessage* _tmp39_ = NULL;
SoupURI* _tmp40_ = NULL;
gchar* _tmp41_ = NULL;
gchar* _tmp42_ = NULL;
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp39_ = self->priv->message;
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp40_ = soup_message_get_uri (_tmp39_);
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp41_ = soup_uri_to_string (_tmp40_, FALSE);
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = _tmp41_;
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:344: sending message to URI = '%s'", _tmp42_);
-#line 344 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:402: sending message to URI = '%s'", _tmp42_);
+#line 402 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp42_);
-#line 345 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_send (self, &_inner_error_);
-#line 345 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3174 "RESTSupport.c"
+#line 3478 "RESTSupport.c"
goto __finally1;
}
}
__finally1:
{
const gchar* _tmp43_ = NULL;
-#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp43_ = old_url;
-#line 348 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp43_ != NULL) {
-#line 3185 "RESTSupport.c"
+#line 3489 "RESTSupport.c"
SoupMessage* _tmp44_ = NULL;
const gchar* _tmp45_ = NULL;
SoupURI* _tmp46_ = NULL;
SoupURI* _tmp47_ = NULL;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp44_ = self->priv->message;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp45_ = old_url;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp46_ = soup_uri_new (_tmp45_);
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp47_ = _tmp46_;
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_set_uri (_tmp44_, _tmp47_);
-#line 349 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupURI_free0 (_tmp47_);
-#line 3202 "RESTSupport.c"
+#line 3506 "RESTSupport.c"
}
}
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3219 "RESTSupport.c"
+#line 3523 "RESTSupport.c"
} else {
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 343 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 3233 "RESTSupport.c"
+#line 3537 "RESTSupport.c"
}
}
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (url_with_query);
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (old_url);
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (formdata_string);
-#line 3242 "RESTSupport.c"
+#line 3546 "RESTSupport.c"
}
void publishing_rest_support_transaction_execute (PublishingRESTSupportTransaction* self, GError** error) {
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3251 "RESTSupport.c"
+#line 3555 "RESTSupport.c"
}
@@ -3260,27 +3571,27 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr
guint8* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 353 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp0_, "get_is_executed()");
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->message;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_->response_body;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _tmp2_->data;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3__length1 = (gint) _tmp2_->length;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp4_;
-#line 355 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3283 "RESTSupport.c"
+#line 3587 "RESTSupport.c"
}
@@ -3289,21 +3600,21 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu
gboolean _tmp0_ = FALSE;
SoupMessage* _tmp1_ = NULL;
SoupMessageHeaders* _tmp2_ = NULL;
-#line 358 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp0_, "get_is_executed()");
-#line 360 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->message;
-#line 360 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp1_->response_headers;
-#line 360 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 360 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3306 "RESTSupport.c"
+#line 3610 "RESTSupport.c"
}
@@ -3312,38 +3623,38 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp
gboolean _tmp0_ = FALSE;
SoupMessage* _tmp1_ = NULL;
SoupMessage* _tmp2_ = NULL;
-#line 363 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = publishing_rest_support_transaction_get_is_executed (self);
-#line 364 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp0_, "get_is_executed()");
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->message;
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 365 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3329 "RESTSupport.c"
+#line 3633 "RESTSupport.c"
}
static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if ((*length) == (*size)) {
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*size = (*size) ? (2 * (*size)) : 4;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3340 "RESTSupport.c"
+#line 3644 "RESTSupport.c"
}
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[(*length)++] = value;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
(*array)[*length] = NULL;
-#line 3346 "RESTSupport.c"
+#line 3650 "RESTSupport.c"
}
@@ -3353,25 +3664,25 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
const gchar* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
PublishingRESTSupportArgument* _tmp3_ = NULL;
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (name != NULL);
-#line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (value != NULL);
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->arguments;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->arguments_length1;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = name;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = value;
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 369 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3374 "RESTSupport.c"
+#line 3678 "RESTSupport.c"
}
@@ -3379,49 +3690,49 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
gchar* result = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 372 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->endpoint_url;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ != NULL) {
-#line 3388 "RESTSupport.c"
+#line 3692 "RESTSupport.c"
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->endpoint_url;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup (_tmp2_);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp0_);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp3_;
-#line 3399 "RESTSupport.c"
+#line 3703 "RESTSupport.c"
} else {
PublishingRESTSupportSession* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = self->priv->parent_session;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = publishing_rest_support_session_get_endpoint_url (_tmp4_);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp0_);
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp5_;
-#line 3411 "RESTSupport.c"
+#line 3715 "RESTSupport.c"
}
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
-#line 373 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3417 "RESTSupport.c"
+#line 3721 "RESTSupport.c"
}
static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3424 "RESTSupport.c"
+#line 3728 "RESTSupport.c"
}
@@ -3429,17 +3740,17 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
PublishingRESTSupportSession* result = NULL;
PublishingRESTSupportSession* _tmp0_ = NULL;
PublishingRESTSupportSession* _tmp1_ = NULL;
-#line 376 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self), NULL);
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->parent_session;
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 377 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3442 "RESTSupport.c"
+#line 3746 "RESTSupport.c"
}
@@ -3450,267 +3761,267 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
register gpointer data1;
register gpointer data2;
cc = (GCClosure *) closure;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (n_param_values == 3);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data1 = closure->data;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = param_values->data[0].v_pointer;
-#line 3461 "RESTSupport.c"
+#line 3765 "RESTSupport.c"
} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data1 = param_values->data[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
data2 = closure->data;
-#line 3467 "RESTSupport.c"
+#line 3771 "RESTSupport.c"
}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 3473 "RESTSupport.c"
+#line 3777 "RESTSupport.c"
}
static void publishing_rest_support_value_transaction_init (GValue* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3480 "RESTSupport.c"
+#line 3784 "RESTSupport.c"
}
static void publishing_rest_support_value_transaction_free_value (GValue* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3489 "RESTSupport.c"
+#line 3793 "RESTSupport.c"
}
}
static void publishing_rest_support_value_transaction_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer);
-#line 3499 "RESTSupport.c"
+#line 3803 "RESTSupport.c"
} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3503 "RESTSupport.c"
+#line 3807 "RESTSupport.c"
}
}
static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3511 "RESTSupport.c"
+#line 3815 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 3518 "RESTSupport.c"
+#line 3822 "RESTSupport.c"
PublishingRESTSupportTransaction* object;
object = collect_values[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3525 "RESTSupport.c"
+#line 3829 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3529 "RESTSupport.c"
+#line 3833 "RESTSupport.c"
}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3533 "RESTSupport.c"
+#line 3837 "RESTSupport.c"
} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3537 "RESTSupport.c"
+#line 3841 "RESTSupport.c"
}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3541 "RESTSupport.c"
+#line 3845 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
PublishingRESTSupportTransaction** object_p;
object_p = collect_values[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3552 "RESTSupport.c"
+#line 3856 "RESTSupport.c"
}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 3558 "RESTSupport.c"
+#line 3862 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 3562 "RESTSupport.c"
+#line 3866 "RESTSupport.c"
} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3566 "RESTSupport.c"
+#line 3870 "RESTSupport.c"
}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 3570 "RESTSupport.c"
+#line 3874 "RESTSupport.c"
}
GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
PublishingRESTSupportParamSpecTransaction* spec;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 3584 "RESTSupport.c"
+#line 3888 "RESTSupport.c"
}
gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 3593 "RESTSupport.c"
+#line 3897 "RESTSupport.c"
}
void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_object) {
PublishingRESTSupportTransaction* old;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3613 "RESTSupport.c"
+#line 3917 "RESTSupport.c"
} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3617 "RESTSupport.c"
+#line 3921 "RESTSupport.c"
}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3623 "RESTSupport.c"
+#line 3927 "RESTSupport.c"
}
}
void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_object) {
PublishingRESTSupportTransaction* old;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 3642 "RESTSupport.c"
+#line 3946 "RESTSupport.c"
} else {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 3646 "RESTSupport.c"
+#line 3950 "RESTSupport.c"
}
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_unref (old);
-#line 3652 "RESTSupport.c"
+#line 3956 "RESTSupport.c"
}
}
static void publishing_rest_support_transaction_class_init (PublishingRESTSupportTransactionClass * klass) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_transaction_finalize;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportTransactionPrivate));
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_transaction_real_add_header;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_transaction_real_execute;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("chunk_transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__INT_INT, G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("network_error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3674 "RESTSupport.c"
+#line 3978 "RESTSupport.c"
}
static void publishing_rest_support_transaction_instance_init (PublishingRESTSupportTransaction * self) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_TRANSACTION_GET_PRIVATE (self);
-#line 141 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->is_executed = FALSE;
-#line 142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->parent_session = NULL;
-#line 143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->message = NULL;
-#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 149 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->bytes_written = 0;
-#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->err = NULL;
-#line 146 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->endpoint_url = NULL;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 3695 "RESTSupport.c"
+#line 3999 "RESTSupport.c"
}
static void publishing_rest_support_transaction_finalize (PublishingRESTSupportTransaction* obj) {
PublishingRESTSupportTransaction * self;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_destroy (self);
-#line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->arguments = (_vala_array_free (self->priv->arguments, self->priv->arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->message);
-#line 145 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (self->priv->err);
-#line 146 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->endpoint_url);
-#line 3713 "RESTSupport.c"
+#line 4017 "RESTSupport.c"
}
@@ -3731,24 +4042,24 @@ GType publishing_rest_support_transaction_get_type (void) {
gpointer publishing_rest_support_transaction_ref (gpointer instance) {
PublishingRESTSupportTransaction* self;
self = instance;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 3738 "RESTSupport.c"
+#line 4042 "RESTSupport.c"
}
void publishing_rest_support_transaction_unref (gpointer instance) {
PublishingRESTSupportTransaction* self;
self = instance;
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
-#line 139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3751 "RESTSupport.c"
+#line 4055 "RESTSupport.c"
}
}
@@ -3763,54 +4074,54 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
gchar* _tmp5_ = NULL;
GHashTable* _tmp6_ = NULL;
GeeHashMap* _tmp7_ = NULL;
-#line 387 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 387 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 388 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = session;
-#line 388 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishable;
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
-#line 389 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->publishable = _tmp2_;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = publishable;
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = spit_publishing_publishable_get_media_type (_tmp3_);
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp4_);
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->mime_type);
-#line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->mime_type = _tmp5_;
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
-#line 392 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->binary_disposition_table = _tmp6_;
-#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->message_headers);
-#line 394 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->message_headers = _tmp7_;
-#line 387 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 3806 "RESTSupport.c"
+#line 4110 "RESTSupport.c"
}
PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
-#line 387 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 3813 "RESTSupport.c"
+#line 4117 "RESTSupport.c"
}
@@ -3825,58 +4136,58 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
gchar* _tmp6_ = NULL;
GHashTable* _tmp7_ = NULL;
GeeHashMap* _tmp8_ = NULL;
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = session;
-#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = endpoint_url;
-#line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportUploadTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, _tmp1_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 400 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = publishable;
-#line 400 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 400 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
-#line 400 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->publishable = _tmp3_;
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishable;
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = spit_publishing_publishable_get_media_type (_tmp4_);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_upload_transaction_media_type_to_mime_type (_tmp5_);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->mime_type);
-#line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->mime_type = _tmp6_;
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = publishing_rest_support_upload_transaction_create_default_binary_disposition_table (self);
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
-#line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->binary_disposition_table = _tmp7_;
-#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->message_headers);
-#line 405 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->message_headers = _tmp8_;
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 3872 "RESTSupport.c"
+#line 4176 "RESTSupport.c"
}
PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
-#line 397 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url);
-#line 3879 "RESTSupport.c"
+#line 4183 "RESTSupport.c"
}
@@ -3885,74 +4196,74 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
GeeHashMap* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
-#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (key != NULL);
-#line 408 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (value != NULL);
-#line 409 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->message_headers;
-#line 409 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = key;
-#line 409 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = value;
-#line 409 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_);
-#line 3902 "RESTSupport.c"
+#line 4206 "RESTSupport.c"
}
static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type (SpitPublishingPublisherMediaType media_type) {
gchar* result = NULL;
SpitPublishingPublisherMediaType _tmp0_ = 0;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = media_type;
-#line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 3913 "RESTSupport.c"
+#line 4217 "RESTSupport.c"
gchar* _tmp1_ = NULL;
-#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = g_strdup ("image/jpeg");
-#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 414 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3921 "RESTSupport.c"
+#line 4225 "RESTSupport.c"
} else {
SpitPublishingPublisherMediaType _tmp2_ = 0;
-#line 415 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = media_type;
-#line 415 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 3928 "RESTSupport.c"
+#line 4232 "RESTSupport.c"
gchar* _tmp3_ = NULL;
-#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup ("video/mpeg");
-#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp3_;
-#line 416 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 3936 "RESTSupport.c"
+#line 4240 "RESTSupport.c"
} else {
SpitPublishingPublisherMediaType _tmp4_ = 0;
GEnumValue* _tmp5_;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = media_type;
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_);
-#line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_error ("RESTSupport.vala:418: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
-#line 3946 "RESTSupport.c"
+#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_error ("RESTSupport.vala:476: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
+#line 4250 "RESTSupport.c"
}
}
}
static void _g_free0_ (gpointer var) {
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
var = (g_free (var), NULL);
-#line 3955 "RESTSupport.c"
+#line 4259 "RESTSupport.c"
}
@@ -3969,81 +4280,81 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 421 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_str_hash;
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = g_str_equal;
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _g_free0_, _g_free0_);
-#line 422 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_result_ = _tmp2_;
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = g_strdup ("filename");
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = self->publishable;
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp5_;
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = g_file_get_basename (_tmp6_);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _tmp7_;
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = soup_uri_encode (_tmp8_, NULL);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_hash_table_insert (_result_, _tmp3_, _tmp9_);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp8_);
-#line 425 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_tmp6_);
-#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _result_;
-#line 428 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4006 "RESTSupport.c"
+#line 4310 "RESTSupport.c"
}
static gpointer _g_hash_table_ref0 (gpointer self) {
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? g_hash_table_ref (self) : NULL;
-#line 4013 "RESTSupport.c"
+#line 4317 "RESTSupport.c"
}
void publishing_rest_support_upload_transaction_set_binary_disposition_table (PublishingRESTSupportUploadTransaction* self, GHashTable* new_disp_table) {
GHashTable* _tmp0_ = NULL;
GHashTable* _tmp1_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_UPLOAD_TRANSACTION (self));
-#line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (new_disp_table != NULL);
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = new_disp_table;
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _g_hash_table_ref0 (_tmp0_);
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
-#line 432 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->binary_disposition_table = _tmp1_;
-#line 4032 "RESTSupport.c"
+#line 4336 "RESTSupport.c"
}
static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 4039 "RESTSupport.c"
+#line 4343 "RESTSupport.c"
}
static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 4046 "RESTSupport.c"
+#line 4350 "RESTSupport.c"
}
@@ -4103,71 +4414,71 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
gboolean _tmp49_ = FALSE;
SoupMessage* _tmp61_ = NULL;
GError * _inner_error_ = NULL;
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_transaction_get_arguments (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_tmp0_);
-#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = _tmp1_;
-#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments_length1 = _tmp0_;
-#line 436 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_request_arguments_size_ = request_arguments_length1;
-#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = request_arguments;
-#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2__length1 = request_arguments_length1;
-#line 437 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp2__length1 > 0, "request_arguments.length > 0");
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = soup_multipart_new ("multipart/form-data");
-#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
message_parts = _tmp3_;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = request_arguments;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4__length1 = request_arguments_length1;
-#line 4130 "RESTSupport.c"
+#line 4434 "RESTSupport.c"
{
PublishingRESTSupportArgument** arg_collection = NULL;
gint arg_collection_length1 = 0;
gint _arg_collection_size_ = 0;
gint arg_it = 0;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg_collection = _tmp4_;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg_collection_length1 = _tmp4__length1;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4142 "RESTSupport.c"
+#line 4446 "RESTSupport.c"
PublishingRESTSupportArgument* _tmp5_ = NULL;
PublishingRESTSupportArgument* arg = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
arg = _tmp5_;
-#line 4149 "RESTSupport.c"
+#line 4453 "RESTSupport.c"
{
SoupMultipart* _tmp6_ = NULL;
PublishingRESTSupportArgument* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
PublishingRESTSupportArgument* _tmp9_ = NULL;
const gchar* _tmp10_ = NULL;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = message_parts;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = arg;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _tmp7_->key;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = arg;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = _tmp9_->value;
-#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
-#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_argument_unref0 (arg);
-#line 4170 "RESTSupport.c"
+#line 4474 "RESTSupport.c"
}
}
}
@@ -4179,48 +4490,48 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
gsize _tmp17_ = 0UL;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = self->publishable;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = spit_publishing_publishable_get_serialized_file (_tmp11_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = _tmp12_;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = g_file_get_path (_tmp13_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = _tmp14_;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_file_get_contents (_tmp15_, &_tmp16_, &_tmp17_, &_inner_error_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
payload = _tmp16_;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
payload_length = _tmp17_;
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp15_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_tmp13_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4208 "RESTSupport.c"
+#line 4512 "RESTSupport.c"
goto __catch2_g_file_error;
}
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 447 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4223 "RESTSupport.c"
+#line 4527 "RESTSupport.c"
}
}
goto __finally2;
@@ -4229,140 +4540,140 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
GError* e = NULL;
const gchar* _tmp18_ = NULL;
GError* _tmp19_ = NULL;
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
e = _inner_error_;
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = _ ("A temporary file needed for publishing is unavailable");
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp18_);
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp19_;
-#line 450 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (e);
-#line 4244 "RESTSupport.c"
+#line 4548 "RESTSupport.c"
goto __finally2;
}
__finally2:
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4262 "RESTSupport.c"
+#line 4566 "RESTSupport.c"
} else {
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 446 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4276 "RESTSupport.c"
+#line 4580 "RESTSupport.c"
}
}
-#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = message_parts;
-#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = soup_multipart_get_length (_tmp20_);
-#line 454 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
payload_part_num = _tmp21_;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = payload;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = string_get_data (_tmp22_, &_tmp23__length1);
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = _tmp23_;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24__length1 = _tmp23__length1;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = payload_length;
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp24_ + 0, ((gint) _tmp25_) - 0);
-#line 456 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
bindable_data = _tmp26_;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp27_ = message_parts;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = self->publishable;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = spit_publishing_publishable_get_serialized_file (_tmp28_);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp30_ = _tmp29_;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp31_ = g_file_get_path (_tmp30_);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp32_ = _tmp31_;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp33_ = self->mime_type;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp34_ = bindable_data;
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_multipart_append_form_file (_tmp27_, "", _tmp32_, _tmp33_, _tmp34_);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp32_);
-#line 457 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (_tmp30_);
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = message_parts;
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp36_ = payload_part_num;
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_multipart_get_part (_tmp35_, _tmp36_, &_tmp37_, &_tmp38_);
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
image_part_header = _tmp37_;
-#line 462 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
image_part_body = _tmp38_;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp39_ = image_part_header;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp40_ = self->binary_disposition_table;
-#line 463 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_headers_set_content_disposition (_tmp39_, "form-data", _tmp40_);
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp41_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp42_ = _tmp41_;
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp43_ = message_parts;
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp44_ = soup_form_request_new_from_multipart (_tmp42_, _tmp43_);
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp45_ = _tmp44_;
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp42_);
-#line 465 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
outbound_message = _tmp45_;
-#line 468 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp46_ = self->message_headers;
-#line 468 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp47_ = gee_abstract_map_map_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 468 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
i = _tmp47_;
-#line 469 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp48_ = i;
-#line 469 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp49_ = gee_map_iterator_next (_tmp48_);
-#line 469 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
cont = _tmp49_;
-#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4365 "RESTSupport.c"
+#line 4669 "RESTSupport.c"
gboolean _tmp50_ = FALSE;
SoupMessage* _tmp51_ = NULL;
SoupMessageHeaders* _tmp52_ = NULL;
@@ -4374,150 +4685,150 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
gchar* _tmp58_ = NULL;
GeeMapIterator* _tmp59_ = NULL;
gboolean _tmp60_ = FALSE;
-#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp50_ = cont;
-#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp50_) {
-#line 470 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4383 "RESTSupport.c"
+#line 4687 "RESTSupport.c"
}
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp51_ = outbound_message;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp52_ = _tmp51_->request_headers;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp53_ = i;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp54_ = gee_map_iterator_get_key (_tmp53_);
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp55_ = (gchar*) _tmp54_;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp56_ = i;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp57_ = gee_map_iterator_get_value (_tmp56_);
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp58_ = (gchar*) _tmp57_;
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
soup_message_headers_append (_tmp52_, _tmp55_, _tmp58_);
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp58_);
-#line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp55_);
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp59_ = i;
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp60_ = gee_map_iterator_next (_tmp59_);
-#line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
cont = _tmp60_;
-#line 4413 "RESTSupport.c"
+#line 4717 "RESTSupport.c"
}
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp61_ = outbound_message;
-#line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp61_);
-#line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (outbound_message);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupBuffer_free0 (bindable_data);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4443 "RESTSupport.c"
+#line 4747 "RESTSupport.c"
} else {
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (outbound_message);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupBuffer_free0 (bindable_data);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 477 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 4463 "RESTSupport.c"
+#line 4767 "RESTSupport.c"
}
}
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (i);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (outbound_message);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupBuffer_free0 (bindable_data);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (payload);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 4478 "RESTSupport.c"
+#line 4782 "RESTSupport.c"
}
static void publishing_rest_support_upload_transaction_class_init (PublishingRESTSupportUploadTransactionClass * klass) {
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_rest_support_upload_transaction_finalize;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_upload_transaction_real_add_header;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_upload_transaction_real_execute;
-#line 4491 "RESTSupport.c"
+#line 4795 "RESTSupport.c"
}
static void publishing_rest_support_upload_transaction_instance_init (PublishingRESTSupportUploadTransaction * self) {
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->binary_disposition_table = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->publishable = NULL;
-#line 385 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->message_headers = NULL;
-#line 4502 "RESTSupport.c"
+#line 4806 "RESTSupport.c"
}
static void publishing_rest_support_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
PublishingRESTSupportUploadTransaction * self;
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction);
-#line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_hash_table_unref0 (self->binary_disposition_table);
-#line 383 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->publishable);
-#line 384 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->mime_type);
-#line 385 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->message_headers);
-#line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4520 "RESTSupport.c"
+#line 4824 "RESTSupport.c"
}
@@ -4536,22 +4847,22 @@ GType publishing_rest_support_upload_transaction_get_type (void) {
static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_construct (GType object_type, xmlDoc* doc) {
PublishingRESTSupportXmlDocument* self = NULL;
xmlDoc* _tmp0_ = NULL;
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportXmlDocument*) g_type_create_instance (object_type);
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = doc;
-#line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->document = _tmp0_;
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 4547 "RESTSupport.c"
+#line 4851 "RESTSupport.c"
}
static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
-#line 489 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4554 "RESTSupport.c"
+#line 4858 "RESTSupport.c"
}
@@ -4559,17 +4870,17 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
xmlNode* result = NULL;
xmlDoc* _tmp0_ = NULL;
xmlNode* _tmp1_ = NULL;
-#line 497 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->document;
-#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = xmlDocGetRootElement (_tmp0_);
-#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 498 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4572 "RESTSupport.c"
+#line 4876 "RESTSupport.c"
}
@@ -4581,92 +4892,92 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
const gchar* _tmp10_ = NULL;
GError* _tmp11_ = NULL;
GError * _inner_error_ = NULL;
-#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 501 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 559 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (child_name != NULL, NULL);
-#line 503 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = parent;
-#line 503 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _tmp0_->children;
-#line 503 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
doc_node_iter = _tmp1_;
-#line 4594 "RESTSupport.c"
+#line 4898 "RESTSupport.c"
{
gboolean _tmp2_ = FALSE;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = TRUE;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 4601 "RESTSupport.c"
+#line 4905 "RESTSupport.c"
xmlNode* _tmp5_ = NULL;
xmlNode* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp2_) {
-#line 4608 "RESTSupport.c"
+#line 4912 "RESTSupport.c"
xmlNode* _tmp3_ = NULL;
xmlNode* _tmp4_ = NULL;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = doc_node_iter;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = _tmp3_->next;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
doc_node_iter = _tmp4_;
-#line 4617 "RESTSupport.c"
+#line 4921 "RESTSupport.c"
}
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = FALSE;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = doc_node_iter;
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!(_tmp5_ != NULL)) {
-#line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 4627 "RESTSupport.c"
+#line 4931 "RESTSupport.c"
}
-#line 506 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = doc_node_iter;
-#line 506 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_->name;
-#line 506 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = child_name;
-#line 506 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4637 "RESTSupport.c"
+#line 4941 "RESTSupport.c"
xmlNode* _tmp9_ = NULL;
-#line 507 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = doc_node_iter;
-#line 507 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp9_;
-#line 507 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4645 "RESTSupport.c"
+#line 4949 "RESTSupport.c"
}
}
}
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = child_name;
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML node %s", _tmp10_);
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp11_;
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4661 "RESTSupport.c"
+#line 4965 "RESTSupport.c"
} else {
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 510 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4669 "RESTSupport.c"
+#line 4973 "RESTSupport.c"
}
}
@@ -4679,63 +4990,63 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
gchar* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
GError * _inner_error_ = NULL;
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (self), NULL);
-#line 514 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (property_key != NULL, NULL);
-#line 516 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = node;
-#line 516 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = property_key;
-#line 516 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = (gchar*) xmlGetProp (_tmp0_, (xmlChar*) _tmp1_);
-#line 516 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value_string = _tmp2_;
-#line 517 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = value_string;
-#line 517 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp3_ == NULL) {
-#line 4698 "RESTSupport.c"
+#line 5002 "RESTSupport.c"
const gchar* _tmp4_ = NULL;
xmlNode* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
GError* _tmp7_ = NULL;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = property_key;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = node;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp5_->name;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Can't find XML " "property %s on node %s", _tmp4_, _tmp6_);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp7_;
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (value_string);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4721 "RESTSupport.c"
+#line 5025 "RESTSupport.c"
} else {
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (value_string);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 518 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4731 "RESTSupport.c"
+#line 5035 "RESTSupport.c"
}
}
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = value_string;
-#line 521 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 4738 "RESTSupport.c"
+#line 5042 "RESTSupport.c"
}
@@ -4758,7 +5069,7 @@ static gchar* string_chug (const gchar* self) {
result = _result_;
#line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 4761 "RESTSupport.c"
+#line 5065 "RESTSupport.c"
}
@@ -4781,7 +5092,7 @@ static gchar* string_chomp (const gchar* self) {
result = _result_;
#line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 4784 "RESTSupport.c"
+#line 5088 "RESTSupport.c"
}
@@ -4816,75 +5127,75 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
gchar* _tmp35_ = NULL;
const gchar* _tmp36_ = NULL;
GError * _inner_error_ = NULL;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = input_string;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ == NULL) {
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = TRUE;
-#line 4825 "RESTSupport.c"
+#line 5129 "RESTSupport.c"
} else {
const gchar* _tmp2_ = NULL;
gint _tmp3_ = 0;
gint _tmp4_ = 0;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = input_string;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = strlen (_tmp2_);
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = _tmp3_;
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _tmp4_ == 0;
-#line 4838 "RESTSupport.c"
+#line 5142 "RESTSupport.c"
}
-#line 526 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 4842 "RESTSupport.c"
+#line 5146 "RESTSupport.c"
GError* _tmp5_ = NULL;
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp5_;
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4854 "RESTSupport.c"
+#line 5158 "RESTSupport.c"
} else {
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 527 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4862 "RESTSupport.c"
+#line 5166 "RESTSupport.c"
}
}
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = input_string;
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = string_chug (_tmp7_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = _tmp8_;
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = string_chomp (_tmp9_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = _tmp10_;
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = g_str_has_prefix (_tmp11_, "<");
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = !_tmp12_;
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp11_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp9_);
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp13_) {
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = TRUE;
-#line 4887 "RESTSupport.c"
+#line 5191 "RESTSupport.c"
} else {
const gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
@@ -4892,395 +5203,395 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
gboolean _tmp19_ = FALSE;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = input_string;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = string_chug (_tmp14_);
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = _tmp15_;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = string_chomp (_tmp16_);
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = _tmp17_;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = g_str_has_suffix (_tmp18_, ">");
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = !_tmp19_;
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp18_);
-#line 531 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp16_);
-#line 4913 "RESTSupport.c"
+#line 5217 "RESTSupport.c"
}
-#line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 4917 "RESTSupport.c"
+#line 5221 "RESTSupport.c"
GError* _tmp20_ = NULL;
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp20_;
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4929 "RESTSupport.c"
+#line 5233 "RESTSupport.c"
} else {
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 533 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4937 "RESTSupport.c"
+#line 5241 "RESTSupport.c"
}
}
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = input_string;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = input_string;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = strlen (_tmp22_);
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = _tmp23_;
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = xmlReadMemory (_tmp21_, (gint) _tmp24_, NULL, NULL, (gint) (XML_PARSE_NOBLANKS | XML_PARSE_RECOVER));
-#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
doc = _tmp25_;
-#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = doc;
-#line 541 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp26_ == NULL) {
-#line 4956 "RESTSupport.c"
+#line 5260 "RESTSupport.c"
GError* _tmp27_ = NULL;
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp27_;
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4968 "RESTSupport.c"
+#line 5272 "RESTSupport.c"
} else {
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 542 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4976 "RESTSupport.c"
+#line 5280 "RESTSupport.c"
}
}
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = doc;
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = _tmp28_->children;
-#line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp29_ == NULL) {
-#line 4985 "RESTSupport.c"
+#line 5289 "RESTSupport.c"
GError* _tmp30_ = NULL;
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp30_;
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 4997 "RESTSupport.c"
+#line 5301 "RESTSupport.c"
} else {
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 548 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5005 "RESTSupport.c"
+#line 5309 "RESTSupport.c"
}
}
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp31_ = doc;
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp32_ = publishing_rest_support_xml_document_new (_tmp31_);
-#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
rest_doc = _tmp32_;
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp33_ = check_for_error_response;
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp33__target = check_for_error_response_target;
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp34_ = rest_doc;
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = _tmp33_ (_tmp34_, _tmp33__target);
-#line 554 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_result_ = _tmp35_;
-#line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp36_ = _result_;
-#line 555 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp36_ != NULL) {
-#line 5028 "RESTSupport.c"
+#line 5332 "RESTSupport.c"
const gchar* _tmp37_ = NULL;
GError* _tmp38_ = NULL;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp37_ = _result_;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp38_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_SERVICE_ERROR, "%s", _tmp37_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = _tmp38_;
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_propagate_error (error, _inner_error_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_xml_document_unref0 (rest_doc);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5047 "RESTSupport.c"
+#line 5351 "RESTSupport.c"
} else {
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_xml_document_unref0 (rest_doc);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5059 "RESTSupport.c"
+#line 5363 "RESTSupport.c"
}
}
-#line 558 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = rest_doc;
-#line 558 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_result_);
-#line 558 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5068 "RESTSupport.c"
+#line 5372 "RESTSupport.c"
}
static void publishing_rest_support_value_xml_document_init (GValue* value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5075 "RESTSupport.c"
+#line 5379 "RESTSupport.c"
}
static void publishing_rest_support_value_xml_document_free_value (GValue* value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5084 "RESTSupport.c"
+#line 5388 "RESTSupport.c"
}
}
static void publishing_rest_support_value_xml_document_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer);
-#line 5094 "RESTSupport.c"
+#line 5398 "RESTSupport.c"
} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5098 "RESTSupport.c"
+#line 5402 "RESTSupport.c"
}
}
static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5106 "RESTSupport.c"
+#line 5410 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 5113 "RESTSupport.c"
+#line 5417 "RESTSupport.c"
PublishingRESTSupportXmlDocument* object;
object = collect_values[0].v_pointer;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5120 "RESTSupport.c"
+#line 5424 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5124 "RESTSupport.c"
+#line 5428 "RESTSupport.c"
}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5128 "RESTSupport.c"
+#line 5432 "RESTSupport.c"
} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5132 "RESTSupport.c"
+#line 5436 "RESTSupport.c"
}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5136 "RESTSupport.c"
+#line 5440 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
PublishingRESTSupportXmlDocument** object_p;
object_p = collect_values[0].v_pointer;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5147 "RESTSupport.c"
+#line 5451 "RESTSupport.c"
}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 5153 "RESTSupport.c"
+#line 5457 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 5157 "RESTSupport.c"
+#line 5461 "RESTSupport.c"
} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5161 "RESTSupport.c"
+#line 5465 "RESTSupport.c"
}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5165 "RESTSupport.c"
+#line 5469 "RESTSupport.c"
}
GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
PublishingRESTSupportParamSpecXmlDocument* spec;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 5179 "RESTSupport.c"
+#line 5483 "RESTSupport.c"
}
gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5188 "RESTSupport.c"
+#line 5492 "RESTSupport.c"
}
void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_object) {
PublishingRESTSupportXmlDocument* old;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5208 "RESTSupport.c"
+#line 5512 "RESTSupport.c"
} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5212 "RESTSupport.c"
+#line 5516 "RESTSupport.c"
}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5218 "RESTSupport.c"
+#line 5522 "RESTSupport.c"
}
}
void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_object) {
PublishingRESTSupportXmlDocument* old;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 5237 "RESTSupport.c"
+#line 5541 "RESTSupport.c"
} else {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5241 "RESTSupport.c"
+#line 5545 "RESTSupport.c"
}
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_unref (old);
-#line 5247 "RESTSupport.c"
+#line 5551 "RESTSupport.c"
}
}
static void publishing_rest_support_xml_document_class_init (PublishingRESTSupportXmlDocumentClass * klass) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_xml_document_parent_class = g_type_class_peek_parent (klass);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5259 "RESTSupport.c"
+#line 5563 "RESTSupport.c"
}
static void publishing_rest_support_xml_document_instance_init (PublishingRESTSupportXmlDocument * self) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 5268 "RESTSupport.c"
+#line 5572 "RESTSupport.c"
}
static void publishing_rest_support_xml_document_finalize (PublishingRESTSupportXmlDocument* obj) {
PublishingRESTSupportXmlDocument * self;
xmlDoc* _tmp0_ = NULL;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, PublishingRESTSupportXmlDocument);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_destroy (self);
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->document;
-#line 494 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
xmlFreeDoc (_tmp0_);
-#line 5283 "RESTSupport.c"
+#line 5587 "RESTSupport.c"
}
@@ -5301,24 +5612,24 @@ GType publishing_rest_support_xml_document_get_type (void) {
gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
PublishingRESTSupportXmlDocument* self;
self = instance;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 5308 "RESTSupport.c"
+#line 5612 "RESTSupport.c"
}
void publishing_rest_support_xml_document_unref (gpointer instance) {
PublishingRESTSupportXmlDocument* self;
self = instance;
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
-#line 481 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 5321 "RESTSupport.c"
+#line 5625 "RESTSupport.c"
}
}
@@ -5333,21 +5644,21 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
GString* _tmp23_ = NULL;
const gchar* _tmp24_ = NULL;
gchar* _tmp25_ = NULL;
-#line 567 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (source != NULL, NULL);
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_string_new ("");
-#line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
encoded_str_builder = _tmp0_;
-#line 569 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = source;
-#line 569 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 569 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
current_char = _tmp2_;
-#line 570 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 5350 "RESTSupport.c"
+#line 5654 "RESTSupport.c"
gint current_char_value = 0;
const gchar* _tmp3_ = NULL;
gunichar _tmp4_ = 0U;
@@ -5359,146 +5670,146 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
const gchar* _tmp20_ = NULL;
const gchar* _tmp21_ = NULL;
gchar* _tmp22_ = NULL;
-#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = current_char;
-#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = g_utf8_get_char_validated (_tmp3_, (gssize) -1);
-#line 571 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
current_char_value = (gint) _tmp4_;
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = current_char_value;
-#line 574 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp5_ < 1) {
-#line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 5374 "RESTSupport.c"
+#line 5678 "RESTSupport.c"
}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = current_char_value;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp9_ < 128) {
-#line 5380 "RESTSupport.c"
+#line 5684 "RESTSupport.c"
gint _tmp10_ = 0;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = current_char_value;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _tmp10_ != ((gint) '&');
-#line 5386 "RESTSupport.c"
+#line 5690 "RESTSupport.c"
} else {
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = FALSE;
-#line 5390 "RESTSupport.c"
+#line 5694 "RESTSupport.c"
}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_) {
-#line 5394 "RESTSupport.c"
+#line 5698 "RESTSupport.c"
gint _tmp11_ = 0;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = current_char_value;
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp11_ != ((gint) '<');
-#line 5400 "RESTSupport.c"
+#line 5704 "RESTSupport.c"
} else {
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = FALSE;
-#line 5404 "RESTSupport.c"
+#line 5708 "RESTSupport.c"
}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp7_) {
-#line 5408 "RESTSupport.c"
+#line 5712 "RESTSupport.c"
gint _tmp12_ = 0;
-#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = current_char_value;
-#line 580 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp12_ != ((gint) '>');
-#line 5414 "RESTSupport.c"
+#line 5718 "RESTSupport.c"
} else {
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = FALSE;
-#line 5418 "RESTSupport.c"
+#line 5722 "RESTSupport.c"
}
-#line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 5422 "RESTSupport.c"
+#line 5726 "RESTSupport.c"
GString* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
gunichar _tmp15_ = 0U;
-#line 581 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = encoded_str_builder;
-#line 581 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = current_char;
-#line 581 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
-#line 581 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5434 "RESTSupport.c"
+#line 5738 "RESTSupport.c"
} else {
GString* _tmp16_ = NULL;
gint _tmp17_ = 0;
gchar* _tmp18_ = NULL;
gchar* _tmp19_ = NULL;
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = encoded_str_builder;
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = current_char_value;
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = g_strdup_printf ("%d;", _tmp17_);
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = _tmp18_;
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_string_append (_tmp16_, _tmp19_);
-#line 583 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp19_);
-#line 5452 "RESTSupport.c"
+#line 5756 "RESTSupport.c"
}
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = current_char;
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = g_utf8_next_char (_tmp20_);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = g_strdup (_tmp21_);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (current_char);
-#line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
current_char = _tmp22_;
-#line 5464 "RESTSupport.c"
+#line 5768 "RESTSupport.c"
}
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = encoded_str_builder;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = _tmp23_->str;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = g_strdup (_tmp24_);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp25_;
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (current_char);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (encoded_str_builder);
-#line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5480 "RESTSupport.c"
+#line 5784 "RESTSupport.c"
}
static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable** self, int length) {
SpitPublishingPublishable** result;
int i;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = g_new0 (SpitPublishingPublishable*, length + 1);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (i = 0; i < length; i++) {
-#line 5491 "RESTSupport.c"
+#line 5795 "RESTSupport.c"
SpitPublishingPublishable* _tmp0_ = NULL;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = _g_object_ref0 (self[i]);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result[i] = _tmp0_;
-#line 5497 "RESTSupport.c"
+#line 5801 "RESTSupport.c"
}
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5501 "RESTSupport.c"
+#line 5805 "RESTSupport.c"
}
@@ -5510,44 +5821,44 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
gint _tmp1__length1 = 0;
PublishingRESTSupportSession* _tmp2_ = NULL;
PublishingRESTSupportSession* _tmp3_ = NULL;
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportBatchUploader*) g_type_create_instance (object_type);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = publishables;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = publishables_length1;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1__length1 = _tmp0__length1;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables = _tmp1_;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables_length1 = _tmp1__length1;
-#line 601 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 602 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = session;
-#line 602 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _publishing_rest_support_session_ref0 (_tmp2_);
-#line 602 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 602 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->session = _tmp3_;
-#line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 5543 "RESTSupport.c"
+#line 5847 "RESTSupport.c"
}
static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) {
-#line 623 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes);
-#line 5550 "RESTSupport.c"
+#line 5854 "RESTSupport.c"
}
@@ -5557,36 +5868,36 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
gint _tmp0__length1 = 0;
gboolean _tmp23_ = FALSE;
GError * _inner_error_ = NULL;
-#line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->current_file = 0;
-#line 607 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
stop = FALSE;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->publishables;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 5570 "RESTSupport.c"
+#line 5874 "RESTSupport.c"
{
SpitPublishingPublishable** publishable_collection = NULL;
gint publishable_collection_length1 = 0;
gint _publishable_collection_size_ = 0;
gint publishable_it = 0;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable_collection = _tmp0_;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable_collection_length1 = _tmp0__length1;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5582 "RESTSupport.c"
+#line 5886 "RESTSupport.c"
SpitPublishingPublishable* _tmp1_ = NULL;
SpitPublishingPublishable* publishable = NULL;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishable = _tmp1_;
-#line 5589 "RESTSupport.c"
+#line 5893 "RESTSupport.c"
{
GFile* file = NULL;
SpitPublishingPublishable* _tmp2_ = NULL;
@@ -5609,104 +5920,104 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
guint _tmp20_ = 0U;
gboolean _tmp21_ = FALSE;
gint _tmp22_ = 0;
-#line 609 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = publishable;
-#line 609 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = spit_publishing_publishable_get_serialized_file (_tmp2_);
-#line 609 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
file = _tmp3_;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = file;
-#line 612 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp4_ == NULL) {
-#line 5622 "RESTSupport.c"
+#line 5926 "RESTSupport.c"
gint _tmp5_ = 0;
-#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->current_file;
-#line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->current_file = _tmp5_ + 1;
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
continue;
-#line 5634 "RESTSupport.c"
+#line 5938 "RESTSupport.c"
}
-#line 617 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = self->priv->current_file;
-#line 617 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = self->priv->publishables;
-#line 617 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7__length1 = self->priv->publishables_length1;
-#line 617 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
fraction_complete = ((gdouble) _tmp6_) / _tmp7__length1;
-#line 618 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->status_updated;
-#line 618 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8__target = self->priv->status_updated_target;
-#line 618 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ != NULL) {
-#line 5650 "RESTSupport.c"
+#line 5954 "RESTSupport.c"
SpitPublishingProgressCallback _tmp9_ = NULL;
void* _tmp9__target = NULL;
gint _tmp10_ = 0;
gdouble _tmp11_ = 0.0;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->status_updated;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9__target = self->priv->status_updated_target;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = self->priv->current_file;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = fraction_complete;
-#line 619 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5665 "RESTSupport.c"
+#line 5969 "RESTSupport.c"
}
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = self->priv->publishables;
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12__length1 = self->priv->publishables_length1;
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = self->priv->current_file;
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = _tmp12_[_tmp13_];
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = publishing_rest_support_batch_uploader_create_transaction (self, _tmp14_);
-#line 621 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
txn = _tmp15_;
-#line 623 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = txn;
-#line 623 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 5683 "RESTSupport.c"
+#line 5987 "RESTSupport.c"
{
PublishingRESTSupportTransaction* _tmp17_ = NULL;
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = txn;
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (_tmp17_, &_inner_error_);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5694 "RESTSupport.c"
+#line 5998 "RESTSupport.c"
goto __catch3_spit_publishing_publishing_error;
}
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 626 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 5709 "RESTSupport.c"
+#line 6013 "RESTSupport.c"
}
}
goto __finally3;
@@ -5714,82 +6025,82 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
{
GError* err = NULL;
GError* _tmp18_ = NULL;
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = err;
-#line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 686 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "upload-error", _tmp18_);
-#line 629 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
stop = TRUE;
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 5729 "RESTSupport.c"
+#line 6033 "RESTSupport.c"
}
__finally3:
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 625 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 5746 "RESTSupport.c"
+#line 6050 "RESTSupport.c"
}
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = txn;
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("chunk-transmitted", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp20_, NULL, FALSE);
-#line 632 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp19_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 634 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = stop;
-#line 634 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp21_) {
-#line 635 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 635 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 635 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 635 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 5766 "RESTSupport.c"
+#line 6070 "RESTSupport.c"
}
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = self->priv->current_file;
-#line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->current_file = _tmp22_ + 1;
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (file);
-#line 608 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (publishable);
-#line 5778 "RESTSupport.c"
+#line 6082 "RESTSupport.c"
}
}
}
-#line 640 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = stop;
-#line 640 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp23_) {
-#line 5786 "RESTSupport.c"
+#line 6090 "RESTSupport.c"
gint _tmp24_ = 0;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = self->priv->current_file;
-#line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_emit_by_name (self, "upload-complete", _tmp24_);
-#line 5792 "RESTSupport.c"
+#line 6096 "RESTSupport.c"
}
}
@@ -5808,52 +6119,52 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
gdouble _tmp6_ = 0.0;
SpitPublishingProgressCallback _tmp7_ = NULL;
void* _tmp7__target = NULL;
-#line 644 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 645 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->publishables;
-#line 645 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 645 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
file_span = 1.0 / _tmp0__length1;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = bytes_written_so_far;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = total_bytes;
-#line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = self->priv->current_file;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = file_span;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = this_file_fraction_complete;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = file_span;
-#line 647 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
-#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = self->priv->status_updated;
-#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7__target = self->priv->status_updated_target;
-#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp7_ != NULL) {
-#line 5841 "RESTSupport.c"
+#line 6145 "RESTSupport.c"
SpitPublishingProgressCallback _tmp8_ = NULL;
void* _tmp8__target = NULL;
gint _tmp9_ = 0;
gdouble _tmp10_ = 0.0;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->status_updated;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8__target = self->priv->status_updated_target;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->current_file;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = fraction_complete;
-#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 5856 "RESTSupport.c"
+#line 6160 "RESTSupport.c"
}
}
@@ -5862,17 +6173,17 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
PublishingRESTSupportSession* result = NULL;
PublishingRESTSupportSession* _tmp0_ = NULL;
PublishingRESTSupportSession* _tmp1_ = NULL;
-#line 654 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 655 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->session;
-#line 655 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
-#line 655 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 655 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5875 "RESTSupport.c"
+#line 6179 "RESTSupport.c"
}
@@ -5883,41 +6194,41 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
gint _tmp1_ = 0;
SpitPublishingPublishable* _tmp2_ = NULL;
SpitPublishingPublishable* _tmp3_ = NULL;
-#line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->publishables;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__length1 = self->priv->publishables_length1;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->current_file;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = _tmp0_[_tmp1_];
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp3_;
-#line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 5902 "RESTSupport.c"
+#line 6206 "RESTSupport.c"
}
static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
-#line 662 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 662 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 5911 "RESTSupport.c"
+#line 6215 "RESTSupport.c"
}
PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_transaction (PublishingRESTSupportBatchUploader* self, SpitPublishingPublishable* publishable) {
-#line 662 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
-#line 662 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 5920 "RESTSupport.c"
+#line 6224 "RESTSupport.c"
}
@@ -5926,258 +6237,258 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
void* _tmp0__target = NULL;
SpitPublishingPublishable** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
-#line 664 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self));
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = status_updated;
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0__target = status_updated_target;
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->status_updated = _tmp0_;
-#line 665 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->status_updated_target = _tmp0__target;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->publishables;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1__length1 = self->priv->publishables_length1;
-#line 667 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1__length1 > 0) {
-#line 668 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_send_files (self);
-#line 5947 "RESTSupport.c"
+#line 6251 "RESTSupport.c"
}
}
static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 5955 "RESTSupport.c"
+#line 6259 "RESTSupport.c"
}
static void publishing_rest_support_value_batch_uploader_free_value (GValue* value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (value->data[0].v_pointer) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 5964 "RESTSupport.c"
+#line 6268 "RESTSupport.c"
}
}
static void publishing_rest_support_value_batch_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (src_value->data[0].v_pointer) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer);
-#line 5974 "RESTSupport.c"
+#line 6278 "RESTSupport.c"
} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
dest_value->data[0].v_pointer = NULL;
-#line 5978 "RESTSupport.c"
+#line 6282 "RESTSupport.c"
}
}
static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 5986 "RESTSupport.c"
+#line 6290 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (collect_values[0].v_pointer) {
-#line 5993 "RESTSupport.c"
+#line 6297 "RESTSupport.c"
PublishingRESTSupportBatchUploader* object;
object = collect_values[0].v_pointer;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (object->parent_instance.g_class == NULL) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6000 "RESTSupport.c"
+#line 6304 "RESTSupport.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6004 "RESTSupport.c"
+#line 6308 "RESTSupport.c"
}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6008 "RESTSupport.c"
+#line 6312 "RESTSupport.c"
} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6012 "RESTSupport.c"
+#line 6316 "RESTSupport.c"
}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6016 "RESTSupport.c"
+#line 6320 "RESTSupport.c"
}
static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
PublishingRESTSupportBatchUploader** object_p;
object_p = collect_values[0].v_pointer;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!object_p) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6027 "RESTSupport.c"
+#line 6331 "RESTSupport.c"
}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!value->data[0].v_pointer) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = NULL;
-#line 6033 "RESTSupport.c"
+#line 6337 "RESTSupport.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = value->data[0].v_pointer;
-#line 6037 "RESTSupport.c"
+#line 6341 "RESTSupport.c"
} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6041 "RESTSupport.c"
+#line 6345 "RESTSupport.c"
}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6045 "RESTSupport.c"
+#line 6349 "RESTSupport.c"
}
GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
PublishingRESTSupportParamSpecBatchUploader* spec;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return G_PARAM_SPEC (spec);
-#line 6059 "RESTSupport.c"
+#line 6363 "RESTSupport.c"
}
gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return value->data[0].v_pointer;
-#line 6068 "RESTSupport.c"
+#line 6372 "RESTSupport.c"
}
void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v_object) {
PublishingRESTSupportBatchUploader* old;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6088 "RESTSupport.c"
+#line 6392 "RESTSupport.c"
} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6092 "RESTSupport.c"
+#line 6396 "RESTSupport.c"
}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6098 "RESTSupport.c"
+#line 6402 "RESTSupport.c"
}
}
void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer v_object) {
PublishingRESTSupportBatchUploader* old;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
old = value->data[0].v_pointer;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (v_object) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = v_object;
-#line 6117 "RESTSupport.c"
+#line 6421 "RESTSupport.c"
} else {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
value->data[0].v_pointer = NULL;
-#line 6121 "RESTSupport.c"
+#line 6425 "RESTSupport.c"
}
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (old) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_unref (old);
-#line 6127 "RESTSupport.c"
+#line 6431 "RESTSupport.c"
}
}
static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSupportBatchUploaderClass * klass) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_batch_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_rest_support_batch_uploader_finalize;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportBatchUploaderPrivate));
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_rest_support_batch_uploader_real_create_transaction;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("upload_complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("upload_error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 6145 "RESTSupport.c"
+#line 6449 "RESTSupport.c"
}
static void publishing_rest_support_batch_uploader_instance_init (PublishingRESTSupportBatchUploader * self) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_PRIVATE (self);
-#line 592 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->current_file = 0;
-#line 593 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables = NULL;
-#line 593 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables_length1 = 0;
-#line 593 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->session = NULL;
-#line 595 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->status_updated = NULL;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->ref_count = 1;
-#line 6166 "RESTSupport.c"
+#line 6470 "RESTSupport.c"
}
static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
PublishingRESTSupportBatchUploader * self;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_destroy (self);
-#line 593 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 594 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6180 "RESTSupport.c"
+#line 6484 "RESTSupport.c"
}
@@ -6198,24 +6509,24 @@ GType publishing_rest_support_batch_uploader_get_type (void) {
gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
PublishingRESTSupportBatchUploader* self;
self = instance;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_atomic_int_inc (&self->ref_count);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return instance;
-#line 6205 "RESTSupport.c"
+#line 6509 "RESTSupport.c"
}
void publishing_rest_support_batch_uploader_unref (gpointer instance) {
PublishingRESTSupportBatchUploader* self;
self = instance;
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
-#line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 6218 "RESTSupport.c"
+#line 6522 "RESTSupport.c"
}
}
@@ -6234,7 +6545,7 @@ static gunichar string_get_char (const gchar* self, glong index) {
result = _tmp1_;
#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6237 "RESTSupport.c"
+#line 6541 "RESTSupport.c"
}
@@ -6248,201 +6559,201 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
GString* _tmp14_ = NULL;
const gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
-#line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (s != NULL, NULL);
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = s;
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = g_utf8_normalize (_tmp0_, (gssize) -1, G_NORMALIZE_DEFAULT);
-#line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
t = _tmp1_;
-#line 678 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_string_new ("");
-#line 678 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
b = _tmp2_;
-#line 6263 "RESTSupport.c"
+#line 6567 "RESTSupport.c"
{
const gchar* u = NULL;
const gchar* _tmp3_ = NULL;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = t;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
u = _tmp3_;
-#line 6271 "RESTSupport.c"
+#line 6575 "RESTSupport.c"
{
gboolean _tmp4_ = FALSE;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = TRUE;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
while (TRUE) {
-#line 6278 "RESTSupport.c"
+#line 6582 "RESTSupport.c"
const gchar* _tmp7_ = NULL;
gunichar _tmp8_ = 0U;
gunichar c = 0U;
const gchar* _tmp9_ = NULL;
gunichar _tmp10_ = 0U;
gunichar _tmp11_ = 0U;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 6287 "RESTSupport.c"
+#line 6591 "RESTSupport.c"
const gchar* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = u;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = g_utf8_next_char (_tmp5_);
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
u = _tmp6_;
-#line 6296 "RESTSupport.c"
+#line 6600 "RESTSupport.c"
}
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = FALSE;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = u;
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = string_get_char (_tmp7_, (glong) 0);
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!(_tmp8_ != ((gunichar) 0))) {
-#line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
break;
-#line 6308 "RESTSupport.c"
+#line 6612 "RESTSupport.c"
}
-#line 680 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = u;
-#line 680 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = string_get_char (_tmp9_, (glong) 0);
-#line 680 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
c = _tmp10_;
-#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = c;
-#line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (((gint) _tmp11_) < 128) {
-#line 6320 "RESTSupport.c"
+#line 6624 "RESTSupport.c"
GString* _tmp12_ = NULL;
gunichar _tmp13_ = 0U;
-#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = b;
-#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = c;
-#line 682 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6329 "RESTSupport.c"
+#line 6633 "RESTSupport.c"
}
}
}
}
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = b;
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = _tmp14_->str;
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = g_strdup (_tmp15_);
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp16_;
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_string_free0 (b);
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (t);
-#line 685 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 6348 "RESTSupport.c"
+#line 6652 "RESTSupport.c"
}
static gchar* publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self) {
-#line 689 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 689 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6357 "RESTSupport.c"
+#line 6661 "RESTSupport.c"
}
gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self) {
-#line 689 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 689 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6366 "RESTSupport.c"
+#line 6670 "RESTSupport.c"
}
static gchar* publishing_rest_support_google_session_real_get_access_token (PublishingRESTSupportGoogleSession* self) {
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6375 "RESTSupport.c"
+#line 6679 "RESTSupport.c"
}
gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self) {
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6384 "RESTSupport.c"
+#line 6688 "RESTSupport.c"
}
static gchar* publishing_rest_support_google_session_real_get_refresh_token (PublishingRESTSupportGoogleSession* self) {
-#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_refresh_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return NULL;
-#line 6393 "RESTSupport.c"
+#line 6697 "RESTSupport.c"
}
gchar* publishing_rest_support_google_session_get_refresh_token (PublishingRESTSupportGoogleSession* self) {
-#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 691 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_refresh_token (self);
-#line 6402 "RESTSupport.c"
+#line 6706 "RESTSupport.c"
}
static void publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_deauthenticate'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6411 "RESTSupport.c"
+#line 6715 "RESTSupport.c"
}
void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
-#line 692 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6420 "RESTSupport.c"
+#line 6724 "RESTSupport.c"
}
PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type) {
PublishingRESTSupportGoogleSession* self = NULL;
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6430 "RESTSupport.c"
+#line 6734 "RESTSupport.c"
}
static void publishing_rest_support_google_session_class_init (PublishingRESTSupportGoogleSessionClass * klass) {
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_session_parent_class = g_type_class_peek_parent (klass);
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = publishing_rest_support_google_session_real_get_user_name;
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = publishing_rest_support_google_session_real_get_access_token;
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_session_real_get_refresh_token;
-#line 688 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_session_real_deauthenticate;
-#line 6445 "RESTSupport.c"
+#line 6749 "RESTSupport.c"
}
@@ -6469,50 +6780,50 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
SpitPublishingService* _tmp3_ = NULL;
SpitPublishingPluginHost* _tmp4_ = NULL;
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (scope != NULL, NULL);
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisher*) g_object_new (object_type, NULL);
-#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = scope;
-#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->scope);
-#line 872 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->scope = _tmp1_;
-#line 873 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = publishing_rest_support_google_publisher_google_session_impl_new ();
-#line 873 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 873 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 883 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->session = _tmp2_;
-#line 874 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = service;
-#line 874 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->service = _tmp3_;
-#line 875 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = host;
-#line 875 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->host = _tmp4_;
-#line 876 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->web_auth_pane);
-#line 876 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->web_auth_pane = NULL;
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 6508 "RESTSupport.c"
+#line 6812 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized (PublishingRESTSupportGooglePublisherWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_web_auth_pane_authorized ((PublishingRESTSupportGooglePublisher*) self, auth_code);
-#line 6515 "RESTSupport.c"
+#line 6819 "RESTSupport.c"
}
@@ -6523,50 +6834,50 @@ static void publishing_rest_support_google_publisher_on_web_auth_pane_authorized
const gchar* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
const gchar* _tmp5_ = NULL;
-#line 879 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 879 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (auth_code != NULL);
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->web_auth_pane;
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("authorized", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, &_tmp1_, NULL, FALSE);
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized, self);
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->scope;
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = auth_code;
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:882: EVENT: user authorized scope %s with auth_code %" \
+#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:892: EVENT: user authorized scope %s with auth_code %" \
"s", _tmp2_, _tmp3_);
-#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 885 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6548 "RESTSupport.c"
+#line 6852 "RESTSupport.c"
}
-#line 887 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = auth_code;
-#line 887 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_get_access_tokens (self, _tmp5_);
-#line 6554 "RESTSupport.c"
+#line 6858 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 891 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_get_access_tokens_complete ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6561 "RESTSupport.c"
+#line 6865 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_get_access_tokens_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6568 "RESTSupport.c"
+#line 6872 "RESTSupport.c"
}
@@ -6579,44 +6890,44 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_comple
PublishingRESTSupportTransaction* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
-#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 891 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = txn;
-#line 891 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 891 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = txn;
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
-#line 894 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:894: %s", "EVENT: network transaction to exchange authorization code for access t" \
+#line 904 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:904: %s", "EVENT: network transaction to exchange authorization code for access t" \
"okens " "completed successfully.");
-#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 898 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6605 "RESTSupport.c"
+#line 6909 "RESTSupport.c"
}
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = txn;
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_;
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp7_);
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 6617 "RESTSupport.c"
+#line 6921 "RESTSupport.c"
}
@@ -6631,62 +6942,62 @@ static void publishing_rest_support_google_publisher_on_get_access_tokens_error
gboolean _tmp7_ = FALSE;
SpitPublishingPluginHost* _tmp8_ = NULL;
GError* _tmp9_ = NULL;
-#line 903 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 903 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 905 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = txn;
-#line 905 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 905 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
-#line 906 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = txn;
-#line 906 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 906 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = txn;
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = _tmp5_;
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_debug ("EVENT: network transaction to exchange authorization code for access t" \
"okens " "failed; response = '%s'", _tmp6_);
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp6_);
-#line 911 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = publishing_rest_support_google_publisher_is_running (self);
-#line 911 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp7_) {
-#line 912 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6664 "RESTSupport.c"
+#line 6968 "RESTSupport.c"
}
-#line 914 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->host;
-#line 914 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = err;
-#line 914 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 6672 "RESTSupport.c"
+#line 6976 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 919 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6679 "RESTSupport.c"
+#line 6983 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 920 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6686 "RESTSupport.c"
+#line 6990 "RESTSupport.c"
}
@@ -6701,54 +7012,54 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
PublishingRESTSupportTransaction* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 917 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 917 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 919 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = txn;
-#line 919 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 919 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 920 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = txn;
-#line 920 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 920 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 922 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:922: EVENT: refresh access token transaction complete" \
+#line 932 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:932: EVENT: refresh access token transaction complete" \
"d successfully.");
-#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 925 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6725 "RESTSupport.c"
+#line 7029 "RESTSupport.c"
}
-#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->session;
-#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 928 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6735 "RESTSupport.c"
+#line 7039 "RESTSupport.c"
}
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = txn;
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = _tmp8_;
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp9_);
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp9_);
-#line 6747 "RESTSupport.c"
+#line 7051 "RESTSupport.c"
}
@@ -6764,62 +7075,62 @@ static void publishing_rest_support_google_publisher_on_refresh_access_token_tra
guint _tmp8_ = 0U;
SpitPublishingPluginHost* _tmp9_ = NULL;
GError* _tmp10_ = NULL;
-#line 933 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 933 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = txn;
-#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 936 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = txn;
-#line 936 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 936 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 938 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:938: EVENT: refresh access token transaction caused a" \
+#line 948 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:948: EVENT: refresh access token transaction caused a" \
" network error.");
-#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 941 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 951 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6787 "RESTSupport.c"
+#line 7091 "RESTSupport.c"
}
-#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->session;
-#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 944 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6797 "RESTSupport.c"
+#line 7101 "RESTSupport.c"
}
-#line 948 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = txn;
-#line 948 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = publishing_rest_support_transaction_get_status_code (_tmp7_);
-#line 948 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp8_ == ((guint) 400)) {
-#line 949 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_logout (self);
-#line 950 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 960 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6809 "RESTSupport.c"
+#line 7113 "RESTSupport.c"
}
-#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = self->priv->host;
-#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = err;
-#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp9_, _tmp10_);
-#line 6817 "RESTSupport.c"
+#line 7121 "RESTSupport.c"
}
@@ -6829,34 +7140,34 @@ static void publishing_rest_support_google_publisher_on_refresh_token_available
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
-#line 956 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 956 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (token != NULL);
-#line 957 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = token;
-#line 957 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:957: EVENT: an OAuth refresh token has become availab" \
+#line 967 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:967: EVENT: an OAuth refresh token has become availab" \
"le; token = '%s'.", _tmp0_);
-#line 959 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_google_publisher_is_running (self);
-#line 959 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 969 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp1_) {
-#line 960 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 970 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6841 "RESTSupport.c"
+#line 7145 "RESTSupport.c"
}
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->session;
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = token;
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = g_strdup (_tmp3_);
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp2_->refresh_token);
-#line 962 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_->refresh_token = _tmp4_;
-#line 6853 "RESTSupport.c"
+#line 7157 "RESTSupport.c"
}
@@ -6866,50 +7177,50 @@ static void publishing_rest_support_google_publisher_on_access_token_available (
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
-#line 965 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 965 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (token != NULL);
-#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = token;
-#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:966: EVENT: an OAuth access token has become availabl" \
+#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:976: EVENT: an OAuth access token has become availabl" \
"e; token = '%s'.", _tmp0_);
-#line 968 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = publishing_rest_support_google_publisher_is_running (self);
-#line 968 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp1_) {
-#line 969 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6877 "RESTSupport.c"
+#line 7181 "RESTSupport.c"
}
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->session;
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = token;
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = g_strdup (_tmp3_);
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp2_->access_token);
-#line 971 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_->access_token = _tmp4_;
-#line 973 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_fetch_username (self);
-#line 6891 "RESTSupport.c"
+#line 7195 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 977 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_fetch_username_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6898 "RESTSupport.c"
+#line 7202 "RESTSupport.c"
}
static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_fetch_username_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6905 "RESTSupport.c"
+#line 7209 "RESTSupport.c"
}
@@ -6922,44 +7233,44 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
PublishingRESTSupportTransaction* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
-#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 986 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 986 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 977 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = txn;
-#line 977 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 977 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = txn;
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 980 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:980: EVENT: username fetch transaction completed succ" \
+#line 990 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:990: EVENT: username fetch transaction completed succ" \
"essfully.");
-#line 982 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 982 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 983 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6942 "RESTSupport.c"
+#line 7246 "RESTSupport.c"
}
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = txn;
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_;
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_extract_username (self, _tmp7_);
-#line 985 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 6954 "RESTSupport.c"
+#line 7258 "RESTSupport.c"
}
@@ -6971,40 +7282,40 @@ static void publishing_rest_support_google_publisher_on_fetch_username_transacti
gboolean _tmp4_ = FALSE;
SpitPublishingPluginHost* _tmp5_ = NULL;
GError* _tmp6_ = NULL;
-#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 990 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = txn;
-#line 990 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 990 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 991 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = txn;
-#line 991 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 991 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 993 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:993: EVENT: username fetch transaction caused a netwo" \
-"rk error");
-#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:1003: EVENT: username fetch transaction caused a netw" \
+"ork error");
+#line 1005 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp4_) {
-#line 996 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 6990 "RESTSupport.c"
+#line 7294 "RESTSupport.c"
}
-#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = self->priv->host;
-#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = err;
-#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 6998 "RESTSupport.c"
+#line 7302 "RESTSupport.c"
}
@@ -7015,49 +7326,49 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
const gchar* _tmp2_ = NULL;
PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* _tmp3_ = NULL;
GError * _inner_error_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (auth_code != NULL);
-#line 1002 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:1002: ACTION: exchanging authorization code for acces" \
+#line 1012 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:1012: ACTION: exchanging authorization code for acces" \
"s & refresh tokens");
-#line 1004 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->host;
-#line 1004 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
-#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->session;
-#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = auth_code;
-#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = publishing_rest_support_google_publisher_get_access_tokens_transaction_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp2_);
-#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
tokens_txn = _tmp3_;
-#line 1007 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1018 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7031 "RESTSupport.c"
+#line 7335 "RESTSupport.c"
{
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7039 "RESTSupport.c"
+#line 7343 "RESTSupport.c"
goto __catch4_spit_publishing_publishing_error;
}
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7050 "RESTSupport.c"
+#line 7354 "RESTSupport.c"
}
}
goto __finally4;
@@ -7066,36 +7377,36 @@ static void publishing_rest_support_google_publisher_do_get_access_tokens (Publi
GError* err = NULL;
SpitPublishingPluginHost* _tmp4_ = NULL;
GError* _tmp5_ = NULL;
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = self->priv->host;
-#line 1013 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = err;
-#line 1013 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 7071 "RESTSupport.c"
+#line 7375 "RESTSupport.c"
}
__finally4:
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 1010 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7084 "RESTSupport.c"
+#line 7388 "RESTSupport.c"
}
-#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 7088 "RESTSupport.c"
+#line 7392 "RESTSupport.c"
}
@@ -7132,110 +7443,110 @@ static void publishing_rest_support_google_publisher_do_hosted_web_authenticatio
PublishingRESTSupportGooglePublisherWebAuthenticationPane* _tmp28_ = NULL;
SpitPublishingPluginHost* _tmp29_ = NULL;
PublishingRESTSupportGooglePublisherWebAuthenticationPane* _tmp30_ = NULL;
-#line 1017 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1018 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:1018: ACTION: running OAuth authentication flow in ho" \
+#line 1028 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:1028: ACTION: running OAuth authentication flow in ho" \
"sted web pane.");
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = soup_uri_encode ("urn:ietf:wg:oauth:2.0:oob", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _tmp0_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_strconcat ("https://accounts.google.com/o/oauth2/auth?" "response_type=code&" "client_id=" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID "&" "redirect_uri=", _tmp1_, NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _tmp2_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = g_strconcat (_tmp3_, "&", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _tmp4_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = g_strconcat (_tmp5_, "scope=", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = self->priv->scope;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = soup_uri_encode (_tmp8_, NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = _tmp9_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = g_strconcat (_tmp7_, _tmp10_, NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = _tmp11_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = g_strconcat (_tmp12_, "+", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = _tmp13_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = soup_uri_encode ("https://www.googleapis.com/auth/userinfo.profile", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = _tmp15_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = g_strconcat (_tmp14_, _tmp16_, NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = _tmp17_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = g_strconcat (_tmp18_, "&", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = _tmp19_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = g_strconcat (_tmp20_, "state=connect&", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = _tmp21_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = g_strconcat (_tmp22_, "access_type=offline&", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = _tmp23_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = g_strconcat (_tmp24_, "approval_prompt=force", NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = _tmp25_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp24_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp22_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp20_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp18_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp16_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp14_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp12_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp10_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp5_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp3_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp1_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- user_authorization_url = _tmp26_;
#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ user_authorization_url = _tmp26_;
+#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp27_ = publishing_rest_support_google_publisher_web_authentication_pane_new (user_authorization_url);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->web_auth_pane);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv->web_auth_pane = _tmp27_;
-#line 1031 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = self->priv->web_auth_pane;
-#line 1031 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (_tmp28_, "authorized", (GCallback) _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized, self, 0);
-#line 1033 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = self->priv->host;
-#line 1033 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp30_ = self->priv->web_auth_pane;
-#line 1033 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_install_dialog_pane (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1017 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (user_authorization_url);
-#line 7227 "RESTSupport.c"
+#line 7531 "RESTSupport.c"
}
@@ -7245,45 +7556,45 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp1_ = NULL;
PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* _tmp2_ = NULL;
GError * _inner_error_ = NULL;
-#line 1037 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1038 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:1038: ACTION: exchanging OAuth refresh token for OAut" \
+#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:1048: ACTION: exchanging OAuth refresh token for OAut" \
"h access token.");
-#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->host;
-#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
-#line 1042 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->session;
-#line 1042 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = publishing_rest_support_google_publisher_refresh_access_token_transaction_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1042 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
txn = _tmp2_;
-#line 1044 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 1045 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7255 "RESTSupport.c"
+#line 7559 "RESTSupport.c"
{
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7263 "RESTSupport.c"
+#line 7567 "RESTSupport.c"
goto __catch5_spit_publishing_publishing_error;
}
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7274 "RESTSupport.c"
+#line 7578 "RESTSupport.c"
}
}
goto __finally5;
@@ -7292,43 +7603,43 @@ static void publishing_rest_support_google_publisher_do_exchange_refresh_token_f
GError* err = NULL;
SpitPublishingPluginHost* _tmp3_ = NULL;
GError* _tmp4_ = NULL;
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = self->priv->host;
-#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = err;
-#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 7295 "RESTSupport.c"
+#line 7599 "RESTSupport.c"
}
__finally5:
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7308 "RESTSupport.c"
+#line 7612 "RESTSupport.c"
}
-#line 1037 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 7312 "RESTSupport.c"
+#line 7616 "RESTSupport.c"
}
static gpointer _json_object_ref0 (gpointer self) {
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self ? json_object_ref (self) : NULL;
-#line 7319 "RESTSupport.c"
+#line 7623 "RESTSupport.c"
}
@@ -7348,30 +7659,30 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
JsonObject* _tmp29_ = NULL;
gboolean _tmp30_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (response_body != NULL);
-#line 1055 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:1055: ACTION: extracting OAuth tokens from body of se" \
+#line 1065 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:1065: ACTION: extracting OAuth tokens from body of se" \
"rver response");
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = json_parser_new ();
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
parser = _tmp0_;
-#line 7349 "RESTSupport.c"
+#line 7653 "RESTSupport.c"
{
JsonParser* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = parser;
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = response_body;
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7361 "RESTSupport.c"
+#line 7665 "RESTSupport.c"
goto __catch6_g_error;
}
}
@@ -7386,183 +7697,183 @@ static void publishing_rest_support_google_publisher_do_extract_tokens (Publishi
gchar* _tmp7_ = NULL;
GError* _tmp8_ = NULL;
GError* _tmp9_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = self->priv->host;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = err;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _tmp4_->message;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = _tmp8_;
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (_tmp9_);
-#line 1062 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7406 "RESTSupport.c"
+#line 7710 "RESTSupport.c"
}
__finally6:
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 1059 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7419 "RESTSupport.c"
+#line 7723 "RESTSupport.c"
}
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = parser;
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = json_parser_get_root (_tmp10_);
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = json_node_get_object (_tmp11_);
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = _json_object_ref0 (_tmp12_);
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
response_obj = _tmp13_;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = response_obj;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = json_object_has_member (_tmp15_, "access_token");
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (!_tmp16_) {
-#line 7437 "RESTSupport.c"
+#line 7741 "RESTSupport.c"
JsonObject* _tmp17_ = NULL;
gboolean _tmp18_ = FALSE;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = response_obj;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = !_tmp18_;
-#line 7446 "RESTSupport.c"
+#line 7750 "RESTSupport.c"
} else {
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = FALSE;
-#line 7450 "RESTSupport.c"
+#line 7754 "RESTSupport.c"
}
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp14_) {
-#line 7454 "RESTSupport.c"
+#line 7758 "RESTSupport.c"
SpitPublishingPluginHost* _tmp19_ = NULL;
GError* _tmp20_ = NULL;
GError* _tmp21_ = NULL;
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = self->priv->host;
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "neither access_token nor refresh_token not present in server response");
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = _tmp20_;
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp19_, _tmp21_);
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (_tmp21_);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_json_object_unref0 (response_obj);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7474 "RESTSupport.c"
+#line 7778 "RESTSupport.c"
}
-#line 1075 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = response_obj;
-#line 1075 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = json_object_has_member (_tmp22_, "refresh_token");
-#line 1075 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp23_) {
-#line 7482 "RESTSupport.c"
+#line 7786 "RESTSupport.c"
gchar* refresh_token = NULL;
JsonObject* _tmp24_ = NULL;
const gchar* _tmp25_ = NULL;
gchar* _tmp26_ = NULL;
const gchar* _tmp27_ = NULL;
-#line 1076 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = response_obj;
-#line 1076 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = json_object_get_string_member (_tmp24_, "refresh_token");
-#line 1076 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = g_strdup (_tmp25_);
-#line 1076 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
refresh_token = _tmp26_;
-#line 1078 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp27_ = refresh_token;
-#line 1078 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp27_, "") != 0) {
-#line 7500 "RESTSupport.c"
+#line 7804 "RESTSupport.c"
const gchar* _tmp28_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = refresh_token;
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_refresh_token_available (self, _tmp28_);
-#line 7506 "RESTSupport.c"
+#line 7810 "RESTSupport.c"
}
-#line 1075 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (refresh_token);
-#line 7510 "RESTSupport.c"
+#line 7814 "RESTSupport.c"
}
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = response_obj;
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp30_ = json_object_has_member (_tmp29_, "access_token");
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp30_) {
-#line 7518 "RESTSupport.c"
+#line 7822 "RESTSupport.c"
gchar* access_token = NULL;
JsonObject* _tmp31_ = NULL;
const gchar* _tmp32_ = NULL;
gchar* _tmp33_ = NULL;
const gchar* _tmp34_ = NULL;
-#line 1083 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp31_ = response_obj;
-#line 1083 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp32_ = json_object_get_string_member (_tmp31_, "access_token");
-#line 1083 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp33_ = g_strdup (_tmp32_);
-#line 1083 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
access_token = _tmp33_;
-#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp34_ = access_token;
-#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1095 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 7536 "RESTSupport.c"
+#line 7840 "RESTSupport.c"
const gchar* _tmp35_ = NULL;
-#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp35_ = access_token;
-#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_access_token_available (self, _tmp35_);
-#line 7542 "RESTSupport.c"
+#line 7846 "RESTSupport.c"
}
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (access_token);
-#line 7546 "RESTSupport.c"
+#line 7850 "RESTSupport.c"
}
-#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_json_object_unref0 (response_obj);
-#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 7552 "RESTSupport.c"
+#line 7856 "RESTSupport.c"
}
@@ -7573,36 +7884,36 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
PublishingRESTSupportGooglePublisherUsernameFetchTransaction* _tmp3_ = NULL;
GError * _inner_error_ = NULL;
-#line 1090 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1091 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:1091: ACTION: running network transaction to fetch us" \
+#line 1101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:1101: ACTION: running network transaction to fetch us" \
"ername.");
-#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->host;
-#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
-#line 1094 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->priv->host;
-#line 1094 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = self->priv->session;
-#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = publishing_rest_support_google_publisher_username_fetch_transaction_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
txn = _tmp3_;
-#line 1097 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 1098 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7585 "RESTSupport.c"
+#line 7889 "RESTSupport.c"
{
-#line 1101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 1101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7591 "RESTSupport.c"
+#line 7895 "RESTSupport.c"
goto __catch7_g_error;
}
}
@@ -7612,36 +7923,36 @@ static void publishing_rest_support_google_publisher_do_fetch_username (Publishi
GError* err = NULL;
SpitPublishingPluginHost* _tmp4_ = NULL;
GError* _tmp5_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = self->priv->host;
-#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = err;
-#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 7613 "RESTSupport.c"
+#line 7917 "RESTSupport.c"
}
__finally7:
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7626 "RESTSupport.c"
+#line 7930 "RESTSupport.c"
}
-#line 1090 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_transaction_unref0 (txn);
-#line 7630 "RESTSupport.c"
+#line 7934 "RESTSupport.c"
}
@@ -7660,30 +7971,30 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp32_ = NULL;
gboolean _tmp33_ = FALSE;
GError * _inner_error_ = NULL;
-#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (response_body != NULL);
-#line 1108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_debug ("RESTSupport.vala:1108: ACTION: extracting username from body of server" \
+#line 1118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_debug ("RESTSupport.vala:1118: ACTION: extracting username from body of server" \
" response");
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = json_parser_new ();
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
parser = _tmp0_;
-#line 7659 "RESTSupport.c"
+#line 7963 "RESTSupport.c"
{
JsonParser* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = parser;
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = response_body;
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7671 "RESTSupport.c"
+#line 7975 "RESTSupport.c"
goto __catch8_g_error;
}
}
@@ -7698,177 +8009,177 @@ static void publishing_rest_support_google_publisher_do_extract_username (Publis
gchar* _tmp7_ = NULL;
GError* _tmp8_ = NULL;
GError* _tmp9_ = NULL;
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
err = _inner_error_;
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_inner_error_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = self->priv->host;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = err;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = _tmp4_->message;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = _tmp8_;
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (_tmp9_);
-#line 1115 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_error_free0 (err);
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7716 "RESTSupport.c"
+#line 8020 "RESTSupport.c"
}
__finally8:
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_clear_error (&_inner_error_);
-#line 1112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7729 "RESTSupport.c"
+#line 8033 "RESTSupport.c"
}
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp10_ = parser;
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp11_ = json_parser_get_root (_tmp10_);
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp12_ = json_node_get_object (_tmp11_);
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp13_ = _json_object_ref0 (_tmp12_);
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
response_obj = _tmp13_;
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp14_ = response_obj;
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp15_ = json_object_has_member (_tmp14_, "name");
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp15_) {
-#line 7747 "RESTSupport.c"
+#line 8051 "RESTSupport.c"
gchar* username = NULL;
JsonObject* _tmp16_ = NULL;
const gchar* _tmp17_ = NULL;
gchar* _tmp18_ = NULL;
const gchar* _tmp19_ = NULL;
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp16_ = response_obj;
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp17_ = json_object_get_string_member (_tmp16_, "name");
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp18_ = g_strdup (_tmp17_);
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
username = _tmp18_;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp19_ = username;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 7765 "RESTSupport.c"
+#line 8069 "RESTSupport.c"
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp20_ = NULL;
const gchar* _tmp21_ = NULL;
gchar* _tmp22_ = NULL;
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_ = self->priv->session;
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp21_ = username;
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp22_ = g_strdup (_tmp21_);
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp20_->user_name);
-#line 1126 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp20_->user_name = _tmp22_;
-#line 7779 "RESTSupport.c"
+#line 8083 "RESTSupport.c"
}
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (username);
-#line 7783 "RESTSupport.c"
+#line 8087 "RESTSupport.c"
}
-#line 1129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp23_ = response_obj;
-#line 1129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp24_ = json_object_has_member (_tmp23_, "access_token");
-#line 1129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp24_) {
-#line 7791 "RESTSupport.c"
+#line 8095 "RESTSupport.c"
gchar* access_token = NULL;
JsonObject* _tmp25_ = NULL;
const gchar* _tmp26_ = NULL;
gchar* _tmp27_ = NULL;
const gchar* _tmp28_ = NULL;
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp25_ = response_obj;
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp26_ = json_object_get_string_member (_tmp25_, "access_token");
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp27_ = g_strdup (_tmp26_);
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
access_token = _tmp27_;
-#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp28_ = access_token;
-#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (g_strcmp0 (_tmp28_, "") != 0) {
-#line 7809 "RESTSupport.c"
+#line 8113 "RESTSupport.c"
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp29_ = NULL;
const gchar* _tmp30_ = NULL;
gchar* _tmp31_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_ = self->priv->session;
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp30_ = access_token;
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp31_ = g_strdup (_tmp30_);
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp29_->access_token);
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp29_->access_token = _tmp31_;
-#line 7823 "RESTSupport.c"
+#line 8127 "RESTSupport.c"
}
-#line 1129 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (access_token);
-#line 7827 "RESTSupport.c"
+#line 8131 "RESTSupport.c"
}
-#line 1138 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp32_ = self->priv->session;
-#line 1138 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp33_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1138 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp33_, "session.is_authenticated()");
-#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_on_login_flow_complete (self);
-#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_json_object_unref0 (response_obj);
-#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (parser);
-#line 7841 "RESTSupport.c"
+#line 8145 "RESTSupport.c"
}
SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self) {
SpitPublishingPluginHost* result = NULL;
SpitPublishingPluginHost* _tmp0_ = NULL;
-#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 1144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->host;
-#line 1144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
-#line 1144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 7856 "RESTSupport.c"
+#line 8160 "RESTSupport.c"
}
@@ -7876,177 +8187,177 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
PublishingRESTSupportGoogleSession* result = NULL;
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_ = NULL;
PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-#line 1147 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->session;
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _publishing_rest_support_session_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 7874 "RESTSupport.c"
+#line 8178 "RESTSupport.c"
}
void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSupportGooglePublisher* self, const gchar* refresh_token) {
gboolean _tmp0_ = FALSE;
const gchar* _tmp1_ = NULL;
-#line 1151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = refresh_token;
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp1_ != NULL) {
-#line 7887 "RESTSupport.c"
+#line 8191 "RESTSupport.c"
const gchar* _tmp2_ = NULL;
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = refresh_token;
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = g_strcmp0 (_tmp2_, "") != 0;
-#line 7893 "RESTSupport.c"
+#line 8197 "RESTSupport.c"
} else {
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = FALSE;
-#line 7897 "RESTSupport.c"
+#line 8201 "RESTSupport.c"
}
-#line 1152 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp0_) {
-#line 7901 "RESTSupport.c"
+#line 8205 "RESTSupport.c"
PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp3_ = NULL;
const gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = self->priv->session;
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = refresh_token;
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = g_strdup (_tmp4_);
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp3_->refresh_token);
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_->refresh_token = _tmp5_;
-#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_exchange_refresh_token_for_access_token (self);
-#line 7917 "RESTSupport.c"
+#line 8221 "RESTSupport.c"
} else {
gboolean _tmp6_ = FALSE;
-#line 1156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty ();
-#line 1156 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
if (_tmp6_) {
-#line 7924 "RESTSupport.c"
+#line 8228 "RESTSupport.c"
SpitPublishingPluginHost* _tmp7_ = NULL;
const gchar* _tmp8_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = self->priv->host;
-#line 1157 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = _ ("You have already logged in and out of a Google service during this Sho" \
"twell session.\n" \
"\n" \
"To continue publishing to Google services, quit and restart Shotwell, " \
"then try publishing again.");
-#line 1157 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp8_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7935 "RESTSupport.c"
+#line 8239 "RESTSupport.c"
}
-#line 1161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_do_hosted_web_authentication (self);
-#line 7939 "RESTSupport.c"
+#line 8243 "RESTSupport.c"
}
}
static void publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 1165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_on_login_flow_complete'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7949 "RESTSupport.c"
+#line 8253 "RESTSupport.c"
}
void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 1165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1165 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 7958 "RESTSupport.c"
+#line 8262 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_do_logout'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 7967 "RESTSupport.c"
+#line 8271 "RESTSupport.c"
}
void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 7976 "RESTSupport.c"
+#line 8280 "RESTSupport.c"
}
static gboolean publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self) {
-#line 1169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_is_running'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return FALSE;
-#line 7985 "RESTSupport.c"
+#line 8289 "RESTSupport.c"
}
gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self) {
-#line 1169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
-#line 1169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 7994 "RESTSupport.c"
+#line 8298 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self) {
-#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_start'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8003 "RESTSupport.c"
+#line 8307 "RESTSupport.c"
}
void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self) {
-#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 8012 "RESTSupport.c"
+#line 8316 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 1173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_publisher_stop'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8021 "RESTSupport.c"
+#line 8325 "RESTSupport.c"
}
void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 1173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1173 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 8030 "RESTSupport.c"
+#line 8334 "RESTSupport.c"
}
@@ -8055,46 +8366,46 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_ = NULL;
SpitPublishingService* _tmp1_ = NULL;
-#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 1176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->priv->service;
-#line 1176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp1_;
-#line 1176 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8049 "RESTSupport.c"
+#line 8353 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type) {
PublishingRESTSupportGooglePublisherGoogleSessionImpl* self = NULL;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisherGoogleSessionImpl*) publishing_rest_support_google_session_construct (object_type);
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->access_token);
-#line 705 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->access_token = NULL;
-#line 706 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->user_name);
-#line 706 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->user_name = NULL;
-#line 707 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->refresh_token);
-#line 707 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->refresh_token = NULL;
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8071 "RESTSupport.c"
+#line 8375 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
-#line 704 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL);
-#line 8078 "RESTSupport.c"
+#line 8382 "RESTSupport.c"
}
@@ -8102,15 +8413,15 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
-#line 710 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 711 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->access_token;
-#line 711 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_ != NULL;
-#line 711 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8094 "RESTSupport.c"
+#line 8398 "RESTSupport.c"
}
@@ -8120,21 +8431,21 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
const gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
-#line 714 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 715 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->user_name;
-#line 715 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp0_ != NULL, "user_name != null");
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->user_name;
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 716 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8118 "RESTSupport.c"
+#line 8422 "RESTSupport.c"
}
@@ -8144,21 +8455,21 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
gboolean _tmp0_ = FALSE;
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
-#line 719 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp0_, "is_authenticated()");
-#line 721 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->access_token;
-#line 721 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 721 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 721 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8142 "RESTSupport.c"
+#line 8446 "RESTSupport.c"
}
@@ -8168,60 +8479,60 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
const gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
-#line 724 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = self->refresh_token;
-#line 725 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp0_ != NULL, "refresh_token != null");
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = self->refresh_token;
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp2_;
-#line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8166 "RESTSupport.c"
+#line 8470 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base) {
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-#line 729 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 730 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->access_token);
-#line 730 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->access_token = NULL;
-#line 731 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->user_name);
-#line 731 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->user_name = NULL;
-#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->refresh_token);
-#line 732 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->refresh_token = NULL;
-#line 8186 "RESTSupport.c"
+#line 8490 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_google_session_impl_class_init (PublishingRESTSupportGooglePublisherGoogleSessionImplClass * klass) {
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_google_session_impl_parent_class = g_type_class_peek_parent (klass);
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_google_publisher_google_session_impl_finalize;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = publishing_rest_support_google_publisher_google_session_impl_real_get_user_name;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = publishing_rest_support_google_publisher_google_session_impl_real_get_access_token;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 8205 "RESTSupport.c"
+#line 8509 "RESTSupport.c"
}
@@ -8231,17 +8542,17 @@ static void publishing_rest_support_google_publisher_google_session_impl_instanc
static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession* obj) {
PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL, PublishingRESTSupportGooglePublisherGoogleSessionImpl);
-#line 700 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->access_token);
-#line 701 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->user_name);
-#line 702 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->refresh_token);
-#line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj);
-#line 8225 "RESTSupport.c"
+#line 8529 "RESTSupport.c"
}
@@ -8253,119 +8564,42 @@ static GType publishing_rest_support_google_publisher_google_session_impl_get_ty
publishing_rest_support_google_publisher_google_session_impl_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, "PublishingRESTSupportGooglePublisherGoogleSessionImpl", &g_define_type_info, 0);
g_once_init_leave (&publishing_rest_support_google_publisher_google_session_impl_type_id__volatile, publishing_rest_support_google_publisher_google_session_impl_type_id);
}
- return publishing_rest_support_google_publisher_google_session_impl_type_id__volatile;
-}
-
-
-static void _publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed ((PublishingRESTSupportGooglePublisherWebAuthenticationPane*) self, load_event);
-#line 8244 "RESTSupport.c"
-}
-
-
-static gboolean __lambda4_ (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self) {
- gboolean result = FALSE;
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = FALSE;
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return result;
-#line 8254 "RESTSupport.c"
-}
-
-
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
- gboolean result;
- result = __lambda4_ ((PublishingRESTSupportGooglePublisherWebAuthenticationPane*) self);
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return result;
-#line 8263 "RESTSupport.c"
+ return publishing_rest_support_google_publisher_google_session_impl_type_id__volatile;
}
static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url) {
PublishingRESTSupportGooglePublisherWebAuthenticationPane * self = NULL;
const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- GtkBox* _tmp2_ = NULL;
- WebKitWebView* _tmp3_ = NULL;
- WebKitWebView* _tmp4_ = NULL;
- WebKitSettings* _tmp5_ = NULL;
- WebKitWebView* _tmp6_ = NULL;
- WebKitWebView* _tmp7_ = NULL;
- GtkBox* _tmp8_ = NULL;
- WebKitWebView* _tmp9_ = NULL;
-#line 745 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (auth_sequence_start_url != NULL, NULL);
-#line 745 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = (PublishingRESTSupportGooglePublisherWebAuthenticationPane*) g_object_new (object_type, NULL);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 800 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = auth_sequence_start_url;
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = g_strdup (_tmp0_);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (self->priv->auth_sequence_start_url);
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->auth_sequence_start_url = _tmp1_;
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_ref_sink (_tmp2_);
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_object_unref0 (self->priv->pane_widget);
-#line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->pane_widget = _tmp2_;
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = (WebKitWebView*) webkit_web_view_new ();
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_object_ref_sink (_tmp3_);
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_object_unref0 (self->priv->webview);
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv->webview = _tmp3_;
-#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = self->priv->webview;
-#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = webkit_web_view_get_settings (_tmp4_);
-#line 751 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- webkit_settings_set_enable_plugins (_tmp5_, FALSE);
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = self->priv->webview;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_connect_object (_tmp6_, "load-changed", (GCallback) _publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed, self, 0);
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = self->priv->webview;
-#line 754 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_connect_object (_tmp7_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = self->priv->pane_widget;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = self->priv->webview;
-#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 745 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 800 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self = (PublishingRESTSupportGooglePublisherWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8329 "RESTSupport.c"
+#line 8556 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
-#line 745 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_web_authentication_pane_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
-#line 8336 "RESTSupport.c"
+#line 8563 "RESTSupport.c"
}
static gboolean publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty (void) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
-#line 760 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty;
-#line 760 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
result = _tmp0_;
-#line 760 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return result;
-#line 8349 "RESTSupport.c"
+#line 8576 "RESTSupport.c"
}
@@ -8392,7 +8626,7 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
_tmp3_ = _result_;
#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
-#line 8376 "RESTSupport.c"
+#line 8603 "RESTSupport.c"
gchar* _tmp4_ = NULL;
#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
@@ -8400,13 +8634,13 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
result = (gint) (_tmp4_ - ((gchar*) self));
#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8384 "RESTSupport.c"
+#line 8611 "RESTSupport.c"
} else {
#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = -1;
#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8390 "RESTSupport.c"
+#line 8617 "RESTSupport.c"
}
}
@@ -8430,7 +8664,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
_tmp3_ = end;
#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 8414 "RESTSupport.c"
+#line 8641 "RESTSupport.c"
glong _tmp4_ = 0L;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
@@ -8438,7 +8672,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = _tmp4_;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8422 "RESTSupport.c"
+#line 8649 "RESTSupport.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
@@ -8450,7 +8684,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = (glong) (_tmp5_ - _tmp6_);
#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8434 "RESTSupport.c"
+#line 8661 "RESTSupport.c"
}
}
@@ -8474,21 +8708,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp1_ = offset;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 8458 "RESTSupport.c"
+#line 8685 "RESTSupport.c"
glong _tmp2_ = 0L;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8464 "RESTSupport.c"
+#line 8691 "RESTSupport.c"
} else {
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 8468 "RESTSupport.c"
+#line 8695 "RESTSupport.c"
}
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 8472 "RESTSupport.c"
+#line 8699 "RESTSupport.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
@@ -8500,7 +8734,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 8484 "RESTSupport.c"
+#line 8711 "RESTSupport.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -8510,13 +8744,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp7_ = _tmp6_;
#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 8494 "RESTSupport.c"
+#line 8721 "RESTSupport.c"
}
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 8500 "RESTSupport.c"
+#line 8727 "RESTSupport.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
@@ -8530,7 +8764,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp11_ = offset;
#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8514 "RESTSupport.c"
+#line 8741 "RESTSupport.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
@@ -8540,13 +8774,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp13_ = string_length;
#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8524 "RESTSupport.c"
+#line 8751 "RESTSupport.c"
}
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 8530 "RESTSupport.c"
+#line 8757 "RESTSupport.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8555,7 +8789,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp16_ = offset;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 8539 "RESTSupport.c"
+#line 8766 "RESTSupport.c"
}
#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
@@ -8575,265 +8809,116 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
result = _tmp22_;
#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 8559 "RESTSupport.c"
+#line 8786 "RESTSupport.c"
}
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_page_load (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self) {
- GtkBox* _tmp0_ = NULL;
- GdkWindow* _tmp1_ = NULL;
- GdkCursor* _tmp2_ = NULL;
- GdkCursor* _tmp3_ = NULL;
+static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+ PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
gchar* page_title = NULL;
- WebKitWebView* _tmp4_ = NULL;
+ WebKitWebView* _tmp0_ = NULL;
+ WebKitWebView* _tmp1_ = NULL;
+ const gchar* _tmp2_ = NULL;
+ gchar* _tmp3_ = NULL;
+ gchar* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
- gchar* _tmp6_ = NULL;
- const gchar* _tmp7_ = NULL;
- gint _tmp8_ = 0;
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_return_if_fail (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_WEB_AUTHENTICATION_PANE (self));
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _tmp2_;
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_object_unref0 (_tmp3_);
-#line 766 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp4_ = self->priv->webview;
-#line 766 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp5_ = webkit_web_view_get_title (_tmp4_);
-#line 766 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp6_ = g_strdup (_tmp5_);
-#line 766 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- page_title = _tmp6_;
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp7_ = page_title;
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp8_ = string_index_of (_tmp7_, "state=connect", 0);
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp8_ > 0) {
-#line 8602 "RESTSupport.c"
+ gint _tmp6_ = 0;
+#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp0_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp1_ = _tmp0_;
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp2_ = webkit_web_view_get_title (_tmp1_);
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp3_ = g_strdup (_tmp2_);
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp4_ = _tmp3_;
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _g_object_unref0 (_tmp1_);
+#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ page_title = _tmp4_;
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp5_ = page_title;
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp6_ > 0) {
+#line 8822 "RESTSupport.c"
gint auth_code_field_start = 0;
- const gchar* _tmp9_ = NULL;
- gint _tmp10_ = 0;
- gint _tmp11_ = 0;
+ const gchar* _tmp7_ = NULL;
+ gint _tmp8_ = 0;
+ gint _tmp9_ = 0;
gchar* auth_code = NULL;
- const gchar* _tmp12_ = NULL;
- gint _tmp13_ = 0;
- gchar* _tmp14_ = NULL;
- const gchar* _tmp15_ = NULL;
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp9_ = page_title;
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp10_ = string_index_of (_tmp9_, "code=", 0);
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- auth_code_field_start = _tmp10_;
-#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp11_ = auth_code_field_start;
-#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- if (_tmp11_ < 0) {
-#line 770 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ const gchar* _tmp10_ = NULL;
+ gint _tmp11_ = 0;
+ gchar* _tmp12_ = NULL;
+ const gchar* _tmp13_ = NULL;
+#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp7_ = page_title;
+#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp8_ = string_index_of (_tmp7_, "code=", 0);
+#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ auth_code_field_start = _tmp8_;
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp9_ = auth_code_field_start;
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ if (_tmp9_ < 0) {
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (page_title);
-#line 770 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return;
-#line 8626 "RESTSupport.c"
+#line 8846 "RESTSupport.c"
}
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp12_ = page_title;
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp13_ = auth_code_field_start;
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp14_ = string_substring (_tmp12_, (glong) (_tmp13_ + 5), (glong) -1);
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- auth_code = _tmp14_;
-#line 775 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp10_ = page_title;
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp11_ = auth_code_field_start;
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp12_ = string_substring (_tmp10_, (glong) (_tmp11_ + 5), (glong) -1);
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ auth_code = _tmp12_;
+#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty = TRUE;
-#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp15_ = auth_code;
-#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_signal_emit_by_name (self, "authorized", _tmp15_);
-#line 767 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ _tmp13_ = auth_code;
+#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ g_signal_emit_by_name (self, "authorized", _tmp13_);
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (auth_code);
-#line 8644 "RESTSupport.c"
- }
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (page_title);
-#line 8648 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_load_started (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self) {
- GtkBox* _tmp0_ = NULL;
- GdkWindow* _tmp1_ = NULL;
- GdkCursor* _tmp2_ = NULL;
- GdkCursor* _tmp3_ = NULL;
-#line 781 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_return_if_fail (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_WEB_AUTHENTICATION_PANE (self));
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp2_ = gdk_cursor_new (GDK_WATCH);
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp3_ = _tmp2_;
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_object_unref0 (_tmp3_);
-#line 8671 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_on_page_load_changed (PublishingRESTSupportGooglePublisherWebAuthenticationPane* self, WebKitLoadEvent load_event) {
- WebKitLoadEvent _tmp0_ = 0;
-#line 785 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_return_if_fail (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_WEB_AUTHENTICATION_PANE (self));
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = load_event;
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- switch (_tmp0_) {
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- case WEBKIT_LOAD_STARTED:
-#line 8685 "RESTSupport.c"
- {
-#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_google_publisher_web_authentication_pane_on_load_started (self);
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- break;
-#line 8691 "RESTSupport.c"
- }
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- case WEBKIT_LOAD_FINISHED:
-#line 8695 "RESTSupport.c"
- {
-#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_google_publisher_web_authentication_pane_on_page_load (self);
-#line 792 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- break;
-#line 8701 "RESTSupport.c"
- }
- default:
-#line 786 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- break;
-#line 8706 "RESTSupport.c"
+#line 8864 "RESTSupport.c"
}
-#line 795 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return;
-#line 8710 "RESTSupport.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_rest_support_google_publisher_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
- PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
- SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 798 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return result;
-#line 8723 "RESTSupport.c"
-}
-
-
-static GtkWidget* publishing_rest_support_google_publisher_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
- PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
- GtkWidget* result = NULL;
- GtkBox* _tmp0_ = NULL;
- GtkWidget* _tmp1_ = NULL;
-#line 802 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- result = _tmp1_;
-#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- return result;
-#line 8742 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
- PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
- WebKitWebView* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
-#line 806 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp0_ = self->priv->webview;
#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _tmp1_ = self->priv->auth_sequence_start_url;
-#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- webkit_web_view_load_uri (_tmp0_, _tmp1_);
-#line 8758 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
- PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
-#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 8766 "RESTSupport.c"
+ _g_free0 (page_title);
+#line 8868 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_web_authentication_pane_class_init (PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass * klass) {
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate));
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+ ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_rest_support_google_publisher_web_authentication_pane_real_on_page_load;
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_web_authentication_pane_finalize;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_signal_new ("authorized", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 8779 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- publishing_rest_support_google_publisher_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_rest_support_google_publisher_web_authentication_pane_real_get_preferred_geometry;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_rest_support_google_publisher_web_authentication_pane_real_get_widget;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_installed;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_rest_support_google_publisher_web_authentication_pane_real_on_pane_uninstalled;
-#line 8794 "RESTSupport.c"
+#line 8881 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_web_authentication_pane_instance_init (PublishingRESTSupportGooglePublisherWebAuthenticationPane * self) {
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
-#line 8801 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_web_authentication_pane_finalize (GObject* obj) {
PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_object_unref0 (self->priv->webview);
-#line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_object_unref0 (self->priv->pane_widget);
-#line 741 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
- _g_free0 (self->priv->auth_sequence_start_url);
-#line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (publishing_rest_support_google_publisher_web_authentication_pane_parent_class)->finalize (obj);
-#line 8817 "RESTSupport.c"
+#line 8895 "RESTSupport.c"
}
@@ -8841,10 +8926,8 @@ static GType publishing_rest_support_google_publisher_web_authentication_pane_ge
static volatile gsize publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_web_authentication_pane_instance_init, NULL };
- static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_rest_support_google_publisher_web_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType publishing_rest_support_google_publisher_web_authentication_pane_type_id;
- publishing_rest_support_google_publisher_web_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingRESTSupportGooglePublisherWebAuthenticationPane", &g_define_type_info, 0);
- g_type_add_interface_static (publishing_rest_support_google_publisher_web_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+ publishing_rest_support_google_publisher_web_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingRESTSupportGooglePublisherWebAuthenticationPane", &g_define_type_info, 0);
g_once_init_leave (&publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile, publishing_rest_support_google_publisher_web_authentication_pane_type_id);
}
return publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile;
@@ -8855,43 +8938,43 @@ static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishin
PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* self = NULL;
PublishingRESTSupportSession* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (auth_code != NULL, NULL);
-#line 818 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = session;
-#line 818 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisherGetAccessTokensTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 820 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = auth_code;
-#line 820 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "code", _tmp1_);
-#line 821 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID);
-#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_SECRET);
-#line 823 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "redirect_uri", "urn:ietf:wg:oauth:2.0:oob");
-#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
-#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8861 "RESTSupport.c"
+#line 8937 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishing_rest_support_google_publisher_get_access_tokens_transaction_new (PublishingRESTSupportSession* session, const gchar* auth_code) {
-#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_get_access_tokens_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
-#line 8868 "RESTSupport.c"
+#line 8944 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_get_access_tokens_transaction_class_init (PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass * klass) {
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 8875 "RESTSupport.c"
+#line 8951 "RESTSupport.c"
}
@@ -8917,45 +9000,45 @@ static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publis
PublishingRESTSupportSession* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 832 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = session;
-#line 832 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID);
-#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_SECRET);
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = session;
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = publishing_rest_support_google_session_get_refresh_token (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = _tmp2_;
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "refresh_token", _tmp3_);
-#line 836 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp3_);
-#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8925 "RESTSupport.c"
+#line 9001 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publishing_rest_support_google_publisher_refresh_access_token_transaction_new (PublishingRESTSupportSession* session) {
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_refresh_access_token_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
-#line 8932 "RESTSupport.c"
+#line 9008 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_refresh_access_token_transaction_class_init (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass * klass) {
-#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 8939 "RESTSupport.c"
+#line 9015 "RESTSupport.c"
}
@@ -8980,28 +9063,28 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_
PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
PublishingRESTSupportHttpMethod _tmp2_ = 0;
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = session;
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = endpoint_url;
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = method;
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 8978 "RESTSupport.c"
+#line 9054 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 8985 "RESTSupport.c"
+#line 9061 "RESTSupport.c"
}
@@ -9017,57 +9100,57 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = session;
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp1_ = endpoint_url;
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp2_ = method;
-#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisherAuthenticatedTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp2_);
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp3_ = session;
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp4_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_vala_assert (_tmp4_, "session.is_authenticated()");
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp5_ = session;
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp6_ = publishing_rest_support_google_session_get_access_token (_tmp5_);
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp7_ = _tmp6_;
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp8_ = g_strconcat ("Bearer ", _tmp7_, NULL);
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp9_ = _tmp8_;
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp9_);
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp9_);
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (_tmp7_);
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9037 "RESTSupport.c"
+#line 9113 "RESTSupport.c"
}
PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9044 "RESTSupport.c"
+#line 9120 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
-#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9051 "RESTSupport.c"
+#line 9127 "RESTSupport.c"
}
@@ -9090,29 +9173,29 @@ GType publishing_rest_support_google_publisher_authenticated_transaction_get_typ
static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
PublishingRESTSupportGooglePublisherUsernameFetchTransaction* self = NULL;
PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_tmp0_ = session;
-#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = (PublishingRESTSupportGooglePublisherUsernameFetchTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return self;
-#line 9082 "RESTSupport.c"
+#line 9158 "RESTSupport.c"
}
static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_new (PublishingRESTSupportGoogleSession* session) {
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
return publishing_rest_support_google_publisher_username_fetch_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION, session);
-#line 9089 "RESTSupport.c"
+#line 9165 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_username_fetch_transaction_class_init (PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass * klass) {
-#line 856 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9096 "RESTSupport.c"
+#line 9172 "RESTSupport.c"
}
@@ -9133,61 +9216,61 @@ static GType publishing_rest_support_google_publisher_username_fetch_transaction
static void publishing_rest_support_google_publisher_class_init (PublishingRESTSupportGooglePublisherClass * klass) {
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherPrivate));
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_rest_support_google_publisher_real_on_login_flow_complete;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_rest_support_google_publisher_real_do_logout;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_rest_support_google_publisher_real_is_running;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_rest_support_google_publisher_real_start;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_rest_support_google_publisher_real_stop;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 9133 "RESTSupport.c"
+#line 9209 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_is_running;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->start = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_start;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_stop;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_real_get_service;
-#line 9148 "RESTSupport.c"
+#line 9224 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 9155 "RESTSupport.c"
+#line 9231 "RESTSupport.c"
}
static void publishing_rest_support_google_publisher_finalize (GObject* obj) {
PublishingRESTSupportGooglePublisher * self;
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 864 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_free0 (self->priv->scope);
-#line 865 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 875 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
_g_object_unref0 (self->priv->web_auth_pane);
-#line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 9171 "RESTSupport.c"
+#line 9247 "RESTSupport.c"
}
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index 838192e..1a9052b 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -33,7 +33,7 @@ public abstract class Session {
public Session(string? endpoint_url = null) {
this.endpoint_url = endpoint_url;
- soup_session = new Soup.SessionAsync();
+ soup_session = new Soup.Session ();
this.soup_session.ssl_use_system_ca_file = true;
}
@@ -73,6 +73,11 @@ public abstract class Session {
soup_session.request_unqueued.disconnect(notify_wire_message_unqueued);
}
+
+ public void set_insecure () {
+ this.soup_session.ssl_use_system_ca_file = false;
+ this.soup_session.ssl_strict = false;
+ }
}
public enum HttpMethod {
@@ -186,6 +191,59 @@ public class Transaction {
}
}
+ /* Texts copied from epiphany */
+ public string detailed_error_from_tls_flags (out TlsCertificate cert) {
+ TlsCertificateFlags tls_errors;
+ this.message.get_https_status (out cert, out tls_errors);
+
+ var list = new Gee.ArrayList ();
+ if (TlsCertificateFlags.BAD_IDENTITY in tls_errors) {
+ /* Possible error message when a site presents a bad certificate. */
+ list.add (_("⚫ This website presented identification that belongs to a different website."));
+ }
+
+ if (TlsCertificateFlags.EXPIRED in tls_errors) {
+ /* Possible error message when a site presents a bad certificate. */
+ list.add (_("⚫ This website’s identification is too old to trust. Check the date on your computer’s calendar."));
+ }
+
+ if (TlsCertificateFlags.UNKNOWN_CA in tls_errors) {
+ /* Possible error message when a site presents a bad certificate. */
+ list.add (_("⚫ This website’s identification was not issued by a trusted organization."));
+ }
+
+ if (TlsCertificateFlags.GENERIC_ERROR in tls_errors) {
+ /* Possible error message when a site presents a bad certificate. */
+ list.add (_("⚫ This website’s identification could not be processed. It may be corrupted."));
+ }
+
+ if (TlsCertificateFlags.REVOKED in tls_errors) {
+ /* Possible error message when a site presents a bad certificate. */
+ list.add (_("⚫ This website’s identification has been revoked by the trusted organization that issued it."));
+ }
+
+ if (TlsCertificateFlags.INSECURE in tls_errors) {
+ /* Possible error message when a site presents a bad certificate. */
+ list.add (_("⚫ This website’s identification cannot be trusted because it uses very weak encryption."));
+ }
+
+ if (TlsCertificateFlags.NOT_ACTIVATED in tls_errors) {
+ /* Possible error message when a site presents a bad certificate. */
+ list.add (_("⚫ This website’s identification is only valid for future dates. Check the date on your computer’s calendar."));
+ }
+
+ var builder = new StringBuilder ();
+ if (list.size == 1) {
+ builder.append (list.get (0));
+ } else {
+ foreach (var entry in list) {
+ builder.append_printf ("%s\n", entry);
+ }
+ }
+
+ return builder.str;
+ }
+
protected void check_response(Soup.Message message) throws Spit.Publishing.PublishingError {
switch (message.status_code) {
case Soup.KnownStatusCode.OK:
@@ -733,37 +791,21 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
}
}
- private class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
+ private class WebAuthenticationPane : Shotwell.Plugins.Common.WebAuthenticationPane {
public static bool cache_dirty = false;
- private WebKit.WebView webview;
- private Gtk.Box pane_widget;
- private string auth_sequence_start_url;
-
public signal void authorized(string auth_code);
public WebAuthenticationPane(string auth_sequence_start_url) {
- this.auth_sequence_start_url = auth_sequence_start_url;
-
- pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-
- webview = new WebKit.WebView();
- webview.get_settings().enable_plugins = false;
-
- webview.load_changed.connect(on_page_load_changed);
- webview.context_menu.connect(() => { return false; });
-
- pane_widget.pack_start(webview, true, true, 0);
+ Object (login_uri : auth_sequence_start_url);
}
public static bool is_cache_dirty() {
return cache_dirty;
}
- private void on_page_load() {
- pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
-
- string page_title = webview.get_title();
+ public override void on_page_load() {
+ string page_title = get_view ().get_title();
if (page_title.index_of("state=connect") > 0) {
int auth_code_field_start = page_title.index_of("code=");
if (auth_code_field_start < 0)
@@ -777,38 +819,6 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
authorized(auth_code);
}
}
-
- private void on_load_started() {
- pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
- }
-
- private void on_page_load_changed (WebKit.LoadEvent load_event) {
- switch (load_event) {
- case WebKit.LoadEvent.STARTED:
- on_load_started();
- break;
- case WebKit.LoadEvent.FINISHED:
- on_page_load();
- break;
- }
-
- return;
- }
-
- public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
- return Spit.Publishing.DialogPane.GeometryOptions.NONE;
- }
-
- public Gtk.Widget get_widget() {
- return pane_widget;
- }
-
- public void on_pane_installed() {
- webview.load_uri(auth_sequence_start_url);
- }
-
- public void on_pane_uninstalled() {
- }
}
private class GetAccessTokensTransaction : Publishing.RESTSupport.Transaction {
diff --git a/plugins/common/WebAuthenticationPane.c b/plugins/common/WebAuthenticationPane.c
new file mode 100644
index 0000000..e430441
--- /dev/null
+++ b/plugins/common/WebAuthenticationPane.c
@@ -0,0 +1,575 @@
+/* WebAuthenticationPane.c generated by valac 0.34.1, the Vala compiler
+ * generated from WebAuthenticationPane.vala, do not modify */
+
+/* Copyright 2016 Jens Georg
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+
+#include
+#include
+#include "shotwell-plugin-dev-1.0.h"
+#include
+#include
+#include
+#include
+#include
+
+
+#define SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE (shotwell_plugins_common_web_authentication_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+
+typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommonWebAuthenticationPane;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+struct _ShotwellPluginsCommonWebAuthenticationPane {
+ GObject parent_instance;
+ ShotwellPluginsCommonWebAuthenticationPanePrivate * priv;
+};
+
+struct _ShotwellPluginsCommonWebAuthenticationPaneClass {
+ GObjectClass parent_class;
+ void (*on_page_load) (ShotwellPluginsCommonWebAuthenticationPane* self);
+};
+
+struct _ShotwellPluginsCommonWebAuthenticationPanePrivate {
+ SpitPublishingDialogPaneGeometryOptions _preferred_geometry;
+ gchar* _login_uri;
+ WebKitWebView* webview;
+ GtkBox* pane_widget;
+};
+
+
+static gpointer shotwell_plugins_common_web_authentication_pane_parent_class = NULL;
+static SpitPublishingDialogPaneIface* shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = NULL;
+
+GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPanePrivate))
+enum {
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY,
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY,
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI
+};
+static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base);
+static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event);
+static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self);
+static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self);
+static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self);
+void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
+static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type);
+WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
+static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);
+static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base);
+static void shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
+gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self);
+static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
+ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
+static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value);
+static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value);
+static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* obj);
+static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec);
+static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec);
+
+
+static void _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ shotwell_plugins_common_web_authentication_pane_on_page_load_changed ((ShotwellPluginsCommonWebAuthenticationPane*) self, load_event);
+#line 88 "WebAuthenticationPane.c"
+}
+
+
+static gboolean __lambda4_ (ShotwellPluginsCommonWebAuthenticationPane* self) {
+ gboolean result = FALSE;
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ result = FALSE;
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return result;
+#line 98 "WebAuthenticationPane.c"
+}
+
+
+static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
+ gboolean result;
+ result = __lambda4_ ((ShotwellPluginsCommonWebAuthenticationPane*) self);
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return result;
+#line 107 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_real_constructed (GObject* base) {
+ ShotwellPluginsCommonWebAuthenticationPane * self;
+ WebKitWebView* _tmp0_ = NULL;
+ WebKitWebView* _tmp1_ = NULL;
+ WebKitSettings* _tmp2_ = NULL;
+ WebKitWebView* _tmp3_ = NULL;
+ WebKitWebView* _tmp4_ = NULL;
+ GtkBox* _tmp5_ = NULL;
+ GtkBox* _tmp6_ = NULL;
+ WebKitWebView* _tmp7_ = NULL;
+#line 19 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 20 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->constructed (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject));
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = (WebKitWebView*) webkit_web_view_new ();
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_object_ref_sink (_tmp0_);
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_object_unref0 (self->priv->webview);
+#line 22 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self->priv->webview = _tmp0_;
+#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp1_ = self->priv->webview;
+#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp2_ = webkit_web_view_get_settings (_tmp1_);
+#line 23 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ webkit_settings_set_enable_plugins (_tmp2_, FALSE);
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp3_ = self->priv->webview;
+#line 25 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_signal_connect_object (_tmp3_, "load-changed", (GCallback) _shotwell_plugins_common_web_authentication_pane_on_page_load_changed_webkit_web_view_load_changed, self, 0);
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp4_ = self->priv->webview;
+#line 26 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_signal_connect_object (_tmp4_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp5_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_object_ref_sink (_tmp5_);
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_object_unref0 (self->priv->pane_widget);
+#line 28 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self->priv->pane_widget = _tmp5_;
+#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp6_ = self->priv->pane_widget;
+#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp7_ = self->priv->webview;
+#line 29 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ gtk_box_pack_start (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+#line 161 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_critical ("Type `%s' does not implement abstract method `shotwell_plugins_common_web_authentication_pane_on_page_load'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return;
+#line 170 "WebAuthenticationPane.c"
+}
+
+
+void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self) {
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 32 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS (self)->on_page_load (self);
+#line 179 "WebAuthenticationPane.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return self ? g_object_ref (self) : NULL;
+#line 186 "WebAuthenticationPane.c"
+}
+
+
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type) {
+ GdkWindow* window = NULL;
+ GtkBox* _tmp0_ = NULL;
+ GdkWindow* _tmp1_ = NULL;
+ GdkWindow* _tmp2_ = NULL;
+ GdkDisplay* display = NULL;
+ GdkDisplay* _tmp3_ = NULL;
+ GdkDisplay* _tmp4_ = NULL;
+ GdkCursor* cursor = NULL;
+ GdkCursorType _tmp5_ = 0;
+ GdkCursor* _tmp6_ = NULL;
+#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = self->priv->pane_widget;
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp2_ = _g_object_ref0 (_tmp1_);
+#line 35 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ window = _tmp2_;
+#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp3_ = gdk_window_get_display (window);
+#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp4_ = _g_object_ref0 (_tmp3_);
+#line 36 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ display = _tmp4_;
+#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp5_ = type;
+#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp6_ = gdk_cursor_new_for_display (display, _tmp5_);
+#line 37 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ cursor = _tmp6_;
+#line 38 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ gdk_window_set_cursor (window, cursor);
+#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_object_unref0 (cursor);
+#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_object_unref0 (display);
+#line 34 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_object_unref0 (window);
+#line 231 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_on_page_load_changed (ShotwellPluginsCommonWebAuthenticationPane* self, WebKitLoadEvent load_event) {
+ WebKitLoadEvent _tmp0_ = 0;
+#line 41 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = load_event;
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ switch (_tmp0_) {
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ case WEBKIT_LOAD_STARTED:
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ case WEBKIT_LOAD_REDIRECTED:
+#line 247 "WebAuthenticationPane.c"
+ {
+#line 45 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_WATCH);
+#line 46 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ break;
+#line 253 "WebAuthenticationPane.c"
+ }
+#line 42 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ case WEBKIT_LOAD_FINISHED:
+#line 257 "WebAuthenticationPane.c"
+ {
+#line 48 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ shotwell_plugins_common_web_authentication_pane_set_cursor (self, GDK_LEFT_PTR);
+#line 49 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ shotwell_plugins_common_web_authentication_pane_on_page_load (self);
+#line 50 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ break;
+#line 265 "WebAuthenticationPane.c"
+ }
+ default:
+ {
+#line 52 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ break;
+#line 271 "WebAuthenticationPane.c"
+ }
+ }
+}
+
+
+WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self) {
+ WebKitWebView* result = NULL;
+ WebKitWebView* _tmp0_ = NULL;
+ WebKitWebView* _tmp1_ = NULL;
+#line 56 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL);
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = self->priv->webview;
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp1_ = _g_object_ref0 (_tmp0_);
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ result = _tmp1_;
+#line 57 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return result;
+#line 291 "WebAuthenticationPane.c"
+}
+
+
+static SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
+ ShotwellPluginsCommonWebAuthenticationPane * self;
+ SpitPublishingDialogPaneGeometryOptions result = 0;
+ SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 60 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = self->priv->_preferred_geometry;
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ result = _tmp0_;
+#line 61 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return result;
+#line 307 "WebAuthenticationPane.c"
+}
+
+
+static GtkWidget* shotwell_plugins_common_web_authentication_pane_real_get_widget (SpitPublishingDialogPane* base) {
+ ShotwellPluginsCommonWebAuthenticationPane * self;
+ GtkWidget* result = NULL;
+ GtkBox* _tmp0_ = NULL;
+ GtkWidget* _tmp1_ = NULL;
+#line 64 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = self->priv->pane_widget;
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ result = _tmp1_;
+#line 65 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return result;
+#line 326 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+ ShotwellPluginsCommonWebAuthenticationPane * self;
+ WebKitWebView* _tmp0_ = NULL;
+ WebKitWebView* _tmp1_ = NULL;
+ gchar* _tmp2_ = NULL;
+ gchar* _tmp3_ = NULL;
+ gchar* _tmp4_ = NULL;
+#line 68 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = shotwell_plugins_common_web_authentication_pane_get_view (self);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp1_ = _tmp0_;
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp2_ = shotwell_plugins_common_web_authentication_pane_get_login_uri (self);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp3_ = _tmp2_;
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp4_ = _tmp3_;
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ webkit_web_view_load_uri (_tmp1_, _tmp4_);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_free0 (_tmp4_);
+#line 69 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_object_unref0 (_tmp1_);
+#line 355 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+ ShotwellPluginsCommonWebAuthenticationPane * self;
+#line 72 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 363 "WebAuthenticationPane.c"
+}
+
+
+ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type) {
+ ShotwellPluginsCommonWebAuthenticationPane * self = NULL;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self = (ShotwellPluginsCommonWebAuthenticationPane*) g_object_new (object_type, NULL);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return self;
+#line 373 "WebAuthenticationPane.c"
+}
+
+
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self) {
+ SpitPublishingDialogPaneGeometryOptions result;
+ SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), 0);
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = self->priv->_preferred_geometry;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ result = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return result;
+#line 388 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self, SpitPublishingDialogPaneGeometryOptions value) {
+ SpitPublishingDialogPaneGeometryOptions _tmp0_ = 0;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = value;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self->priv->_preferred_geometry = _tmp0_;
+#line 11 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_object_notify ((GObject *) self, "preferred-geometry");
+#line 402 "WebAuthenticationPane.c"
+}
+
+
+gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self) {
+ gchar* result;
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_return_val_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self), NULL);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = self->priv->_login_uri;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ result = _tmp1_;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ return result;
+#line 420 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_set_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self, const gchar* value) {
+ const gchar* _tmp0_ = NULL;
+ gchar* _tmp1_ = NULL;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_return_if_fail (SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE (self));
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp0_ = value;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _tmp1_ = g_strdup (_tmp0_);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_free0 (self->priv->_login_uri);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self->priv->_login_uri = _tmp1_;
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_object_notify ((GObject *) self, "login-uri");
+#line 439 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_class_init (ShotwellPluginsCommonWebAuthenticationPaneClass * klass) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ shotwell_plugins_common_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_type_class_add_private (klass, sizeof (ShotwellPluginsCommonWebAuthenticationPanePrivate));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ ((GObjectClass *) klass)->constructed = shotwell_plugins_common_web_authentication_pane_real_constructed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = shotwell_plugins_common_web_authentication_pane_real_on_page_load;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ G_OBJECT_CLASS (klass)->get_property = _vala_shotwell_plugins_common_web_authentication_pane_get_property;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ G_OBJECT_CLASS (klass)->set_property = _vala_shotwell_plugins_common_web_authentication_pane_set_property;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ G_OBJECT_CLASS (klass)->finalize = shotwell_plugins_common_web_authentication_pane_finalize;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY, g_param_spec_enum ("preferred-geometry", "preferred-geometry", "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_TYPE_GEOMETRY_OPTIONS, SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_object_class_install_property (G_OBJECT_CLASS (klass), SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI, g_param_spec_string ("login-uri", "login-uri", "login-uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
+#line 462 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_get_preferred_geometry;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_get_widget;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_installed;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) shotwell_plugins_common_web_authentication_pane_real_on_pane_uninstalled;
+#line 477 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_instance_init (ShotwellPluginsCommonWebAuthenticationPane * self) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self->priv = SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_PRIVATE (self);
+#line 10 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self->priv->_preferred_geometry = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
+#line 486 "WebAuthenticationPane.c"
+}
+
+
+static void shotwell_plugins_common_web_authentication_pane_finalize (GObject* obj) {
+ ShotwellPluginsCommonWebAuthenticationPane * self;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (obj, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 14 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_free0 (self->priv->_login_uri);
+#line 16 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_object_unref0 (self->priv->webview);
+#line 17 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ _g_object_unref0 (self->priv->pane_widget);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ G_OBJECT_CLASS (shotwell_plugins_common_web_authentication_pane_parent_class)->finalize (obj);
+#line 502 "WebAuthenticationPane.c"
+}
+
+
+GType shotwell_plugins_common_web_authentication_pane_get_type (void) {
+ static volatile gsize shotwell_plugins_common_web_authentication_pane_type_id__volatile = 0;
+ if (g_once_init_enter (&shotwell_plugins_common_web_authentication_pane_type_id__volatile)) {
+ static const GTypeInfo g_define_type_info = { sizeof (ShotwellPluginsCommonWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) shotwell_plugins_common_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ShotwellPluginsCommonWebAuthenticationPane), 0, (GInstanceInitFunc) shotwell_plugins_common_web_authentication_pane_instance_init, NULL };
+ static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) shotwell_plugins_common_web_authentication_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+ GType shotwell_plugins_common_web_authentication_pane_type_id;
+ shotwell_plugins_common_web_authentication_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "ShotwellPluginsCommonWebAuthenticationPane", &g_define_type_info, G_TYPE_FLAG_ABSTRACT);
+ g_type_add_interface_static (shotwell_plugins_common_web_authentication_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+ g_once_init_leave (&shotwell_plugins_common_web_authentication_pane_type_id__volatile, shotwell_plugins_common_web_authentication_pane_type_id);
+ }
+ return shotwell_plugins_common_web_authentication_pane_type_id__volatile;
+}
+
+
+static void _vala_shotwell_plugins_common_web_authentication_pane_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
+ ShotwellPluginsCommonWebAuthenticationPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ switch (property_id) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_value_set_enum (value, shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ g_value_take_string (value, shotwell_plugins_common_web_authentication_pane_get_login_uri (self));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ break;
+#line 537 "WebAuthenticationPane.c"
+ default:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ break;
+#line 543 "WebAuthenticationPane.c"
+ }
+}
+
+
+static void _vala_shotwell_plugins_common_web_authentication_pane_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
+ ShotwellPluginsCommonWebAuthenticationPane * self;
+ self = G_TYPE_CHECK_INSTANCE_CAST (object, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ switch (property_id) {
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_PREFERRED_GEOMETRY:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ shotwell_plugins_common_web_authentication_pane_set_preferred_geometry (self, g_value_get_enum (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ break;
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ case SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_LOGIN_URI:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ shotwell_plugins_common_web_authentication_pane_set_login_uri (self, g_value_get_string (value));
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ break;
+#line 565 "WebAuthenticationPane.c"
+ default:
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+#line 9 "/home/jens/Source/shotwell/plugins/common/WebAuthenticationPane.vala"
+ break;
+#line 571 "WebAuthenticationPane.c"
+ }
+}
+
+
+
diff --git a/plugins/common/WebAuthenticationPane.vala b/plugins/common/WebAuthenticationPane.vala
new file mode 100644
index 0000000..0a77cf6
--- /dev/null
+++ b/plugins/common/WebAuthenticationPane.vala
@@ -0,0 +1,75 @@
+/* Copyright 2016 Jens Georg
+ *
+ * This software is licensed under the GNU LGPL (version 2.1 or later).
+ * See the COPYING file in this distribution.
+ */
+using Spit.Publishing;
+
+namespace Shotwell.Plugins.Common {
+ public abstract class WebAuthenticationPane : Spit.Publishing.DialogPane, Object {
+ public DialogPane.GeometryOptions preferred_geometry {
+ get; construct; default = DialogPane.GeometryOptions.NONE;
+ }
+
+ public string login_uri { owned get; construct; }
+
+ private WebKit.WebView webview;
+ private Gtk.Box pane_widget;
+
+ public override void constructed () {
+ base.constructed ();
+
+ this.webview = new WebKit.WebView ();
+ this.webview.get_settings ().enable_plugins = false;
+
+ this.webview.load_changed.connect (this.on_page_load_changed);
+ this.webview.context_menu.connect ( () => { return false; });
+
+ this.pane_widget = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+ this.pane_widget.pack_start (this.webview, true, true, 0);
+ }
+
+ public abstract void on_page_load ();
+
+ protected void set_cursor (Gdk.CursorType type) {
+ var window = pane_widget.get_window ();
+ var display = window.get_display ();
+ var cursor = new Gdk.Cursor.for_display (display, type);
+ window.set_cursor (cursor);
+ }
+
+ private void on_page_load_changed (WebKit.LoadEvent load_event) {
+ switch (load_event) {
+ case WebKit.LoadEvent.STARTED:
+ case WebKit.LoadEvent.REDIRECTED:
+ this.set_cursor (Gdk.CursorType.WATCH);
+ break;
+ case WebKit.LoadEvent.FINISHED:
+ this.set_cursor (Gdk.CursorType.LEFT_PTR);
+ this.on_page_load ();
+ break;
+ default:
+ break;
+ }
+ }
+
+ public WebKit.WebView get_view () {
+ return this.webview;
+ }
+
+ public DialogPane.GeometryOptions get_preferred_geometry() {
+ return this.preferred_geometry;
+ }
+
+ public Gtk.Widget get_widget() {
+ return pane_widget;
+ }
+
+ public void on_pane_installed () {
+ this.get_view ().load_uri (this.login_uri);
+ }
+
+ public void on_pane_uninstalled() {
+ }
+ }
+}
diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h
index f0e19f5..4cae37f 100644
--- a/plugins/shotwell-plugin-common.h
+++ b/plugins/shotwell-plugin-common.h
@@ -10,10 +10,12 @@
#include
#include
#include "shotwell-plugin-dev-1.0.h"
+#include
#include
#include
-#include
#include
+#include
+#include
G_BEGIN_DECLS
@@ -119,6 +121,17 @@ typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransaction Pub
typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass;
typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionPrivate PublishingRESTSupportGooglePublisherAuthenticatedTransactionPrivate;
+#define SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE (shotwell_plugins_common_web_authentication_pane_get_type ())
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
+#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
+
+typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommonWebAuthenticationPane;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
+typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
+
struct _PublishingRESTSupportSession {
GTypeInstance parent_instance;
volatile int ref_count;
@@ -236,6 +249,16 @@ struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass {
PublishingRESTSupportTransactionClass parent_class;
};
+struct _ShotwellPluginsCommonWebAuthenticationPane {
+ GObject parent_instance;
+ ShotwellPluginsCommonWebAuthenticationPanePrivate * priv;
+};
+
+struct _ShotwellPluginsCommonWebAuthenticationPaneClass {
+ GObjectClass parent_class;
+ void (*on_page_load) (ShotwellPluginsCommonWebAuthenticationPane* self);
+};
+
gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message);
gpointer publishing_rest_support_session_ref (gpointer instance);
@@ -254,6 +277,7 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSession* self);
gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRESTSupportSession* self);
void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSession* self, SoupMessage* message);
+void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession* self);
GType publishing_rest_support_http_method_get_type (void) G_GNUC_CONST;
gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpMethod self);
PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string (const gchar* str);
@@ -280,6 +304,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (Publi
PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct (GType object_type, PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method);
PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
+gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (PublishingRESTSupportTransaction* self, GTlsCertificate** cert);
void publishing_rest_support_transaction_check_response (PublishingRESTSupportTransaction* self, SoupMessage* message, GError** error);
PublishingRESTSupportArgument** publishing_rest_support_transaction_get_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_arguments (PublishingRESTSupportTransaction* self, int* result_length1);
@@ -375,6 +400,13 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
#define RESOURCES_TRANSLATORS _ ("translator-credits")
GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1);
GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* result_length1);
+GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
+void shotwell_plugins_common_web_authentication_pane_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* self);
+void shotwell_plugins_common_web_authentication_pane_set_cursor (ShotwellPluginsCommonWebAuthenticationPane* self, GdkCursorType type);
+WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
+ShotwellPluginsCommonWebAuthenticationPane* shotwell_plugins_common_web_authentication_pane_construct (GType object_type);
+SpitPublishingDialogPaneGeometryOptions shotwell_plugins_common_web_authentication_pane_get_preferred_geometry (ShotwellPluginsCommonWebAuthenticationPane* self);
+gchar* shotwell_plugins_common_web_authentication_pane_get_login_uri (ShotwellPluginsCommonWebAuthenticationPane* self);
G_END_DECLS
diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi
index 8b1a0e1..f6213af 100644
--- a/plugins/shotwell-plugin-common.vapi
+++ b/plugins/shotwell-plugin-common.vapi
@@ -54,6 +54,7 @@ namespace Publishing {
protected void notify_authentication_failed (Spit.Publishing.PublishingError err);
protected void notify_wire_message_unqueued (Soup.Message message);
public void send_wire_message (Soup.Message message);
+ public void set_insecure ();
public void stop_transactions ();
public signal void authenticated ();
public signal void authentication_failed (Spit.Publishing.PublishingError err);
@@ -65,6 +66,7 @@ namespace Publishing {
public void add_argument (string name, string value);
protected virtual void add_header (string key, string value);
protected void check_response (Soup.Message message) throws Spit.Publishing.PublishingError;
+ public string detailed_error_from_tls_flags (out GLib.TlsCertificate cert);
public virtual void execute () throws Spit.Publishing.PublishingError;
public Publishing.RESTSupport.Argument[] get_arguments ();
public string? get_endpoint_url ();
@@ -137,3 +139,19 @@ namespace Resources {
[CCode (cheader_filename = "shotwell-plugin-common.h")]
public static Gdk.Pixbuf[]? load_icon_set (GLib.File? icon_file);
}
+namespace Shotwell {
+ namespace Plugins {
+ namespace Common {
+ [CCode (cheader_filename = "shotwell-plugin-common.h")]
+ public abstract class WebAuthenticationPane : Spit.Publishing.DialogPane, GLib.Object {
+ public WebAuthenticationPane ();
+ public override void constructed ();
+ public WebKit.WebView get_view ();
+ public abstract void on_page_load ();
+ protected void set_cursor (Gdk.CursorType type);
+ public string login_uri { owned get; construct; }
+ public Spit.Publishing.DialogPane.GeometryOptions preferred_geometry { get; construct; }
+ }
+ }
+ }
+}
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.c b/plugins/shotwell-publishing-extras/GalleryConnector.c
index 716b48e..f658eef 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.c
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.c
@@ -829,8 +829,8 @@ enum {
};
#define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_FILE_MSG _ ("\n" \
"\n" \
-"The file \"%s\" may not be supported by or may be too large for this i" \
-"nstance of Gallery3.")
+"The file “%s” may not be supported by or may be too large for this ins" \
+"tance of Gallery3.")
#define PUBLISHING_GALLERY3_GALLERY_PUBLISHER_BAD_MOVIE_MSG _ ("\n" \
"Note that Gallery3 only supports the video types that Flowplayer does.")
PublishingGallery3Session* publishing_gallery3_session_new (void);
@@ -7320,7 +7320,7 @@ static void publishing_gallery3_gallery_publisher_do_show_publishing_options_pan
#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp4_ = self->priv->host;
#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can't " \
+ _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \
"continue.");
#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME);
@@ -11459,7 +11459,7 @@ PublishingGallery3CredentialsPane* publishing_gallery3_credentials_pane_construc
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp4_ = host;
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
- _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can't " \
+ _tmp5_ = _ ("A file required for publishing is unavailable. Publishing to %s can’t " \
"continue.");
#line 1771 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/GalleryConnector.vala"
_tmp6_ = g_strdup_printf (_tmp5_, PUBLISHING_GALLERY3_SERVICE_NAME);
diff --git a/plugins/shotwell-publishing-extras/GalleryConnector.vala b/plugins/shotwell-publishing-extras/GalleryConnector.vala
index ee7bd19..9932862 100644
--- a/plugins/shotwell-publishing-extras/GalleryConnector.vala
+++ b/plugins/shotwell-publishing-extras/GalleryConnector.vala
@@ -798,7 +798,7 @@ private class GalleryUploadTransaction :
public class GalleryPublisher : Spit.Publishing.Publisher, GLib.Object {
- private const string BAD_FILE_MSG = _("\n\nThe file \"%s\" may not be supported by or may be too large for this instance of Gallery3.");
+ private const string BAD_FILE_MSG = _("\n\nThe file “%s” may not be supported by or may be too large for this instance of Gallery3.");
private const string BAD_MOVIE_MSG = _("\nNote that Gallery3 only supports the video types that Flowplayer does.");
private weak Spit.Publishing.PluginHost host = null;
@@ -1018,7 +1018,7 @@ public class GalleryPublisher : Spit.Publishing.Publisher, GLib.Object {
warning("Could not parse UI file! Error: %s.", e.message);
host.post_error(
new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
- _("A file required for publishing is unavailable. Publishing to %s can't continue.")
+ _("A file required for publishing is unavailable. Publishing to %s can’t continue.")
.printf(SERVICE_NAME)
)
);
@@ -1770,7 +1770,7 @@ internal class CredentialsPane : Spit.Publishing.DialogPane, GLib.Object {
warning("Could not parse UI file! Error: %s.", e.message);
host.post_error(
new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(
- _("A file required for publishing is unavailable. Publishing to %s can't continue.")
+ _("A file required for publishing is unavailable. Publishing to %s can’t continue.")
.printf(SERVICE_NAME)
)
);
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.c b/plugins/shotwell-publishing-extras/RajcePublishing.c
index 9ede44f..2888418 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.c
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.c
@@ -1035,7 +1035,7 @@ static void rajce_service_real_get_info (SpitPluggable* base, SpitPluggableInfo*
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
(*info).authors = _tmp0_;
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp1_ = _ ("Copyright (C) 2013 rajce.net");
+ _tmp1_ = _ ("Copyright © 2013 rajce.net");
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp2_ = g_strdup (_tmp1_);
#line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
@@ -6664,7 +6664,7 @@ PublishingRajceAuthenticationPane* publishing_rajce_authentication_pane_construc
#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
_tmp55_ = self->priv->login_button;
#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
- _tmp56_ = _ ("Login");
+ _tmp56_ = _ ("Log in");
#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
gtk_button_set_label (_tmp55_, _tmp56_);
#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/RajcePublishing.vala"
diff --git a/plugins/shotwell-publishing-extras/RajcePublishing.vala b/plugins/shotwell-publishing-extras/RajcePublishing.vala
index 4cf232c..b304f13 100644
--- a/plugins/shotwell-publishing-extras/RajcePublishing.vala
+++ b/plugins/shotwell-publishing-extras/RajcePublishing.vala
@@ -37,7 +37,7 @@ public class RajceService : Object, Spit.Pluggable, Spit.Publishing.Service
public void get_info(ref Spit.PluggableInfo info)
{
info.authors = "rajce.net developers";
- info.copyright = _("Copyright (C) 2013 rajce.net");
+ info.copyright = _("Copyright © 2013 rajce.net");
info.translators = Resources.TRANSLATORS;
info.version = _VERSION;
info.website_name = Resources.WEBSITE_NAME;
@@ -892,7 +892,7 @@ internal class AuthenticationPane : Spit.Publishing.DialogPane, Object
label2.set_label(_("_Email address") );
label3.set_label(_("_Password") );
remember_checkbutton.set_label(_("_Remember") );
- login_button.set_label(_("Login") );
+ login_button.set_label(_("Log in") );
username_entry.changed.connect(on_user_changed);
password_entry.changed.connect(on_password_changed);
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.c b/plugins/shotwell-publishing-extras/TumblrPublishing.c
index 71b6574..6dfaa9a 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.c
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.c
@@ -1604,7 +1604,7 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp1__length1 = _result__length1;
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
- _tmp2_ = _ ("500 x 375 pixels");
+ _tmp2_ = _ ("500 × 375 pixels");
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp3_ = publishing_tumblr_size_entry_new (_tmp2_, 500);
#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1614,7 +1614,7 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp4__length1 = _result__length1;
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
- _tmp5_ = _ ("1024 x 768 pixels");
+ _tmp5_ = _ ("1024 × 768 pixels");
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp6_ = publishing_tumblr_size_entry_new (_tmp5_, 1024);
#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -1624,7 +1624,7 @@ static PublishingTumblrSizeEntry** publishing_tumblr_tumblr_publisher_create_siz
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp7__length1 = _result__length1;
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
- _tmp8_ = _ ("1280 x 853 pixels");
+ _tmp8_ = _ ("1280 × 853 pixels");
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp9_ = publishing_tumblr_size_entry_new (_tmp8_, 1280);
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2452,7 +2452,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp10_ = self->priv->host;
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
- _tmp11_ = _ ("'%s' isn't a valid response to an OAuth authentication request");
+ _tmp11_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp12_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp11_);
#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -2554,7 +2554,7 @@ static void publishing_tumblr_tumblr_publisher_do_parse_token_info_from_auth_req
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp27_ = self->priv->host;
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
- _tmp28_ = _ ("'%s' isn't a valid response to an OAuth authentication request");
+ _tmp28_ = _ ("“%s” isn’t a valid response to an OAuth authentication request");
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
_tmp29_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp28_);
#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
@@ -3894,7 +3894,7 @@ static void publishing_tumblr_tumblr_publisher_real_start (SpitPublishingPublish
#line 3878 "TumblrPublishing.c"
const gchar* _tmp2_ = NULL;
#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
- _tmp2_ = _ ("TumblrPublisher: start( ): can't start; this publisher is not restarta" \
+ _tmp2_ = _ ("TumblrPublisher: start( ): can’t start; this publisher is not restarta" \
"ble.");
#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/TumblrPublishing.vala"
g_error ("TumblrPublishing.vala:559: %s", _tmp2_);
diff --git a/plugins/shotwell-publishing-extras/TumblrPublishing.vala b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
index 3f5a2ed..bc6fcec 100644
--- a/plugins/shotwell-publishing-extras/TumblrPublishing.vala
+++ b/plugins/shotwell-publishing-extras/TumblrPublishing.vala
@@ -102,12 +102,12 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
private SizeEntry[] create_sizes() {
SizeEntry[] result = new SizeEntry[0];
- result += new SizeEntry(_("500 x 375 pixels"), 500);
- result += new SizeEntry(_("1024 x 768 pixels"), 1024);
- result += new SizeEntry(_("1280 x 853 pixels"), 1280);
+ result += new SizeEntry(_("500 × 375 pixels"), 500);
+ result += new SizeEntry(_("1024 × 768 pixels"), 1024);
+ result += new SizeEntry(_("1280 × 853 pixels"), 1280);
//Larger images make no sense for Tumblr
-// result += new SizeEntry(_("2048 x 1536 pixels"), 2048);
-// result += new SizeEntry(_("4096 x 3072 pixels"), 4096);
+// result += new SizeEntry(_("2048 × 1536 pixels"), 2048);
+// result += new SizeEntry(_("4096 × 3072 pixels"), 4096);
// result += new SizeEntry(_("Original size"), ORIGINAL_SIZE);
return result;
@@ -308,7 +308,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
if (split_pair.length != 2)
host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
- _("'%s' isn't a valid response to an OAuth authentication request")));
+ _("“%s” isn’t a valid response to an OAuth authentication request")));
if (split_pair[0] == "oauth_token")
oauth_token = split_pair[1];
@@ -318,7 +318,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
if (oauth_token == null || oauth_token_secret == null)
host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
- _("'%s' isn't a valid response to an OAuth authentication request")));
+ _("“%s” isn’t a valid response to an OAuth authentication request")));
session.set_access_phase_credentials(oauth_token, oauth_token_secret);
}
@@ -556,7 +556,7 @@ public class TumblrPublisher : Spit.Publishing.Publisher, GLib.Object {
return;
if (was_started)
- error(_("TumblrPublisher: start( ): can't start; this publisher is not restartable."));
+ error(_("TumblrPublisher: start( ): can’t start; this publisher is not restartable."));
debug("TumblrPublisher: starting interaction.");
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.c b/plugins/shotwell-publishing-extras/YandexPublishing.c
index d13a33b..93f4aeb 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.c
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.c
@@ -15,8 +15,8 @@
#include
#include "shotwell-plugin-common.h"
#include
-#include
#include
+#include
#include
#include
#include
@@ -82,9 +82,9 @@ typedef struct _PublishingYandexSessionPrivate PublishingYandexSessionPrivate;
typedef struct _PublishingYandexWebAuthPane PublishingYandexWebAuthPane;
typedef struct _PublishingYandexWebAuthPaneClass PublishingYandexWebAuthPaneClass;
typedef struct _PublishingYandexWebAuthPanePrivate PublishingYandexWebAuthPanePrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_match_info_unref0(var) ((var == NULL) ? NULL : (var = (g_match_info_unref (var), NULL)))
#define __vala_WebKitNavigationAction_free0(var) ((var == NULL) ? NULL : (var = (_vala_WebKitNavigationAction_free (var), NULL)))
@@ -177,20 +177,16 @@ struct _PublishingYandexSessionPrivate {
};
struct _PublishingYandexWebAuthPane {
- GObject parent_instance;
+ ShotwellPluginsCommonWebAuthenticationPane parent_instance;
PublishingYandexWebAuthPanePrivate * priv;
};
struct _PublishingYandexWebAuthPaneClass {
- GObjectClass parent_class;
+ ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
};
struct _PublishingYandexWebAuthPanePrivate {
- WebKitWebView* webview;
- GtkBox* pane_widget;
- GtkScrolledWindow* webview_frame;
GRegex* re;
- gchar* login_url;
};
struct _PublishingYandexPublishOptions {
@@ -283,7 +279,6 @@ static SpitPublishingServiceIface* yandex_service_spit_publishing_service_parent
static gpointer publishing_yandex_transaction_parent_class = NULL;
static gpointer publishing_yandex_session_parent_class = NULL;
static gpointer publishing_yandex_web_auth_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_yandex_web_auth_pane_spit_publishing_dialog_pane_parent_iface = NULL;
static gpointer publishing_yandex_publish_options_parent_class = NULL;
static gpointer publishing_yandex_publishing_options_pane_parent_class = NULL;
static SpitPublishingDialogPaneIface* publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
@@ -339,20 +334,12 @@ enum {
};
PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url);
PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url);
-static void publishing_yandex_web_auth_pane_on_page_load_changed (PublishingYandexWebAuthPane* self, WebKitLoadEvent load_event);
-static void _publishing_yandex_web_auth_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self);
+static void publishing_yandex_web_auth_pane_real_constructed (GObject* base);
static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type);
static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self);
-static gboolean __lambda4_ (PublishingYandexWebAuthPane* self);
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self);
-static void publishing_yandex_web_auth_pane_on_page_load (PublishingYandexWebAuthPane* self);
+static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self);
static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self);
-static void publishing_yandex_web_auth_pane_on_load_started (PublishingYandexWebAuthPane* self);
-static GtkWidget* publishing_yandex_web_auth_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_yandex_web_auth_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_yandex_web_auth_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void publishing_yandex_web_auth_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base);
static void publishing_yandex_web_auth_pane_finalize (GObject* obj);
gpointer publishing_yandex_publish_options_ref (gpointer instance);
void publishing_yandex_publish_options_unref (gpointer instance);
@@ -475,7 +462,7 @@ static gint yandex_service_real_get_pluggable_interface (SpitPluggable* base, gi
result = _tmp2_;
#line 9 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 479 "YandexPublishing.c"
+#line 466 "YandexPublishing.c"
}
@@ -488,7 +475,7 @@ static const gchar* yandex_service_real_get_id (SpitPluggable* base) {
result = "org.yorba.shotwell.publishing.yandex-fotki";
#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 492 "YandexPublishing.c"
+#line 479 "YandexPublishing.c"
}
@@ -501,7 +488,7 @@ static const gchar* yandex_service_real_get_pluggable_name (SpitPluggable* base)
result = "Yandex.Fotki";
#line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 505 "YandexPublishing.c"
+#line 492 "YandexPublishing.c"
}
@@ -568,7 +555,7 @@ static void yandex_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
_g_free0 ((*info).license);
#line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
(*info).license = _tmp8_;
-#line 572 "YandexPublishing.c"
+#line 559 "YandexPublishing.c"
}
@@ -589,7 +576,7 @@ static SpitPublishingPublisher* yandex_service_real_create_publisher (SpitPublis
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 593 "YandexPublishing.c"
+#line 580 "YandexPublishing.c"
}
@@ -602,7 +589,7 @@ static SpitPublishingPublisherMediaType yandex_service_real_get_supported_media
result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
#line 36 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 606 "YandexPublishing.c"
+#line 593 "YandexPublishing.c"
}
@@ -610,7 +597,7 @@ static void yandex_service_real_activation (SpitPluggable* base, gboolean enable
YandexService * self;
#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YANDEX_SERVICE, YandexService);
-#line 614 "YandexPublishing.c"
+#line 601 "YandexPublishing.c"
}
@@ -620,21 +607,21 @@ YandexService* yandex_service_construct (GType object_type) {
self = (YandexService*) g_object_new (object_type, NULL);
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 624 "YandexPublishing.c"
+#line 611 "YandexPublishing.c"
}
YandexService* yandex_service_new (void) {
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return yandex_service_construct (TYPE_YANDEX_SERVICE);
-#line 631 "YandexPublishing.c"
+#line 618 "YandexPublishing.c"
}
static void yandex_service_class_init (YandexServiceClass * klass) {
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
yandex_service_parent_class = g_type_class_peek_parent (klass);
-#line 638 "YandexPublishing.c"
+#line 625 "YandexPublishing.c"
}
@@ -651,7 +638,7 @@ static void yandex_service_spit_pluggable_interface_init (SpitPluggableIface * i
iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) yandex_service_real_get_info;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->activation = (void (*)(SpitPluggable*, gboolean)) yandex_service_real_activation;
-#line 655 "YandexPublishing.c"
+#line 642 "YandexPublishing.c"
}
@@ -662,7 +649,7 @@ static void yandex_service_spit_publishing_service_interface_init (SpitPublishin
iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) yandex_service_real_create_publisher;
#line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) yandex_service_real_get_supported_media;
-#line 666 "YandexPublishing.c"
+#line 653 "YandexPublishing.c"
}
@@ -707,14 +694,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct_with_url (G
publishing_yandex_transaction_add_headers (self);
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 711 "YandexPublishing.c"
+#line 698 "YandexPublishing.c"
}
PublishingYandexTransaction* publishing_yandex_transaction_new_with_url (PublishingYandexSession* session, const gchar* url, PublishingRESTSupportHttpMethod method) {
#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_transaction_construct_with_url (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, url, method);
-#line 718 "YandexPublishing.c"
+#line 705 "YandexPublishing.c"
}
@@ -737,7 +724,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
_publishing_rest_support_session_unref0 (_tmp1_);
#line 56 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp3_) {
-#line 741 "YandexPublishing.c"
+#line 728 "YandexPublishing.c"
PublishingRESTSupportSession* _tmp4_ = NULL;
PublishingYandexSession* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
@@ -766,7 +753,7 @@ static void publishing_yandex_transaction_add_headers (PublishingYandexTransacti
_publishing_rest_support_session_unref0 (_tmp5_);
#line 58 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Connection", "close");
-#line 770 "YandexPublishing.c"
+#line 757 "YandexPublishing.c"
}
}
@@ -787,14 +774,14 @@ PublishingYandexTransaction* publishing_yandex_transaction_construct (GType obje
publishing_yandex_transaction_add_headers (self);
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 791 "YandexPublishing.c"
+#line 778 "YandexPublishing.c"
}
PublishingYandexTransaction* publishing_yandex_transaction_new (PublishingYandexSession* session, PublishingRESTSupportHttpMethod method) {
#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_transaction_construct (PUBLISHING_YANDEX_TYPE_TRANSACTION, session, method);
-#line 798 "YandexPublishing.c"
+#line 785 "YandexPublishing.c"
}
@@ -813,14 +800,14 @@ void publishing_yandex_transaction_add_data (PublishingYandexTransaction* self,
_tmp1_ = type;
#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp0_, _tmp1_, (gulong) 0);
-#line 817 "YandexPublishing.c"
+#line 804 "YandexPublishing.c"
}
static void publishing_yandex_transaction_class_init (PublishingYandexTransactionClass * klass) {
#line 49 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 824 "YandexPublishing.c"
+#line 811 "YandexPublishing.c"
}
@@ -846,14 +833,14 @@ PublishingYandexSession* publishing_yandex_session_construct (GType object_type)
self = (PublishingYandexSession*) publishing_rest_support_session_construct (object_type, NULL);
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 850 "YandexPublishing.c"
+#line 837 "YandexPublishing.c"
}
PublishingYandexSession* publishing_yandex_session_new (void) {
#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_session_construct (PUBLISHING_YANDEX_TYPE_SESSION);
-#line 857 "YandexPublishing.c"
+#line 844 "YandexPublishing.c"
}
@@ -869,7 +856,7 @@ static gboolean publishing_yandex_session_real_is_authenticated (PublishingRESTS
result = _tmp0_ != NULL;
#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 873 "YandexPublishing.c"
+#line 860 "YandexPublishing.c"
}
@@ -880,7 +867,7 @@ void publishing_yandex_session_deauthenticate (PublishingYandexSession* self) {
_g_free0 (self->priv->auth_token);
#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->auth_token = NULL;
-#line 884 "YandexPublishing.c"
+#line 871 "YandexPublishing.c"
}
@@ -899,7 +886,7 @@ void publishing_yandex_session_set_auth_token (PublishingYandexSession* self, co
_g_free0 (self->priv->auth_token);
#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->auth_token = _tmp1_;
-#line 903 "YandexPublishing.c"
+#line 890 "YandexPublishing.c"
}
@@ -917,7 +904,7 @@ gchar* publishing_yandex_session_get_auth_token (PublishingYandexSession* self)
result = _tmp1_;
#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 921 "YandexPublishing.c"
+#line 908 "YandexPublishing.c"
}
@@ -930,7 +917,7 @@ static void publishing_yandex_session_class_init (PublishingYandexSessionClass *
g_type_class_add_private (klass, sizeof (PublishingYandexSessionPrivate));
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_yandex_session_real_is_authenticated;
-#line 934 "YandexPublishing.c"
+#line 921 "YandexPublishing.c"
}
@@ -939,7 +926,7 @@ static void publishing_yandex_session_instance_init (PublishingYandexSession * s
self->priv = PUBLISHING_YANDEX_SESSION_GET_PRIVATE (self);
#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->auth_token = NULL;
-#line 943 "YandexPublishing.c"
+#line 930 "YandexPublishing.c"
}
@@ -951,7 +938,7 @@ static void publishing_yandex_session_finalize (PublishingRESTSupportSession* ob
_g_free0 (self->priv->auth_token);
#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_yandex_session_parent_class)->finalize (obj);
-#line 955 "YandexPublishing.c"
+#line 942 "YandexPublishing.c"
}
@@ -967,279 +954,167 @@ GType publishing_yandex_session_get_type (void) {
}
-static void _publishing_yandex_web_auth_pane_on_page_load_changed_webkit_web_view_load_changed (WebKitWebView* _sender, WebKitLoadEvent load_event, gpointer self) {
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_web_auth_pane_on_page_load_changed ((PublishingYandexWebAuthPane*) self, load_event);
-#line 974 "YandexPublishing.c"
-}
-
-
-static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self) {
- gboolean result;
- result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return result;
-#line 983 "YandexPublishing.c"
+PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url) {
+ PublishingYandexWebAuthPane * self = NULL;
+ const gchar* _tmp0_ = NULL;
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_return_val_if_fail (login_url != NULL, NULL);
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp0_ = login_url;
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ self = (PublishingYandexWebAuthPane*) g_object_new (object_type, "login-uri", _tmp0_, "preferred-geometry", SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE, NULL);
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ return self;
+#line 969 "YandexPublishing.c"
}
-static gboolean __lambda4_ (PublishingYandexWebAuthPane* self) {
- gboolean result = FALSE;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- result = FALSE;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return result;
-#line 993 "YandexPublishing.c"
+PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
+#line 976 "YandexPublishing.c"
}
-static gboolean ___lambda4__webkit_web_view_context_menu (WebKitWebView* _sender, WebKitContextMenu* context_menu, GdkEvent* event, WebKitHitTestResult* hit_test_result, gpointer self) {
+static gboolean _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy (WebKitWebView* _sender, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type, gpointer self) {
gboolean result;
- result = __lambda4_ ((PublishingYandexWebAuthPane*) self);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ result = publishing_yandex_web_auth_pane_on_decide_policy ((PublishingYandexWebAuthPane*) self, decision, type);
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1002 "YandexPublishing.c"
+#line 985 "YandexPublishing.c"
}
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_construct (GType object_type, const gchar* login_url) {
- PublishingYandexWebAuthPane * self = NULL;
- const gchar* _tmp0_ = NULL;
- gchar* _tmp1_ = NULL;
- GtkBox* _tmp7_ = NULL;
- GtkScrolledWindow* _tmp8_ = NULL;
- GtkScrolledWindow* _tmp9_ = NULL;
- GtkScrolledWindow* _tmp10_ = NULL;
- WebKitWebView* _tmp11_ = NULL;
- WebKitWebView* _tmp12_ = NULL;
- WebKitSettings* _tmp13_ = NULL;
- WebKitWebView* _tmp14_ = NULL;
- WebKitWebView* _tmp15_ = NULL;
- WebKitWebView* _tmp16_ = NULL;
- GtkScrolledWindow* _tmp17_ = NULL;
- WebKitWebView* _tmp18_ = NULL;
- GtkBox* _tmp19_ = NULL;
- GtkScrolledWindow* _tmp20_ = NULL;
+static void publishing_yandex_web_auth_pane_real_constructed (GObject* base) {
+ PublishingYandexWebAuthPane * self;
+ WebKitWebView* _tmp3_ = NULL;
+ WebKitWebView* _tmp4_ = NULL;
GError * _inner_error_ = NULL;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_return_val_if_fail (login_url != NULL, NULL);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = (PublishingYandexWebAuthPane*) g_object_new (object_type, NULL);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = login_url;
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = g_strdup (_tmp0_);
-#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (self->priv->login_url);
#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->login_url = _tmp1_;
-#line 1037 "YandexPublishing.c"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
+#line 996 "YandexPublishing.c"
{
+ GRegex* _tmp0_ = NULL;
+ GRegex* _tmp1_ = NULL;
GRegex* _tmp2_ = NULL;
- GRegex* _tmp3_ = NULL;
- GRegex* _tmp4_ = NULL;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = g_regex_new ("(.*)#access_token=([a-zA-Z0-9]*)&", 0, 0, &_inner_error_);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = _tmp3_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp1_ = g_regex_new ("(.*)#access_token=([a-zA-Z0-9]*)&", 0, 0, &_inner_error_);
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp0_ = _tmp1_;
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 1050 "YandexPublishing.c"
+#line 1009 "YandexPublishing.c"
goto __catch39_g_regex_error;
}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return NULL;
-#line 1059 "YandexPublishing.c"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ return;
+#line 1018 "YandexPublishing.c"
}
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp4_ = _tmp2_;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = NULL;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp2_ = _tmp0_;
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp0_ = NULL;
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_regex_unref0 (self->priv->re);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->re = _tmp4_;
#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_regex_unref0 (_tmp2_);
-#line 1071 "YandexPublishing.c"
+ self->priv->re = _tmp2_;
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _g_regex_unref0 (_tmp0_);
+#line 1030 "YandexPublishing.c"
}
goto __finally39;
__catch39_g_regex_error:
{
GError* e = NULL;
- GError* _tmp5_ = NULL;
- const gchar* _tmp6_ = NULL;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
e = _inner_error_;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp5_ = e;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp6_ = _tmp5_->message;
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_critical ("YandexPublishing.vala:112: %s", _tmp6_);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_assert_not_reached ();
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (e);
-#line 1091 "YandexPublishing.c"
+#line 1044 "YandexPublishing.c"
}
__finally39:
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return NULL;
-#line 1102 "YandexPublishing.c"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ return;
+#line 1055 "YandexPublishing.c"
}
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_object_ref_sink (_tmp7_);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (self->priv->pane_widget);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->pane_widget = _tmp7_;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp8_ = (GtkScrolledWindow*) gtk_scrolled_window_new (NULL, NULL);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_object_ref_sink (_tmp8_);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (self->priv->webview_frame);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->webview_frame = _tmp8_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp9_ = self->priv->webview_frame;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_scrolled_window_set_shadow_type (_tmp9_, GTK_SHADOW_ETCHED_IN);
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp10_ = self->priv->webview_frame;
-#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_scrolled_window_set_policy (_tmp10_, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp11_ = (WebKitWebView*) webkit_web_view_new ();
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_object_ref_sink (_tmp11_);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (self->priv->webview);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->webview = _tmp11_;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp12_ = self->priv->webview;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp13_ = webkit_web_view_get_settings (_tmp12_);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- webkit_settings_set_enable_plugins (_tmp13_, FALSE);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp14_ = self->priv->webview;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_connect_object (_tmp14_, "load-changed", (GCallback) _publishing_yandex_web_auth_pane_on_page_load_changed_webkit_web_view_load_changed, self, 0);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp15_ = self->priv->webview;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_connect_object (_tmp15_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp16_ = self->priv->webview;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_connect_object (_tmp16_, "context-menu", (GCallback) ___lambda4__webkit_web_view_context_menu, self, 0);
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp17_ = self->priv->webview_frame;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp18_ = self->priv->webview;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp19_ = self->priv->pane_widget;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp20_ = self->priv->webview_frame;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gtk_box_pack_start (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return self;
-#line 1168 "YandexPublishing.c"
-}
-
-
-PublishingYandexWebAuthPane* publishing_yandex_web_auth_pane_new (const gchar* login_url) {
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return publishing_yandex_web_auth_pane_construct (PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, login_url);
-#line 1175 "YandexPublishing.c"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp3_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp4_ = _tmp3_;
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_signal_connect_object (_tmp4_, "decide-policy", (GCallback) _publishing_yandex_web_auth_pane_on_decide_policy_webkit_web_view_decide_policy, self, 0);
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _g_object_unref0 (_tmp4_);
+#line 1065 "YandexPublishing.c"
}
-static void publishing_yandex_web_auth_pane_on_page_load (PublishingYandexWebAuthPane* self) {
- GtkBox* _tmp0_ = NULL;
- GdkWindow* _tmp1_ = NULL;
- GdkCursor* _tmp2_ = NULL;
- GdkCursor* _tmp3_ = NULL;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_return_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self));
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = _tmp2_;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (_tmp3_);
-#line 1198 "YandexPublishing.c"
+static void publishing_yandex_web_auth_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+ PublishingYandexWebAuthPane * self;
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
+#line 1073 "YandexPublishing.c"
}
static gpointer _g_object_ref0 (gpointer self) {
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self ? g_object_ref (self) : NULL;
-#line 1205 "YandexPublishing.c"
+#line 1080 "YandexPublishing.c"
}
static WebKitNavigationAction* _vala_WebKitNavigationAction_copy (WebKitNavigationAction* self) {
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_boxed_copy (webkit_navigation_action_get_type (), self);
-#line 1212 "YandexPublishing.c"
+#line 1087 "YandexPublishing.c"
}
static gpointer __vala_WebKitNavigationAction_copy0 (gpointer self) {
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self ? _vala_WebKitNavigationAction_copy (self) : NULL;
-#line 1219 "YandexPublishing.c"
+#line 1094 "YandexPublishing.c"
}
static void _vala_WebKitNavigationAction_free (WebKitNavigationAction* self) {
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_boxed_free (webkit_navigation_action_get_type (), self);
-#line 1226 "YandexPublishing.c"
+#line 1101 "YandexPublishing.c"
}
static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYandexWebAuthPane* self, WebKitPolicyDecision* decision, WebKitPolicyDecisionType type) {
gboolean result = FALSE;
WebKitPolicyDecisionType _tmp0_ = 0;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self), FALSE);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (WEBKIT_IS_POLICY_DECISION (decision), FALSE);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = type;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
switch (_tmp0_) {
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
case WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION:
-#line 1243 "YandexPublishing.c"
+#line 1118 "YandexPublishing.c"
{
WebKitNavigationPolicyDecision* n_decision = NULL;
WebKitPolicyDecision* _tmp1_ = NULL;
@@ -1261,54 +1136,54 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
const gchar* _tmp14_ = NULL;
GMatchInfo* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
- WebKitPolicyDecision* _tmp32_ = NULL;
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ WebKitPolicyDecision* _tmp28_ = NULL;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = decision;
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, webkit_navigation_policy_decision_get_type (), WebKitNavigationPolicyDecision));
-#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
n_decision = _tmp2_;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = n_decision;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = webkit_navigation_policy_decision_get_navigation_action (_tmp3_);
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = _tmp4_;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = __vala_WebKitNavigationAction_copy0 (_tmp5_);
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
action = _tmp6_;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = action;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = webkit_navigation_action_get_request (_tmp7_);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = webkit_uri_request_get_uri (_tmp8_);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = _tmp9_;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = g_strdup (_tmp10_);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
uri = _tmp11_;
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = uri;
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:143: Navigating to '%s'", _tmp12_);
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:126: Navigating to '%s'", _tmp12_);
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
info = NULL;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_ = self->priv->re;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp14_ = uri;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = g_regex_match (_tmp13_, _tmp14_, 0, &_tmp15_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_match_info_unref0 (info);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
info = _tmp15_;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp16_) {
-#line 1312 "YandexPublishing.c"
+#line 1187 "YandexPublishing.c"
gchar* access_token = NULL;
GMatchInfo* _tmp17_ = NULL;
gchar** _tmp18_ = NULL;
@@ -1319,308 +1194,149 @@ static gboolean publishing_yandex_web_auth_pane_on_decide_policy (PublishingYand
gchar* _tmp22_ = NULL;
gchar* _tmp23_ = NULL;
const gchar* _tmp24_ = NULL;
- GtkBox* _tmp25_ = NULL;
- GdkWindow* _tmp26_ = NULL;
- GdkCursor* _tmp27_ = NULL;
- GdkCursor* _tmp28_ = NULL;
- const gchar* _tmp29_ = NULL;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ const gchar* _tmp25_ = NULL;
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp17_ = info;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp19_ = _tmp18_ = g_match_info_fetch_all (_tmp17_);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_ = _tmp19_;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20__length1 = _vala_array_length (_tmp18_);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp21_ = _tmp20_[2];
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp22_ = g_strdup (_tmp21_);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp23_ = _tmp22_;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_ = (_vala_array_free (_tmp20_, _tmp20__length1, (GDestroyNotify) g_free), NULL);
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
access_token = _tmp23_;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp24_ = access_token;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:150: Load completed: %s", _tmp24_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp25_ = self->priv->pane_widget;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp26_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp27_ = gdk_cursor_new (GDK_LEFT_PTR);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp28_ = _tmp27_;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gdk_window_set_cursor (_tmp26_, _tmp28_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (_tmp28_);
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp29_ = access_token;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- if (_tmp29_ != NULL) {
-#line 1366 "YandexPublishing.c"
- const gchar* _tmp30_ = NULL;
- WebKitPolicyDecision* _tmp31_ = NULL;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp30_ = access_token;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_emit_by_name (self, "login-succeeded", _tmp30_);
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp31_ = decision;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- webkit_policy_decision_ignore (_tmp31_);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:133: Load completed: %s", _tmp24_);
+#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ shotwell_plugins_common_web_authentication_pane_set_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane), GDK_LEFT_PTR);
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp25_ = access_token;
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ if (_tmp25_ != NULL) {
+#line 1227 "YandexPublishing.c"
+ const gchar* _tmp26_ = NULL;
+ WebKitPolicyDecision* _tmp27_ = NULL;
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp26_ = access_token;
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_signal_emit_by_name (self, "login-succeeded", _tmp26_);
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp27_ = decision;
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ webkit_policy_decision_ignore (_tmp27_);
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (access_token);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_match_info_unref0 (info);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (uri);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
__vala_WebKitNavigationAction_free0 (action);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (n_decision);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1389 "YandexPublishing.c"
+#line 1250 "YandexPublishing.c"
} else {
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_emit_by_name (self, "login-failed");
-#line 1393 "YandexPublishing.c"
+#line 1254 "YandexPublishing.c"
}
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (access_token);
-#line 1397 "YandexPublishing.c"
+#line 1258 "YandexPublishing.c"
}
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp32_ = decision;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- webkit_policy_decision_use (_tmp32_);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp28_ = decision;
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ webkit_policy_decision_use (_tmp28_);
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_match_info_unref0 (info);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (uri);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
__vala_WebKitNavigationAction_free0 (action);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (n_decision);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1413 "YandexPublishing.c"
+#line 1274 "YandexPublishing.c"
}
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
case WEBKIT_POLICY_DECISION_TYPE_RESPONSE:
-#line 1417 "YandexPublishing.c"
+#line 1278 "YandexPublishing.c"
{
- WebKitPolicyDecision* _tmp33_ = NULL;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp33_ = decision;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- webkit_policy_decision_use (_tmp33_);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ WebKitPolicyDecision* _tmp29_ = NULL;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ _tmp29_ = decision;
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ webkit_policy_decision_use (_tmp29_);
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 1426 "YandexPublishing.c"
+#line 1287 "YandexPublishing.c"
}
default:
{
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = FALSE;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1434 "YandexPublishing.c"
+#line 1295 "YandexPublishing.c"
}
}
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = TRUE;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1441 "YandexPublishing.c"
+#line 1302 "YandexPublishing.c"
}
-static void publishing_yandex_web_auth_pane_on_load_started (PublishingYandexWebAuthPane* self) {
- GtkBox* _tmp0_ = NULL;
- GdkWindow* _tmp1_ = NULL;
- GdkCursor* _tmp2_ = NULL;
- GdkCursor* _tmp3_ = NULL;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_return_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self));
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp2_ = gdk_cursor_new (GDK_WATCH);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp3_ = _tmp2_;
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- gdk_window_set_cursor (_tmp1_, _tmp3_);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (_tmp3_);
-#line 1464 "YandexPublishing.c"
+static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthPaneClass * klass) {
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ publishing_yandex_web_auth_pane_parent_class = g_type_class_peek_parent (klass);
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_type_class_add_private (klass, sizeof (PublishingYandexWebAuthPanePrivate));
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ ((GObjectClass *) klass)->constructed = publishing_yandex_web_auth_pane_real_constructed;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ ((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_yandex_web_auth_pane_real_on_page_load;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ G_OBJECT_CLASS (klass)->finalize = publishing_yandex_web_auth_pane_finalize;
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_signal_new ("login_succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_signal_new ("login_failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 1321 "YandexPublishing.c"
}
-static void publishing_yandex_web_auth_pane_on_page_load_changed (PublishingYandexWebAuthPane* self, WebKitLoadEvent load_event) {
- WebKitLoadEvent _tmp0_ = 0;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_return_if_fail (PUBLISHING_YANDEX_IS_WEB_AUTH_PANE (self));
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = load_event;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- switch (_tmp0_) {
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- case WEBKIT_LOAD_STARTED:
-#line 1478 "YandexPublishing.c"
- {
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_web_auth_pane_on_load_started (self);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- break;
-#line 1484 "YandexPublishing.c"
- }
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- case WEBKIT_LOAD_FINISHED:
-#line 1488 "YandexPublishing.c"
- {
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_web_auth_pane_on_page_load (self);
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- break;
-#line 1494 "YandexPublishing.c"
- }
- default:
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- break;
-#line 1499 "YandexPublishing.c"
- }
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return;
-#line 1503 "YandexPublishing.c"
+static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) {
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self);
+#line 1328 "YandexPublishing.c"
}
-static GtkWidget* publishing_yandex_web_auth_pane_real_get_widget (SpitPublishingDialogPane* base) {
- PublishingYandexWebAuthPane * self;
- GtkWidget* result = NULL;
- GtkBox* _tmp0_ = NULL;
- GtkWidget* _tmp1_ = NULL;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = self->priv->pane_widget;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- result = _tmp1_;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return result;
-#line 1522 "YandexPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_yandex_web_auth_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
- PublishingYandexWebAuthPane * self;
- SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_RESIZABLE;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- return result;
-#line 1535 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
- PublishingYandexWebAuthPane * self;
- WebKitWebView* _tmp0_ = NULL;
- const gchar* _tmp1_ = NULL;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp0_ = self->priv->webview;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _tmp1_ = self->priv->login_url;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- webkit_web_view_load_uri (_tmp0_, _tmp1_);
-#line 1551 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
- PublishingYandexWebAuthPane * self;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
-#line 1559 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_class_init (PublishingYandexWebAuthPaneClass * klass) {
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_web_auth_pane_parent_class = g_type_class_peek_parent (klass);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_type_class_add_private (klass, sizeof (PublishingYandexWebAuthPanePrivate));
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- G_OBJECT_CLASS (klass)->finalize = publishing_yandex_web_auth_pane_finalize;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_new ("login_succeeded", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_signal_new ("login_failed", PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1574 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- publishing_yandex_web_auth_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_yandex_web_auth_pane_real_get_widget;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_yandex_web_auth_pane_real_get_preferred_geometry;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_web_auth_pane_real_on_pane_installed;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_web_auth_pane_real_on_pane_uninstalled;
-#line 1589 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_instance_init (PublishingYandexWebAuthPane * self) {
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv = PUBLISHING_YANDEX_WEB_AUTH_PANE_GET_PRIVATE (self);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->webview = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->pane_widget = NULL;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->webview_frame = NULL;
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- self->priv->login_url = NULL;
-#line 1604 "YandexPublishing.c"
-}
-
-
-static void publishing_yandex_web_auth_pane_finalize (GObject* obj) {
+static void publishing_yandex_web_auth_pane_finalize (GObject* obj) {
PublishingYandexWebAuthPane * self;
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_WEB_AUTH_PANE, PublishingYandexWebAuthPane);
#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (self->priv->webview);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (self->priv->pane_widget);
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_object_unref0 (self->priv->webview_frame);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_regex_unref0 (self->priv->re);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- _g_free0 (self->priv->login_url);
#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (publishing_yandex_web_auth_pane_parent_class)->finalize (obj);
-#line 1624 "YandexPublishing.c"
+#line 1340 "YandexPublishing.c"
}
@@ -1628,10 +1344,8 @@ GType publishing_yandex_web_auth_pane_get_type (void) {
static volatile gsize publishing_yandex_web_auth_pane_type_id__volatile = 0;
if (g_once_init_enter (&publishing_yandex_web_auth_pane_type_id__volatile)) {
static const GTypeInfo g_define_type_info = { sizeof (PublishingYandexWebAuthPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_yandex_web_auth_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYandexWebAuthPane), 0, (GInstanceInitFunc) publishing_yandex_web_auth_pane_instance_init, NULL };
- static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_yandex_web_auth_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
GType publishing_yandex_web_auth_pane_type_id;
- publishing_yandex_web_auth_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingYandexWebAuthPane", &g_define_type_info, 0);
- g_type_add_interface_static (publishing_yandex_web_auth_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
+ publishing_yandex_web_auth_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingYandexWebAuthPane", &g_define_type_info, 0);
g_once_init_leave (&publishing_yandex_web_auth_pane_type_id__volatile, publishing_yandex_web_auth_pane_type_id);
}
return publishing_yandex_web_auth_pane_type_id__volatile;
@@ -1640,238 +1354,238 @@ GType publishing_yandex_web_auth_pane_get_type (void) {
PublishingYandexPublishOptions* publishing_yandex_publish_options_construct (GType object_type) {
PublishingYandexPublishOptions* self = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (PublishingYandexPublishOptions*) g_type_create_instance (object_type);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 1648 "YandexPublishing.c"
+#line 1362 "YandexPublishing.c"
}
PublishingYandexPublishOptions* publishing_yandex_publish_options_new (void) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_publish_options_construct (PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS);
-#line 1655 "YandexPublishing.c"
+#line 1369 "YandexPublishing.c"
}
static void publishing_yandex_value_publish_options_init (GValue* value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1662 "YandexPublishing.c"
+#line 1376 "YandexPublishing.c"
}
static void publishing_yandex_value_publish_options_free_value (GValue* value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (value->data[0].v_pointer) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_unref (value->data[0].v_pointer);
-#line 1671 "YandexPublishing.c"
+#line 1385 "YandexPublishing.c"
}
}
static void publishing_yandex_value_publish_options_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (src_value->data[0].v_pointer) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
dest_value->data[0].v_pointer = publishing_yandex_publish_options_ref (src_value->data[0].v_pointer);
-#line 1681 "YandexPublishing.c"
+#line 1395 "YandexPublishing.c"
} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1685 "YandexPublishing.c"
+#line 1399 "YandexPublishing.c"
}
}
static gpointer publishing_yandex_value_publish_options_peek_pointer (const GValue* value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return value->data[0].v_pointer;
-#line 1693 "YandexPublishing.c"
+#line 1407 "YandexPublishing.c"
}
static gchar* publishing_yandex_value_publish_options_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (collect_values[0].v_pointer) {
-#line 1700 "YandexPublishing.c"
+#line 1414 "YandexPublishing.c"
PublishingYandexPublishOptions* object;
object = collect_values[0].v_pointer;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (object->parent_instance.g_class == NULL) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1707 "YandexPublishing.c"
+#line 1421 "YandexPublishing.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1711 "YandexPublishing.c"
+#line 1425 "YandexPublishing.c"
}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = publishing_yandex_publish_options_ref (object);
-#line 1715 "YandexPublishing.c"
+#line 1429 "YandexPublishing.c"
} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1719 "YandexPublishing.c"
+#line 1433 "YandexPublishing.c"
}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 1723 "YandexPublishing.c"
+#line 1437 "YandexPublishing.c"
}
static gchar* publishing_yandex_value_publish_options_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
PublishingYandexPublishOptions** object_p;
object_p = collect_values[0].v_pointer;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!object_p) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1734 "YandexPublishing.c"
+#line 1448 "YandexPublishing.c"
}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!value->data[0].v_pointer) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
*object_p = NULL;
-#line 1740 "YandexPublishing.c"
+#line 1454 "YandexPublishing.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
*object_p = value->data[0].v_pointer;
-#line 1744 "YandexPublishing.c"
+#line 1458 "YandexPublishing.c"
} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
*object_p = publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1748 "YandexPublishing.c"
+#line 1462 "YandexPublishing.c"
}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 1752 "YandexPublishing.c"
+#line 1466 "YandexPublishing.c"
}
GParamSpec* publishing_yandex_param_spec_publish_options (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
PublishingYandexParamSpecPublishOptions* spec;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_PARAM_SPEC (spec)->value_type = object_type;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return G_PARAM_SPEC (spec);
-#line 1766 "YandexPublishing.c"
+#line 1480 "YandexPublishing.c"
}
gpointer publishing_yandex_value_get_publish_options (const GValue* value) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS), NULL);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return value->data[0].v_pointer;
-#line 1775 "YandexPublishing.c"
+#line 1489 "YandexPublishing.c"
}
void publishing_yandex_value_set_publish_options (GValue* value, gpointer v_object) {
PublishingYandexPublishOptions* old;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
old = value->data[0].v_pointer;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (v_object) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_ref (value->data[0].v_pointer);
-#line 1795 "YandexPublishing.c"
+#line 1509 "YandexPublishing.c"
} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1799 "YandexPublishing.c"
+#line 1513 "YandexPublishing.c"
}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (old) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_unref (old);
-#line 1805 "YandexPublishing.c"
+#line 1519 "YandexPublishing.c"
}
}
void publishing_yandex_value_take_publish_options (GValue* value, gpointer v_object) {
PublishingYandexPublishOptions* old;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
old = value->data[0].v_pointer;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (v_object) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = v_object;
-#line 1824 "YandexPublishing.c"
+#line 1538 "YandexPublishing.c"
} else {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
value->data[0].v_pointer = NULL;
-#line 1828 "YandexPublishing.c"
+#line 1542 "YandexPublishing.c"
}
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (old) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_unref (old);
-#line 1834 "YandexPublishing.c"
+#line 1548 "YandexPublishing.c"
}
}
static void publishing_yandex_publish_options_class_init (PublishingYandexPublishOptionsClass * klass) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publish_options_parent_class = g_type_class_peek_parent (klass);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingYandexPublishOptionsClass *) klass)->finalize = publishing_yandex_publish_options_finalize;
-#line 1844 "YandexPublishing.c"
+#line 1558 "YandexPublishing.c"
}
static void publishing_yandex_publish_options_instance_init (PublishingYandexPublishOptions * self) {
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->disable_comments = FALSE;
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->hide_original = FALSE;
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->destination_album = NULL;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->destination_album_url = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->ref_count = 1;
-#line 1859 "YandexPublishing.c"
+#line 1573 "YandexPublishing.c"
}
static void publishing_yandex_publish_options_finalize (PublishingYandexPublishOptions* obj) {
PublishingYandexPublishOptions * self;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISH_OPTIONS, PublishingYandexPublishOptions);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_destroy (self);
-#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->access_type);
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->destination_album);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->destination_album_url);
-#line 1875 "YandexPublishing.c"
+#line 1589 "YandexPublishing.c"
}
@@ -1892,24 +1606,24 @@ GType publishing_yandex_publish_options_get_type (void) {
gpointer publishing_yandex_publish_options_ref (gpointer instance) {
PublishingYandexPublishOptions* self;
self = instance;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_atomic_int_inc (&self->ref_count);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return instance;
-#line 1900 "YandexPublishing.c"
+#line 1614 "YandexPublishing.c"
}
void publishing_yandex_publish_options_unref (gpointer instance) {
PublishingYandexPublishOptions* self;
self = instance;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
PUBLISHING_YANDEX_PUBLISH_OPTIONS_GET_CLASS (self)->finalize (self);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 1913 "YandexPublishing.c"
+#line 1627 "YandexPublishing.c"
}
}
@@ -1917,29 +1631,29 @@ void publishing_yandex_publish_options_unref (gpointer instance) {
static SpitPublishingDialogPaneGeometryOptions publishing_yandex_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
PublishingYandexPublishingOptionsPane * self;
SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1927 "YandexPublishing.c"
+#line 1641 "YandexPublishing.c"
}
static void publishing_yandex_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
PublishingYandexPublishingOptionsPane * self;
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1935 "YandexPublishing.c"
+#line 1649 "YandexPublishing.c"
}
static void publishing_yandex_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
PublishingYandexPublishingOptionsPane * self;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 1943 "YandexPublishing.c"
+#line 1657 "YandexPublishing.c"
}
@@ -1948,31 +1662,31 @@ static GtkWidget* publishing_yandex_publishing_options_pane_real_get_widget (Spi
GtkWidget* result = NULL;
GtkBox* _tmp0_ = NULL;
GtkWidget* _tmp1_ = NULL;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->box;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = _tmp1_;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 1962 "YandexPublishing.c"
+#line 1676 "YandexPublishing.c"
}
static void _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_on_publish_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1969 "YandexPublishing.c"
+#line 1683 "YandexPublishing.c"
}
static void _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_on_logout_clicked ((PublishingYandexPublishingOptionsPane*) self);
-#line 1976 "YandexPublishing.c"
+#line 1690 "YandexPublishing.c"
}
@@ -1981,27 +1695,27 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
PublishingYandexPublishOptions* _tmp0_ = NULL;
GtkBox* _tmp1_ = NULL;
GError * _inner_error_ = NULL;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (GEE_IS_HASH_MAP (list), NULL);
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (PublishingYandexPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = options;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->options = _tmp0_;
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_object_ref_sink (_tmp1_);
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->box);
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->box = _tmp1_;
-#line 2005 "YandexPublishing.c"
+#line 1719 "YandexPublishing.c"
{
GtkBuilder* _tmp2_ = NULL;
GtkBuilder* _tmp3_ = NULL;
@@ -2026,44 +1740,44 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
GtkBox* _tmp33_ = NULL;
GtkBox* _tmp34_ = NULL;
GtkAlignment* _tmp35_ = NULL;
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = gtk_builder_new ();
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->builder);
-#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->builder = _tmp2_;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = self->priv->builder;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
gtk_builder_add_from_resource (_tmp3_, PLUGIN_RESOURCE_PATH "/yandex_publish_model.ui", &_inner_error_);
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2042 "YandexPublishing.c"
+#line 1756 "YandexPublishing.c"
goto __catch40_g_error;
}
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = self->priv->builder;
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
gtk_builder_connect_signals (_tmp4_, NULL);
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = self->priv->builder;
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = gtk_builder_get_object (_tmp5_, "alignment");
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp6_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp6_) : NULL);
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
align = _tmp7_;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = self->priv->builder;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = gtk_builder_get_object (_tmp8_, "album_list");
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp9_) : NULL);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->album_list);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->album_list = _tmp10_;
-#line 2067 "YandexPublishing.c"
+#line 1781 "YandexPublishing.c"
{
GeeIterator* _key_it = NULL;
GeeHashMap* _tmp11_ = NULL;
@@ -2072,25 +1786,25 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
GeeSet* _tmp14_ = NULL;
GeeIterator* _tmp15_ = NULL;
GeeIterator* _tmp16_ = NULL;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = list;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = gee_abstract_map_get_keys (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_MAP, GeeMap));
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_ = _tmp12_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp14_ = _tmp13_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp15_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = _tmp15_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_tmp14_);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_key_it = _tmp16_;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 2094 "YandexPublishing.c"
+#line 1808 "YandexPublishing.c"
GeeIterator* _tmp17_ = NULL;
gboolean _tmp18_ = FALSE;
gchar* key = NULL;
@@ -2098,83 +1812,83 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
gpointer _tmp20_ = NULL;
GtkComboBoxText* _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp17_ = _key_it;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp18_ = gee_iterator_next (_tmp17_);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp18_) {
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 2110 "YandexPublishing.c"
+#line 1824 "YandexPublishing.c"
}
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp19_ = _key_it;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_ = gee_iterator_get (_tmp19_);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
key = (gchar*) _tmp20_;
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp21_ = self->priv->album_list;
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp22_ = key;
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
gtk_combo_box_text_append_text (_tmp21_, _tmp22_);
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (key);
-#line 2126 "YandexPublishing.c"
+#line 1840 "YandexPublishing.c"
}
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_key_it);
-#line 2130 "YandexPublishing.c"
+#line 1844 "YandexPublishing.c"
}
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp23_ = self->priv->album_list;
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp24_ = self->priv->builder;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp25_ = gtk_builder_get_object (_tmp24_, "publish_button");
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->publish_button);
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->publish_button = _tmp26_;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp27_ = self->priv->builder;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp28_ = gtk_builder_get_object (_tmp27_, "logout_button");
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp29_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, gtk_button_get_type ()) ? ((GtkButton*) _tmp28_) : NULL);
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->logout_button);
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->logout_button = _tmp29_;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp30_ = self->priv->publish_button;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (_tmp30_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp31_ = self->priv->logout_button;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (_tmp31_, "clicked", (GCallback) _publishing_yandex_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp32_ = align;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp33_ = self->priv->box;
-#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
gtk_widget_reparent (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp34_ = self->priv->box;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp35_ = align;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
gtk_box_set_child_packing (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (align);
-#line 2178 "YandexPublishing.c"
+#line 1892 "YandexPublishing.c"
}
goto __finally40;
__catch40_g_error:
@@ -2182,50 +1896,50 @@ PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane
GError* e = NULL;
GError* _tmp36_ = NULL;
const gchar* _tmp37_ = NULL;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
e = _inner_error_;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp36_ = e;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp37_ = _tmp36_->message;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:263: Could not load UI: %s", _tmp37_);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_warning ("YandexPublishing.vala:214: Could not load UI: %s", _tmp37_);
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (e);
-#line 2198 "YandexPublishing.c"
+#line 1912 "YandexPublishing.c"
}
__finally40:
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 2209 "YandexPublishing.c"
+#line 1923 "YandexPublishing.c"
}
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 2213 "YandexPublishing.c"
+#line 1927 "YandexPublishing.c"
}
PublishingYandexPublishingOptionsPane* publishing_yandex_publishing_options_pane_new (PublishingYandexPublishOptions* options, GeeHashMap* list, SpitPublishingPluginHost* host) {
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_publishing_options_pane_construct (PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, options, list, host);
-#line 2220 "YandexPublishing.c"
+#line 1934 "YandexPublishing.c"
}
static void publishing_yandex_publishing_options_pane_on_logout_clicked (PublishingYandexPublishingOptionsPane* self) {
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_emit_by_name (self, "logout");
-#line 2229 "YandexPublishing.c"
+#line 1943 "YandexPublishing.c"
}
@@ -2254,136 +1968,136 @@ static void publishing_yandex_publishing_options_pane_on_publish_clicked (Publis
GtkComboBoxText* _tmp19_ = NULL;
PublishingYandexPublishOptions* _tmp20_ = NULL;
gchar* _tmp21_ = NULL;
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->options;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = self->priv->album_list;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = gtk_combo_box_text_get_active_text (_tmp1_);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp0_->destination_album);
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_->destination_album = _tmp2_;
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = self->priv->builder;
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = gtk_builder_get_object (_tmp3_, "hide_original_check");
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp4_) : NULL);
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
tmp = _tmp5_;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = self->priv->options;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = tmp;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = _tmp8_;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_->hide_original = _tmp9_;
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = self->priv->builder;
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = gtk_builder_get_object (_tmp10_, "disable_comments_check");
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp11_) : NULL);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (tmp);
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
tmp = _tmp12_;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_ = self->priv->options;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp14_ = tmp;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp15_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = _tmp15_;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_->disable_comments = _tmp16_;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp17_ = self->priv->builder;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp18_ = gtk_builder_get_object (_tmp17_, "access_type_list");
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp18_) : NULL);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
access_type = _tmp19_;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_ = self->priv->options;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp21_ = gtk_combo_box_text_get_active_text (access_type);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp20_->access_type);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_->access_type = _tmp21_;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_emit_by_name (self, "publish");
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (access_type);
-#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (tmp);
-#line 2330 "YandexPublishing.c"
+#line 2044 "YandexPublishing.c"
}
static void publishing_yandex_publishing_options_pane_class_init (PublishingYandexPublishingOptionsPaneClass * klass) {
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingYandexPublishingOptionsPanePrivate));
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_yandex_publishing_options_pane_finalize;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_new ("publish", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_new ("logout", PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2345 "YandexPublishing.c"
+#line 2059 "YandexPublishing.c"
}
static void publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_preferred_geometry;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_installed;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_on_pane_uninstalled;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_yandex_publishing_options_pane_real_get_widget;
-#line 2360 "YandexPublishing.c"
+#line 2074 "YandexPublishing.c"
}
static void publishing_yandex_publishing_options_pane_instance_init (PublishingYandexPublishingOptionsPane * self) {
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 2367 "YandexPublishing.c"
+#line 2081 "YandexPublishing.c"
}
static void publishing_yandex_publishing_options_pane_finalize (GObject* obj) {
PublishingYandexPublishingOptionsPane * self;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYandexPublishingOptionsPane);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->box);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->builder);
-#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->logout_button);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->publish_button);
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->album_list);
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (publishing_yandex_publishing_options_pane_parent_class)->finalize (obj);
-#line 2387 "YandexPublishing.c"
+#line 2101 "YandexPublishing.c"
}
@@ -2407,32 +2121,32 @@ PublishingYandexUploader* publishing_yandex_uploader_construct (GType object_typ
SpitPublishingPublishable** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
PublishingYandexPublishOptions* _tmp2_ = NULL;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = session;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = photos;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1__length1 = photos_length1;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (PublishingYandexUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = options;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->options = _tmp2_;
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 2429 "YandexPublishing.c"
+#line 2143 "YandexPublishing.c"
}
PublishingYandexUploader* publishing_yandex_uploader_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable** photos, int photos_length1) {
-#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_uploader_construct (PUBLISHING_YANDEX_TYPE_UPLOADER, session, options, photos, photos_length1);
-#line 2436 "YandexPublishing.c"
+#line 2150 "YandexPublishing.c"
}
@@ -2446,65 +2160,65 @@ static PublishingRESTSupportTransaction* publishing_yandex_uploader_real_create_
SpitPublishingPublishable* _tmp4_ = NULL;
PublishingYandexUploadTransaction* _tmp5_ = NULL;
PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:297: create transaction");
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:248: create transaction");
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_YANDEX_TYPE_SESSION, PublishingYandexSession);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = self->priv->options;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = _tmp3_;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = publishing_yandex_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_tmp4_);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_session_unref0 (_tmp1_);
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = _tmp6_;
-#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 2478 "YandexPublishing.c"
+#line 2192 "YandexPublishing.c"
}
static void publishing_yandex_uploader_class_init (PublishingYandexUploaderClass * klass) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_yandex_uploader_finalize;
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingYandexUploaderPrivate));
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_yandex_uploader_real_create_transaction;
-#line 2491 "YandexPublishing.c"
+#line 2205 "YandexPublishing.c"
}
static void publishing_yandex_uploader_instance_init (PublishingYandexUploader * self) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_UPLOADER_GET_PRIVATE (self);
-#line 2498 "YandexPublishing.c"
+#line 2212 "YandexPublishing.c"
}
static void publishing_yandex_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
PublishingYandexUploader * self;
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_UPLOADER, PublishingYandexUploader);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_yandex_uploader_parent_class)->finalize (obj);
-#line 2508 "YandexPublishing.c"
+#line 2222 "YandexPublishing.c"
}
@@ -2524,7 +2238,7 @@ static gchar* bool_to_string (gboolean self) {
gchar* result = NULL;
#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (self) {
-#line 2528 "YandexPublishing.c"
+#line 2242 "YandexPublishing.c"
gchar* _tmp0_ = NULL;
#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup ("true");
@@ -2532,7 +2246,7 @@ static gchar* bool_to_string (gboolean self) {
result = _tmp0_;
#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 2536 "YandexPublishing.c"
+#line 2250 "YandexPublishing.c"
} else {
gchar* _tmp1_ = NULL;
#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2541,15 +2255,15 @@ static gchar* bool_to_string (gboolean self) {
result = _tmp1_;
#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 2545 "YandexPublishing.c"
+#line 2259 "YandexPublishing.c"
}
}
static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_boxed_free (soup_multipart_get_type (), self);
-#line 2553 "YandexPublishing.c"
+#line 2267 "YandexPublishing.c"
}
@@ -2593,27 +2307,27 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
if (result_length1) {
#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
*result_length1 = _tmp4__length1;
-#line 2597 "YandexPublishing.c"
+#line 2311 "YandexPublishing.c"
}
#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
result = _tmp4_;
#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 2603 "YandexPublishing.c"
+#line 2317 "YandexPublishing.c"
}
static void _g_free0_ (gpointer var) {
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
var = (g_free (var), NULL);
-#line 2610 "YandexPublishing.c"
+#line 2324 "YandexPublishing.c"
}
static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_boxed_free (soup_buffer_get_type (), self);
-#line 2617 "YandexPublishing.c"
+#line 2331 "YandexPublishing.c"
}
@@ -2686,91 +2400,91 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
gchar* _tmp67_ = NULL;
SoupMessageHeaders* _tmp68_ = NULL;
GError * _inner_error_ = NULL;
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_SESSION (session), NULL);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_PUBLISH_OPTIONS (options), NULL);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (photo), NULL);
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = session;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = options;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = _tmp1_->destination_album_url;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (PublishingYandexUploadTransaction*) publishing_yandex_transaction_construct_with_url (object_type, _tmp0_, _tmp2_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "qwe", "image/jpeg", (gulong) 1);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = photo;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = spit_publishing_publishable_get_publishing_name (_tmp3_);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = _tmp4_;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = options;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = _tmp6_->destination_album;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = options;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = _tmp8_->destination_album_url;
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:308: Uploading '%s' -> %s : %s", _tmp5_, _tmp7_, _tmp9_);
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:259: Uploading '%s' -> %s : %s", _tmp5_, _tmp7_, _tmp9_);
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp5_);
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = soup_multipart_new ("multipart/form-data");
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
message_parts = _tmp10_;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = photo;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = spit_publishing_publishable_get_publishing_name (_tmp11_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_ = _tmp12_;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_multipart_append_form_string (message_parts, "title", _tmp13_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp13_);
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp14_ = options;
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp15_ = _tmp14_->hide_original;
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = bool_to_string (_tmp15_);
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp17_ = _tmp16_;
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_multipart_append_form_string (message_parts, "hide_original", _tmp17_);
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp17_);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp18_ = options;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp19_ = _tmp18_->disable_comments;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_ = bool_to_string (_tmp19_);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp21_ = _tmp20_;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_multipart_append_form_string (message_parts, "disable_comments", _tmp21_);
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp21_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp22_ = options;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp23_ = _tmp22_->access_type;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp24_ = g_utf8_strdown (_tmp23_, (gssize) -1);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp25_ = _tmp24_;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_multipart_append_form_string (message_parts, "access", _tmp25_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp25_);
-#line 2774 "YandexPublishing.c"
+#line 2488 "YandexPublishing.c"
{
SpitPublishingPublishable* _tmp26_ = NULL;
GFile* _tmp27_ = NULL;
@@ -2779,46 +2493,46 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
gchar* _tmp30_ = NULL;
gchar* _tmp31_ = NULL;
gsize _tmp32_ = 0UL;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp26_ = photo;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp27_ = spit_publishing_publishable_get_serialized_file (_tmp26_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp28_ = _tmp27_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp29_ = g_file_get_path (_tmp28_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp30_ = _tmp29_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_file_get_contents (_tmp30_, &_tmp31_, &_tmp32_, &_inner_error_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (photo_data);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
photo_data = _tmp31_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
data_length = _tmp32_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp30_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_tmp28_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == G_FILE_ERROR) {
-#line 2809 "YandexPublishing.c"
+#line 2523 "YandexPublishing.c"
goto __catch41_g_file_error;
}
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (photo_data);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 2822 "YandexPublishing.c"
+#line 2536 "YandexPublishing.c"
}
}
goto __finally41;
@@ -2832,170 +2546,170 @@ PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_construc
gchar* _tmp37_ = NULL;
GError* _tmp38_ = NULL;
const gchar* _tmp39_ = NULL;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
e = _inner_error_;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp33_ = photo;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp34_ = spit_publishing_publishable_get_serialized_file (_tmp33_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp35_ = _tmp34_;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp36_ = g_file_get_path (_tmp35_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp37_ = _tmp36_;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp38_ = e;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp39_ = _tmp38_->message;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_critical ("YandexPublishing.vala:322: Failed to read data file '%s': %s", _tmp37_, _tmp39_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_critical ("YandexPublishing.vala:273: Failed to read data file '%s': %s", _tmp37_, _tmp39_);
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp37_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_tmp35_);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (e);
-#line 2862 "YandexPublishing.c"
+#line 2576 "YandexPublishing.c"
}
__finally41:
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (photo_data);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return NULL;
-#line 2877 "YandexPublishing.c"
+#line 2591 "YandexPublishing.c"
}
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp40_ = soup_multipart_get_length (message_parts);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
image_part_num = _tmp40_;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp41_ = string_get_data (photo_data, &_tmp41__length1);
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp42_ = _tmp41_;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp42__length1 = _tmp41__length1;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp43_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp42_ + 0, ((gint) data_length) - 0);
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
bindable_data = _tmp43_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp44_ = photo;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp45_ = spit_publishing_publishable_get_serialized_file (_tmp44_);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp46_ = _tmp45_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp47_ = g_file_get_path (_tmp46_);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp48_ = _tmp47_;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_multipart_append_form_file (message_parts, "", _tmp48_, "image/jpeg", bindable_data);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp48_);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (_tmp46_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_multipart_get_part (message_parts, image_part_num, &_tmp49_, &_tmp50_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
image_part_header = _tmp49_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
image_part_body = _tmp50_;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp51_ = g_str_hash;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp52_ = g_str_equal;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp53_ = g_hash_table_new_full (_tmp51_, _tmp52_, _g_free0_, _g_free0_);
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_result_ = _tmp53_;
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp54_ = g_strdup ("name");
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp55_ = g_strdup ("image");
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_hash_table_insert (_result_, _tmp54_, _tmp55_);
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp56_ = g_strdup ("filename");
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp57_ = g_strdup ("unused");
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_hash_table_insert (_result_, _tmp56_, _tmp57_);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_message_headers_set_content_disposition (image_part_header, "form-data", _result_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp58_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp59_ = _tmp58_;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp60_ = soup_form_request_new_from_multipart (_tmp59_, message_parts);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp61_ = _tmp60_;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp59_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
outbound_message = _tmp61_;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp62_ = outbound_message->request_headers;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp63_ = session;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp64_ = publishing_yandex_session_get_auth_token (_tmp63_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp65_ = _tmp64_;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp66_ = g_strdup_printf ("OAuth %s", _tmp65_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp67_ = _tmp66_;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_message_headers_append (_tmp62_, "Authorization", _tmp67_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp67_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp65_);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp68_ = outbound_message->request_headers;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
soup_message_headers_append (_tmp68_, "Connection", "close");
-#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (outbound_message);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_hash_table_unref0 (_result_);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
__vala_SoupBuffer_free0 (bindable_data);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (photo_data);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
__vala_SoupMultipart_free0 (message_parts);
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 2985 "YandexPublishing.c"
+#line 2699 "YandexPublishing.c"
}
PublishingYandexUploadTransaction* publishing_yandex_upload_transaction_new (PublishingYandexSession* session, PublishingYandexPublishOptions* options, SpitPublishingPublishable* photo) {
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_upload_transaction_construct (PUBLISHING_YANDEX_TYPE_UPLOAD_TRANSACTION, session, options, photo);
-#line 2992 "YandexPublishing.c"
+#line 2706 "YandexPublishing.c"
}
static void publishing_yandex_upload_transaction_class_init (PublishingYandexUploadTransactionClass * klass) {
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2999 "YandexPublishing.c"
+#line 2713 "YandexPublishing.c"
}
@@ -3022,48 +2736,48 @@ PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_construct (G
PublishingYandexSession* _tmp2_ = NULL;
GeeHashMap* _tmp3_ = NULL;
PublishingYandexPublishOptions* _tmp4_ = NULL;
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = (PublishingYandexYandexPublisher*) g_object_new (object_type, NULL);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = service;
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->service = _tmp0_;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = host;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->host = _tmp1_;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = publishing_yandex_session_new ();
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->session = _tmp2_;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->album_list);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->album_list = _tmp3_;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = publishing_yandex_publish_options_new ();
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_yandex_publish_options_unref0 (self->priv->options);
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->options = _tmp4_;
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return self;
-#line 3060 "YandexPublishing.c"
+#line 2774 "YandexPublishing.c"
}
PublishingYandexYandexPublisher* publishing_yandex_yandex_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return publishing_yandex_yandex_publisher_construct (PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, service, host);
-#line 3067 "YandexPublishing.c"
+#line 2781 "YandexPublishing.c"
}
@@ -3071,46 +2785,46 @@ gchar* publishing_yandex_yandex_publisher_get_persistent_auth_token (PublishingY
gchar* result = NULL;
SpitPublishingPluginHost* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), NULL);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->host;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", NULL);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = _tmp1_;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 3085 "YandexPublishing.c"
+#line 2799 "YandexPublishing.c"
}
void publishing_yandex_yandex_publisher_set_persistent_auth_token (PublishingYandexYandexPublisher* self, const gchar* auth_token) {
SpitPublishingPluginHost* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (auth_token != NULL);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->host;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = auth_token;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token", _tmp1_);
-#line 3102 "YandexPublishing.c"
+#line 2816 "YandexPublishing.c"
}
void publishing_yandex_yandex_publisher_invalidate_persistent_session (PublishingYandexYandexPublisher* self) {
SpitPublishingPluginHost* _tmp0_ = NULL;
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->host;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "auth_token");
-#line 3114 "YandexPublishing.c"
+#line 2828 "YandexPublishing.c"
}
@@ -3119,21 +2833,21 @@ gboolean publishing_yandex_yandex_publisher_is_persistent_session_available (Pub
gchar* _tmp0_ = NULL;
gchar* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), FALSE);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = _tmp0_;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = _tmp1_ != NULL;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp1_);
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = _tmp2_;
-#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 3137 "YandexPublishing.c"
+#line 2851 "YandexPublishing.c"
}
@@ -3141,15 +2855,15 @@ static gboolean publishing_yandex_yandex_publisher_real_is_running (SpitPublishi
PublishingYandexYandexPublisher * self;
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->running;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = _tmp0_;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 3153 "YandexPublishing.c"
+#line 2867 "YandexPublishing.c"
}
@@ -3158,62 +2872,62 @@ static SpitPublishingService* publishing_yandex_yandex_publisher_real_get_servic
SpitPublishingService* result = NULL;
SpitPublishingService* _tmp0_ = NULL;
SpitPublishingService* _tmp1_ = NULL;
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->service;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = _tmp1_;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 343 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 3172 "YandexPublishing.c"
+#line 2886 "YandexPublishing.c"
}
static gchar* publishing_yandex_yandex_publisher_check_response (PublishingYandexYandexPublisher* self, PublishingRESTSupportXmlDocument* doc) {
gchar* result = NULL;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self), NULL);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
result = NULL;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 3186 "YandexPublishing.c"
+#line 2900 "YandexPublishing.c"
}
static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYandexYandexPublisher* self, xmlNode* e, GError** error) {
gchar* title = NULL;
gchar* link = NULL;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
title = NULL;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
link = NULL;
-#line 3199 "YandexPublishing.c"
+#line 2913 "YandexPublishing.c"
{
xmlNode* c = NULL;
xmlNode* _tmp0_ = NULL;
xmlNode* _tmp1_ = NULL;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = e;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = _tmp0_->children;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
c = _tmp1_;
-#line 3210 "YandexPublishing.c"
+#line 2924 "YandexPublishing.c"
{
gboolean _tmp2_ = FALSE;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = TRUE;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 3217 "YandexPublishing.c"
+#line 2931 "YandexPublishing.c"
xmlNode* _tmp5_ = NULL;
xmlNode* _tmp6_ = NULL;
const gchar* _tmp7_ = NULL;
@@ -3222,156 +2936,156 @@ static void publishing_yandex_yandex_publisher_parse_album_entry (PublishingYand
const gchar* _tmp12_ = NULL;
gboolean _tmp18_ = FALSE;
const gchar* _tmp19_ = NULL;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp2_) {
-#line 3228 "YandexPublishing.c"
+#line 2942 "YandexPublishing.c"
xmlNode* _tmp3_ = NULL;
xmlNode* _tmp4_ = NULL;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = c;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = _tmp3_->next;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
c = _tmp4_;
-#line 3237 "YandexPublishing.c"
+#line 2951 "YandexPublishing.c"
}
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = FALSE;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = c;
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!(_tmp5_ != NULL)) {
-#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 3247 "YandexPublishing.c"
+#line 2961 "YandexPublishing.c"
}
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = c;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = _tmp6_->name;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (g_strcmp0 (_tmp7_, "title") == 0) {
-#line 3255 "YandexPublishing.c"
+#line 2969 "YandexPublishing.c"
xmlNode* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = c;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = (gchar*) xmlNodeGetContent (_tmp8_);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (title);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
title = _tmp9_;
-#line 3266 "YandexPublishing.c"
+#line 2980 "YandexPublishing.c"
}
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = c;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = _tmp11_->name;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (g_strcmp0 (_tmp12_, "link") == 0) {
-#line 3274 "YandexPublishing.c"
+#line 2988 "YandexPublishing.c"
xmlNode* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
gchar* _tmp15_ = NULL;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_ = c;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp14_ = (gchar*) xmlGetProp (_tmp13_, (xmlChar*) "rel");
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp15_ = _tmp14_;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = g_strcmp0 (_tmp15_, "photos") == 0;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp15_);
-#line 3288 "YandexPublishing.c"
+#line 3002 "YandexPublishing.c"
} else {
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = FALSE;
-#line 3292 "YandexPublishing.c"
+#line 3006 "YandexPublishing.c"
}
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp10_) {
-#line 3296 "YandexPublishing.c"
+#line 3010 "YandexPublishing.c"
xmlNode* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = c;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp17_ = (gchar*) xmlGetProp (_tmp16_, (xmlChar*) "href");
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (link);
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
link = _tmp17_;
-#line 3307 "YandexPublishing.c"
+#line 3021 "YandexPublishing.c"
}
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp19_ = title;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp19_ != NULL) {
-#line 3313 "YandexPublishing.c"
+#line 3027 "YandexPublishing.c"
const gchar* _tmp20_ = NULL;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_ = link;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp18_ = _tmp20_ != NULL;
-#line 3319 "YandexPublishing.c"
+#line 3033 "YandexPublishing.c"
} else {
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp18_ = FALSE;
-#line 3323 "YandexPublishing.c"
+#line 3037 "YandexPublishing.c"
}
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp18_) {
-#line 3327 "YandexPublishing.c"
+#line 3041 "YandexPublishing.c"
const gchar* _tmp21_ = NULL;
const gchar* _tmp22_ = NULL;
GeeHashMap* _tmp23_ = NULL;
const gchar* _tmp24_ = NULL;
const gchar* _tmp25_ = NULL;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp21_ = title;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp22_ = link;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:411: Added album: '%s', link: %s", _tmp21_, _tmp22_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:362: Added album: '%s', link: %s", _tmp21_, _tmp22_);
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp23_ = self->priv->album_list;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp24_ = title;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp25_ = link;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, _tmp25_);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (title);
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
title = NULL;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (link);
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
link = NULL;
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 3357 "YandexPublishing.c"
+#line 3071 "YandexPublishing.c"
}
}
}
}
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (link);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (title);
-#line 3366 "YandexPublishing.c"
+#line 3080 "YandexPublishing.c"
}
static gchar* _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
gchar* result;
result = publishing_yandex_yandex_publisher_check_response ((PublishingYandexYandexPublisher*) self, doc);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return result;
-#line 3375 "YandexPublishing.c"
+#line 3089 "YandexPublishing.c"
}
@@ -3384,71 +3098,71 @@ void publishing_yandex_yandex_publisher_parse_album_creation (PublishingYandexYa
xmlNode* _tmp3_ = NULL;
xmlNode* _tmp4_ = NULL;
GError * _inner_error_ = NULL;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (data != NULL);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = data;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = publishing_rest_support_xml_document_parse_string (_tmp0_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
doc = _tmp1_;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_propagate_error (error, _inner_error_);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3406 "YandexPublishing.c"
+#line 3120 "YandexPublishing.c"
} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3414 "YandexPublishing.c"
+#line 3128 "YandexPublishing.c"
}
}
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = doc;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
root = _tmp3_;
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = root;
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp4_, &_inner_error_);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_propagate_error (error, _inner_error_);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3437 "YandexPublishing.c"
+#line 3151 "YandexPublishing.c"
} else {
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3447 "YandexPublishing.c"
+#line 3161 "YandexPublishing.c"
}
}
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 3452 "YandexPublishing.c"
+#line 3166 "YandexPublishing.c"
}
@@ -3460,144 +3174,144 @@ void publishing_yandex_yandex_publisher_parse_album_list (PublishingYandexYandex
PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
xmlNode* _tmp3_ = NULL;
GError * _inner_error_ = NULL;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (data != NULL);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = data;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = publishing_rest_support_xml_document_parse_string (_tmp0_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
doc = _tmp1_;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_propagate_error (error, _inner_error_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3482 "YandexPublishing.c"
+#line 3196 "YandexPublishing.c"
} else {
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3490 "YandexPublishing.c"
+#line 3204 "YandexPublishing.c"
}
}
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = doc;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = publishing_rest_support_xml_document_get_root_node (_tmp2_);
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
root = _tmp3_;
-#line 3499 "YandexPublishing.c"
+#line 3213 "YandexPublishing.c"
{
xmlNode* e = NULL;
xmlNode* _tmp4_ = NULL;
xmlNode* _tmp5_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = root;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = _tmp4_->children;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
e = _tmp5_;
-#line 3510 "YandexPublishing.c"
+#line 3224 "YandexPublishing.c"
{
gboolean _tmp6_ = FALSE;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = TRUE;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 3517 "YandexPublishing.c"
+#line 3231 "YandexPublishing.c"
xmlNode* _tmp9_ = NULL;
xmlNode* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
xmlNode* _tmp12_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp6_) {
-#line 3524 "YandexPublishing.c"
+#line 3238 "YandexPublishing.c"
xmlNode* _tmp7_ = NULL;
xmlNode* _tmp8_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = e;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = _tmp7_->next;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
e = _tmp8_;
-#line 3533 "YandexPublishing.c"
+#line 3247 "YandexPublishing.c"
}
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = FALSE;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = e;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!(_tmp9_ != NULL)) {
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 3543 "YandexPublishing.c"
+#line 3257 "YandexPublishing.c"
}
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = e;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = _tmp10_->name;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (g_strcmp0 (_tmp11_, "entry") != 0) {
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
continue;
-#line 3553 "YandexPublishing.c"
+#line 3267 "YandexPublishing.c"
}
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = e;
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_parse_album_entry (self, _tmp12_, &_inner_error_);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_propagate_error (error, _inner_error_);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3569 "YandexPublishing.c"
+#line 3283 "YandexPublishing.c"
} else {
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3579 "YandexPublishing.c"
+#line 3293 "YandexPublishing.c"
}
}
}
}
}
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 3587 "YandexPublishing.c"
+#line 3301 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_album_creation_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 3594 "YandexPublishing.c"
+#line 3308 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_album_creation_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3601 "YandexPublishing.c"
+#line 3315 "YandexPublishing.c"
}
@@ -3608,29 +3322,29 @@ static void publishing_yandex_yandex_publisher_album_creation_error (PublishingY
guint _tmp3_ = 0U;
GError* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = t;
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = t;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = err;
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = _tmp4_->message;
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:443: Album creation error: %s", _tmp5_);
-#line 3634 "YandexPublishing.c"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_warning ("YandexPublishing.vala:394: Album creation error: %s", _tmp5_);
+#line 3348 "YandexPublishing.c"
}
@@ -3646,51 +3360,51 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
gchar* _tmp13_ = NULL;
gboolean _tmp14_ = FALSE;
GError * _inner_error_ = NULL;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = t;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = t;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 3666 "YandexPublishing.c"
+#line 3380 "YandexPublishing.c"
{
PublishingRESTSupportTransaction* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = t;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = _tmp5_;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_parse_album_creation (self, _tmp6_, &_inner_error_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp6_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3685 "YandexPublishing.c"
+#line 3399 "YandexPublishing.c"
goto __catch42_spit_publishing_publishing_error;
}
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3694 "YandexPublishing.c"
+#line 3408 "YandexPublishing.c"
}
}
goto __finally42;
@@ -3699,67 +3413,67 @@ static void publishing_yandex_yandex_publisher_album_creation_complete (Publishi
GError* err = NULL;
SpitPublishingPluginHost* _tmp7_ = NULL;
GError* _tmp8_ = NULL;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = self->priv->host;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = err;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3717 "YandexPublishing.c"
+#line 3431 "YandexPublishing.c"
}
__finally42:
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3728 "YandexPublishing.c"
+#line 3442 "YandexPublishing.c"
}
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = self->priv->album_list;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = self->priv->options;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = _tmp10_->destination_album;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp11_);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_ = (gchar*) _tmp12_;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp14_ = _tmp13_ != NULL;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp13_);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp14_) {
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_start_upload (self);
-#line 3748 "YandexPublishing.c"
+#line 3462 "YandexPublishing.c"
} else {
SpitPublishingPluginHost* _tmp15_ = NULL;
GError* _tmp16_ = NULL;
GError* _tmp17_ = NULL;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp15_ = self->priv->host;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_PROTOCOL_ERROR, "Server did not create album");
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp17_ = _tmp16_;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp15_, _tmp17_);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (_tmp17_);
-#line 3763 "YandexPublishing.c"
+#line 3477 "YandexPublishing.c"
}
}
@@ -3776,59 +3490,59 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
const gchar* _tmp5_ = NULL;
PublishingYandexTransaction* _tmp6_ = NULL;
GError * _inner_error_ = NULL;
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->options;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = _tmp0_->destination_album;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = g_strdup (_tmp1_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
album = _tmp2_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = g_strdup_printf ("" \
"%s", album);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
data = _tmp3_;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = self->priv->session;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = self->priv->service_url;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = publishing_yandex_transaction_new_with_url (_tmp4_, _tmp5_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
t = _tmp6_;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_transaction_add_data (t, "application/atom+xml; charset=utf-8; type=entry", data);
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3808 "YandexPublishing.c"
+#line 3522 "YandexPublishing.c"
{
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3816 "YandexPublishing.c"
+#line 3530 "YandexPublishing.c"
goto __catch43_spit_publishing_publishing_error;
}
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (data);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (album);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3831 "YandexPublishing.c"
+#line 3545 "YandexPublishing.c"
}
}
goto __finally43;
@@ -3837,58 +3551,58 @@ static void publishing_yandex_yandex_publisher_create_destination_album (Publish
GError* err = NULL;
SpitPublishingPluginHost* _tmp7_ = NULL;
GError* _tmp8_ = NULL;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = self->priv->host;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = err;
-#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 3852 "YandexPublishing.c"
+#line 3566 "YandexPublishing.c"
}
__finally43:
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (data);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (album);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 3869 "YandexPublishing.c"
+#line 3583 "YandexPublishing.c"
}
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (data);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (album);
-#line 3877 "YandexPublishing.c"
+#line 3591 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_upload_complete ((PublishingYandexYandexPublisher*) self, _sender, num_photos_published);
-#line 3884 "YandexPublishing.c"
+#line 3598 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_upload_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 3891 "YandexPublishing.c"
+#line 3605 "YandexPublishing.c"
}
@@ -3900,51 +3614,51 @@ static void publishing_yandex_yandex_publisher_on_upload_complete (PublishingYan
gint _tmp4_ = 0;
SpitPublishingPluginHost* _tmp8_ = NULL;
SpitPublishingPluginHost* _tmp9_ = NULL;
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = uploader;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = uploader;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = num_published;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp4_ == 0) {
-#line 3923 "YandexPublishing.c"
+#line 3637 "YandexPublishing.c"
SpitPublishingPluginHost* _tmp5_ = NULL;
GError* _tmp6_ = NULL;
GError* _tmp7_ = NULL;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = self->priv->host;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "");
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = _tmp6_;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp5_, _tmp7_);
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (_tmp7_);
-#line 3937 "YandexPublishing.c"
+#line 3651 "YandexPublishing.c"
}
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = self->priv->host;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp8_, FALSE);
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = self->priv->host;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_success_pane (_tmp9_);
-#line 3947 "YandexPublishing.c"
+#line 3661 "YandexPublishing.c"
}
@@ -3955,29 +3669,29 @@ static void publishing_yandex_yandex_publisher_on_upload_error (PublishingYandex
guint _tmp3_ = 0U;
GError* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = uploader;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = uploader;
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = err;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = _tmp4_->message;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:497: Photo upload error: %s", _tmp5_);
-#line 3980 "YandexPublishing.c"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_warning ("YandexPublishing.vala:448: Photo upload error: %s", _tmp5_);
+#line 3694 "YandexPublishing.c"
}
@@ -3989,37 +3703,37 @@ static void publishing_yandex_yandex_publisher_on_upload_status_updated (Publish
void* _tmp2__target = NULL;
gint _tmp3_ = 0;
gdouble _tmp4_ = 0.0;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = completed_fraction;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:501: EVENT: uploader reports upload %.2f percent" \
+#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:452: EVENT: uploader reports upload %.2f percent" \
" complete.", 100.0 * _tmp0_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = self->priv->progress_reporter;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1__target = self->priv->progress_reporter_target;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_vala_assert (_tmp1_ != NULL, "progress_reporter != null");
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = self->priv->progress_reporter;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2__target = self->priv->progress_reporter_target;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = file_number;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = completed_fraction;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ (_tmp3_, _tmp4_, _tmp2__target);
-#line 4014 "YandexPublishing.c"
+#line 3728 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_upload_status_updated ((PublishingYandexYandexPublisher*) self, file_number, fraction_complete);
-#line 4021 "YandexPublishing.c"
+#line 3735 "YandexPublishing.c"
}
@@ -4044,100 +3758,100 @@ static void publishing_yandex_yandex_publisher_start_upload (PublishingYandexYan
PublishingYandexSession* _tmp13_ = NULL;
PublishingYandexPublishOptions* _tmp14_ = NULL;
PublishingYandexUploader* _tmp15_ = NULL;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->host;
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = self->priv->host;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, 0, FALSE, &_tmp2_, &_tmp3_);
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter = NULL;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter_target = NULL;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter = _tmp4_;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter_target = _tmp2_;
-#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = _tmp3_;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = self->priv->options;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = self->priv->album_list;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = self->priv->options;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = _tmp7_->destination_album;
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp5_->destination_album_url);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_->destination_album_url = (gchar*) _tmp9_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = self->priv->host;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishables = _tmp12_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishables_length1 = _tmp11_;
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishables_size_ = publishables_length1;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_ = self->priv->session;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp14_ = self->priv->options;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp15_ = publishing_yandex_uploader_new (_tmp13_, _tmp14_, publishables, publishables_length1);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
uploader = _tmp15_;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_yandex_yandex_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_yandex_yandex_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (uploader, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_yandex_yandex_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 4112 "YandexPublishing.c"
+#line 3826 "YandexPublishing.c"
}
static void publishing_yandex_yandex_publisher_on_logout (PublishingYandexYandexPublisher* self) {
gboolean _tmp0_ = FALSE;
PublishingYandexSession* _tmp1_ = NULL;
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp0_) {
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4127 "YandexPublishing.c"
+#line 3841 "YandexPublishing.c"
}
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = self->priv->session;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_session_deauthenticate (_tmp1_);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_invalidate_persistent_session (self);
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->running = FALSE;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 4139 "YandexPublishing.c"
+#line 3853 "YandexPublishing.c"
}
@@ -4155,64 +3869,64 @@ static void publishing_yandex_yandex_publisher_on_publish (PublishingYandexYande
gpointer _tmp10_ = NULL;
gchar* _tmp11_ = NULL;
gboolean _tmp12_ = FALSE;
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->options;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = _tmp0_->destination_album;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = self->priv->album_list;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = self->priv->options;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = _tmp3_->destination_album;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = (gchar*) _tmp5_;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:535: Going to publish to '%s' : %s", _tmp1_, _tmp6_);
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:486: Going to publish to '%s' : %s", _tmp1_, _tmp6_);
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp6_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = self->priv->album_list;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = self->priv->options;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = _tmp8_->destination_album;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = (gchar*) _tmp10_;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = _tmp11_ == NULL;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp11_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp12_) {
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_create_destination_album (self);
-#line 4195 "YandexPublishing.c"
+#line 3909 "YandexPublishing.c"
} else {
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_start_upload (self);
-#line 4199 "YandexPublishing.c"
+#line 3913 "YandexPublishing.c"
}
}
static void _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_service_get_album_list_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 4207 "YandexPublishing.c"
+#line 3921 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_service_get_album_list_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 4214 "YandexPublishing.c"
+#line 3928 "YandexPublishing.c"
}
@@ -4223,45 +3937,45 @@ void publishing_yandex_yandex_publisher_service_get_album_list_error (Publishing
guint _tmp3_ = 0U;
GError* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = t;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = t;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_invalidate_persistent_session (self);
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = err;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = _tmp4_->message;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:547: Failed to get album list: %s", _tmp5_);
-#line 4249 "YandexPublishing.c"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_warning ("YandexPublishing.vala:498: Failed to get album list: %s", _tmp5_);
+#line 3963 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_publish ((PublishingYandexYandexPublisher*) self);
-#line 4256 "YandexPublishing.c"
+#line 3970 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout (PublishingYandexPublishingOptionsPane* _sender, gpointer self) {
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_on_logout ((PublishingYandexYandexPublisher*) self);
-#line 4263 "YandexPublishing.c"
+#line 3977 "YandexPublishing.c"
}
@@ -4280,61 +3994,61 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
PublishingYandexPublishingOptionsPane* _tmp15_ = NULL;
SpitPublishingPluginHost* _tmp16_ = NULL;
GError * _inner_error_ = NULL;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = t;
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = t;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = t;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = _tmp5_;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:554: service_get_album_list_complete: %s", _tmp6_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:505: service_get_album_list_complete: %s", _tmp6_);
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp6_);
-#line 4308 "YandexPublishing.c"
+#line 4022 "YandexPublishing.c"
{
PublishingRESTSupportTransaction* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = t;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = _tmp8_;
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_parse_album_list (self, _tmp9_, &_inner_error_);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp9_);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4327 "YandexPublishing.c"
+#line 4041 "YandexPublishing.c"
goto __catch44_spit_publishing_publishing_error;
}
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4336 "YandexPublishing.c"
+#line 4050 "YandexPublishing.c"
}
}
goto __finally44;
@@ -4343,52 +4057,52 @@ void publishing_yandex_yandex_publisher_service_get_album_list_complete (Publish
GError* err = NULL;
SpitPublishingPluginHost* _tmp10_ = NULL;
GError* _tmp11_ = NULL;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = self->priv->host;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = err;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp10_, _tmp11_);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4357 "YandexPublishing.c"
+#line 4071 "YandexPublishing.c"
}
__finally44:
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4368 "YandexPublishing.c"
+#line 4082 "YandexPublishing.c"
}
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = self->priv->options;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_ = self->priv->album_list;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp14_ = self->priv->host;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp15_ = publishing_yandex_publishing_options_pane_new (_tmp12_, _tmp13_, _tmp14_);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_options_pane = _tmp15_;
-#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (publishing_options_pane, "publish", (GCallback) _publishing_yandex_yandex_publisher_on_publish_publishing_yandex_publishing_options_pane_publish, self, 0);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (publishing_options_pane, "logout", (GCallback) _publishing_yandex_yandex_publisher_on_logout_publishing_yandex_publishing_options_pane_logout, self, 0);
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = self->priv->host;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_dialog_pane (_tmp16_, G_TYPE_CHECK_INSTANCE_CAST (publishing_options_pane, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (publishing_options_pane);
-#line 4390 "YandexPublishing.c"
+#line 4104 "YandexPublishing.c"
}
@@ -4400,50 +4114,50 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
const gchar* _tmp3_ = NULL;
PublishingYandexTransaction* _tmp4_ = NULL;
GError * _inner_error_ = NULL;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (url != NULL);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = url;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = g_strdup (_tmp0_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->priv->service_url);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->service_url = _tmp1_;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = self->priv->session;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = url;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = publishing_yandex_transaction_new_with_url (_tmp2_, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
t = _tmp4_;
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_service_get_album_list_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4426 "YandexPublishing.c"
+#line 4140 "YandexPublishing.c"
{
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4434 "YandexPublishing.c"
+#line 4148 "YandexPublishing.c"
goto __catch45_spit_publishing_publishing_error;
}
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4445 "YandexPublishing.c"
+#line 4159 "YandexPublishing.c"
}
}
goto __finally45;
@@ -4452,50 +4166,50 @@ void publishing_yandex_yandex_publisher_service_get_album_list (PublishingYandex
GError* err = NULL;
SpitPublishingPluginHost* _tmp5_ = NULL;
GError* _tmp6_ = NULL;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = self->priv->host;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = err;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4466 "YandexPublishing.c"
+#line 4180 "YandexPublishing.c"
}
__finally45:
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4479 "YandexPublishing.c"
+#line 4193 "YandexPublishing.c"
}
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 4483 "YandexPublishing.c"
+#line 4197 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_fetch_account_complete ((PublishingYandexYandexPublisher*) self, _sender);
-#line 4490 "YandexPublishing.c"
+#line 4204 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_fetch_account_error ((PublishingYandexYandexPublisher*) self, _sender, err);
-#line 4497 "YandexPublishing.c"
+#line 4211 "YandexPublishing.c"
}
@@ -4506,29 +4220,29 @@ void publishing_yandex_yandex_publisher_fetch_account_error (PublishingYandexYan
guint _tmp3_ = 0U;
GError* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = t;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = t;
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = err;
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = _tmp4_->message;
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_warning ("YandexPublishing.vala:587: Failed to fetch account info: %s", _tmp5_);
-#line 4530 "YandexPublishing.c"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_warning ("YandexPublishing.vala:538: Failed to fetch account info: %s", _tmp5_);
+#line 4244 "YandexPublishing.c"
}
@@ -4541,33 +4255,33 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
GError * _inner_error_ = NULL;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (t));
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = t;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = t;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = t;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = _tmp5_;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:594: account info: %s", _tmp6_);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:545: account info: %s", _tmp6_);
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp6_);
-#line 4569 "YandexPublishing.c"
+#line 4283 "YandexPublishing.c"
{
PublishingRESTSupportXmlDocument* doc = NULL;
PublishingRESTSupportTransaction* _tmp7_ = NULL;
@@ -4578,114 +4292,114 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
xmlNode* root = NULL;
PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
xmlNode* _tmp13_ = NULL;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = t;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp9_ = _tmp8_;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp10_ = publishing_rest_support_xml_document_parse_string (_tmp9_, _publishing_yandex_yandex_publisher_check_response_publishing_rest_support_xml_document_check_for_error_response, self, &_inner_error_);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp11_ = _tmp10_;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp9_);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
doc = _tmp11_;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4598 "YandexPublishing.c"
+#line 4312 "YandexPublishing.c"
goto __catch46_spit_publishing_publishing_error;
}
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4607 "YandexPublishing.c"
+#line 4321 "YandexPublishing.c"
}
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp12_ = doc;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp13_ = publishing_rest_support_xml_document_get_root_node (_tmp12_);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
root = _tmp13_;
-#line 4615 "YandexPublishing.c"
+#line 4329 "YandexPublishing.c"
{
xmlNode* work = NULL;
xmlNode* _tmp14_ = NULL;
xmlNode* _tmp15_ = NULL;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp14_ = root;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp15_ = _tmp14_->children;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
work = _tmp15_;
-#line 4626 "YandexPublishing.c"
+#line 4340 "YandexPublishing.c"
{
gboolean _tmp16_ = FALSE;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = TRUE;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 4633 "YandexPublishing.c"
+#line 4347 "YandexPublishing.c"
xmlNode* _tmp19_ = NULL;
xmlNode* _tmp20_ = NULL;
const gchar* _tmp21_ = NULL;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp16_) {
-#line 4639 "YandexPublishing.c"
+#line 4353 "YandexPublishing.c"
xmlNode* _tmp17_ = NULL;
xmlNode* _tmp18_ = NULL;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp17_ = work;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp18_ = _tmp17_->next;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
work = _tmp18_;
-#line 4648 "YandexPublishing.c"
+#line 4362 "YandexPublishing.c"
}
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp16_ = FALSE;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp19_ = work;
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!(_tmp19_ != NULL)) {
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 4658 "YandexPublishing.c"
+#line 4372 "YandexPublishing.c"
}
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp20_ = work;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp21_ = _tmp20_->name;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (g_strcmp0 (_tmp21_, "workspace") != 0) {
-#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
continue;
-#line 4668 "YandexPublishing.c"
+#line 4382 "YandexPublishing.c"
}
{
xmlNode* c = NULL;
xmlNode* _tmp22_ = NULL;
xmlNode* _tmp23_ = NULL;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp22_ = work;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp23_ = _tmp22_->children;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
c = _tmp23_;
-#line 4680 "YandexPublishing.c"
+#line 4394 "YandexPublishing.c"
{
gboolean _tmp24_ = FALSE;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp24_ = TRUE;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
while (TRUE) {
-#line 4687 "YandexPublishing.c"
+#line 4401 "YandexPublishing.c"
xmlNode* _tmp27_ = NULL;
xmlNode* _tmp28_ = NULL;
const gchar* _tmp29_ = NULL;
@@ -4693,52 +4407,52 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
gchar* _tmp31_ = NULL;
gchar* _tmp32_ = NULL;
gboolean _tmp33_ = FALSE;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!_tmp24_) {
-#line 4697 "YandexPublishing.c"
+#line 4411 "YandexPublishing.c"
xmlNode* _tmp25_ = NULL;
xmlNode* _tmp26_ = NULL;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp25_ = c;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp26_ = _tmp25_->next;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
c = _tmp26_;
-#line 4706 "YandexPublishing.c"
+#line 4420 "YandexPublishing.c"
}
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp24_ = FALSE;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp27_ = c;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (!(_tmp27_ != NULL)) {
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 4716 "YandexPublishing.c"
+#line 4430 "YandexPublishing.c"
}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp28_ = c;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp29_ = _tmp28_->name;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (g_strcmp0 (_tmp29_, "collection") != 0) {
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
continue;
-#line 4726 "YandexPublishing.c"
+#line 4440 "YandexPublishing.c"
}
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp30_ = c;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp31_ = (gchar*) xmlGetProp (_tmp30_, (xmlChar*) "id");
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp32_ = _tmp31_;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp33_ = g_strcmp0 (_tmp32_, "album-list") == 0;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp32_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp33_) {
-#line 4740 "YandexPublishing.c"
+#line 4454 "YandexPublishing.c"
gchar* url = NULL;
xmlNode* _tmp34_ = NULL;
gchar* _tmp35_ = NULL;
@@ -4746,31 +4460,31 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
gchar* _tmp37_ = NULL;
gchar* _tmp38_ = NULL;
const gchar* _tmp39_ = NULL;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp34_ = c;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp35_ = (gchar*) xmlGetProp (_tmp34_, (xmlChar*) "href");
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
url = _tmp35_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp36_ = self->priv->session;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp37_ = publishing_yandex_session_get_auth_token (_tmp36_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp38_ = _tmp37_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_set_persistent_auth_token (self, _tmp38_);
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp38_);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp39_ = url;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_service_get_album_list (self, _tmp39_);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (url);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
break;
-#line 4772 "YandexPublishing.c"
+#line 4486 "YandexPublishing.c"
}
}
}
@@ -4778,9 +4492,9 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
}
}
}
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_xml_document_unref0 (doc);
-#line 4782 "YandexPublishing.c"
+#line 4496 "YandexPublishing.c"
}
goto __finally46;
__catch46_spit_publishing_publishing_error:
@@ -4788,30 +4502,30 @@ void publishing_yandex_yandex_publisher_fetch_account_complete (PublishingYandex
GError* err = NULL;
SpitPublishingPluginHost* _tmp40_ = NULL;
GError* _tmp41_ = NULL;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp40_ = self->priv->host;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp41_ = err;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp40_, _tmp41_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4802 "YandexPublishing.c"
+#line 4516 "YandexPublishing.c"
}
__finally46:
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4813 "YandexPublishing.c"
+#line 4527 "YandexPublishing.c"
}
}
@@ -4823,46 +4537,46 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
PublishingYandexSession* _tmp2_ = NULL;
PublishingYandexTransaction* _tmp3_ = NULL;
GError * _inner_error_ = NULL;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (auth_token != NULL);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->session;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = auth_token;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_session_set_auth_token (_tmp0_, _tmp1_);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = self->priv->session;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = publishing_yandex_transaction_new_with_url (_tmp2_, "http://api-fotki.yandex.ru/api/me/", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
t = _tmp3_;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_yandex_yandex_publisher_fetch_account_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 4845 "YandexPublishing.c"
+#line 4559 "YandexPublishing.c"
{
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (t, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 4853 "YandexPublishing.c"
+#line 4567 "YandexPublishing.c"
goto __catch47_spit_publishing_publishing_error;
}
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4864 "YandexPublishing.c"
+#line 4578 "YandexPublishing.c"
}
}
goto __finally47;
@@ -4871,36 +4585,36 @@ void publishing_yandex_yandex_publisher_fetch_account_information (PublishingYan
GError* err = NULL;
SpitPublishingPluginHost* _tmp4_ = NULL;
GError* _tmp5_ = NULL;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
err = _inner_error_;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_inner_error_ = NULL;
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = self->priv->host;
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = err;
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_error_free0 (err);
-#line 4885 "YandexPublishing.c"
+#line 4599 "YandexPublishing.c"
}
__finally47:
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_clear_error (&_inner_error_);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 4898 "YandexPublishing.c"
+#line 4612 "YandexPublishing.c"
}
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_transaction_unref0 (t);
-#line 4902 "YandexPublishing.c"
+#line 4616 "YandexPublishing.c"
}
@@ -4909,50 +4623,50 @@ static void publishing_yandex_yandex_publisher_web_auth_login_succeeded (Publish
SpitPublishingPluginHost* _tmp1_ = NULL;
SpitPublishingPluginHost* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (access_token != NULL);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = access_token;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:635: login succeeded with token %s", _tmp0_);
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:586: login succeeded with token %s", _tmp0_);
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = self->priv->host;
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = self->priv->host;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp2_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = access_token;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp3_);
-#line 4931 "YandexPublishing.c"
+#line 4645 "YandexPublishing.c"
}
static void publishing_yandex_yandex_publisher_web_auth_login_failed (PublishingYandexYandexPublisher* self) {
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:644: login failed");
-#line 4940 "YandexPublishing.c"
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:595: login failed");
+#line 4654 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded (PublishingYandexWebAuthPane* _sender, const gchar* success_url, gpointer self) {
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_web_auth_login_succeeded ((PublishingYandexYandexPublisher*) self, success_url);
-#line 4947 "YandexPublishing.c"
+#line 4661 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed (PublishingYandexWebAuthPane* _sender, gpointer self) {
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_web_auth_login_failed ((PublishingYandexYandexPublisher*) self);
-#line 4954 "YandexPublishing.c"
+#line 4668 "YandexPublishing.c"
}
@@ -4965,61 +4679,61 @@ static void publishing_yandex_yandex_publisher_start_web_auth (PublishingYandexY
PublishingYandexWebAuthPane* _tmp5_ = NULL;
SpitPublishingPluginHost* _tmp6_ = NULL;
PublishingYandexWebAuthPane* _tmp7_ = NULL;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->host;
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = g_strdup_printf ("http://oauth.yandex.ru/authorize?client_id=%s&response_type=token", PUBLISHING_YANDEX_client_id);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = _tmp1_;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = publishing_yandex_web_auth_pane_new (_tmp2_);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->web_auth_pane);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->web_auth_pane = _tmp3_;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp2_);
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = self->priv->web_auth_pane;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (_tmp4_, "login-succeeded", (GCallback) _publishing_yandex_yandex_publisher_web_auth_login_succeeded_publishing_yandex_web_auth_pane_login_succeeded, self, 0);
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = self->priv->web_auth_pane;
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_signal_connect_object (_tmp5_, "login-failed", (GCallback) _publishing_yandex_yandex_publisher_web_auth_login_failed_publishing_yandex_web_auth_pane_login_failed, self, 0);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = self->priv->host;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = self->priv->web_auth_pane;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_dialog_pane (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 4999 "YandexPublishing.c"
+#line 4713 "YandexPublishing.c"
}
static void _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback (gpointer self) {
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_start_web_auth ((PublishingYandexYandexPublisher*) self);
-#line 5006 "YandexPublishing.c"
+#line 4720 "YandexPublishing.c"
}
static void publishing_yandex_yandex_publisher_show_welcome_page (PublishingYandexYandexPublisher* self) {
SpitPublishingPluginHost* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_return_if_fail (PUBLISHING_YANDEX_IS_YANDEX_PUBLISHER (self));
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = self->priv->host;
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = _ ("You are not currently logged into Yandex.Fotki.");
-#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_yandex_yandex_publisher_start_web_auth_spit_publishing_login_callback, self);
-#line 5021 "YandexPublishing.c"
+#line 4735 "YandexPublishing.c"
}
@@ -5028,152 +4742,152 @@ static void publishing_yandex_yandex_publisher_real_start (SpitPublishingPublish
gboolean _tmp0_ = FALSE;
SpitPublishingPluginHost* _tmp1_ = NULL;
gboolean _tmp2_ = FALSE;
-#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp0_) {
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
return;
-#line 5038 "YandexPublishing.c"
+#line 4752 "YandexPublishing.c"
}
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp1_ = self->priv->host;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp1_ == NULL) {
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_error ("YandexPublishing.vala:667: YandexPublisher: start( ): can't start; thi" \
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_error ("YandexPublishing.vala:618: YandexPublisher: start( ): can't start; thi" \
"s publisher is not restartable.");
-#line 5046 "YandexPublishing.c"
+#line 4760 "YandexPublishing.c"
}
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:669: YandexPublisher: starting interaction.");
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:620: YandexPublisher: starting interaction.");
+#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->running = TRUE;
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp2_ = publishing_yandex_yandex_publisher_is_persistent_session_available (self);
-#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
if (_tmp2_) {
-#line 5056 "YandexPublishing.c"
+#line 4770 "YandexPublishing.c"
PublishingYandexSession* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
gchar* _tmp7_ = NULL;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp3_ = self->priv->session;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp4_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp5_ = _tmp4_;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_session_set_auth_token (_tmp3_, _tmp5_);
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp5_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp6_ = publishing_yandex_yandex_publisher_get_persistent_auth_token (self);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_tmp7_ = _tmp6_;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_fetch_account_information (self, _tmp7_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (_tmp7_);
-#line 5080 "YandexPublishing.c"
+#line 4794 "YandexPublishing.c"
} else {
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_show_welcome_page (self);
-#line 5084 "YandexPublishing.c"
+#line 4798 "YandexPublishing.c"
}
}
static void publishing_yandex_yandex_publisher_real_stop (SpitPublishingPublisher* base) {
PublishingYandexYandexPublisher * self;
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 633 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
- g_debug ("YandexPublishing.vala:683: YandexPublisher: stop( ) invoked.");
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+ g_debug ("YandexPublishing.vala:634: YandexPublisher: stop( ) invoked.");
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->host = NULL;
-#line 686 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->running = FALSE;
-#line 5099 "YandexPublishing.c"
+#line 4813 "YandexPublishing.c"
}
static void publishing_yandex_yandex_publisher_class_init (PublishingYandexYandexPublisherClass * klass) {
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
g_type_class_add_private (klass, sizeof (PublishingYandexYandexPublisherPrivate));
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (klass)->finalize = publishing_yandex_yandex_publisher_finalize;
-#line 5110 "YandexPublishing.c"
+#line 4824 "YandexPublishing.c"
}
static void publishing_yandex_yandex_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
publishing_yandex_yandex_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_is_running;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_get_service;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->start = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_start;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_yandex_yandex_publisher_real_stop;
-#line 5125 "YandexPublishing.c"
+#line 4839 "YandexPublishing.c"
}
static void publishing_yandex_yandex_publisher_instance_init (PublishingYandexYandexPublisher * self) {
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv = PUBLISHING_YANDEX_YANDEX_PUBLISHER_GET_PRIVATE (self);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->host = NULL;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter = NULL;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->service = NULL;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->service_url = NULL;
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->album_list = NULL;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->running = FALSE;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->web_auth_pane = NULL;
-#line 5146 "YandexPublishing.c"
+#line 4860 "YandexPublishing.c"
}
static void publishing_yandex_yandex_publisher_finalize (GObject* obj) {
PublishingYandexYandexPublisher * self;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YANDEX_TYPE_YANDEX_PUBLISHER, PublishingYandexYandexPublisher);
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter = NULL;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter_target = NULL;
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_free0 (self->priv->service_url);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->album_list);
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_yandex_publish_options_unref0 (self->priv->options);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_g_object_unref0 (self->priv->web_auth_pane);
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
_publishing_rest_support_session_unref0 (self->priv->session);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/YandexPublishing.vala"
G_OBJECT_CLASS (publishing_yandex_yandex_publisher_parent_class)->finalize (obj);
-#line 5174 "YandexPublishing.c"
+#line 4888 "YandexPublishing.c"
}
diff --git a/plugins/shotwell-publishing-extras/YandexPublishing.vala b/plugins/shotwell-publishing-extras/YandexPublishing.vala
index 2ee67cf..2eb78f3 100644
--- a/plugins/shotwell-publishing-extras/YandexPublishing.vala
+++ b/plugins/shotwell-publishing-extras/YandexPublishing.vala
@@ -92,46 +92,29 @@ internal class Session : Publishing.RESTSupport.Session {
}
}
-internal class WebAuthPane : Spit.Publishing.DialogPane, GLib.Object {
- private WebKit.WebView webview = null;
- private Gtk.Box pane_widget = null;
- private Gtk.ScrolledWindow webview_frame = null;
-
+internal class WebAuthPane : Shotwell.Plugins.Common.WebAuthenticationPane {
private Regex re;
- private string? login_url = null;
public signal void login_succeeded(string success_url);
public signal void login_failed();
public WebAuthPane(string login_url) {
- this.login_url = login_url;
+ Object (login_uri : login_url,
+ preferred_geometry :
+ Spit.Publishing.DialogPane.GeometryOptions.RESIZABLE);
+ }
+ public override void constructed () {
try {
this.re = new Regex("(.*)#access_token=([a-zA-Z0-9]*)&");
} catch (RegexError e) {
- critical("%s", e.message);
+ assert_not_reached ();
}
- pane_widget = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
-
- webview_frame = new Gtk.ScrolledWindow(null, null);
- webview_frame.set_shadow_type(Gtk.ShadowType.ETCHED_IN);
- webview_frame.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
-
- webview = new WebKit.WebView();
- webview.get_settings().enable_plugins = false;
-
- webview.load_changed.connect(on_page_load_changed);
- webview.decide_policy.connect(on_decide_policy);
- webview.context_menu.connect(() => { return false; });
-
- webview_frame.add(webview);
- pane_widget.pack_start(webview_frame, true, true, 0);
+ this.get_view ().decide_policy.connect (on_decide_policy);
}
- private void on_page_load() {
- pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
- }
+ public override void on_page_load () { }
private bool on_decide_policy (WebKit.PolicyDecision decision,
WebKit.PolicyDecisionType type) {
@@ -148,7 +131,7 @@ internal class WebAuthPane : Spit.Publishing.DialogPane, GLib.Object {
string access_token = info.fetch_all()[2];
debug("Load completed: %s", access_token);
- pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.LEFT_PTR));
+ this.set_cursor (Gdk.CursorType.LEFT_PTR);
if (access_token != null) {
login_succeeded(access_token);
decision.ignore();
@@ -166,38 +149,6 @@ internal class WebAuthPane : Spit.Publishing.DialogPane, GLib.Object {
}
return true;
}
-
- private void on_load_started() {
- pane_widget.get_window().set_cursor(new Gdk.Cursor(Gdk.CursorType.WATCH));
- }
-
- private void on_page_load_changed (WebKit.LoadEvent load_event) {
- switch (load_event) {
- case WebKit.LoadEvent.STARTED:
- on_load_started();
- break;
- case WebKit.LoadEvent.FINISHED:
- on_page_load();
- break;
- }
-
- return;
- }
-
- public Gtk.Widget get_widget() {
- return pane_widget;
- }
-
- public Spit.Publishing.DialogPane.GeometryOptions get_preferred_geometry() {
- return Spit.Publishing.DialogPane.GeometryOptions.RESIZABLE;
- }
-
- public void on_pane_installed() {
- webview.load_uri(login_url);
- }
-
- public void on_pane_uninstalled() {
- }
}
internal class PublishOptions {
diff --git a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
index dc8b373..1f2dfae 100644
--- a/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
+++ b/plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui
@@ -5,7 +5,7 @@
Go _Back