summaryrefslogtreecommitdiff
path: root/plugins/shotwell-publishing
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2020-05-31 12:05:32 +0200
committerJörg Frings-Fürst <debian@jff.email>2020-05-31 12:05:32 +0200
commita03d7d2e5151332bbe89e5bc36965956cfa7af35 (patch)
tree1667c3a269ad810db3a7a4a592a5721955dbdf01 /plugins/shotwell-publishing
parent2db2a00a812ec31ee59c3920ff457290e1f4a05e (diff)
parenta99b581716d7972a62ed6c227a807e304a98d6af (diff)
Merge branch 'release/debian/0.30.10-1'debian/0.30.10-1
Diffstat (limited to 'plugins/shotwell-publishing')
-rw-r--r--plugins/shotwell-publishing/PhotosPublisher.vala2
-rw-r--r--plugins/shotwell-publishing/YouTubePublishing.vala2
-rw-r--r--plugins/shotwell-publishing/youtube.pngbin1083 -> 560 bytes
-rw-r--r--plugins/shotwell-publishing/youtube_publishing_options_pane.ui28
4 files changed, 8 insertions, 24 deletions
diff --git a/plugins/shotwell-publishing/PhotosPublisher.vala b/plugins/shotwell-publishing/PhotosPublisher.vala
index ce5e505..5f46470 100644
--- a/plugins/shotwell-publishing/PhotosPublisher.vala
+++ b/plugins/shotwell-publishing/PhotosPublisher.vala
@@ -47,7 +47,7 @@ internal class PublishingParameters {
return target_album_name;
}
- public void set_target_album_name(string target_album_name) {
+ public void set_target_album_name(string? target_album_name) {
this.target_album_name = target_album_name;
}
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala
index 87f1959..e50d17a 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -99,7 +99,7 @@ internal class YouTubeAuthorizer : GData.Authorizer, Object {
}
public bool is_authorized_for_domain(GData.AuthorizationDomain domain) {
- return true;
+ return domain.scope.has_suffix ("auth/youtube");
}
public void process_request(GData.AuthorizationDomain? domain,
diff --git a/plugins/shotwell-publishing/youtube.png b/plugins/shotwell-publishing/youtube.png
index 214e1de..3793ff0 100644
--- a/plugins/shotwell-publishing/youtube.png
+++ b/plugins/shotwell-publishing/youtube.png
Binary files differ
diff --git a/plugins/shotwell-publishing/youtube_publishing_options_pane.ui b/plugins/shotwell-publishing/youtube_publishing_options_pane.ui
index cdf82af..47f75a1 100644
--- a/plugins/shotwell-publishing/youtube_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/youtube_publishing_options_pane.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.0 -->
+<!-- Generated with glade 3.22.2 -->
+<interface domain="shotwell">
+ <requires lib="gtk+" version="3.22"/>
<object class="GtkBox" id="youtube_pane_widget">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -19,22 +20,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">4</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="publish_to_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">8</property>
- <property name="margin_bottom">64</property>
- <property name="label" comments="This string does not require translation and may be safely skipped.">videos will appear in
-(populated in the application code.)</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -81,7 +67,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="padding">4</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -97,7 +83,6 @@
<child>
<object class="GtkButton" id="logout_button">
<property name="label" translatable="yes">_Logout</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -113,7 +98,6 @@
<child>
<object class="GtkButton" id="publish_button">
<property name="label" translatable="yes">_Publish</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -130,7 +114,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">2</property>
</packing>
</child>
</object>