[SCM] mate-netbook Debian package branch, master, updated. debian/1.8.0-1-5-gf4482a9

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-netbook.git;a=commitdiff;h=a94c7ac

The following commit has been merged in the master branch:
commit a94c7ace016d33693e0283e935f9e7a2e851e620
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 7 23:14:15 2014 +0200

    debian/patches: Add 0001_fix-mwp-applet-segfaulting-while-loading.patch. Fix segfaulting of mate-windowpicker-applet while it is loading. (Closes: #748351).
---
 ..._fix-mwp-applet-segfaulting-while-loading.patch | 37 ++++++++++++++++++++++
 debian/patches/README                              |  3 ++
 debian/patches/series                              |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/patches/0001_fix-mwp-applet-segfaulting-while-loading.patch b/debian/patches/0001_fix-mwp-applet-segfaulting-while-loading.patch
new file mode 100644
index 0000000..7e5a53c
--- /dev/null
+++ b/debian/patches/0001_fix-mwp-applet-segfaulting-while-loading.patch
@@ -0,0 +1,37 @@
+Description: Check for allocation = NULL. This fixes a segfault during applet load
+Author: Daniel Schürmann <daschuer at mixxx.org>
+Origin: http://git.mate-desktop.org/mate-netbook/patch/?id=551983e0fa42ee207f136e64ca4a8dea545bb57a
+
+---
+diff --git a/mate-window-picker-applet/task-item.c b/mate-window-picker-applet/task-item.c
+index cafcb2c..366dea0 100644
+--- a/mate-window-picker-applet/task-item.c
++++ b/mate-window-picker-applet/task-item.c
+@@ -106,9 +106,11 @@ update_hints (TaskItem *item)
+     
+   /* Set the minimize hint for the window */
+   gtk_widget_get_allocation (widget, allocation);
+-  wnck_window_set_icon_geometry (window, x, y,
++  if (allocation) {    
++       wnck_window_set_icon_geometry (window, x, y,
+                                  allocation->width,
+                                  allocation->height);
++  }
+ }
+ 
+ static gboolean 
+diff --git a/mate-window-picker-applet/task-title.c b/mate-window-picker-applet/task-title.c
+index 546e331..e81dfd3 100644
+--- a/mate-window-picker-applet/task-title.c
++++ b/mate-window-picker-applet/task-title.c
+@@ -407,7 +407,7 @@ on_expose (GtkWidget *eb, GdkEventExpose *event)
+   style = gtk_widget_get_style (eb);
+   state = gtk_widget_get_state (eb);
+ 
+-  if (state == GTK_STATE_ACTIVE)
++  if (state == GTK_STATE_ACTIVE && allocation)
+     gtk_paint_box (style,
+ #if GTK_CHECK_VERSION (3, 0, 0)
+                  cr,
+--
+cgit 
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8f55782
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_fix-mwp-applet-segfaulting-while-loading.patch

-- 
mate-netbook Debian package