r43738 - in /desktop/unstable/libwnck3/debian: changelog patches/03_skip_invalid_rectangles.patch patches/04_missing_icon_in_tasklist.patch patches/series
mitya57-guest at users.alioth.debian.org
mitya57-guest at users.alioth.debian.org
Wed Oct 22 15:12:59 UTC 2014
Author: mitya57-guest
Date: Wed Oct 22 15:12:59 2014
New Revision: 43738
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43738
Log:
* Backport two patches from upstream Git:
- To make get_workspace_rect() skip invalid rectangles.
- To fix missing icon in tasklist button.
Added:
desktop/unstable/libwnck3/debian/patches/03_skip_invalid_rectangles.patch
desktop/unstable/libwnck3/debian/patches/04_missing_icon_in_tasklist.patch
Modified:
desktop/unstable/libwnck3/debian/changelog
desktop/unstable/libwnck3/debian/patches/series
Modified: desktop/unstable/libwnck3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/changelog?rev=43738&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/changelog [utf-8] (original)
+++ desktop/unstable/libwnck3/debian/changelog [utf-8] Wed Oct 22 15:12:59 2014
@@ -1,3 +1,11 @@
+libwnck3 (3.4.9-3) UNRELEASED; urgency=medium
+
+ * Backport two patches from upstream Git:
+ - To make get_workspace_rect() skip invalid rectangles.
+ - To fix missing icon in tasklist button.
+
+ -- Dmitry Shachnev <mitya57 at debian.org> Wed, 22 Oct 2014 19:10:12 +0400
+
libwnck3 (3.4.9-2) unstable; urgency=medium
* Install typelib file into MA libdir and mark gir package as M-A: same.
Added: desktop/unstable/libwnck3/debian/patches/03_skip_invalid_rectangles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/patches/03_skip_invalid_rectangles.patch?rev=43738&op=file
==============================================================================
--- desktop/unstable/libwnck3/debian/patches/03_skip_invalid_rectangles.patch (added)
+++ desktop/unstable/libwnck3/debian/patches/03_skip_invalid_rectangles.patch [utf-8] Wed Oct 22 15:12:59 2014
@@ -0,0 +1,24 @@
+Description: don’t return invalid workspace rectangle
+Origin: upstream, https://git.gnome.org/browse/libwnck/commit/?id=2fc0f058f00daf76
+Last-Update: 2014-10-22
+
+--- a/libwnck/pager.c
++++ b/libwnck/pager.c
+@@ -788,6 +788,17 @@
+
+ gtk_widget_get_allocation (widget, &allocation);
+
++ if (allocation.x < 0 || allocation.y < 0 ||
++ allocation.width < 0 || allocation.height < 0)
++ {
++ rect->x = 0;
++ rect->y = 0;
++ rect->width = 0;
++ rect->height = 0;
++
++ return;
++ }
++
+ _wnck_pager_get_padding (pager, &padding);
+ gtk_widget_style_get (widget,
+ "focus-line-width", &focus_width,
Added: desktop/unstable/libwnck3/debian/patches/04_missing_icon_in_tasklist.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/patches/04_missing_icon_in_tasklist.patch?rev=43738&op=file
==============================================================================
--- desktop/unstable/libwnck3/debian/patches/04_missing_icon_in_tasklist.patch (added)
+++ desktop/unstable/libwnck3/debian/patches/04_missing_icon_in_tasklist.patch [utf-8] Wed Oct 22 15:12:59 2014
@@ -0,0 +1,87 @@
+Description: fix missing icon in tasklist button
+Origin: upstream, https://git.gnome.org/browse/libwnck/commit/?id=afc7505fc1898801
+Last-Update: 2014-10-22
+
+--- a/libwnck/tasklist.c
++++ b/libwnck/tasklist.c
+@@ -158,6 +158,8 @@
+
+ guint row;
+ guint col;
++
++ guint resize_idle_id;
+ };
+
+ struct _WnckTaskClass
+@@ -364,6 +366,7 @@
+ wnck_task_init (WnckTask *task)
+ {
+ task->type = WNCK_TASK_WINDOW;
++ task->resize_idle_id = 0;
+ }
+
+ static void
+@@ -562,6 +565,12 @@
+
+ wnck_task_stop_glow (task);
+
++ if (task->resize_idle_id > 0)
++ {
++ g_source_remove (task->resize_idle_id);
++ task->resize_idle_id = 0;
++ }
++
+ G_OBJECT_CLASS (wnck_task_parent_class)->finalize (object);
+ }
+
+@@ -1407,6 +1416,18 @@
+ return tasklist->priv->size_hints;
+ }
+
++static gboolean
++task_button_queue_resize (gpointer user_data)
++{
++ WnckTask *task = WNCK_TASK (user_data);
++
++ gtk_widget_queue_resize (task->image);
++ gtk_widget_queue_resize (task->label);
++ task->resize_idle_id = 0;
++
++ return G_SOURCE_REMOVE;
++}
++
+ static void
+ wnck_task_size_allocated (GtkWidget *widget,
+ GtkAllocation *allocation,
+@@ -1417,6 +1438,8 @@
+ GtkStateFlags state;
+ GtkBorder padding;
+ int min_image_width;
++ gboolean old_image_visible;
++ gboolean old_label_visible;
+
+ state = gtk_widget_get_state_flags (widget);
+ context = gtk_widget_get_style_context (widget);
+@@ -1425,6 +1448,8 @@
+ min_image_width = MINI_ICON_SIZE +
+ padding.left + padding.right +
+ 2 * TASKLIST_BUTTON_PADDING;
++ old_image_visible = gtk_widget_get_visible (task->image);
++ old_label_visible = gtk_widget_get_visible (task->label);
+
+ if ((allocation->width < min_image_width + 2 * TASKLIST_BUTTON_PADDING) &&
+ (allocation->width >= min_image_width)) {
+@@ -1437,6 +1462,13 @@
+ gtk_widget_show (task->image);
+ gtk_widget_show (task->label);
+ }
++
++ if (old_image_visible != gtk_widget_get_visible (task->image) ||
++ old_label_visible != gtk_widget_get_visible (task->label))
++ {
++ if (task->resize_idle_id == 0)
++ task->resize_idle_id = g_idle_add (task_button_queue_resize, task);
++ }
+ }
+
+ static void
Modified: desktop/unstable/libwnck3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libwnck3/debian/patches/series?rev=43738&op=diff
==============================================================================
--- desktop/unstable/libwnck3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libwnck3/debian/patches/series [utf-8] Wed Oct 22 15:12:59 2014
@@ -1 +1,3 @@
#02_moveresize_static_gravity.patch
+03_skip_invalid_rectangles.patch
+04_missing_icon_in_tasklist.patch
More information about the pkg-gnome-commits
mailing list