Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tag for commit edc9dd404d

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVxLEBAAoJEBu5sftaTG2tTTkP/2TLJ68Qx6FnLS9AIcRS7gWJ
 9Bj8oXU2vc1YPrFPHpgV3nLkt1TQ0AO/Z6i5SlXj7ExJllDVi1fq++iph6gITfNH
 K5MA+8/XhoXfyLuFXqfzJo5QN18Kg39T9LPUWT149b39l1/4kI+1utDD8TSzEmuD
 tAD3eLEgFl4BDKoOkOX5lF7zhJU8E/U0xuhnA8DQmy40jmKd6wwkDgXMqp8cC5Me
 UioNv/JbxXuYsmv4RG4FUQfY700ZcK7Z8vtmrAOOT/ILsoGAo26LYTATBr9WRyqD
 HsmVi2RAUhWZECfRFdWXnF2q16J0lCjbF9ORZAruvgwNrk9dR3RIqR6blZc1Ptdn
 DLjD3ZjCSZR1M78++kSIJiS+MbuMN17ZV952VhBZMQj90okdcpJJpTHP+sII+Qpt
 X353s6pEBSfydXlawZiMhQ75h96zZVKxTsnnZLZ1ZrbeHgreLK8S1QJcdx0Y4wZt
 ATGMV+M5aQZWM/kj/u8q0JIeN55iFG4x8y5y/4XZrbugpIV+eK/Z1qFyZRgYt899
 oubxzOg9mGG5lnGhNhV9DH05dQe4khqs9A1kk3AuFY/kxQ5ZxNzlye50P7w5qD4r
 K4xOMTnl0Csg5GYExucbL6bjdFSdmH056pl76z/FVpdsNpGQzq7+lWpTcxml+ZB/
 3IioarpI+yR52MBiMLHA
 =Yg7C
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJVxUV1AAoJEAY5OLpCz6ck5iEQALXiOprb35A6kr6DsNRyvF3z
 kL/nguhzA1QXJIeMtG303JTsF/5CBut6Lpe6qo+Ghh/j7GZY2U3yXq6DJ/dGTTlq
 LlV1/q9c6z7kAg5aUzGWlyPAU2mnlUSD89xf1Wkti56jrb5mAz4OG0mDuJEMBDny
 IId/eYMio0L7mulY8sIN5y06lBqDiwzY9dPw7wj/DS+89IwpkmUkdtfB+1GC7ZFt
 labo/vf06dskLXHl8s3eXCJlfV9zqAB8/C3r071LmymV8lVuFvC3ig51j1G5AyEZ
 +ZWRTgqB4JDefGY1XYAYmEO+96J6tTWHxT21C70314Df74/mYmSw40a/2jcrZT29
 e2B+bF6rU7CFGnNQM3YK8q5+cPjpbT1gJrYt+67GGI/IqLHWMOcMkpK9YJauGSU7
 3YgTXf7meDrxkyoYSpUZfdx2wtkwHfAcWFgqhX43ntsXLcYOrKlDQyPkxDvNEz2Y
 K66TA83LD1r7cTWHlKi3jLeYvWmHEf0iNVlIFGCxB6C4c0qZeXiHsO3W4Bkbg97p
 ovfa86S6vLcqGbLRThZnzqcDxROU518mDDJVGMbJPLWg6aceEGP9PMVc5RzaNcwj
 gTT9FT1JXIbfg+W2nrZFq3VhKmdOQvz+0AruFC9WwHIYFGyCxfbx55C++BOM8xj0
 LI3o4KAI/JZMao9hIpuK
 =Vd5+
 -----END PGP SIGNATURE-----

Merge tag 'jm_edc9dd40'

Tag for commit edc9dd404d

# gpg: Signature made Fri 07 Aug 2015 03:22:09 PM CEST using RSA key ID 5A4C6DAD
# gpg: Good signature from "Jason Mehring (Qubes OS Signing Key) <nrgaway@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: E0E3 2283 FDCA C1A5 1007  8F27 1BB9 B1FB 5A4C 6DAD

* tag 'jm_edc9dd40':
  fedora: Use 'slider' org.mate.NotificationDaemon theme
  debian: Switch to using org.mate.NotificationDaemon by default to eliminate popups not closing
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-08 01:55:33 +02:00
commit a0bfbda04d
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -97,6 +97,7 @@ install-rh: install-systemd install-systemd-dropins install-sysvinit
install -d $(DESTDIR)/usr/share/glib-2.0/schemas/
install -m 0644 misc/org.gnome.settings-daemon.plugins.updates.gschema.override $(DESTDIR)/usr/share/glib-2.0/schemas/
install -m 0644 misc/org.gnome.nautilus.gschema.override $(DESTDIR)/usr/share/glib-2.0/schemas/
install -m 0644 misc/org.mate.NotificationDaemon.gschema.override $(DESTDIR)/usr/share/glib-2.0/schemas/
install -d $(DESTDIR)$(LIBDIR)/yum-plugins/
install -m 0644 misc/yum-qubes-hooks.py* $(DESTDIR)$(LIBDIR)/yum-plugins/
install -D -m 0644 misc/yum-qubes-hooks.conf $(DESTDIR)/etc/yum/pluginconf.d/yum-qubes-hooks.conf

2
debian/control vendored
View File

@ -45,9 +45,9 @@ Recommends:
gnome-themes-standard,
haveged,
libnotify-bin,
mate-notification-daemon,
network-manager (>= 0.8.1-1),
network-manager-gnome,
notify-osd,
ntpdate,
python-nautilus,
python-xdg,

2
debian/qubes-core-agent.gsettings-override vendored Normal file
View File

@ -0,0 +1,2 @@
[org.mate.NotificationDaemon]
theme='slider'

2
misc/org.mate.NotificationDaemon.gschema.override Normal file
View File

@ -0,0 +1,2 @@
[org.mate.NotificationDaemon]
theme='slider'

5
misc/qubes-trigger-desktop-file-install
View File

@ -62,6 +62,7 @@ FILES=(
'gnome-sound-applet'
'gnome-screensaver'
'orca-autostart'
'notify-osd'
); install --remove-show-in --add-not-show-in X-QUBES
# Desktop Entry Modification - NotShowIn=DisposableVM
@ -91,7 +92,3 @@ FILES=('nm-applet')
FILES=(
'abrt-applet'
); install --remove-show-in
# Desktop Entry Modification - Misc
# notify-osd
$INSTALL_CMD --remove-show-in --remove-key X-GNOME-Autostart-enabled "$(generatePath notify-osd)"

1
rpm_spec/core-vm.spec
View File

@ -421,6 +421,7 @@ rm -f %{name}-%{version}
/usr/share/qubes/serial.conf
/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.override
/usr/share/glib-2.0/schemas/org.gnome.nautilus.gschema.override
/usr/share/glib-2.0/schemas/org.mate.NotificationDaemon.gschema.override
/usr/share/nautilus-python/extensions/qvm_copy_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*