Hello community,
here is the log from the commit of package notification-daemon
checked in at Thu Mar 15 01:47:10 CET 2007.
--------
--- GNOME/notification-daemon/notification-daemon.changes 2007-03-06 17:24:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/notification-daemon/notification-daemon.changes 2007-03-13 22:10:37.472742000 +0100
@@ -1,0 +2,9 @@
+Tue Mar 13 22:09:01 CET 2007 - dobey@suse.de
+
+- Update drawing patch to build
+- notification-daemon-bubble-enable.patch
+ * Enable building the bubble theme again
+- notification-daemon-bubble-init.patch
+ * Add new methods requiresd for theme to load
+
+-------------------------------------------------------------------
New:
----
notification-daemon-bubble-enable.patch
notification-daemon-bubble-init.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ notification-daemon.spec ++++++
--- /var/tmp/diff_new_pack.I16865/_old 2007-03-15 01:46:14.000000000 +0100
+++ /var/tmp/diff_new_pack.I16865/_new 2007-03-15 01:46:14.000000000 +0100
@@ -18,7 +18,7 @@
BuildRequires: dbus-1-devel dbus-1-glib
%endif
Version: 0.3.7
-Release: 1
+Release: 3
URL: http://www.galago-project.org/
Group: System/Daemons
License: GNU General Public License (GPL)
@@ -26,6 +26,8 @@
Source: %{name}-%{version}.tar.bz2
Patch: notification-daemon-drawing.patch
Patch1: notification-daemon-default-theme.patch
+Patch2: notification-daemon-bubble-enable.patch
+Patch3: notification-daemon-bubble-init.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -42,9 +44,10 @@
%prep
%setup -q
-# FIXME: Patch does not compile with the new version
-#%patch
+%patch
%patch1
+%patch2
+%patch3
%build
autoreconf -f -i
@@ -82,6 +85,12 @@
%{_datadir}/dbus-1/services/*.service
%changelog
+* Tue Mar 13 2007 - dobey@suse.de
+- Update drawing patch to build
+- notification-daemon-bubble-enable.patch
+ * Enable building the bubble theme again
+- notification-daemon-bubble-init.patch
+ * Add new methods requiresd for theme to load
* Tue Mar 06 2007 - sbrabec@suse.cz
- Updated to version 0.3.7:
* Bug and crash fixes.
++++++ notification-daemon-bubble-enable.patch ++++++
Index: src/themes/Makefile.am
===================================================================
--- src/themes/Makefile.am (revision 2972)
+++ src/themes/Makefile.am (working copy)
@@ -1,2 +1 @@
-SUBDIRS = standard
-DIST_SUBDIRS = $(SUBDIRS) bubble
+SUBDIRS = standard bubble
++++++ notification-daemon-bubble-init.patch ++++++
Index: src/themes/bubble/theme.c
===================================================================
--- src/themes/bubble/theme.c (revision 2977)
+++ src/themes/bubble/theme.c (working copy)
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include
#include "eggnotificationbubblewidget.h"
@@ -78,3 +82,32 @@ move_notification(GtkWindow *nw, int x,
egg_notification_bubble_widget_set_pos(EGG_NOTIFICATION_BUBBLE_WIDGET(nw),
x, y);
}
+
+void
+clear_notification_actions(GtkWindow *nw)
+{
+}
+
+void
+get_theme_info(char **theme_name,
+ char **theme_ver,
+ char **author,
+ char **homepage)
+{
+ *theme_name = g_strdup("Bubble");
+ *theme_ver = g_strdup_printf("%d.%d.%d",
+ NOTIFICATION_DAEMON_MAJOR_VERSION,
+ NOTIFICATION_DAEMON_MINOR_VERSION,
+ NOTIFICATION_DAEMON_MICRO_VERSION);
+ *author = g_strdup("John Palmieri, Rodney Dawes");
+ *homepage = g_strdup("http://www.galago-project.org/");
+}
+
+gboolean
+theme_check_init(unsigned int major_ver, unsigned int minor_ver,
+ unsigned int micro_ver)
+{
+ return major_ver == NOTIFICATION_DAEMON_MAJOR_VERSION &&
+ minor_ver == NOTIFICATION_DAEMON_MINOR_VERSION &&
+ micro_ver == NOTIFICATION_DAEMON_MICRO_VERSION;
+}
++++++ notification-daemon-drawing.patch ++++++
--- /var/tmp/diff_new_pack.I16865/_old 2007-03-15 01:46:14.000000000 +0100
+++ /var/tmp/diff_new_pack.I16865/_new 2007-03-15 01:46:15.000000000 +0100
@@ -1,8 +1,30 @@
-Index: themes/bubble/eggnotificationbubblewidget.c
+Index: src/daemon/daemon.c
===================================================================
---- src/themes/bubble/eggnotificationbubblewidget.c (revision 2487)
+--- src/daemon/daemon.c (revision 2977)
++++ src/daemon/daemon.c (working copy)
+@@ -957,17 +957,6 @@ notify_daemon_notify_handler(NotifyDaemo
+ }
+ }
+
+- if (use_pos_data)
+- {
+- /*
+- * Typically, the theme engine will set its own position based on
+- * the arrow X, Y hints. However, in case, move the notification to
+- * that position.
+- */
+- theme_set_notification_arrow(nw, TRUE, x, y);
+- theme_move_notification(nw, x, y);
+- }
+- else
+ {
+ gint monitor;
+ GdkScreen *screen;
+Index: src/themes/bubble/eggnotificationbubblewidget.c
+===================================================================
+--- src/themes/bubble/eggnotificationbubblewidget.c (revision 2977)
+++ src/themes/bubble/eggnotificationbubblewidget.c (working copy)
-@@ -212,11 +213,9 @@
+@@ -212,11 +212,9 @@ _layout_window (EggNotificationBubbleWid
gtk_container_remove (GTK_CONTAINER (bubble_widget->table),
bubble_widget->button_hbox);
@@ -15,7 +37,7 @@
GTK_FILL, GTK_FILL,
0, 0);
-@@ -231,29 +230,8 @@
+@@ -231,28 +229,7 @@ _layout_window (EggNotificationBubbleWid
1, 2, 1, 2,
GTK_FILL, GTK_FILL,
0, 0);
@@ -33,7 +55,7 @@
- 0, 1, 0, 1,
- GTK_FILL, GTK_FILL,
- 0, 0);
-
+-
- gtk_table_attach (GTK_TABLE (bubble_widget->table),
- bubble_widget->bubble_widget_body_label,
- 0, 1, 1, 2,
@@ -41,11 +63,10 @@
- 0, 0);
-
- }
--
+
if (bubble_widget->button_hbox != NULL)
{
- GtkWidget *alignment = gtk_alignment_new(1.0, 0.5, 0, 0);
-@@ -477,7 +455,7 @@
+@@ -477,7 +454,7 @@ _populate_window (EggNotificationBubbleW
//use placeholder so we can use pango/cairo to draw body
bubble_widget->bubble_widget_body_label = gtk_frame_new("");
gtk_frame_set_shadow_type (GTK_FRAME (bubble_widget->bubble_widget_body_label), GTK_SHADOW_NONE);
@@ -54,7 +75,7 @@
gtk_widget_ref (bubble_widget->bubble_widget_header_label);
gtk_widget_ref (bubble_widget->bubble_widget_body_label);
gtk_widget_ref (bubble_widget->icon);
-@@ -607,7 +585,7 @@
+@@ -607,7 +584,7 @@ egg_notification_bubble_widget_set (EggN
{
if (g_str_has_prefix (icon, "file://"))
{
@@ -63,7 +84,7 @@
gtk_image_set_from_file (GTK_IMAGE (bubble_widget->icon), icon_path);
}
else
-@@ -719,7 +697,7 @@
+@@ -719,7 +696,7 @@ egg_notification_bubble_widget_body_labe
cairo_set_source_rgba (cr, bw->body_text_color.red,
bw->body_text_color.green,
bw->body_text_color.blue,
@@ -72,7 +93,7 @@
cairo_move_to (cr, event->area.x, event->area.y);
pango_cairo_layout_path (cr, bw->body_layout);
-@@ -874,12 +852,12 @@
+@@ -874,12 +851,12 @@ _stencil_bubble_no_arrow (EggNotificatio
bw->offset_x = 0;
bw->offset_y = 0;
@@ -89,7 +110,7 @@
_close_path (bw);
-@@ -1008,7 +986,6 @@
+@@ -1008,7 +985,6 @@ draw_bubble_widget (EggNotificationBubbl
{
GtkRequisition requisition;
gint w, h;
@@ -97,7 +118,7 @@
GdkPixmap *mask;
GdkPoint arrow_pos;
-@@ -1044,42 +1021,48 @@
+@@ -1044,42 +1020,48 @@ draw_bubble_widget (EggNotificationBubbl
if (!can_composite)
g_list_foreach (bubble_widget->dp.pipeline, (GFunc) _drawing_instruction_draw, mask_cr);
@@ -119,6 +140,15 @@
+ bubble_widget->border_color.blue / 65535.0, 1);
+ cairo_rectangle (cairo_context, 0, 0, w, h);
+ cairo_fill (cairo_context);
++
++ cairo_set_operator (cairo_context, CAIRO_OPERATOR_ADD);
++
++ cairo_set_source_rgba (cairo_context,
++ bubble_widget->bg_start_gradient.red / 65535.0,
++ bubble_widget->bg_start_gradient.green / 65535.0,
++ bubble_widget->bg_start_gradient.blue / 65535.0, 1);
++ cairo_rectangle (cairo_context, 1, 1, w - 2, h - 2);
++ cairo_fill (cairo_context);
- pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, h);
- //cairo_pattern_add_color_stop_rgba (pat, 1, 0.59, 0.76, 0.93, 1);
@@ -129,8 +159,7 @@
- 65535.0,
- bubble_widget->bg_start_gradient.blue /
- 65535.0, 1);
-+ cairo_set_operator (cairo_context, CAIRO_OPERATOR_ADD);
-
+-
- cairo_pattern_add_color_stop_rgba (pat, 1,
- bubble_widget->bg_end_gradient.red /
- 65535.0,
@@ -138,14 +167,6 @@
- 65535.0,
- bubble_widget->bg_end_gradient.blue /
- 65535.0, 1);
-+ cairo_set_source_rgba (cairo_context,
-+ bubble_widget->bg_start_gradient.red / 65535.0,
-+ bubble_widget->bg_start_gradient.green / 65535.0,
-+ bubble_widget->bg_start_gradient.blue / 65535.0, 1);
-+ cairo_rectangle (cairo_context, 1, 1, w - 2, h - 2);
-+ cairo_fill (cairo_context);
-
-- cairo_set_source (cairo_context, pat);
+ cairo_set_operator (cairo_context, CAIRO_OPERATOR_SOURCE);
+
+ switch (bubble_widget->urgency)
@@ -166,7 +187,8 @@
+ cairo_fill (cairo_context);
+ break;
+ }
-+
+
+- cairo_set_source (cairo_context, pat);
cairo_fill_preserve (cairo_context);
- cairo_pattern_destroy (pat);
@@ -175,29 +197,8 @@
cairo_set_source_rgba (cairo_context, 0.43, 0.49, 0.55, 1);
cairo_stroke (cairo_context);
-@@ -1211,3 +1194,4 @@
+@@ -1211,3 +1193,4 @@ egg_notification_bubble_widget_set_hints
if (data)
bubble_widget->urgency = g_value_get_uchar (data);
}
+
-Index: src/daemon.c
-===================================================================
---- src/daemon/daemon.c (revision 2487)
-+++ src/daemon/daemon.c (working copy)
-@@ -781,13 +781,9 @@
-
- if (use_pos_data)
- {
-- /*
-- * Typically, the theme engine will set its own position based on
-- * the arrow X, Y hints. However, in case, move the notification to
-- * that position.
-- */
-- theme_set_notification_arrow(nw, TRUE, x, y);
-- theme_move_notification(nw, x, y);
-+ theme_set_notification_arrow(nw, FALSE, 0, 0);
-+ _notify_daemon_add_bubble_to_poptart_stack(daemon, nw,
-+ new_notification);
- }
- else
- {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org