rpms/nautilus/devel rtl-fix.patch,1.3,1.4

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/nautilus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14144

Modified Files:
	rtl-fix.patch 
Log Message:
try again


rtl-fix.patch:

Index: rtl-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/nautilus/devel/rtl-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rtl-fix.patch	23 Aug 2008 05:41:04 -0000	1.3
+++ rtl-fix.patch	23 Aug 2008 14:39:00 -0000	1.4
@@ -1,54 +1,84 @@
 diff -up nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c.rtl-fix nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c
 --- nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c.rtl-fix	2008-08-18 19:04:40.000000000 -0400
-+++ nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c	2008-08-23 01:38:37.000000000 -0400
-@@ -8923,6 +8923,25 @@ nautilus_icon_container_accessible_get_t
++++ nautilus-2.23.90/libnautilus-private/nautilus-icon-container.c	2008-08-23 10:33:53.000000000 -0400
+@@ -8923,40 +8923,6 @@ nautilus_icon_container_accessible_get_t
          return type;
  }
  
-+gboolean
-+nautilus_icon_container_is_layout_rtl (NautilusIconContainer *container)
-+{
-+	g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), 0);
-+
-+	return container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L ||
-+		container->details->layout_mode == NAUTILUS_ICON_LAYOUT_R_L_T_B;
-+}
-+
-+gboolean
-+nautilus_icon_container_is_layout_vertical (NautilusIconContainer *container)
-+{
-+	g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), FALSE);
-+
-+	return (container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_L_R ||
-+		container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L);
-+}
-+
-+
- #if ! defined (NAUTILUS_OMIT_SELF_CHECK)
- 
- static char *
-@@ -8957,24 +8976,6 @@ nautilus_self_check_icon_container (void
- 	EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
- }
- 
--gboolean
--nautilus_icon_container_is_layout_rtl (NautilusIconContainer *container)
+-#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
+-
+-static char *
+-check_compute_stretch (int icon_x, int icon_y, int icon_size,
+-		       int start_pointer_x, int start_pointer_y,
+-		       int end_pointer_x, int end_pointer_y)
 -{
--	g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), 0);
+-	StretchState start, current;
+-
+-	start.icon_x = icon_x;
+-	start.icon_y = icon_y;
+-	start.icon_size = icon_size;
+-	start.pointer_x = start_pointer_x;
+-	start.pointer_y = start_pointer_y;
+-	current.pointer_x = end_pointer_x;
+-	current.pointer_y = end_pointer_y;
+-
+-	compute_stretch (&start, &current);
 -
--	return container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L ||
--		container->details->layout_mode == NAUTILUS_ICON_LAYOUT_R_L_T_B;
+-	return g_strdup_printf ("%d,%d:%d",
+-				current.icon_x,
+-				current.icon_y,
+-				current.icon_size);
 -}
 -
--gboolean
--nautilus_icon_container_is_layout_vertical (NautilusIconContainer *container)
+-void
+-nautilus_self_check_icon_container (void)
 -{
--	g_return_val_if_fail (NAUTILUS_IS_ICON_CONTAINER (container), FALSE);
--
--	return (container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_L_R ||
--		container->details->layout_mode == NAUTILUS_ICON_LAYOUT_T_B_R_L);
+-	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 0, 0, 0, 0), "0,0:16");
+-	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 17), "0,0:17");
+-	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16");
+-	EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
 -}
 -
- int
- nautilus_icon_container_get_layout_height (NautilusIconContainer  *container)
+ gboolean
+ nautilus_icon_container_is_layout_rtl (NautilusIconContainer *container)
  {
+@@ -8994,4 +8960,39 @@ nautilus_icon_container_get_layout_heigh
+ }
+ 
+ 
++#if ! defined (NAUTILUS_OMIT_SELF_CHECK)
++
++static char *
++check_compute_stretch (int icon_x, int icon_y, int icon_size,
++		       int start_pointer_x, int start_pointer_y,
++		       int end_pointer_x, int end_pointer_y)
++{
++	StretchState start, current;
++
++	start.icon_x = icon_x;
++	start.icon_y = icon_y;
++	start.icon_size = icon_size;
++	start.pointer_x = start_pointer_x;
++	start.pointer_y = start_pointer_y;
++	current.pointer_x = end_pointer_x;
++	current.pointer_y = end_pointer_y;
++
++	compute_stretch (&start, &current);
++
++	return g_strdup_printf ("%d,%d:%d",
++				current.icon_x,
++				current.icon_y,
++				current.icon_size);
++}
++
++void
++nautilus_self_check_icon_container (void)
++{
++	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 0, 0, 0, 0), "0,0:16");
++	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 17), "0,0:17");
++	EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16");
++	EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129");
++}
++
++
+ #endif /* ! NAUTILUS_OMIT_SELF_CHECK */