[maemo-commits] [maemo-commits] r9453 - projects/haf/trunk/hildon-fm/hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-01-30 11:25:41 +0200 (Tue, 30 Jan 2007)
New Revision: 9453

Modified:
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-obex.c
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-settings.c
Log:
	* hildon-fm/hildon-file-system-settings.c,
	hildon-fm/hildon-file-system-obex.c: Do not define
	DBUS_API_SUBJECT_TO_CHANGE, we expect the real one now.

	* hildon-fm/hildon-file-system-settings.c: Do not include
	<osso-ic-dbus.h>, it is deprecated and no longer in our
	Build-Deps.  Instead, hardcode the icd D-Bus names.


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-01-30 09:25:36 UTC (rev 9452)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-obex.c	2007-01-30 09:25:41 UTC (rev 9453)
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <memory.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus-glib-lowlevel.h>
 
 #include <gconf/gconf-client.h>

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-settings.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-settings.c	2007-01-30 09:25:36 UTC (rev 9452)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-settings.c	2007-01-30 09:25:41 UTC (rev 9453)
@@ -42,12 +42,9 @@
 #include <libintl.h>
 #include <string.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include <osso-ic-dbus.h>
-
 #include "hildon-file-common-private.h"
 #include "hildon-file-system-settings.h"
 
@@ -81,6 +78,13 @@
 #define MCE_MATCH_RULE "type='signal',interface='" MCE_SIGNAL_IF \
                        "',member='" MCE_DEVICE_MODE_SIG "'"
 
+/* XXX - use libconic API to listen to the connectedness status
+         instead of talking to ICD directly.
+ */
+
+#define ICD_DBUS_INTERFACE          "com.nokia.icd"
+#define ICD_STATUS_CHANGED_SIG      "status_changed"
+
 #define ICD_MATCH_RULE "type='signal',interface='" ICD_DBUS_INTERFACE \
                        "',member='" ICD_STATUS_CHANGED_SIG "'"