[maemo-commits] [maemo-commits] r16336 - in projects/haf/trunk/ke-recv: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2008-10-03 15:49:49 +0300 (Fri, 03 Oct 2008)
New Revision: 16336

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/debian/init.d
   projects/haf/trunk/ke-recv/src/ke-recv.c
Log:
fix


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2008-10-03 12:06:12 UTC (rev 16335)
+++ projects/haf/trunk/ke-recv/debian/changelog	2008-10-03 12:49:49 UTC (rev 16336)
@@ -2,7 +2,7 @@
 
   * Add noatime and nodiratime mount options.
   * Now that HAL is fixed, re-enable slot_name and cover detection code.
-  * Use g_nokia instead of g_ether in the startup script. Fixes: NB#87638
+  * Added g_nokia to the startup script when detecting usbnet. Fixes: NB#87638
   * Do not unmount anything on exit. Fixes: NB#87593
   * Removed unused D-Bus service file. Fixes: NB#87149
   * Removed dependency to libosso-filemanager-interface. Fixes: NB#87254

Modified: projects/haf/trunk/ke-recv/debian/init.d
===================================================================
--- projects/haf/trunk/ke-recv/debian/init.d	2008-10-03 12:06:12 UTC (rev 16335)
+++ projects/haf/trunk/ke-recv/debian/init.d	2008-10-03 12:49:49 UTC (rev 16336)
@@ -46,9 +46,9 @@
 export MMC_MOUNTPOINT='/media/mmc1'
 export INTERNAL_MMC_MOUNTPOINT='/media/mmc2'
 
-/sbin/lsmod | grep g_nokia > /dev/null
+/sbin/lsmod | grep "\(g_nokia\)\|\(g_ether\)" > /dev/null
 if [ $? = 0 ]; then
-  echo "$DESC: g_nokia loaded, ignoring USB cable"
+  echo "$DESC: USB networking enabled, ignoring USB cable"
   export OSSO_KE_RECV_IGNORE_CABLE=1
 fi
 

Modified: projects/haf/trunk/ke-recv/src/ke-recv.c
===================================================================
--- projects/haf/trunk/ke-recv/src/ke-recv.c	2008-10-03 12:06:12 UTC (rev 16335)
+++ projects/haf/trunk/ke-recv/src/ke-recv.c	2008-10-03 12:49:49 UTC (rev 16336)
@@ -32,7 +32,6 @@
 #include "service-launcher.h"
 #include <hildon-mime.h>
 #include <libgen.h>
-#include <ossofilemanagerinterface.h>
 
 #define FDO_SERVICE "org.freedesktop.Notifications"
 #define FDO_OBJECT_PATH "/org/freedesktop/Notifications"
@@ -1537,7 +1536,6 @@
                 } else {
                         mmc->state = S_COVER_OPEN;
                 }
-                mmc->state = S_COVER_CLOSED;
         }
 
         mmc->unmount_pending_timer_id = 0;
@@ -2584,11 +2582,9 @@
 static int open_fm_folder(const char *folder)
 {
         DBusMessage* m = NULL;
-        DBusError err;
         dbus_bool_t r;
 
         assert(ses_conn != NULL);
-        dbus_error_init(&err);
 
         m = dbus_message_new_method_call("com.nokia.osso_filemanager",
                 "/com/nokia/osso_filemanager",
@@ -2605,12 +2601,10 @@
                 return 0;
         }
 
-        dbus_error_init(&err);
-        r = dbus_connection_send(ses_conn, m, &err);
+        r = dbus_connection_send(ses_conn, m, NULL);
         dbus_message_unref(m);
         if (!r) {
-                ULOG_ERR_F("sending failed: %s", err.message);
-                dbus_error_free(&err);
+                ULOG_ERR_F("dbus_connection_send failed");
                 return 0;
         }
         return 1;