Changeset 3227

Timestamp:

01/09/08 11:51:11

Author:

djcb

Message:

* small fixes to tny-maemo-conic-device

Files:

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

trunk/ChangeLog

@@ +1 @@
+2008-01-09  Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>
+        
+        * small fixes / cleanups for tny-maemo-conic-device
+
-2008-01-08  Sergio Villar Senin  <svillar@igalia.com>
-

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

@@ -80 +80 @@
-conic_emit_status_idle (gpointer user_data)
-{
-
+
+
+
+
+
-
-        /* We lock the gdk thread because tinymail wants implementations to do
@@ -97 +101 @@
-conic_emit_status_destroy (gpointer user_data)
-{
-
-
+
+
+
+
+
+
+
+
+
-        g_slice_free (EmitStatusInfo, info);
-        return;
-}
-
@@ -106 +116 @@
-conic_emit_status (TnyDevice *self, gboolean status)
-{
+        EmitStatusInfo *info;
+        guint time = 1000;
+
+        g_return_if_fail (TNY_IS_DEVICE(self));
+        
-        /* Emit it in an idle handler: */
-
-
-
+
+
-        info->self = g_object_ref (self);
-        info->status = status;
@@ -118 +132 @@
-        g_timeout_add_full (G_PRIORITY_DEFAULT, time, conic_emit_status_idle,
-                info, conic_emit_status_destroy);
-
-        return;
-}
-
@@ -130 +142 @@
-
-        g_return_if_fail (TNY_IS_DEVICE(device));
+        
-        self = TNY_MAEMO_CONIC_DEVICE (device);
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
@@ -138 +151 @@
-        if (status_before != tny_maemo_conic_device_is_online (device))
-                conic_emit_status (device, !status_before);
-
-        return;
-}
-
@@ -145 +156 @@
-handle_connect (TnyMaemoConicDevice *self, int con_err, int con_state)
-{
-
+
+
+
+
+
-
-        if (priv->connect_slot) {
@@ -189 +204 @@
-                g_slice_free (ConnectInfo, info);
-        }
-
-        return;
-}
-
@@ -199 +212 @@
-} HandleConnInfo;
-
-
+ /* FIXME: this function will always return FALSE, is that correct? */
-handle_con_idle (gpointer data)
-{
-
+
+
+
+
+
-        handle_connect (info->self, info->con_err, info->con_state);
+
-        return FALSE;
-}
@@ -209 +227 @@
-static void 
-handle_con_idle_destroy (gpointer data) 
-
-
-
+
+
+
+
+
+
+
+
+
+
-        g_slice_free (HandleConnInfo, data); 
-}
@@ -219 +244 @@
-on_connection_event (ConIcConnection *cnx, ConIcConnectionEvent *event, gpointer user_data)
-{
- = TNY_MAEMO_CONIC_DEVICE (user_data)
- = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (device)
+
+
-        gboolean is_online = FALSE;
-        gboolean emit = FALSE;
-        HandleConnInfo *iinfo;
-        int con_err, con_state;
+        
+        /* we don't need cnx in this function */
+        g_return_if_fail (user_data && TNY_MAEMO_IS_CONIC_DEVICE(user_data));
+        g_return_if_fail (event && CON_IC_IS_CONNECTION_EVENT(event));
+        
+        device = TNY_MAEMO_CONIC_DEVICE (user_data);
+        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (device);
-
-        /* Don't emit nor make any changes in case of forced state */
@@ -252 +284 @@
-        switch (con_state) {
-                case CON_IC_STATUS_CONNECTED:
-
-
+
-                        priv->iap = g_strdup (con_ic_event_get_iap_id ((ConIcEvent*)(event)));
-                        if (!priv->is_online)
@@ -263 +294 @@
-
-                case CON_IC_STATUS_DISCONNECTED:
+                        g_free (priv->iap);
-                        priv->iap = NULL;
-                        if (priv->is_online)
@@ -298 +330 @@
-        if (emit)
-                conic_emit_status (TNY_DEVICE (device), is_online);
-
-        return;
-}
-
@@ -337 +367 @@
-        info->callback = callback;
-        info->user_data = user_data;
-g_strdup (iap_id);
+iap_id ? g_strdup (iap_id) : NULL; /* iap_id can be NULL */
-
-        priv->connect_slot = info;
@@ -369 +399 @@
-                g_slice_free (ConnectInfo, info);
-        }
- 
-        return;
-}
-
@@ -389 +417 @@
-        TnyMaemoConicDevicePriv *priv = NULL;
-
-
+self && 
-
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
@@ -449 +477 @@
-tny_maemo_conic_device_get_iap (TnyMaemoConicDevice *self, const gchar *iap_id)
-{
- = NULL
+
-        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);
@@ -477 +506 @@
-tny_maemo_conic_device_get_iap_list (TnyMaemoConicDevice *self)
-{
-
+
+
+
-
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
@@ -496 +527 @@
-tny_maemo_conic_device_free_iap_list (TnyMaemoConicDevice *self, GSList* cnx_list)
-{
-
-
-
-
-
+
-        g_slist_free (cnx_list);
-        return;
-}
-
@@ -512 +538 @@
-        TnyMaemoConicDevicePriv *priv;
-        gboolean already_online = FALSE;
+
-        g_return_if_fail (TNY_IS_DEVICE(device));
+
-        self = TNY_MAEMO_CONIC_DEVICE (device);
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
-
+
-        already_online = tny_maemo_conic_device_is_online (device);
-
@@ -535 +563 @@
-
-        g_return_if_fail (TNY_IS_DEVICE(device));
+
-        self = TNY_MAEMO_CONIC_DEVICE (device);
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
@@ -545 +574 @@
-        if (!already_offline)
-                conic_emit_status (device, FALSE);
-
-        return;
-}
-
@@ -601 +628 @@
-tny_maemo_conic_device_new (void)
-{
-
-
-
+
-}
-
@@ -609 +634 @@
-tny_maemo_conic_device_finalize (GObject *obj)
-{
-
-
+
+
+
+
+
-        g_signal_handler_disconnect (obj, priv->signal1);
-