Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/nautilus-02-desktop-cluttered-icons.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 16013 6dfdf0aa30c8
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16013
6dfdf0aa30c8 * base-specs/nautilus.spec : Bump to 2.26.3
mattman
parents: 9060
diff changeset 
     1
 
/jds/bin/diff -uprN nautilus-2.26.3.old/libnautilus-private/nautilus-icon-container.c nautilus-2.26.3/libnautilus-private/nautilus-icon-container.c
6dfdf0aa30c8 * base-specs/nautilus.spec : Bump to 2.26.3
mattman
parents: 9060
diff changeset 
     2
 
--- nautilus-2.26.3.old/libnautilus-private/nautilus-icon-container.c	2009-05-18 20:44:26.000000000 +0100
6dfdf0aa30c8 * base-specs/nautilus.spec : Bump to 2.26.3
mattman
parents: 9060
diff changeset 
     3
 
+++ nautilus-2.26.3/libnautilus-private/nautilus-icon-container.c	2009-07-13 11:16:32.205356000 +0100
6dfdf0aa30c8 * base-specs/nautilus.spec : Bump to 2.26.3
mattman
parents: 9060
diff changeset 
     4
 
@@ -1841,6 +1841,12 @@ find_empty_location (NautilusIconContain
9060
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
     5
 
 	/* Start the icon on a grid location */
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
     6
 
 	snap_position (container, icon, &start_x, &start_y);
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
     7
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
     8
 
+	while (start_x < 0)
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
     9
 
+		start_x += SNAP_SIZE_X;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
    10
 
+
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
    11
 
+	while (start_y < 0)
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
    12
 
+		start_y += SNAP_SIZE_Y;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
    13
 
+
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
    14
 
 	icon_position.x0 = start_x;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
    15
 
 	icon_position.y0 = start_y;
c457ded950ba 2007-01-23 Stephen Browne <[email protected]>
stephen
parents:
diff changeset 
    16
 
 	icon_position.x1 = icon_position.x0 + icon_width;
upstream/oracle/spec-files