rpms/notification-daemon/devel notification-daemon-always-stack.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 notification-daemon.spec, 1.33, 1.34 sources, 1.6, 1.7

William Jon McCann mccann at fedoraproject.org
Wed Sep 23 22:08:45 UTC 2009


Author: mccann

Update of /cvs/pkgs/rpms/notification-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8346

Modified Files:
	.cvsignore notification-daemon.spec sources 
Added Files:
	notification-daemon-always-stack.patch 
Log Message:
* Wed Sep 23 2009 Jon McCann <jmccann at redhat.com> - 0.4.1-0.20090923.1
- Update to snapshot to fix crashers
- Add internal API to allow themes to stack only



notification-daemon-always-stack.patch:
 daemon.c  |    6 +++---
 engines.c |   13 +++++++++++++
 engines.h |    1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

--- NEW FILE notification-daemon-always-stack.patch ---
--- notification-daemon-0.4.0/src/daemon/daemon.c.always-stack	2008-09-25 21:27:07.000000000 -0400
+++ notification-daemon-0.4.0/src/daemon/daemon.c	2009-09-23 02:44:22.721967819 -0400
@@ -1270,14 +1270,14 @@
 	}
 
 
-	if (window_xid != None)
+	if (window_xid != None && !theme_get_always_stack(nw))
 	{
 		/*
 		 * Do nothing here if we were passed an XID; we'll call
 		 * sync_notification_position later.
 		 */
 	}
-	else if (use_pos_data)
+	else if (use_pos_data && !theme_get_always_stack(nw))
 	{
 		/*
 		 * Typically, the theme engine will set its own position based on
@@ -1316,7 +1316,7 @@
 	 * for changes, and reposition the window based on the source
 	 * window.  We need to do this after return_id is calculated.
 	 */
-	if (window_xid != None)
+	if (window_xid != None && !theme_get_always_stack(nw))
 	{
 		monitor_notification_source_windows(daemon, nt, window_xid);
 		sync_notification_position(daemon, nw, window_xid);
--- notification-daemon-0.4.0/src/daemon/engines.h.always-stack	2008-03-14 19:11:43.000000000 -0400
+++ notification-daemon-0.4.0/src/daemon/engines.h	2009-09-23 02:16:32.615722273 -0400
@@ -21,5 +21,6 @@
 								   const char *key, GCallback cb);
 void theme_clear_notification_actions(GtkWindow *nw);
 void theme_move_notification(GtkWindow *nw, int x, int y);
+gboolean theme_get_always_stack(GtkWindow *nw);
 
 #endif /* _ENGINES_H_ */
--- notification-daemon-0.4.0/src/daemon/engines.c.always-stack	2008-11-20 05:45:16.000000000 -0500
+++ notification-daemon-0.4.0/src/daemon/engines.c	2009-09-23 02:16:32.614725140 -0400
@@ -30,6 +30,7 @@
 	void (*move_notification)(GtkWindow *nw, int x, int y);
 	void (*set_notification_timeout)(GtkWindow *nw, glong timeout);
 	void (*notification_tick)(GtkWindow *nw, glong timeout);
+	gboolean (*get_always_stack)(GtkWindow *nw);
 
 } ThemeEngine;
 
@@ -83,6 +84,7 @@
 	BIND_OPTIONAL_FUNC(set_notification_timeout);
 	BIND_OPTIONAL_FUNC(set_notification_hints);
 	BIND_OPTIONAL_FUNC(notification_tick);
+	BIND_OPTIONAL_FUNC(get_always_stack);
 
 	if (!engine->theme_check_init(NOTIFICATION_DAEMON_MAJOR_VERSION,
 								  NOTIFICATION_DAEMON_MINOR_VERSION,
@@ -290,3 +292,14 @@
 	ThemeEngine *engine = g_object_get_data(G_OBJECT(nw), "_theme_engine");
 	engine->move_notification(nw, x, y);
 }
+
+gboolean
+theme_get_always_stack(GtkWindow *nw)
+{
+	ThemeEngine *engine = g_object_get_data(G_OBJECT(nw), "_theme_engine");
+
+	if (engine->get_always_stack != NULL)
+		return engine->get_always_stack(nw);
+	else
+		return FALSE;
+}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	23 Nov 2008 03:43:22 -0000	1.6
+++ .cvsignore	23 Sep 2009 22:08:41 -0000	1.7
@@ -1 +1 @@
-notification-daemon-0.4.0.tar.bz2
+notification-daemon-0.4.1.tar.gz


Index: notification-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/notification-daemon.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- notification-daemon.spec	22 Aug 2009 04:03:53 -0000	1.33
+++ notification-daemon.spec	23 Sep 2009 22:08:42 -0000	1.34
@@ -6,8 +6,8 @@
 
 Summary: Desktop Notification Daemon
 Name: notification-daemon
-Version: 0.4.0
-Release: 8%{?dist}
+Version: 0.4.1
+Release: 0.20090923.1%{?dist}
 URL: http://www.galago-project.org/specs/notification/
 License: GPLv2+
 Group: System Environment/Libraries
@@ -33,12 +33,13 @@ Requires(post): GConf2 >= %{gconf_versio
 
 Obsoletes: notify-daemon
 
-Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.bz2
+Source0: http://www.galago-project.org/files/releases/source/notification-daemon/%{name}-%{version}.tar.gz
 
 # drop libsexy dep
 Patch0: sexy.patch
 Patch1: nodoka.patch
 Patch2: location.patch
+Patch10: notification-daemon-always-stack.patch
 
 %description
 notification-daemon is the server implementation of the freedesktop.org desktop
@@ -51,6 +52,7 @@ user's way.
 %patch0 -p1 -b .sexy
 %patch1 -p1 -b .nodoka
 %patch2 -p1 -b .location
+%patch10 -p1 -b .always-stack
 
 autoreconf -i -f
 
@@ -111,6 +113,10 @@ gconftool-2 --makefile-install-rule \
 
 
 %changelog
+* Wed Sep 23 2009 Jon McCann <jmccann at redhat.com> - 0.4.1-0.20090923.1
+- Update to snapshot to fix crashers
+- Add internal API to allow themes to stack only
+
 * Sat Aug 22 2009 Matthias Clasen <mclasen at redhat.com> - 0.4.0-8
 - Change location for stacked notifications to top-right
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/notification-daemon/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	23 Nov 2008 03:43:22 -0000	1.6
+++ sources	23 Sep 2009 22:08:42 -0000	1.7
@@ -1 +1 @@
-e61eff9782551d81045bb53e8a801d58  notification-daemon-0.4.0.tar.bz2
+af93bf2fe0375d031691698105496323  notification-daemon-0.4.1.tar.gz




More information about the fedora-extras-commits mailing list