wok diff marlin/stuff/marlin-0.5.patch @ rev 20497

updated diffutils (3.3 -> 3.6)
author Hans-G?nter Theisgen
date Mon Oct 29 16:27:52 2018 +0100 (2018-10-29)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/marlin/stuff/marlin-0.5.patch	Mon Oct 29 16:27:52 2018 +0100
     1.3 @@ -0,0 +1,51 @@
     1.4 +# discussion: https://aur.archlinux.org/packages/marlin-bzr/
     1.5 +# patch found here: http://pastie.org/5189903
     1.6 +--- marlin-0.5/src/fm-directory-view.h
     1.7 ++++ marlin-0.5/src/fm-directory-view.h
     1.8 +@@ -42,6 +42,7 @@
     1.9 + typedef struct FMDirectoryView FMDirectoryView;
    1.10 + typedef struct FMDirectoryViewClass FMDirectoryViewClass;
    1.11 + 
    1.12 ++#define FM_DIRECTORY_TYPE_VIEW fm_directory_view_get_type()
    1.13 + #define FM_TYPE_DIRECTORY_VIEW fm_directory_view_get_type()
    1.14 + #define FM_DIRECTORY_VIEW(obj) \
    1.15 +     (G_TYPE_CHECK_INSTANCE_CAST ((obj), FM_TYPE_DIRECTORY_VIEW, FMDirectoryView))
    1.16 +
    1.17 +--- marlin-0.5/src/exo-icon-view.c
    1.18 ++++ marlin-0.5/src/exo-icon-view.c
    1.19 +@@ -4641,8 +4641,15 @@
    1.20 +         item = list ? list->data : NULL;
    1.21 + 
    1.22 +         /* Give focus to the first cell initially */
    1.23 +-        exo_icon_view_set_cell_data (icon_view, item);
    1.24 +-        gtk_cell_area_focus (icon_view->priv->cell_area, direction);
    1.25 ++        if (item == NULL)
    1.26 ++        {
    1.27 ++            return;
    1.28 ++        }
    1.29 ++        else
    1.30 ++        {
    1.31 ++            exo_icon_view_set_cell_data (icon_view, item);
    1.32 ++            gtk_cell_area_focus (icon_view->priv->cell_area, direction);
    1.33 ++        }
    1.34 +     }
    1.35 +     else
    1.36 +     {
    1.37 +@@ -4798,8 +4805,15 @@
    1.38 +         item = list ? list->data : NULL;
    1.39 + 
    1.40 +         /* Give focus to the first cell initially */
    1.41 +-        exo_icon_view_set_cell_data (icon_view, item);
    1.42 +-        gtk_cell_area_focus (icon_view->priv->cell_area, direction);
    1.43 ++        if (item == NULL)
    1.44 ++        {
    1.45 ++            return;
    1.46 ++        }
    1.47 ++        else
    1.48 ++        {
    1.49 ++            exo_icon_view_set_cell_data (icon_view, item);
    1.50 ++            gtk_cell_area_focus (icon_view->priv->cell_area, direction);
    1.51 ++        }
    1.52 +     }
    1.53 +     else
    1.54 +     {