Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for CR#6788026 opensolaris-2009-06 OSOL0906_U03B02
authorrohinis
Fri, 17 Jul 2009 13:40:36 +0000
branchopensolaris-2009-06
changeset 14322 bf96d849cd82
parent 14321 1399fec290aa
child 14323 8c0b05236eea
Fix for CR#6788026
ChangeLog file | annotate | diff | comparison | revisions
patches/nautilus-14-interface-changes-indiana.diff file | annotate | diff | comparison | revisions
patches/nautilus-14-interface-changes.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Fri Jul 17 11:40:31 2009 +0000
+++ b/ChangeLog	Fri Jul 17 13:40:36 2009 +0000
@@ -1,3 +1,8 @@
+2009-07-17  Rohini S <[email protected]>
+ Fix for CR#6788026
+ * patches/nautilus-14-interrface-changes.diff:
+ * patches/nautilus-14-interface-changes-indiana.diss:
+
 2009-07-17  praveen Handigol <[email protected]>
 
 	* base-specs/thunderbird.spec:
--- a/patches/nautilus-14-interface-changes-indiana.diff	Fri Jul 17 11:40:31 2009 +0000
+++ b/patches/nautilus-14-interface-changes-indiana.diff	Fri Jul 17 13:40:36 2009 +0000
@@ -204,7 +204,7 @@
 +
 +		link->details->display_name = eel_preferences_get (NAUTILUS_PREFERENCES_DESKTOP_DOCUMENTS_NAME);
 +
-+		DocumentDirectory = g_build_filename (g_get_home_dir (), "Documents", NULL);
++		DocumentDirectory = nautilus_get_xdg_dir ("DOCUMENTS");
 +		link->details->activation_location = g_file_new_for_path (DocumentDirectory);
 +
 +		/* Create the documents directory if it doesn't already exist */
@@ -491,7 +491,7 @@
  	g_free (mount_uri);
  	g_free (desktop_path);
 +
-+        mount_uri = g_filename_to_uri (g_build_filename (g_get_home_dir (), "Documents", NULL), NULL, NULL);
++        mount_uri = g_filename_to_uri (nautilus_get_xdg_dir ("DOCUMENTS"), NULL, NULL);
 +        icon = g_themed_icon_new ("gnome-fs-directory");
 +        display_name = eel_preferences_get (NAUTILUS_PREFERENCES_DESKTOP_DOCUMENTS_NAME);
 +        last_iter = add_place (sidebar, PLACES_BUILT_IN,
@@ -582,7 +582,7 @@
 +
 +	window = NAUTILUS_WINDOW (user_data);
 +
-+	name = g_build_filename (g_get_home_dir (), "Documents", NULL);
++	name = nautilus_get_xdg_dir ("DOCUMENTS");
 +	f = g_file_new_for_path (name);
 +	nautilus_window_go_to (window, f);
 +	g_object_unref (f);
@@ -770,7 +770,7 @@
 +	window = NAUTILUS_WINDOW (user_data);
 +	slot = nautilus_window_get_active_slot (window);
 +
-+	name = g_build_filename (g_get_home_dir (), "Documents", NULL);
++	name = nautilus_get_xdg_dir ("DOCUMENTS");
 +	file = g_file_new_for_path (name);
 +	nautilus_window_slot_go_to (slot, file,
 +				    should_open_in_new_tab ());
--- a/patches/nautilus-14-interface-changes.diff	Fri Jul 17 11:40:31 2009 +0000
+++ b/patches/nautilus-14-interface-changes.diff	Fri Jul 17 13:40:36 2009 +0000
@@ -196,7 +196,7 @@
 +
 +		link->details->display_name = eel_preferences_get (NAUTILUS_PREFERENCES_DESKTOP_DOCUMENTS_NAME);
 +		
-+		DocumentDirectory = g_build_filename (g_get_home_dir (), "Documents", NULL);
++		DocumentDirectory = nautilus_get_xdg_dir ("DOCUMENTS");
 +		link->details->activation_location = g_file_new_for_path (DocumentDirectory);
 +
 +		/* Create the documents directory if it doesn't already exist */
@@ -476,7 +476,7 @@
  	g_free (mount_uri);
  	g_free (desktop_path);
 +
-+       mount_uri = g_filename_to_uri (g_build_filename (g_get_home_dir (), "Documents", NULL), NULL, NULL);
++       mount_uri = g_filename_to_uri (nautilus_get_xdg_dir ("DOCUMENTS"), NULL, NULL);
 +       icon = g_themed_icon_new ("gnome-fs-directory");
 +       display_name = eel_preferences_get (NAUTILUS_PREFERENCES_DESKTOP_DOCUMENTS_NAME);
 +       last_iter = add_place (sidebar, PLACES_BUILT_IN,
@@ -567,7 +567,7 @@
 +
 +	window = NAUTILUS_WINDOW (user_data);
 +
-+	name = g_build_filename (g_get_home_dir (), "Documents", NULL);
++	name = nautilus_get_xdg_dir ("DOCUMENTS");
 +	f = g_file_new_for_path (name);
 +	nautilus_window_go_to (window, f);
 +	g_object_unref (f);
@@ -755,7 +755,7 @@
 +	window = NAUTILUS_WINDOW (user_data);
 +	slot = nautilus_window_get_active_slot (window);
 +
-+	name = g_build_filename (g_get_home_dir (), "Documents", NULL);
++	name = nautilus_get_xdg_dir ("DOCUMENTS");
 +	file = g_file_new_for_path (name);
 +	nautilus_window_slot_go_to (slot, file,
 +				    should_open_in_new_tab ());
sustaining/oi_151a/spec-files