Index: browser-plugin/totemPluginGlue.cpp
===================================================================
--- browser-plugin/totemPluginGlue.cpp	(revision 5165)
+++ browser-plugin/totemPluginGlue.cpp	(working copy)
@@ -353,9 +353,8 @@
 	}
 
 	char *user_ini_file;
-	user_ini_file = g_build_filename (g_get_home_dir (),
-					  ".gnome2",
-					  "Totem",
+	user_ini_file = g_build_filename (g_get_user_config_dir (),
+					  "totem",
 					  "browser-plugins.ini",
 					  NULL);
 	if (g_key_file_load_from_file (user,
Index: browser-plugin/README.browser-plugin
===================================================================
--- browser-plugin/README.browser-plugin	(revision 5165)
+++ browser-plugin/README.browser-plugin	(working copy)
@@ -25,7 +25,7 @@
 This can be achieved using 2 files. They are:
 /etc/totem/browser-plugins.ini ($(sysconfdir)/totem/browser-plugins.ini)
 and
-~/.gnome2/Totem/browser-plugins.ini
+~/.config/totem/browser-plugins.ini
 
 The format is:
 [Plugins]
Index: src/backend/bacon-video-widget-xine.c
===================================================================
--- src/backend/bacon-video-widget-xine.c	(revision 5165)
+++ src/backend/bacon-video-widget-xine.c	(working copy)
@@ -63,7 +63,9 @@
 
 #define DEFAULT_HEIGHT 180
 #define DEFAULT_WIDTH 240
-#define CONFIG_FILE ".gnome2"G_DIR_SEPARATOR_S"Totem"G_DIR_SEPARATOR_S"xine_config"
+/* This is built into a path with g_get_user_config_dir(), so the full
+ * path is something like ~/.config/totem/xine_config */
+#define CONFIG_FILE "totem"G_DIR_SEPARATOR_S"xine_config"
 
 /* Signals */
 enum {
@@ -801,7 +803,7 @@
 	xine_cfg_entry_t entry;
 
 	path = g_build_path (G_DIR_SEPARATOR_S,
-			g_get_home_dir (), CONFIG_FILE, NULL);
+			g_get_user_config_dir (), CONFIG_FILE, NULL);
 	xine_config_load (bvw->priv->xine, path);
 	g_free (path);
 
@@ -1688,7 +1690,7 @@
 
 	/* save config */
 	configfile = g_build_path (G_DIR_SEPARATOR_S,
-			g_get_home_dir (), CONFIG_FILE, NULL);
+			g_get_user_config_dir (), CONFIG_FILE, NULL);
 	xine_config_save (bvw->priv->xine, configfile);
 	g_free (configfile);
 
Index: src/totem-uri.c
===================================================================
--- src/totem-uri.c	(revision 5165)
+++ src/totem-uri.c	(working copy)
@@ -68,9 +68,8 @@
 		return totem_dir;
 	}
 
-	totem_dir = g_build_filename (g_get_home_dir (),
-				      ".gnome2",
-				      "Totem",
+	totem_dir = g_build_filename (g_get_user_config_dir (),
+				      "totem",
 				      NULL);
 
 	totem_ensure_dot_dir (totem_dir);
