Fix missing gio-unix-2.0 dep

Our autogenerated MPRIS code needs it. On some packaging systems this might be included outside of glib, so depend on it explicitly.

lib/gst/clapper/meson.build

@@ -84,7 +84,7 @@ gstclapper = library('gstclapper-' + api_version,
   version: libversion,
   install: true,
   install_dir: pkglibdir,
-  dependencies: [gtk4_dep, glib_dep, gio_dep,
+  dependencies: [gtk4_dep, glib_dep, gio_dep, giounix_dep,
     gstbase_dep, gstvideo_dep, gstaudio_dep,
     gsttag_dep, gstpbutils_dep, libm] + gtk_deps,
 )

lib/meson.build

@@ -247,6 +247,7 @@ libm = cc.find_library('m', required: false)
 glib_dep = dependency('glib-2.0', version: glib_req, fallback: ['glib', 'libglib_dep'])
 gmodule_dep = dependency('gmodule-2.0', fallback: ['glib', 'libgmodule_dep'])
 gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep'])
+giounix_dep = dependency('gio-unix-2.0', version: glib_req, fallback: ['glib', 'libgiounix_dep'])
 
 cdata.set('DISABLE_ORC', 1)
 cdata.set('GST_ENABLE_EXTRA_CHECKS', get_option('devel-checks'))

pkgs/flatpak/com.github.rafostar.Clapper-nightly.json

@@ -23,6 +23,7 @@
         "flathub/shared-modules/gudev/gudev.json",
         "flathub/lib/libsass.json",
         "flathub/lib/sassc.json",
+        "flathub/lib/libadwaita.json",
         "flathub/lib/liba52.json",
         "flathub/lib/libmpeg2.json",
         "flathub/lib/libdv.json",
@@ -38,7 +39,6 @@
         "testing/gstreamer-1.0/gst-plugins-ugly.json",
         "testing/gstreamer-1.0/gst-libav.json",
         "testing/gstreamer-1.0/gstreamer-vaapi.json",
-        "testing/libadwaita.json",
         {
             "name": "clapper",
             "buildsystem": "meson",

pkgs/flatpak/com.github.rafostar.Clapper.json

@@ -20,7 +20,6 @@
         "--env=GST_VAAPI_ALL_DRIVERS=1"
     ],
     "modules": [
-        "flathub/lib/glib-networking.json",
         "flathub/shared-modules/gudev/gudev.json",
         "flathub/lib/pango.json",
         "flathub/lib/libsass.json",
@@ -42,7 +41,7 @@
         "flathub/gstreamer-1.0/gst-libav.json",
         "flathub/gstreamer-1.0/gstreamer-vaapi.json",
         "flathub/lib/gtk4.json",
-        "testing/libadwaita.json",
+        "flathub/lib/libadwaita.json",
         {
             "name": "clapper",
             "buildsystem": "meson",

pkgs/flatpak/testing/libadwaita.json

@@ -1,21 +0,0 @@
-{
-    "name": "libadwaita",
-    "buildsystem": "meson",
-    "config-opts": [
-        "--buildtype=release",
-        "--wrap-mode=nofallback",
-        "-Dintrospection=enabled",
-        "-Dvapi=false",
-        "-Dgtk_doc=false",
-        "-Dtests=false",
-        "-Dexamples=false"
-    ],
-    "sources": [
-        {
-            "type": "git",
-            "url": "https://gitlab.gnome.org/GNOME/libadwaita.git",
-            "tag": "1.0.0-alpha.2",
-            "commit": "f5932ab4250c8e709958c6e75a1a4941a5f0f386"
-        }
-    ]
-}

po/com.github.rafostar.Clapper.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: com.github.rafostar.Clapper\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 20:22+0200\n"
+"POT-Creation-Date: 2021-09-14 16:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -399,55 +399,60 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-#: src/dialogs.js:217
+#: src/dialogs.js:226
 msgid "Title"
 msgstr ""
 
-#: src/dialogs.js:218
+#: src/dialogs.js:227
 msgid "Completed"
 msgstr ""
 
-#: src/dialogs.js:226
+#: src/dialogs.js:235
 msgid "Resume playback?"
 msgstr ""
 
-#: src/dialogs.js:280
+#: src/dialogs.js:289
 #, javascript-format
 msgid "GTK version: %s"
 msgstr ""
 
-#: src/dialogs.js:281
+#: src/dialogs.js:290
 #, javascript-format
 msgid "Adwaita version: %s"
 msgstr ""
 
-#: src/dialogs.js:282
+#: src/dialogs.js:291
 #, javascript-format
 msgid "GStreamer version: %s"
 msgstr ""
 
-#: src/dialogs.js:283
+#: src/dialogs.js:292
 #, javascript-format
 msgid "GJS version: %s"
 msgstr ""
 
-#: src/dialogs.js:291
+#: src/dialogs.js:300
 msgid "A GNOME media player powered by GStreamer"
 msgstr ""
 
+#. TRANSLATORS: Put your name(s) here for credits or leave untranslated
+#: src/dialogs.js:305
+msgid "translator-credits"
+msgstr ""
+
 #: src/revealers.js:170
 #, javascript-format
 msgid "Ends at: %s"
 msgstr ""
 
-#: src/widget.js:225 src/widget.js:234 src/widget.js:240 src/widget.js:246
+#: src/widget.js:227 src/widget.js:236 src/widget.js:242 src/widget.js:248
 msgid "Undetermined"
 msgstr ""
 
-#: src/widget.js:241
+#: src/widget.js:243
 msgid "Channels"
 msgstr ""
 
-#: src/widget.js:259
+#: src/widget.js:261
 msgid "Disabled"
 msgstr ""

src/actions.js

@@ -18,13 +18,13 @@ var actions = {
     prev_track: ['<Ctrl>Left'],
     volume_up: ['Up'],
     volume_down: ['Down'],
-    mute: ['<Ctrl>m'],
+    mute: ['<Ctrl>M', 'M'],
     toggle_play: ['space'],
-    change_repeat: ['<Ctrl>r'],
+    change_repeat: ['<Ctrl>R'],
     reveal_controls: ['Return'],
-    toggle_fullscreen: ['F11', 'f'],
+    toggle_fullscreen: ['F11', 'F'],
     leave_fullscreen: ['Escape'],
-    quit: ['<Ctrl>q', 'q'],
+    quit: ['<Ctrl>Q', 'Q'],
 };
 
 function handleAction(action, window)

src/dialogs.js

@@ -193,8 +193,17 @@ class ClapperUriDialog extends Gtk.Dialog
 
     _readTextAsyncCb(clipboard, result)
     {
-        const uri = clipboard.read_text_finish(result);
+        let uri = null;
-        if(!uri || !Gst.uri_is_valid(uri)) return;
+
+        try {
+            uri = clipboard.read_text_finish(result);
+        }
+        catch(err) {
+            debug(`could not read clipboard: ${err.message}`);
+        }
+
+        if(!uri || !Gst.uri_is_valid(uri))
+            return;
 
         const contentBox = this.get_content_area();
         const linkEntry = contentBox.get_last_child();
@@ -292,6 +301,8 @@ class ClapperAboutDialog extends Gtk.AboutDialog
             version: pkg.version,
             authors: ['Rafał Dzięgiel'],
             artists: ['Rafał Dzięgiel'],
+            /* TRANSLATORS: Put your name(s) here for credits or leave untranslated */
+            translator_credits: _('translator-credits'),
             license_type: Gtk.License.GPL_3_0,
             logo_icon_name: 'com.github.rafostar.Clapper',
             website: 'https://rafostar.github.io/clapper',

ui/help-overlay.ui

@@ -131,7 +131,7 @@
             <child>
               <object class="GtkShortcutsShortcut">
                 <property name="title" translatable="yes">Toggle mute</property>
-                <property name="accelerator">&lt;Ctrl&gt;M</property>
+                <property name="accelerator">&lt;Ctrl&gt;M M</property>
               </object>
             </child>
             <child>