Merge pull request #1188 from Ulauncher/refactor/gio.notification

refactor: move from libnotify to gio.notification

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
       run: |
         echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
         sudo apt update &&
-        sudo apt install -y -q xvfb libgirepository1.0-dev libcairo2-dev gir1.2-glib-2.0 gir1.2-gtk-3.0 gir1.2-keybinder-3.0 gir1.2-notify-0.7 gir1.2-webkit2-4.0 gir1.2-wnck-3.0
+        sudo apt install -y -q xvfb libgirepository1.0-dev libcairo2-dev gir1.2-glib-2.0 gir1.2-gtk-3.0 gir1.2-keybinder-3.0 gir1.2-webkit2-4.0 gir1.2-wnck-3.0
     - uses: actions/checkout@v3
     - uses: actions/setup-python@v4
       with:

CONTRIBUTING.md

@@ -41,7 +41,7 @@ For the v6 branch you need the the following to setup the local build environmen
 
   ```sh
   sudo apt-get install python3-{all,gi,levenshtein} gobject-introspection \
-    gir1.2-{glib-2.0,gtk-3.0,notify-0.7,webkit2-4.0,wnck-3.0,keybinder-3.0}
+    gir1.2-{glib-2.0,gtk-3.0,webkit2-4.0,wnck-3.0,keybinder-3.0}
   ```
 
 </details>
@@ -65,7 +65,7 @@ For the v6 branch you need the the following to setup the local build environmen
 
   ```sh
   sudo pacman -Syu --needed \
-    gtk3 webkit2gtk-4.1 libnotify libkeybinder3 libwnck3 python-{cairo,gobject,levenshtein}
+    gtk3 webkit2gtk-4.1 libkeybinder3 libwnck3 python-{cairo,gobject,levenshtein}
   ```
 </details>
 

Dockerfile

@@ -37,7 +37,6 @@ RUN apt install -y python3-gi-cairo
 RUN apt install -y gir1.2-glib-2.0
 RUN apt install -y gir1.2-gtk-3.0
 RUN apt install -y gir1.2-wnck-3.0
-RUN apt install -y gir1.2-notify-0.7
 RUN apt install -y gir1.2-webkit2-4.0
 RUN apt install -y gir1.2-keybinder-3.0
 

debian/control

@@ -23,7 +23,6 @@ Depends: ${misc:Depends},
  gir1.2-webkit2-4.0,
  gir1.2-wnck-3.0,
  gir1.2-glib-2.0,
- gir1.2-notify-0.7,
  gir1.2-gdkpixbuf-2.0,
  python3-gi,
  python3-gi-cairo,

docs/extensions/libs.rst

@@ -23,8 +23,5 @@ In future we'll make it possible to support ``requirements.txt`` for extensions.
 `gir1.2-glib-2.0 <https://lazka.github.io/pgi-docs/#GLib-2.0>`_
   Low level core library
 
-`gir1.2-notify-0.7 <https://lazka.github.io/pgi-docs/#Notify-0.7>`_
-  Desktop notification library (libnotify is a library for sending desktop notifications)
-
 `gir1.2-gdkpixbuf-2.0 <https://lazka.github.io/pgi-docs/#GdkPixbuf-2.0>`_
   An image loading library

io.ulauncher.Ulauncher.desktop

@@ -10,3 +10,4 @@ Icon=ulauncher
 SingleMainWindow=true
 Terminal=false
 Type=Application
+X-GNOME-UsesNotifications=true

ulauncher/ui/UlauncherApp.py

@@ -6,7 +6,6 @@
 from ulauncher.config import FIRST_RUN
 from ulauncher.utils.environment import IS_X11
 from ulauncher.utils.Settings import Settings
-from ulauncher.utils.desktop.notification import show_notification
 from ulauncher.ui.AppIndicator import AppIndicator
 from ulauncher.ui.windows.PreferencesWindow import PreferencesWindow
 from ulauncher.ui.windows.UlauncherWindow import UlauncherWindow
@@ -112,7 +111,7 @@ def bind_hotkey(self, accel_name):
         self._current_accel_name = accel_name
         if FIRST_RUN:
             display_name = Gtk.accelerator_get_label(*Gtk.accelerator_parse(accel_name))
-            show_notification("Ulauncher", f"Hotkey is set to {display_name}")
+            self.show_notification(f"Hotkey is set to {display_name}", "hotkey_first_run")
 
     def show_preferences(self, page=None):
         self.window.hide()
@@ -122,3 +121,8 @@ def show_preferences(self, page=None):
         else:
             self.preferences = PreferencesWindow(application=self)
             self.preferences.show(page)
+
+    def show_notification(self, text, id=None):
+        notification = Gio.Notification.new("Ulauncher")
+        notification.set_body(text)
+        self.send_notification(id, notification)