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

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-09-04 19:11:04 +0300 (Tue, 04 Sep 2007)
New Revision: 13587

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-obex.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-smb.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-upnp.c
Log:
Fix build.

Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-09-04 14:51:18 UTC (rev 13586)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-09-04 16:11:04 UTC (rev 13587)
@@ -1,3 +1,13 @@
+2007-09-04  Richard Hult  <richard at imendio.com>
+
+	* hildon-fm/hildon-file-system-model.c: (handle_finished_node),
+	(location_rescan):
+	* hildon-fm/hildon-file-system-obex.c:
+	* hildon-fm/hildon-file-system-smb.c:
+	(my_file_folder_list_children):
+	* hildon-fm/hildon-file-system-upnp.c: Apply patch from Carlos to
+	fix build that broke by the previous commit.
+
 2007-09-04  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Another attempt at getting the visibility of special locations

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-09-04 14:51:18 UTC (rev 13586)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-09-04 16:11:04 UTC (rev 13587)
@@ -229,7 +229,6 @@
   GtkTreeIter iter;
   HildonFileSystemModel *model = MODEL_FROM_NODE(node);
   GNode *child_node;
-  HildonFileSystemModelNode *model_node = node->data;
 
   child_node = g_node_first_child(node);
   while (child_node)
@@ -2367,7 +2366,6 @@
 {
     HildonFileSystemModelNode *model_node;
     HildonFileSystemModel *model;
-    GNode *child;
 
     g_assert(HILDON_IS_FILE_SYSTEM_SPECIAL_LOCATION(location));
     g_assert(node != NULL && node->data != NULL);

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-obex.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-obex.c	2007-09-04 14:51:18 UTC (rev 13586)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-obex.c	2007-09-04 16:11:04 UTC (rev 13587)
@@ -84,8 +84,6 @@
 static void
 bondings_changed (GObject *settings, GParamSpec *param, gpointer data)
 {
-  HildonFileSystemObex *obex = HILDON_FILE_SYSTEM_OBEX (data);
-
   fprintf (stderr, "OBEX BONDINGS CHANGED\n");
 
   g_signal_emit_by_name (data, "changed");

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-smb.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-smb.c	2007-09-04 14:51:18 UTC (rev 13586)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-smb.c	2007-09-04 16:11:04 UTC (rev 13587)
@@ -85,8 +85,6 @@
 static void
 iap_connected_changed (GObject *settings, GParamSpec *param, gpointer data)
 {
-  HildonFileSystemSmb *smb = HILDON_FILE_SYSTEM_SMB (data);
-
   g_signal_emit_by_name (data, "connection-state");
   g_signal_emit_by_name (data, "rescan");
   g_signal_emit_by_name (data, "changed");
@@ -317,7 +315,7 @@
   MyFileFolder *my_folder = MY_FILE_FOLDER (folder);
   GList *c;
 
-  fprintf (stderr, "SMB GOT CHILDREN (%d)\n", g_list_length (children));
+  fprintf (stderr, "SMB GOT CHILDREN (%d)\n", g_slist_length (*children));
 
   *children = NULL;
   for (c = my_folder->children; c; c = c->next)
@@ -332,7 +330,7 @@
       *children = g_slist_append (*children, childrens_children);
     }
 
-  fprintf (stderr, "SMB GOT CHILDREN (%d)\n", g_list_length (children));
+  fprintf (stderr, "SMB GOT CHILDREN (%d)\n", g_slist_length (*children));
 
   return TRUE;
 }

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-upnp.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-upnp.c	2007-09-04 14:51:18 UTC (rev 13586)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-upnp.c	2007-09-04 16:11:04 UTC (rev 13587)
@@ -69,8 +69,6 @@
 static void
 iap_connected_changed (GObject *settings, GParamSpec *param, gpointer data)
 {
-  HildonFileSystemUpnp *upnp = HILDON_FILE_SYSTEM_UPNP (data);
-
   g_signal_emit_by_name (data, "connection-state");
   g_signal_emit_by_name (data, "rescan");
 }