nautilus-06-frame-buffer.diff revision 12215
9802N/Adiff -ur nautilus-2.15.91/libnautilus-private/apps_nautilus_preferences.schemas.in nautilus-2.15.91-hacked/libnautilus-private/apps_nautilus_preferences.schemas.in
9802N/A--- nautilus-2.15.91/libnautilus-private/apps_nautilus_preferences.schemas.in Thu Jun 15 17:38:40 2006
9802N/A+++ nautilus-2.15.91-hacked/libnautilus-private/apps_nautilus_preferences.schemas.in Mon Aug 21 16:15:45 2006
9802N/A@@ -866,6 +866,22 @@
9802N/A </long>
9802N/A </locale>
9802N/A </schema>
9802N/A+
9802N/A+ <schema>
9802N/A+ <key>/schemas/apps/nautilus/desktop/primary_screen</key>
9802N/A+ <applyto>/apps/nautilus/desktop/primary_screen</applyto>
9802N/A+ <owner>nautilus</owner>
9802N/A+ <type>int</type>
9802N/A+ <default>0</default>
9802N/A+ <locale name="C">
9802N/A+ <short>Primary magnification screen</short>
9802N/A+ <long>
9802N/A+ This screen can be set if you want to have a screen other
9802N/A+ than screen 0 as the default screen, while working with
9802N/A+ magnifier.
9802N/A+ </long>
9802N/A+ </locale>
9802N/A+ </schema>
9802N/A
9802N/A </schemalist>
9802N/A </gconfschemafile>
12215N/Adiff -ur nautilus-2.21.5/libnautilus-private/nautilus-global-preferences.c nautilus-2.21.5-hacked/libnautilus-private/nautilus-global-preferences.c
12215N/A--- nautilus-2.21.5/libnautilus-private/nautilus-global-preferences.c Sat Jul 22 01:18:56 2006
12215N/A+++ nautilus-2.21.5-hacked/libnautilus-private/nautilus-global-preferences.c Mon Aug 21 16:15:45 2006
12215N/A@@ -483,6 +483,10 @@
10821N/A NULL,
10821N/A default_network_link_name, g_free,
9802N/A },
10821N/A+ { NAUTILUS_PREFERENCES_DESKTOP_PRIMARY_SCREEN,
10821N/A+ PREFERENCE_INTEGER,
10821N/A+ GINT_TO_POINTER (0)
10821N/A+ },
12215N/A
12215N/A { NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT,
12215N/A PREFERENCE_BOOLEAN,
10821N/Adiff -ur nautilus-2.19.4/libnautilus-private/nautilus-global-preferences.h nautilus-2.19.4-hacked/libnautilus-private/nautilus-global-preferences.h
10821N/A--- nautilus-2.19.4/libnautilus-private/nautilus-global-preferences.h Sat Jul 22 01:18:56 2006
10821N/A+++ nautilus-2.19.4-hacked/libnautilus-private/nautilus-global-preferences.h Mon Aug 21 16:18:18 2006
10821N/A@@ -188,6 +188,7 @@
9802N/A #define NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE "desktop/volumes_visible"
9802N/A #define NAUTILUS_PREFERENCES_DESKTOP_NETWORK_VISIBLE "desktop/network_icon_visible"
10821N/A #define NAUTILUS_PREFERENCES_DESKTOP_NETWORK_NAME "desktop/network_icon_name"
9802N/A+#define NAUTILUS_PREFERENCES_DESKTOP_PRIMARY_SCREEN "desktop/primary_screen"
9802N/A
9802N/A void nautilus_global_preferences_init (void);
9802N/A char *nautilus_global_preferences_get_default_folder_viewer_preference_as_iid (void);
9802N/Adiff -ur nautilus-2.15.91/src/file-manager/fm-icon-view.c nautilus-2.15.91-hacked/src/file-manager/fm-icon-view.c
9802N/A--- nautilus-2.15.91/src/file-manager/fm-icon-view.c Mon Aug 7 18:34:31 2006
9802N/A+++ nautilus-2.15.91-hacked/src/file-manager/fm-icon-view.c Mon Aug 21 16:15:45 2006
9802N/A@@ -471,7 +471,8 @@
9802N/A should_show_file_on_screen (FMDirectoryView *view, NautilusFile *file)
9802N/A {
9802N/A char *screen_string;
9802N/A- int screen_num;
9802N/A+ char default_screen_string[8];
9802N/A+ int screen_num, default_screen_num;
9802N/A FMIconView *icon_view;
9802N/A GdkScreen *screen;
9802N/A
9802N/A@@ -480,10 +481,21 @@
9802N/A if (!fm_directory_view_should_show_file (view, file)) {
9802N/A return FALSE;
9802N/A }
9802N/A+
9802N/A+ /* Get the primary magnification screen in multi-head setup */
9802N/A+ if (icon_view->details->num_screens > 1) {
9802N/A+ default_screen_num = eel_preferences_get_integer (NAUTILUS_PREFERENCES_DESKTOP_PRIMARY_SCREEN);
9802N/A+
9802N/A+ /* single head setup. So, default screen is 0 */
9802N/A+ } else {
9802N/A+ default_screen_num = 0;
9802N/A+ }
9802N/A+
9802N/A+ sprintf (default_screen_string, "%d", default_screen_num);
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");
9802N/A+ (file, NAUTILUS_METADATA_KEY_SCREEN, default_screen_string);
9802N/A screen_num = atoi (screen_string);
9802N/A g_free (screen_string);
9802N/A screen = gtk_widget_get_screen (GTK_WIDGET (view));