Hello community, here is the log from the commit of package notification-daemon checked in at Thu Apr 3 01:15:53 CEST 2008. -------- --- GNOME/notification-daemon/notification-daemon.changes 2008-03-13 16:58:01.000000000 +0100 +++ notification-daemon/notification-daemon.changes 2008-03-31 14:43:42.967631000 +0200 @@ -1,0 +2,17 @@ +Mon Mar 31 14:47:21 CEST 2008 - vuntz@suse.de + +- Remove all the bubble related patches: + notification-daemon-bubble-enable.patch, + notification-daemon-bubble-init.patch, + notification-daemon-drawing.patch +- Instead, create a new theme based on the standard theme by + copying the standard theme. +- Add notification-daemon-new-bubble.patch: we patch the + standard-based theme to be easily themed via the GTK+ theme, and + we also add some internal API to know if an engine wants to + always stack notifications. This theme is named bubble to keep + compatibility with previous versions of the package. +- Remove useless build-requires: gcc-c++ libxml2-devel + perl-XML-Parser update-desktop-files + +------------------------------------------------------------------- Old: ---- notification-daemon-bubble-enable.patch notification-daemon-bubble-init.patch notification-daemon-drawing.patch New: ---- notification-daemon-new-bubble.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ notification-daemon.spec ++++++ --- /var/tmp/diff_new_pack.JV1914/_old 2008-04-03 01:14:55.000000000 +0200 +++ /var/tmp/diff_new_pack.JV1914/_new 2008-04-03 01:14:55.000000000 +0200 @@ -12,22 +12,21 @@ Name: notification-daemon -BuildRequires: fdupes gcc-c++ gconf2-devel intltool libsexy-devel libwnck-devel libxml2-devel perl-XML-Parser update-desktop-files +BuildRequires: fdupes gconf2-devel intltool libsexy-devel libwnck-devel %if %suse_version > 1010 BuildRequires: dbus-1-glib-devel %else BuildRequires: dbus-1-devel dbus-1-glib %endif Version: 0.3.7 -Release: 114 +Release: 122 Url: http://www.galago-project.org/ Group: System/Daemons License: GPL v2 or later Summary: Notification Daemon Source: %{name}-%{version}.tar.bz2 -Patch: notification-daemon-drawing.patch -Patch2: notification-daemon-bubble-enable.patch -Patch3: notification-daemon-bubble-init.patch +# PATCH-FEATURE-OPENSUSE notification-daemon-new-bubble.patch vuntz@novell.com -- Patch a new standard-based theme to be compliant with our policy. +Patch: notification-daemon-new-bubble.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Requires: %{name}-lang = %{version} @@ -45,9 +44,10 @@ %lang_package %prep %setup -q -%patch -%patch2 -%patch3 +# We create a new bubble theme based on the standard theme +cp -a src/themes/standard src/themes/newbubble +sed -i "s/libstandard/libbubble/g" src/themes/newbubble/Makefile* +%patch -p1 %build autoreconf -f -i @@ -88,6 +88,20 @@ %files lang -f %{name}.lang %changelog +* Mon Mar 31 2008 vuntz@suse.de +- Remove all the bubble related patches: + notification-daemon-bubble-enable.patch, + notification-daemon-bubble-init.patch, + notification-daemon-drawing.patch +- Instead, create a new theme based on the standard theme by + copying the standard theme. +- Add notification-daemon-new-bubble.patch: we patch the + standard-based theme to be easily themed via the GTK+ theme, and + we also add some internal API to know if an engine wants to + always stack notifications. This theme is named bubble to keep + compatibility with previous versions of the package. +- Remove useless build-requires: gcc-c++ libxml2-devel + perl-XML-Parser update-desktop-files * Thu Mar 13 2008 sbrabec@suse.cz - Custom look'n'feel gconf keys moved to gconf2-branding-openSUSE. * Thu Mar 06 2008 maw@suse.de @@ -95,7 +109,7 @@ * Wed Aug 08 2007 maw@suse.de - Use %%fdupes - Split off a -lang subpackage. -* Tue Mar 13 2007 dobey@suse.de +* Wed Mar 14 2007 dobey@suse.de - Update drawing patch to build - notification-daemon-bubble-enable.patch * Enable building the bubble theme again @@ -153,7 +167,7 @@ org.freedesktop.Notifications.service * Wed Aug 16 2006 aj@suse.de - Add a build require on dbus-1-glib-devel. -* Tue Mar 14 2006 dobey@suse.de +* Wed Mar 15 2006 dobey@suse.de - Add patch to fix default action clicking in notifications * Mon Mar 06 2006 dobey@suse.de - Update drawing patch to fix colors ++++++ notification-daemon-new-bubble.patch ++++++ This patch needs a newbubble directory in src/themes/ which is a copy of the standard directory. This way, we easily create a theme based on the standard theme. We add an internal engine API so that the engine can specify if it wants to always stack notifications. We give a style name to the notification window so the GTK+ theme can change the colors of the stripe. Here's an example: style "notification-magic" { base[NORMAL] = "#ffcb88" # background color of the notification window bg[NORMAL] = "#defc12" # color of the stripe (low urgency) bg[SELECTED] = "#76bf6f" # color of the stripe (normal urgency) } widget "notification-window.GtkEventBox.GtkVBox" style "notification-magic" diff -aur notification-daemon-0.3.7/configure.ac notification-daemon-0.3.7-patched//configure.ac --- notification-daemon-0.3.7/configure.ac 2007-02-28 06:16:16.000000000 +0100 +++ notification-daemon-0.3.7-patched//configure.ac 2008-03-27 00:14:45.000000000 +0100 @@ -173,6 +173,7 @@ src/daemon/Makefile src/themes/Makefile src/themes/bubble/Makefile +src/themes/newbubble/Makefile src/themes/standard/Makefile ]) diff -aur notification-daemon-0.3.7/src/daemon/daemon.c notification-daemon-0.3.7-patched//src/daemon/daemon.c --- notification-daemon-0.3.7/src/daemon/daemon.c 2007-02-15 11:47:09.000000000 +0100 +++ notification-daemon-0.3.7-patched//src/daemon/daemon.c 2008-03-27 01:20:42.000000000 +0100 @@ -957,7 +957,7 @@ } } - if (use_pos_data) + if (use_pos_data && !theme_get_always_stack(nw)) { /* * Typically, the theme engine will set its own position based on diff -aur notification-daemon-0.3.7/src/daemon/engines.c notification-daemon-0.3.7-patched//src/daemon/engines.c --- notification-daemon-0.3.7/src/daemon/engines.c 2007-02-28 08:18:48.000000000 +0100 +++ notification-daemon-0.3.7-patched//src/daemon/engines.c 2008-03-27 01:31:04.000000000 +0100 @@ -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, @@ -293,3 +295,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; +} diff -aur notification-daemon-0.3.7/src/daemon/engines.h notification-daemon-0.3.7-patched//src/daemon/engines.h --- notification-daemon-0.3.7/src/daemon/engines.h 2006-10-08 23:02:37.000000000 +0200 +++ notification-daemon-0.3.7-patched//src/daemon/engines.h 2008-03-27 01:20:14.000000000 +0100 @@ -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_ */ diff -aur notification-daemon-0.3.7/src/themes/Makefile.am notification-daemon-0.3.7-patched//src/themes/Makefile.am --- notification-daemon-0.3.7/src/themes/Makefile.am 2006-10-08 23:04:02.000000000 +0200 +++ notification-daemon-0.3.7-patched//src/themes/Makefile.am 2008-03-27 00:10:13.000000000 +0100 @@ -1,2 +1,2 @@ -SUBDIRS = standard +SUBDIRS = standard newbubble DIST_SUBDIRS = $(SUBDIRS) bubble diff -aur notification-daemon-0.3.7/src/themes/newbubble/theme.c notification-daemon-0.3.7-patched//src/themes/newbubble/theme.c --- notification-daemon-0.3.7/src/themes/newbubble/theme.c 2007-01-26 05:20:15.000000000 +0100 +++ notification-daemon-0.3.7-patched//src/themes/newbubble/theme.c 2008-03-26 23:42:57.000000000 +0100 @@ -693,6 +693,7 @@ gtk_window_set_title(GTK_WINDOW(win), "Notification"); gtk_widget_add_events(win, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); + gtk_widget_set_name(win, "notification-window"); gtk_widget_realize(win); gtk_widget_set_size_request(win, WIDTH, -1); @@ -1100,7 +1101,7 @@ char **author, char **homepage) { - *theme_name = g_strdup("Standard"); + *theme_name = g_strdup("Bubble"); *theme_ver = g_strdup_printf("%d.%d.%d", NOTIFICATION_DAEMON_MAJOR_VERSION, NOTIFICATION_DAEMON_MINOR_VERSION, @@ -1117,3 +1118,9 @@ minor_ver == NOTIFICATION_DAEMON_MINOR_VERSION && micro_ver == NOTIFICATION_DAEMON_MICRO_VERSION; } + +gboolean +get_always_stack(GtkWidget *nw) +{ + return TRUE; +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org