Hello community,
here is the log from the commit of package notify-osd for openSUSE:Factory
checked in at 2017-03-02 19:43:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/notify-osd (Old)
and /work/SRC/openSUSE:Factory/.notify-osd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notify-osd"
Thu Mar 2 19:43:36 2017 rev:25 rq:461886 version:0.9.35~bzr20160415
Changes:
--------
--- /work/SRC/openSUSE:Factory/notify-osd/notify-osd.changes 2017-01-04
19:36:47.449409039 +0100
+++ /work/SRC/openSUSE:Factory/.notify-osd.new/notify-osd.changes
2017-03-02 19:43:37.426248293 +0100
@@ -1,0 +2,8 @@
+Tue Feb 28 10:11:13 UTC 2017 - sor.ale...@meowr.ru
+
+- Provide dbus(org.freedesktop.Notifications) instead of
+ notificationdaemon.
+- Improve notify-osd-fix-workarea.patch: use the primary monitor by
+ default.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ notify-osd.spec ++++++
--- /var/tmp/diff_new_pack.6dHJcf/_old 2017-03-02 19:43:38.114150958 +0100
+++ /var/tmp/diff_new_pack.6dHJcf/_new 2017-03-02 19:43:38.114150958 +0100
@@ -1,7 +1,7 @@
#
# spec file for package notify-osd
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -45,8 +45,7 @@
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libwnck-3.0)
BuildRequires: pkgconfig(pixman-1)
-Conflicts: otherproviders(notificationdaemon)
-Provides: notificationdaemon
+Provides: dbus(org.freedesktop.Notifications)
%glib2_gsettings_schema_requires
%description
++++++ notify-osd-fix-workarea.patch ++++++
--- /var/tmp/diff_new_pack.6dHJcf/_old 2017-03-02 19:43:38.150145865 +0100
+++ /var/tmp/diff_new_pack.6dHJcf/_new 2017-03-02 19:43:38.150145865 +0100
@@ -1,6 +1,6 @@
--- a/src/defaults.c
+++ b/src/defaults.c
-@@ -1882,19 +1882,30 @@ defaults_get_top_corner (Defaults *self,
+@@ -1882,34 +1882,57 @@ defaults_get_top_corner (Defaults *self,
{
GdkRectangle rect;
GdkWindow* active_window = NULL;
@@ -9,12 +9,13 @@
GdkDevice* device;
gint mx;
gint my;
+- gint monitor = 0;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ GdkMonitor * monitor;
+ GdkMonitor * aw_monitor;
+ GdkMonitor * primary_monitor;
+#else
- gint monitor = 0;
++ gint monitor;
gint aw_monitor;
+ gint primary_monitor;
+#endif
@@ -26,14 +27,17 @@
- device_manager = gdk_display_get_device_manager
(gdk_display_get_default ());
+ display = gdk_display_get_default ();
-+#if GTK_CHECK_VERSION (3, 22, 0)
-+ monitor = gdk_display_get_monitor (display, 0);
-+#endif
+ device_manager = gdk_display_get_device_manager (display);
device = gdk_device_manager_get_client_pointer (device_manager);
gdk_device_get_position (device, screen, &mx, &my);
++#if GTK_CHECK_VERSION (3, 22, 0)
++ monitor = gdk_display_get_primary_monitor (display);
++#else
++ monitor = gdk_screen_get_primary_monitor (*screen);
++#endif
+
+ is_composited = gdk_screen_is_composited (*screen);
-@@ -1903,13 +1914,23 @@ defaults_get_top_corner (Defaults *self,
if (follow_focus)
{
g_debug ("multi_head_focus_follow mode");
@@ -57,7 +61,7 @@
if (monitor != aw_monitor)
{
-@@ -1927,7 +1948,7 @@ defaults_get_top_corner (Defaults *self,
+@@ -1927,7 +1950,7 @@ defaults_get_top_corner (Defaults *self,
/* _NET_WORKAREA is always a rectangle spanning all monitors of
* a screen. As such, it can't properly deal with monitor setups
* that aren't aligned or have different resolutions.
@@ -66,7 +70,7 @@
* returning the workarea for the primary screen and the full
* geometry for all other monitors.
*
-@@ -1937,28 +1958,43 @@ defaults_get_top_corner (Defaults *self,
+@@ -1937,28 +1960,43 @@ defaults_get_top_corner (Defaults *self,
* other monitors as well.
*/
