| 1 |
ssuominen 09/09/27 16:14:18 |
| 2 |
|
| 3 |
Added: xfdesktop-4.6.1-assert.patch |
| 4 |
Log: |
| 5 |
Fix assert handling wrt upstream #5791. Thanks to Alexis Ballier. |
| 6 |
(Portage version: 2.2_rc42/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 xfce-base/xfdesktop/files/xfdesktop-4.6.1-assert.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/xfdesktop/files/xfdesktop-4.6.1-assert.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/xfce-base/xfdesktop/files/xfdesktop-4.6.1-assert.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: xfdesktop-4.6.1-assert.patch |
| 15 |
=================================================================== |
| 16 |
Index: xfdesktop-4.6.1/src/xfdesktop-icon-view.c |
| 17 |
=================================================================== |
| 18 |
--- xfdesktop-4.6.1.orig/src/xfdesktop-icon-view.c |
| 19 |
+++ xfdesktop-4.6.1/src/xfdesktop-icon-view.c |
| 20 |
@@ -2143,12 +2143,14 @@ xfdesktop_icon_view_paint_icon(Xfdesktop |
| 21 |
GdkRectangle pix_area, text_area, intersection, adj_area; |
| 22 |
const gchar *label; |
| 23 |
guint16 row, col; |
| 24 |
+ gboolean ret = FALSE; |
| 25 |
gchar x_offset = 0, y_offset = 0; |
| 26 |
GdkColor *sh_text_col = NULL; |
| 27 |
|
| 28 |
/*TRACE("entering (%s)", xfdesktop_icon_peek_label(icon));*/ |
| 29 |
- |
| 30 |
- g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col)); |
| 31 |
+ |
| 32 |
+ ret = xfdesktop_icon_get_position(icon, &row, &col); |
| 33 |
+ g_return_if_fail(ret); |
| 34 |
|
| 35 |
if(g_list_find(icon_view->priv->selected_icons, icon)) { |
| 36 |
if(GTK_WIDGET_FLAGS(widget) & GTK_HAS_FOCUS) |
| 37 |
@@ -2494,8 +2496,10 @@ xfdesktop_grid_unset_position_free(Xfdes |
| 38 |
XfdesktopIcon *icon) |
| 39 |
{ |
| 40 |
guint16 row, col; |
| 41 |
- |
| 42 |
- g_return_val_if_fail(xfdesktop_icon_get_position(icon, &row, &col), FALSE); |
| 43 |
+ gboolean ret = FALSE; |
| 44 |
+ |
| 45 |
+ ret = xfdesktop_icon_get_position(icon, &row, &col); |
| 46 |
+ g_return_val_if_fail(ret, FALSE); |
| 47 |
|
| 48 |
return xfdesktop_grid_unset_position_free_raw(icon_view, row, col, icon); |
| 49 |
} |
| 50 |
@@ -2738,9 +2742,11 @@ xfdesktop_icon_view_add_item_internal(Xf |
| 51 |
{ |
| 52 |
guint16 row, col; |
| 53 |
GdkRectangle fake_area; |
| 54 |
+ gboolean ret = FALSE; |
| 55 |
|
| 56 |
/* sanity check: at this point this should be taken care of */ |
| 57 |
- g_return_if_fail(xfdesktop_icon_get_position(icon, &row, &col)); |
| 58 |
+ ret = xfdesktop_icon_get_position(icon, &row, &col); |
| 59 |
+ g_return_if_fail(ret); |
| 60 |
|
| 61 |
xfdesktop_grid_unset_position_free(icon_view, icon); |
Archives