[shotwell/wip/gtk4: 146/154] wip

[Jens Georg <jensgeorg src gnome org>]

commit 5d0872e8ee97f33fc4a2d8df9f609b418e65d740
Author: Jens Georg <mail jensge org>
Date:   Thu Jun 16 21:05:08 2022 +0200

    wip

 meson.build                                           |  1 -
 plugins/shotwell-publishing/PiwigoPublishing.vala     |  2 ++
 plugins/shotwell-publishing/meson.build               |  2 +-
 .../shotwell-publishing/piwigo_authentication_pane.ui | 19 ++++---------------
 .../piwigo_publishing_options_pane.ui                 |  2 +-
 5 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/meson.build b/meson.build
index 9bc1b90f..615e5e7e 100644
--- a/meson.build
+++ b/meson.build
@@ -106,7 +106,6 @@ if get_option('face_detection')
 endif
 
 json_glib = dependency('json-glib-1.0')
-# gdata = dependency('libgdata')
 gcr = dependency('gcr-4')
 gcr_ui = dependency('gcr-4-gtk4')
 cairo = dependency('cairo')
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala 
b/plugins/shotwell-publishing/PiwigoPublishing.vala
index b47cb8af..7a3ec3c0 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -1090,6 +1090,7 @@ internal class SSLErrorPane : Shotwell.Plugins.Common.BuilderPane {
         var info = this.get_builder ().get_object ("default") as Gtk.Button;
         if (cert != null) {
             info.clicked.connect (() => {
+            #if 0
                 var simple_cert = new Gcr.SimpleCertificate (cert.certificate.data);
                 var widget = new Gcr.CertificateWidget (simple_cert);
                 bool use_header = true;
@@ -1112,6 +1113,7 @@ internal class SSLErrorPane : Shotwell.Plugins.Common.BuilderPane {
                 dialog.response.connect(() => {
                     dialog.destroy();
                 });
+            #endif
             });
         } else {
             info.unparent();
diff --git a/plugins/shotwell-publishing/meson.build b/plugins/shotwell-publishing/meson.build
index dc32a799..235dfbf5 100644
--- a/plugins/shotwell-publishing/meson.build
+++ b/plugins/shotwell-publishing/meson.build
@@ -19,7 +19,7 @@ shared_module('shotwell-publishing',
               shotwell_publishing_sources + shotwell_publishing_resources,
               dependencies : [gtk, soup, gexiv2, gee, sw_plugin, json_glib,
                               webkit, sw_plugin_common_dep, xml, gcr,
-                              gcr_ui, authenticator_dep, secret],
+                              authenticator_dep, secret],
               c_args : ['-DPLUGIN_RESOURCE_PATH="/org/gnome/Shotwell/Publishing"',
                         '-DGCR_API_SUBJECT_TO_CHANGE'],
               install: true,
diff --git a/plugins/shotwell-publishing/piwigo_authentication_pane.ui 
b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
index 70dc23c3..1e75a8c0 100644
--- a/plugins/shotwell-publishing/piwigo_authentication_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_authentication_pane.ui
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="shotwell">
-  <requires lib="gtk" version="4.0"/>
   <requires lib="gtk" version="4.0"/>
   <object class="GtkWindow" id="authentication_pane">
     <property name="child">
       <object class="GtkBox" id="content">
-        <property name="visible">0</property>
         <property name="margin-start">30</property>
         <property name="margin-end">30</property>
         <property name="hexpand">1</property>
@@ -13,8 +11,7 @@
         <property name="spacing">12</property>
         <child>
           <object class="GtkLabel" id="message_label">
-            <property name="visible">0</property>
-            <property name="halign">start</property>
+            <property name="halign">fill</property>
             <property name="hexpand">1</property>
             <property name="vexpand">1</property>
             <property name="label">label</property>
@@ -23,14 +20,12 @@
         </child>
         <child>
           <object class="GtkGrid" id="field_table">
-            <property name="visible">0</property>
             <property name="vexpand">1</property>
             <property name="hexpand">1</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="label1">
-                <property name="visible">0</property>
                 <property name="halign">end</property>
                 <property name="label" translatable="yes">_URL of your Piwigo photo library</property>
                 <property name="use_underline">1</property>
@@ -43,7 +38,6 @@
             </child>
             <child>
               <object class="GtkEntry" id="url_entry">
-                <property name="visible">0</property>
                 <property name="focusable">1</property>
                 <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
@@ -55,7 +49,6 @@
             </child>
             <child>
               <object class="GtkEntry" id="password_entry">
-                <property name="visible">0</property>
                 <property name="focusable">1</property>
                 <property name="hexpand">1</property>
                 <property name="visibility">0</property>
@@ -68,7 +61,6 @@
             </child>
             <child>
               <object class="GtkSwitch" id="remember_password_checkbutton">
-                <property name="visible">0</property>
                 <property name="focusable">1</property>
                 <property name="halign">start</property>
                 <layout>
@@ -79,7 +71,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="label2">
-                <property name="visible">0</property>
                 <property name="halign">end</property>
                 <property name="label" translatable="yes">User _name</property>
                 <property name="use_underline">1</property>
@@ -91,7 +82,6 @@
             </child>
             <child>
               <object class="GtkEntry" id="username_entry">
-                <property name="visible">0</property>
                 <property name="focusable">1</property>
                 <property name="hexpand">1</property>
                 <property name="invisible_char">●</property>
@@ -103,7 +93,6 @@
             </child>
             <child>
               <object class="GtkLabel" id="label3">
-                <property name="visible">0</property>
                 <property name="halign">end</property>
                 <property name="label" translatable="yes">_Password</property>
                 <property name="use_underline">1</property>
@@ -116,7 +105,6 @@
             </child>
             <child>
               <object class="GtkLabel">
-                <property name="visible">0</property>
                 <property name="halign">end</property>
                 <property name="label" translatable="yes">Remember Password</property>
                 <layout>
@@ -129,14 +117,15 @@
         </child>
         <child>
           <object class="GtkBox" id="hbuttonbox1">
-            <property name="visible">0</property>
             <property name="vexpand">1</property>
+            <property name="halign">end</property>
             <child>
               <object class="GtkButton" id="login_button">
-                <property name="visible">0</property>
                 <property name="label" translatable="yes">Log in</property>
                 <property name="focusable">1</property>
                 <property name="receives_default">1</property>
+                <property name="vexpand">false</property>
+                <property name="valign">center</property>
               </object>
             </child>
           </object>
diff --git a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui 
b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
index 94fd7c29..5ebed509 100644
--- a/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/piwigo_publishing_options_pane.ui
@@ -84,7 +84,7 @@
                 <property name="label" translatable="yes">A _new album named</property>
                 <property name="halign">end</property>
                 <property name="use_underline">1</property>
-                <property name="active">1</property>
+                <property name="active">0</property>
                 <property name="group">use_existing_radio</property>
                 <layout>
                   <property name="column">0</property>