intrigeri wrote (17 Oct 2014 10:34:42 GMT) : > Control: tag -1 + patch This time with the patch...
Index: debian/changelog =================================================================== --- debian/changelog (revision 43628) +++ debian/changelog (working copy) @@ -1,3 +1,18 @@ +notification-daemon (0.7.6-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + + [ intrigeri ] + * Fix_GSource_usage_with_recent_GLib.patch: new patch, from upstream + Bugzilla (Closes: #747465). + * Fix_positioning_notifications_with_long_text.patch: new patch, + from upstream Bugzilla (Closes: #693837). + + [ Jeremy Bicha ] + * Use canonical Vcs-* fields. + + -- intrigeri <intrig...@debian.org> Thu, 09 Oct 2014 12:54:55 +0200 + notification-daemon (0.7.6-1) unstable; urgency=low * New upstream bugfix and translation release. Index: debian/patches/Fix_GSource_usage_with_recent_GLib.patch =================================================================== --- debian/patches/Fix_GSource_usage_with_recent_GLib.patch (revision 0) +++ debian/patches/Fix_GSource_usage_with_recent_GLib.patch (working copy) @@ -0,0 +1,51 @@ +From 7e458afddc7c57eba5c392a7a89990600a070ae5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Wed, 8 Oct 2014 23:35:37 +0200 +Subject: [PATCH] Fix GSource usage with recent GLib +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=728157 +Bug-Debian: https://bugs.debian.org/747465 +Origin: https://bugzilla.gnome.org/attachment.cgi?id=288082 + +--- + src/nd-bubble.c | 1 + + src/nd-queue.c | 5 +++++ + 2 files changed, 6 insertions(+) + +diff --git a/src/nd-bubble.c b/src/nd-bubble.c +index 0587478..6de7f8f 100644 +--- a/src/nd-bubble.c ++++ b/src/nd-bubble.c +@@ -420,6 +420,7 @@ nd_bubble_enter_notify_event (GtkWidget *widget, + NdBubble *bubble = ND_BUBBLE (widget); + if (bubble->priv->timeout_id != 0) { + g_source_remove (bubble->priv->timeout_id); ++ bubble->priv->timeout_id = 0; + } + + return FALSE; +diff --git a/src/nd-queue.c b/src/nd-queue.c +index de73940..b744b88 100644 +--- a/src/nd-queue.c ++++ b/src/nd-queue.c +@@ -532,6 +532,10 @@ nd_queue_finalize (GObject *object) + + g_return_if_fail (queue->priv != NULL); + ++ if (queue->priv->update_id != 0) { ++ g_source_remove (queue->priv->update_id); ++ } ++ + g_hash_table_destroy (queue->priv->notifications); + g_queue_free (queue->priv->queue); + +@@ -919,6 +923,7 @@ update_idle (NdQueue *queue) + } + } + ++ queue->priv->update_id = 0; + return FALSE; + } + +-- +2.1.2 + Index: debian/patches/Fix_positioning_notifications_with_long_text.patch =================================================================== --- debian/patches/Fix_positioning_notifications_with_long_text.patch (revision 0) +++ debian/patches/Fix_positioning_notifications_with_long_text.patch (working copy) @@ -0,0 +1,130 @@ +From cef286903c24795e72cae8795c7b433b6baf9f57 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballog...@gmail.com> +Date: Wed, 8 Oct 2014 23:57:34 +0200 +Subject: [PATCH] Fix positioning notifications with long text +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=687724 +Bug-Debian: https://bugs.debian.org/693837 +Origin: https://bugzilla.gnome.org/attachment.cgi?id=288083 + +--- + src/nd-bubble.c | 13 +++++++++++++ + src/nd-notification-box.c | 2 ++ + src/nd-stack.c | 16 ++++++++-------- + 3 files changed, 23 insertions(+), 8 deletions(-) + +diff --git a/src/nd-bubble.c b/src/nd-bubble.c +index 0587478..2d36003 100644 +--- a/src/nd-bubble.c ++++ b/src/nd-bubble.c +@@ -413,6 +413,16 @@ nd_bubble_realize (GtkWidget *widget) + GTK_WIDGET_CLASS (nd_bubble_parent_class)->realize (widget); + } + ++static void ++nd_bubble_get_preferred_width (GtkWidget *widget, ++ gint *min_width, ++ gint *nat_width) ++{ ++ if (nat_width != NULL) { ++ *nat_width = WIDTH; ++ } ++} ++ + static gboolean + nd_bubble_enter_notify_event (GtkWidget *widget, + GdkEventCrossing *event) +@@ -450,6 +460,7 @@ nd_bubble_class_init (NdBubbleClass *klass) + widget_class->enter_notify_event = nd_bubble_enter_notify_event; + widget_class->leave_notify_event = nd_bubble_leave_notify_event; + widget_class->realize = nd_bubble_realize; ++ widget_class->get_preferred_width = nd_bubble_get_preferred_width; + + g_type_class_add_private (klass, sizeof (NdBubblePrivate)); + } +@@ -622,6 +633,7 @@ nd_bubble_init (NdBubble *bubble) + gtk_box_pack_start (GTK_BOX (vbox), bubble->priv->summary_label, TRUE, TRUE, 0); + gtk_misc_set_alignment (GTK_MISC (bubble->priv->summary_label), 0, 0); + gtk_label_set_line_wrap (GTK_LABEL (bubble->priv->summary_label), TRUE); ++ gtk_label_set_line_wrap_mode (GTK_LABEL (bubble->priv->summary_label), PANGO_WRAP_WORD_CHAR); + + atkobj = gtk_widget_get_accessible (bubble->priv->summary_label); + atk_object_set_description (atkobj, "Notification summary text."); +@@ -644,6 +656,7 @@ nd_bubble_init (NdBubble *bubble) + gtk_box_pack_start (GTK_BOX (vbox), bubble->priv->body_label, TRUE, TRUE, 0); + gtk_misc_set_alignment (GTK_MISC (bubble->priv->body_label), 0, 0); + gtk_label_set_line_wrap (GTK_LABEL (bubble->priv->body_label), TRUE); ++ gtk_label_set_line_wrap_mode (GTK_LABEL (bubble->priv->body_label), PANGO_WRAP_WORD_CHAR); + g_signal_connect (bubble->priv->body_label, + "activate-link", + G_CALLBACK (on_activate_link), +diff --git a/src/nd-notification-box.c b/src/nd-notification-box.c +index 352c515..12267a9 100644 +--- a/src/nd-notification-box.c ++++ b/src/nd-notification-box.c +@@ -336,6 +336,7 @@ nd_notification_box_init (NdNotificationBox *notification_box) + gtk_box_pack_start (GTK_BOX (vbox), notification_box->priv->summary_label, TRUE, TRUE, 0); + gtk_misc_set_alignment (GTK_MISC (notification_box->priv->summary_label), 0, 0); + gtk_label_set_line_wrap (GTK_LABEL (notification_box->priv->summary_label), TRUE); ++ gtk_label_set_line_wrap_mode (GTK_LABEL (notification_box->priv->summary_label), PANGO_WRAP_WORD_CHAR); + + atkobj = gtk_widget_get_accessible (notification_box->priv->summary_label); + atk_object_set_description (atkobj, "Notification summary text."); +@@ -354,6 +355,7 @@ nd_notification_box_init (NdNotificationBox *notification_box) + gtk_box_pack_start (GTK_BOX (vbox), notification_box->priv->body_label, TRUE, TRUE, 0); + gtk_misc_set_alignment (GTK_MISC (notification_box->priv->body_label), 0, 0); + gtk_label_set_line_wrap (GTK_LABEL (notification_box->priv->body_label), TRUE); ++ gtk_label_set_line_wrap_mode (GTK_LABEL (notification_box->priv->body_label), PANGO_WRAP_WORD_CHAR); + + atkobj = gtk_widget_get_accessible (notification_box->priv->body_label); + atk_object_set_description (atkobj, "Notification body text."); +diff --git a/src/nd-stack.c b/src/nd-stack.c +index 6c03acc..2206dad 100644 +--- a/src/nd-stack.c ++++ b/src/nd-stack.c +@@ -357,10 +357,10 @@ nd_stack_shift_notifications (NdStack *stack, + + for (i = 0, l = stack->priv->bubbles; l != NULL; i++, l = l->next) { + NdBubble *nw2 = ND_BUBBLE (l->data); +- GtkRequisition req; ++ GtkRequisition minimum_size, natural_size; + + if (bubble == NULL || nw2 != bubble) { +- gtk_widget_size_request (GTK_WIDGET (nw2), &req); ++ gtk_widget_get_preferred_size (GTK_WIDGET (nw2), &minimum_size, &natural_size); + + translate_coordinates (stack->priv->location, + &workarea, +@@ -368,8 +368,8 @@ nd_stack_shift_notifications (NdStack *stack, + &y, + &shiftx, + &shifty, +- req.width, +- req.height + NOTIFY_STACK_SPACING); ++ natural_size.width, ++ natural_size.height + NOTIFY_STACK_SPACING); + positions[i].x = x; + positions[i].y = y; + } else if (nw_l != NULL) { +@@ -428,15 +428,15 @@ nd_stack_add_bubble (NdStack *stack, + NdBubble *bubble, + gboolean new_notification) + { +- GtkRequisition req; ++ GtkRequisition minimum_size, natural_size; + int x, y; + +- gtk_widget_size_request (GTK_WIDGET (bubble), &req); ++ gtk_widget_get_preferred_size (GTK_WIDGET (bubble), &minimum_size, &natural_size); + nd_stack_shift_notifications (stack, + bubble, + NULL, +- req.width, +- req.height + NOTIFY_STACK_SPACING, ++ natural_size.width, ++ natural_size.height + NOTIFY_STACK_SPACING, + &x, + &y); + gtk_widget_show (GTK_WIDGET (bubble)); +-- +2.1.2 + Index: debian/patches/series =================================================================== --- debian/patches/series (revision 43628) +++ debian/patches/series (working copy) @@ -1 +1,3 @@ 01_avoid_crash_for_boolean_hints.patch +Fix_GSource_usage_with_recent_GLib.patch +Fix_positioning_notifications_with_long_text.patch