Changeset 1896

Timestamp:

05/07/07 15:21:44

Author:

djcb

Message:

• • • • Fixed some use-before-initalization bugs in tny-maemo-conic-device
        
      • Don't try to disconnect in the dummy case there
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-maemo/tny-maemo-conic-device.c (modified) (5 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-05-07 Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
+
+        * Fixed some use-before-initalization bugs in tny-maemo-conic-device
+        * Don't try to disconnect in the dummy case there
+
-2007-05-06  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/libtinymail-maemo/tny-maemo-conic-device.c

@@ -133 +133 @@
-        TnyMaemoConicDevicePriv *priv;
-
-if_fail (TNY_IS_DEVICE(self)
+val_if_fail (TNY_IS_DEVICE(self), FALSE
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        
@@ -166 +166 @@
-tny_maemo_conic_device_disconnect (TnyMaemoConicDevice *self, const gchar* iap_id)
-{
+/* don't try to disconnect if we're in dummy mode, as we're not "really"
+ * connected in that case either
+ */
+#ifndef MAEMO_CONIC_DUMMY 
-        TnyMaemoConicDevicePriv *priv;  
-        
-if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self)
+val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), FALSE
-        g_return_val_if_fail (priv->cnx, FALSE);
-
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
-
-        if (iap_id) {
@@ -184 +187 @@
-                        return FALSE;
-                }
+#endif /* MAEMO_CONIC_DUMMY*/
-        return TRUE;
-}
@@ -231 +235 @@
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
-        g_return_val_if_fail (iap_id, NULL);
+
+        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        g_return_val_if_fail (priv->cnx, NULL);
-
-        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
-        /* Note that it is very unusual to return a reference from a get_() function, 
@@ -260 +264 @@
-        
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
+
+        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        g_return_val_if_fail (priv->cnx, NULL);
-
-        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
-        return con_ic_connection_get_all_iaps (priv->cnx);