wok-current annotate marlin/stuff/marlin-0.5.patch @ rev 22209

updated xorg-libXcomposite and xorg-libXcomposite-dev (0.4.4 -> 0.4.5)
author Hans-G?nter Theisgen
date Mon Nov 11 14:40:43 2019 +0100 (2019-11-11)
parents
children
rev   line source
pascal@15721 1 # discussion: https://aur.archlinux.org/packages/marlin-bzr/
pascal@15721 2 # patch found here: http://pastie.org/5189903
pascal@15721 3 --- marlin-0.5/src/fm-directory-view.h
pascal@15721 4 +++ marlin-0.5/src/fm-directory-view.h
pascal@15721 5 @@ -42,6 +42,7 @@
pascal@15721 6 typedef struct FMDirectoryView FMDirectoryView;
pascal@15721 7 typedef struct FMDirectoryViewClass FMDirectoryViewClass;
pascal@15721 8
pascal@15721 9 +#define FM_DIRECTORY_TYPE_VIEW fm_directory_view_get_type()
pascal@15721 10 #define FM_TYPE_DIRECTORY_VIEW fm_directory_view_get_type()
pascal@15721 11 #define FM_DIRECTORY_VIEW(obj) \
pascal@15721 12 (G_TYPE_CHECK_INSTANCE_CAST ((obj), FM_TYPE_DIRECTORY_VIEW, FMDirectoryView))
pascal@15721 13
pascal@15721 14 --- marlin-0.5/src/exo-icon-view.c
pascal@15721 15 +++ marlin-0.5/src/exo-icon-view.c
pascal@15721 16 @@ -4641,8 +4641,15 @@
pascal@15721 17 item = list ? list->data : NULL;
pascal@15721 18
pascal@15721 19 /* Give focus to the first cell initially */
pascal@15721 20 - exo_icon_view_set_cell_data (icon_view, item);
pascal@15721 21 - gtk_cell_area_focus (icon_view->priv->cell_area, direction);
pascal@15721 22 + if (item == NULL)
pascal@15721 23 + {
pascal@15721 24 + return;
pascal@15721 25 + }
pascal@15721 26 + else
pascal@15721 27 + {
pascal@15721 28 + exo_icon_view_set_cell_data (icon_view, item);
pascal@15721 29 + gtk_cell_area_focus (icon_view->priv->cell_area, direction);
pascal@15721 30 + }
pascal@15721 31 }
pascal@15721 32 else
pascal@15721 33 {
pascal@15721 34 @@ -4798,8 +4805,15 @@
pascal@15721 35 item = list ? list->data : NULL;
pascal@15721 36
pascal@15721 37 /* Give focus to the first cell initially */
pascal@15721 38 - exo_icon_view_set_cell_data (icon_view, item);
pascal@15721 39 - gtk_cell_area_focus (icon_view->priv->cell_area, direction);
pascal@15721 40 + if (item == NULL)
pascal@15721 41 + {
pascal@15721 42 + return;
pascal@15721 43 + }
pascal@15721 44 + else
pascal@15721 45 + {
pascal@15721 46 + exo_icon_view_set_cell_data (icon_view, item);
pascal@15721 47 + gtk_cell_area_focus (icon_view->priv->cell_area, direction);
pascal@15721 48 + }
pascal@15721 49 }
pascal@15721 50 else
pascal@15721 51 {