[SCM] mate-netbook Debian package branch, master, updated. debian/1.8.0-2-7-gb66c46f

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit ab6398f3653e77ad9d07e195157ea54b5fa1fd65
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Oct 23 09:25:27 2014 +0200

    debian/patches: Drop 0001_fix-mwp-applet-segfaulting-while-loading.patch. Applied upstream.
---
 ..._fix-mwp-applet-segfaulting-while-loading.patch | 37 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 38 deletions(-)

diff --git a/debian/patches/0001_fix-mwp-applet-segfaulting-while-loading.patch b/debian/patches/0001_fix-mwp-applet-segfaulting-while-loading.patch
deleted file mode 100644
index 7e5a53c..0000000
--- a/debian/patches/0001_fix-mwp-applet-segfaulting-while-loading.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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/series b/debian/patches/series
deleted file mode 100644
index 8f55782..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001_fix-mwp-applet-segfaulting-while-loading.patch

-- 
mate-netbook Debian package