[maemo-commits] [maemo-commits] r14698 - in projects/haf/trunk/hildon-fm: . hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-11-01 18:53:56 +0200 (Thu, 01 Nov 2007)
New Revision: 14698

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-mmc.h
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-old-gateway.h
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-private.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-root.c
Log:
	* hildon-fm/Makefile.am (libhildonfm_la_SOURCES): Removed
	hildon-file-system-old-gateway.[ch] and hildon-file-system-mmc.[ch].
	* hildon-fm/hildon-file-system-private.c: Don't include
	hildon-file-system-old-gateway.h.
	(_hildon_file_system_get_locations): Never set up the old gateway
	special location.
	* hildon-fm/hildon-file-system-root.c: Don't include
	hildon-file-system-mmc.h, it is not needed.


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-11-01 13:44:11 UTC (rev 14697)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-11-01 16:53:56 UTC (rev 14698)
@@ -1,5 +1,14 @@
 2007-11-01  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/Makefile.am (libhildonfm_la_SOURCES): Removed
+	hildon-file-system-old-gateway.[ch] and hildon-file-system-mmc.[ch].
+	* hildon-fm/hildon-file-system-private.c: Don't include
+	hildon-file-system-old-gateway.h.
+	(_hildon_file_system_get_locations): Never set up the old gateway
+	special location.
+	* hildon-fm/hildon-file-system-root.c: Don't include
+	hildon-file-system-mmc.h, it is not needed.
+
 	* hildon-fm/hildon-file-selection.c
 	(hildon_file_selection_row_deleted): Also move cursor to the next
 	row if it was previously in a descendant of the deleted

Modified: projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-11-01 13:44:11 UTC (rev 14697)
+++ projects/haf/trunk/hildon-fm/hildon-fm/Makefile.am	2007-11-01 16:53:56 UTC (rev 14698)
@@ -43,10 +43,6 @@
 	hildon-file-system-local-device.c	\
 	hildon-file-system-remote-device.h	\
 	hildon-file-system-remote-device.c	\
-	hildon-file-system-mmc.h		\
-	hildon-file-system-mmc.c		\
-	hildon-file-system-old-gateway.h	\
-	hildon-file-system-old-gateway.c	\
 	hildon-file-system-dynamic-device.h	\
 	hildon-file-system-dynamic-device.c	\
 	hildon-file-system-upnp.h		\

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-mmc.h
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-mmc.h	2007-11-01 13:44:11 UTC (rev 14697)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-mmc.h	2007-11-01 16:53:56 UTC (rev 14698)
@@ -24,6 +24,8 @@
 #ifndef HILDON_FILE_SYSTEM_MMC_H__
 #define HILDON_FILE_SYSTEM_MMC_H__ 
 
+#error This is obsolete
+
 #include "hildon-file-system-special-location.h"
 
 G_BEGIN_DECLS

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-old-gateway.h
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-old-gateway.h	2007-11-01 13:44:11 UTC (rev 14697)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-old-gateway.h	2007-11-01 16:53:56 UTC (rev 14698)
@@ -24,6 +24,8 @@
 #ifndef HILDON_FILE_SYSTEM_OLD_GATEWAY_H__
 #define HILDON_FILE_SYSTEM_OLD_GATEWAY_H__ 
 
+#error This is obsolete
+
 #include "hildon-file-system-remote-device.h"
 
 G_BEGIN_DECLS

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-private.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-private.c	2007-11-01 13:44:11 UTC (rev 14697)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-private.c	2007-11-01 16:53:56 UTC (rev 14698)
@@ -43,11 +43,9 @@
 #include "hildon-file-common-private.h"
 #include "hildon-file-system-root.h"
 #include "hildon-file-system-local-device.h"
-#include "hildon-file-system-mmc.h"
 #include "hildon-file-system-upnp.h"
 #include "hildon-file-system-smb.h"
 #include "hildon-file-system-obex.h"
-#include "hildon-file-system-old-gateway.h"
 
 extern GtkFileSystem *gtk_file_system_unix_new();
 
@@ -191,19 +189,13 @@
             g_node_append_data(locations, location);
         }
 
-        if (!g_getenv("DISABLE_GATEWAY")) {
-            /* Setup gateway */
-            location = g_object_new(HILDON_TYPE_FILE_SYSTEM_OLD_GATEWAY, NULL);
-            g_node_append_data(locations, location);
-        } else {
-            /* Setup multiple Bluetooth device support */
-            env = g_getenv("HILDON_FM_OBEX_ROOT");
-            if (env && env[0]) {
-                location = g_object_new(HILDON_TYPE_FILE_SYSTEM_OBEX, NULL);
-                location->basepath = g_strdup(env);
-                g_node_append_data(locations, location);
-            }
-        }
+	/* Setup multiple Bluetooth device support */
+	env = g_getenv("HILDON_FM_OBEX_ROOT");
+	if (env && env[0]) {
+	  location = g_object_new(HILDON_TYPE_FILE_SYSTEM_OBEX, NULL);
+	  location->basepath = g_strdup(env);
+	  g_node_append_data(locations, location);
+	}
 
         /* Setup SMB
          */

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-root.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-root.c	2007-11-01 13:44:11 UTC (rev 14697)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-root.c	2007-11-01 16:53:56 UTC (rev 14698)
@@ -29,7 +29,6 @@
 #include "hildon-file-common-private.h"
 #include "hildon-file-system-private.h"
 #include "hildon-file-system-root.h"
-#include "hildon-file-system-mmc.h"
 #include "hildon-file-system-voldev.h"
 #include "hildon-file-system-settings.h"