20802N/A--- nautilus-3.1.3/libnautilus-private/org.gnome.nautilus.gschema.xml.in.orig 2011-07-20 08:33:11.960537746 +0100

20802N/A+++ nautilus-3.1.3/libnautilus-private/org.gnome.nautilus.gschema.xml.in 2011-07-20 08:42:19.037449495 +0100

20802N/A@@ -360,6 +360,11 @@

20802N/A <_summary>Fade the background on change</_summary>

20802N/A <_description>If set to true, then Nautilus will use a fade effect to change the desktop background.</_description>

20802N/A </key>

20802N/A+ <key name="primary-screen" type="i">

9802N/A+ <default>0</default>

20802N/A+ <_summary>Primary magnification screen</_summary>

20802N/A+ <_description> This screen can be set if you want to have a screen other than screen 0 as the default screen, while working with magnifier.</_description>

20802N/A+ </key>

20802N/A </schema>

12215N/A

20802N/A <schema id="org.gnome.nautilus.window-state" path="/org/gnome/nautilus/window-state/" gettext-domain="nautilus">

20802N/A--- nautilus-3.1.3/libnautilus-private/nautilus-global-preferences.h.orig 2011-07-20 09:07:16.166242314 +0100

20802N/A+++ nautilus-3.1.3/libnautilus-private/nautilus-global-preferences.h 2011-07-20 09:02:35.220585656 +0100

20802N/A@@ -177,6 +177,7 @@

20802N/A #define NAUTILUS_PREFERENCES_DESKTOP_NETWORK_VISIBLE "network-icon-visible"

20802N/A #define NAUTILUS_PREFERENCES_DESKTOP_NETWORK_NAME "network-icon-name"

20802N/A #define NAUTILUS_PREFERENCES_DESKTOP_BACKGROUND_FADE "background-fade"

20802N/A+#define NAUTILUS_PREFERENCES_DESKTOP_PRIMARY_SCREEN "primary-screen"

20802N/A

20802N/A /* bulk rename utility */

20802N/A #define NAUTILUS_PREFERENCES_BULK_RENAME_TOOL "bulk-rename-tool"

20802N/A--- nautilus-3.1.3/src/nautilus-icon-view.c.orig 2011-07-20 09:34:55.453069426 +0100

20802N/A+++ nautilus-3.1.3/src/nautilus-icon-view.c 2011-07-20 09:40:29.809158634 +0100

20802N/A@@ -467,19 +467,33 @@

20802N/A should_show_file_on_screen (NautilusView *view, NautilusFile *file)

9802N/A {

9802N/A char *screen_string;

9802N/A- int screen_num;

20802N/A+ char default_screen_string[8];

20802N/A+ int screen_num, default_screen_num;

20802N/A NautilusIconView *icon_view;

9802N/A GdkScreen *screen;

9802N/A

20802N/A icon_view = NAUTILUS_ICON_VIEW (view);

20802N/A

20802N/A+

20802N/A+ /* Get the primary magnification screen in multi-head setup */

20802N/A+ if (icon_view->details->num_screens > 1) {

20802N/A+ default_screen_num = g_settings_get_int (nautilus_desktop_preferences,

20802N/A+ NAUTILUS_PREFERENCES_DESKTOP_PRIMARY_SCREEN);

20802N/A+

20802N/A+ /* single head setup. So, default screen is 0 */

20802N/A+ } else {

20802N/A+ default_screen_num = 0;

20802N/A+ }

20802N/A+

20802N/A+ sprintf (default_screen_string, "%d", default_screen_num);

20802N/A+

20802N/A if (!nautilus_view_should_show_file (view, file)) {

9802N/A return FALSE;

9802N/A }

9802N/A

9802N/A /* Get the screen for this icon from the metadata. */

9802N/A screen_string = nautilus_file_get_metadata

9802N/A- (file, NAUTILUS_METADATA_KEY_SCREEN, "0");

20802N/A+ (file, NAUTILUS_METADATA_KEY_SCREEN, default_screen_num);

9802N/A screen_num = atoi (screen_string);

9802N/A g_free (screen_string);

9802N/A screen = gtk_widget_get_screen (GTK_WIDGET (view));