Remove libnotify from extensions

Use dbus call to show error notifications now.
yilozt · Sep 7, 2022 · 7324572 · 7324572
1 parent a2f125d
commit 7324572
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 18 deletions.
diff --git a/.gi.ts.rc.json b/.gi.ts.rc.json
@@ -26,7 +26,6 @@
   "libraries_prefs": {
     "Gtk": [ "4.0" ],
     "Gdk": [ "4.0" ],
-    "Notify": ["0.7"],
     "Adw": ["1"]
   },
   "libraries_ext": {

diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Prepare
         run: |
           pacman -Sy
-          pacman -S --noconfirm base gnome-shell libnotify gtk3 libadwaita gtk4 glib2 gobject-introspection
+          pacman -S --noconfirm base gnome-shell gtk3 libadwaita gtk4 glib2 gobject-introspection
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3

diff --git a/src/prefs.ts b/src/prefs.ts
@@ -1,6 +1,5 @@
 import * as Gtk                       from '@gi/Gtk'
 import * as Gdk                       from '@gi/Gdk'
-import * as Notify                    from '@gi/Notify'
 import { getCurrentExtension }        from '@imports/misc/extensionUtils'
 
 import { pages }                      from '@me/preferences/index'
@@ -18,7 +17,7 @@ function load_css () {
 }
 
 export function init () {
-    Notify.init ('yi.extensions.rounded-window-corners.prefs')
+    //
 }
 
 // Load preferences Pages for Gnome 40 / Gnome 41
@@ -35,10 +34,6 @@ export function buildPrefsWidget () {
         win.width_request = 550
         const titlebar = win.get_titlebar () as Gtk.HeaderBar | null
         titlebar?.set_title_widget (swither)
-
-        win.connect ('close-request', () => {
-            Notify.uninit ()
-        })
     })
 
     // Load pages
@@ -53,7 +48,7 @@ export function buildPrefsWidget () {
 }
 
 // Load ui for Gnome 42+
-export function fillPreferencesWindow (window: PreferencesWindow) {
+export function fillPreferencesWindow (win: PreferencesWindow) {
     const Adw = imports.gi.Adw
 
     for (const page of pages ()) {
@@ -64,12 +59,8 @@ export function fillPreferencesWindow (window: PreferencesWindow) {
         const group = new Adw.PreferencesGroup ()
         pref_page.add (group)
         group.add (page.widget)
-        window.add (pref_page)
+        win.add (pref_page)
     }
 
-    window.connect ('close-request', () => {
-        Notify.uninit ()
-    })
-
     load_css ()
 }
diff --git a/src/utils/prefs.ts b/src/utils/prefs.ts
@@ -1,5 +1,6 @@
-import { ListBox } from '@gi/Gtk'
-import * as Notify from '@gi/Notify'
+import { DBus, DBusCallFlags } from '@gi/Gio'
+import { Variant }             from '@gi/GLib'
+import { ListBox }             from '@gi/Gtk'
 
 export const list_children = (widget: ListBox) => {
     const children = []
@@ -14,6 +15,30 @@ export const list_children = (widget: ListBox) => {
 }
 
 export const show_err_msg = (info: string) => {
-    const summary = 'Preferences Page'
-    new Notify.Notification ({ summary, body: info }).show ()
+    // Show error message with notifications
+    // by call DBus method of org.freedesktop.Notifications
+    //
+    // Ref: https://gjs.guide/guides/gio/dbus.html#direct-calls
+
+    DBus.session.call (
+        'org.freedesktop.Notifications',
+        '/org/freedesktop/Notifications',
+        'org.freedesktop.Notifications',
+        'Notify',
+        new Variant ('(susssasa{sv}i)', [
+            '',
+            0,
+            '',
+            'Rounded Window Corners',
+            info,
+            [],
+            {},
+            3000,
+        ]),
+        null,
+        DBusCallFlags.NONE,
+        -1,
+        null,
+        null
+    )
 }