Changeset 1840

Timestamp:

04/26/07 14:59:16

Author:

murrayc

Message:

2007-04-26 Murray Cumming <murrayc@murrayc.com>

• • • • libtinymail-maemo/tny-maemo-conic-device.c:
        

(tny_maemo_conic_device_instance_init),
(tny_maemo_conic_device_new): Do all the initialization in init, because
_new functions should just call g_object_new() and not access private API,
because they are just C convenience functions.
(on_connection_event), (tny_maemo_conic_device_connect),
(tny_maemo_conic_device_disconnect),
(tny_maemo_conic_device_get_iap),
(tny_maemo_conic_device_get_iap_list),
(tny_maemo_conic_device_force_online),
(tny_maemo_conic_device_force_offline),
(tny_maemo_conic_device_finalize):
Copy the iap string instead of just storing the pointer, because we have no
guarantees about the lifetime of the string that con_ic_event_get_iap_id()
returns. Free it in finalize.
Added g_return_if*() checks for priv->cnx, without which nothing could work.

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-04-26  Murray Cumming  <murrayc@murrayc.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c:
+        (tny_maemo_conic_device_instance_init),
+        (tny_maemo_conic_device_new): Do all the initialization in init, because 
+        _new functions should just call g_object_new() and not access private API, 
+        because they are just C convenience functions.
+        (on_connection_event), (tny_maemo_conic_device_connect),
+        (tny_maemo_conic_device_disconnect),
+        (tny_maemo_conic_device_get_iap),
+        (tny_maemo_conic_device_get_iap_list),
+        (tny_maemo_conic_device_force_online),
+        (tny_maemo_conic_device_force_offline),
+        (tny_maemo_conic_device_finalize): 
+        Copy the iap string instead of just storing the pointer, because we have no 
+        guarantees about the lifetime of the string that con_ic_event_get_iap_id() 
+        returns. Free it in finalize.
+        Added g_return_if*() checks for priv->cnx, without which nothing could work.
+
-2007-04-23  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -30 +30 @@
-        ConIcConnection *cnx;
-        gboolean        is_online;
-const 
+
-} TnyMaemoConicDevicePriv;
-
@@ -49 +49 @@
-        TnyMaemoConicDevice *device; 
-        TnyMaemoConicDevicePriv *priv;
-
+ = FALSE
-
-        g_return_if_fail (CON_IC_IS_CONNECTION(cnx));
@@ -83 +83 @@
-        switch (con_ic_connection_event_get_status(event)) {
-        case CON_IC_STATUS_CONNECTED:
-con_ic_event_get_iap_id ((ConIcEvent*)(event
+g_strdup (con_ic_event_get_iap_id ((ConIcEvent*)(event)
-                is_online = TRUE;
-                break;
@@ -117 +117 @@
-tny_maemo_conic_device_connect (TnyMaemoConicDevice *self, const gchar* iap_id)
-{
- 
+
-
-        g_return_if_fail (TNY_IS_DEVICE(self));
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        
+        g_return_val_if_fail (priv->cnx, FALSE);
+
-        if (iap_id) {
-                if (!con_ic_connection_connect_by_id (priv->cnx, iap_id, CON_IC_CONNECT_FLAG_NONE)) {
@@ -153 +155 @@
-        
-        g_return_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self));
+        g_return_val_if_fail (priv->cnx, FALSE);
+
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
+
-
-        if (iap_id) {
@@ -212 +217 @@
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
-        g_return_val_if_fail (iap_id, NULL);
+        g_return_val_if_fail (priv->cnx, NULL);
-
-        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
@@ -235 +241 @@
-        
-        g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL);
+        g_return_val_if_fail (priv->cnx, NULL);
-
-        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
@@ -272 +279 @@
-        
-        g_return_if_fail (TNY_IS_DEVICE(self));
+        g_return_if_fail (priv->cnx);
+
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
@@ -289 +298 @@
-
-        g_return_if_fail (TNY_IS_DEVICE(self));
+        g_return_if_fail (priv->cnx);
+
-        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
@@ -313 +324 @@
-{
-        TnyMaemoConicDevice *self = (TnyMaemoConicDevice *)instance;
+
-        TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-        
-        priv->is_online     = FALSE; 
-}
-
-
-
-/**
- * tny_maemo_conic_device_new:
- *
- * Return value: A new #TnyDevice instance
- **/
-TnyDevice*
-tny_maemo_conic_device_new (void)
-{
-        TnyMaemoConicDevice *self; 
-        TnyMaemoConicDevicePriv *priv;
-
-        self = g_object_new (TNY_TYPE_MAEMO_CONIC_DEVICE, NULL);
-        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
-        priv->iap = NULL;
-        priv->cnx = con_ic_connection_new ();
-        if (!priv->cnx) {
-
-
-
+
-        }
-        g_signal_connect (priv->cnx, "connection-event",
@@ -351 +341 @@
-                g_warning ("could not send connect dbus message");
-        
+        
+        priv->is_online     = FALSE; 
+}
+
+
+
+/**
+ * tny_maemo_conic_device_new:
+ *
+ * Return value: A new #TnyDevice instance
+ **/
+TnyDevice*
+tny_maemo_conic_device_new (void)
+{
+        TnyMaemoConicDevice *self = g_object_new (TNY_TYPE_MAEMO_CONIC_DEVICE, NULL);
-        return TNY_DEVICE (self);
-}
@@ -359 +364 @@
-        TnyMaemoConicDevicePriv *priv;
-        priv   = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (obj);
-
+priv->cnx && 
-                if (!con_ic_connection_disconnect (priv->cnx))
-                        g_warning ("failed to send disconnect dbus message");
-                g_object_unref (priv->cnx);
-                priv->cnx = NULL;
+        }
+
+        if (priv->iap) {
+                g_free (priv->iap);
-                priv->iap = NULL;
-      
+
-
-        (*parent_class->finalize) (obj);