Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 229719
Collapse All | Expand All

(-)nautilus-2.22.2/libnautilus-private/nautilus-autorun.c.fix-open-folder (-12 / +4 lines)
Lines 1200-1214 typedef struct { Link Here
1200
	gpointer user_data;
1200
	gpointer user_data;
1201
} AutorunData;
1201
} AutorunData;
1202
1202
1203
1204
static void
1205
autorun_open_folder_for_mount (AutorunData *data)
1206
{
1207
	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN) && 
1208
	    data->open_window_func != NULL)
1209
		data->open_window_func (data->mount, data->user_data);
1210
}
1211
1212
static void
1203
static void
1213
autorun_guessed_content_type_callback (GObject *source_object,
1204
autorun_guessed_content_type_callback (GObject *source_object,
1214
				       GAsyncResult *res,
1205
				       GAsyncResult *res,
Lines 1237-1249 autorun_guessed_content_type_callback (G Link Here
1237
			}
1228
			}
1238
			g_strfreev (guessed_content_type);
1229
			g_strfreev (guessed_content_type);
1239
		} else {
1230
		} else {
1240
			open_folder = TRUE;
1231
			if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT_OPEN))
1232
				open_folder = TRUE;
1241
		}
1233
		}
1242
	}
1234
	}
1243
1235
1244
	/* only open the folder once.. */
1236
	/* only open the folder once.. */
1245
	if (open_folder) {
1237
	if (open_folder && data->open_window_func != NULL) {
1246
		autorun_open_folder_for_mount (data);
1238
		data->open_window_func (data->mount, data->user_data);
1247
	}
1239
	}
1248
1240
1249
	g_object_unref (data->mount);
1241
	g_object_unref (data->mount);

Return to bug 229719