Changeset 2956

Timestamp:

11/15/07 16:29:37

Author:

svillar

Message:

• Added support to specify if the connection request comes from an user
  

Files:

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

trunk/ChangeLog

@@ +1 @@
+2007-11-15  Sergio Villar Senin  <svillar@igalia.com>
+
+        * libtinymail-maemo/tny-maemo-conic-device.c:
+        (tny_maemo_conic_device_connect):
+        (tny_maemo_conic_device_connect_async): added a new parametter called
+        user_requested that specifies whether or not the connection was
+        requested by an user or by an automatic system (like a daemon). This
+        allows the connection not to succed when the device is sleeping.
+
-2007-11-15  Philip Van Hoof  <pvanhoof@gnome.org>
-

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

@@ -307 +307 @@
- * @self: a #TnyDevice object
- * @iap_id: the id of the Internet Access Point (IAP), or NULL for 'any;
+ * @user_requested: whether or not the connection was automatically requested or by an user action
- * @callback: a #TnyMaemoConicDeviceConnectCallback
- * @user_data: user data for @callback
@@ -318 +319 @@
-tny_maemo_conic_device_connect_async (TnyMaemoConicDevice *self, 
-                                      const gchar* iap_id, 
+                                      gboolean user_requested,
-                                      TnyMaemoConicDeviceConnectCallback callback, 
-                                      gpointer user_data)
@@ -325 +327 @@
-        ConnectInfo *info;
-        GError *err = NULL;
+        ConIcConnectFlags flags;
-
-        priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self);
@@ -336 +339 @@
-        priv->connect_slot = info;
-
+        /* Set the flags */
+        if (user_requested)
+                flags = CON_IC_CONNECT_FLAG_NONE;
+        else
+                flags = CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED;
+
-        if (iap_id) {
-CON_IC_CONNECT_FLAG_NONE
+flags
-                        g_set_error (&err, TNY_ACCOUNT_ERROR, TNY_ERROR_UNSPEC,
-                                "Could not send connect_by_id dbus message");
@@ -343 +352 @@
-                }
-        } else {
-CON_IC_CONNECT_FLAG_NONE
+flags
-                        g_set_error (&err, TNY_ACCOUNT_ERROR, TNY_ERROR_UNSPEC,
-                                "Could not send connect dbus message");
@@ -702 +711 @@
- **/
-gboolean
-
+
+
+
-{
-        TnyMaemoConicDevicePriv *priv = NULL;
-        gboolean request_failed = FALSE;
+        ConIcConnectFlags flags;
-
-        g_return_val_if_fail (TNY_IS_DEVICE(self), FALSE);
@@ -713 +725 @@
-        priv->loop = g_main_loop_new(NULL, FALSE /* not running immediately. */);
-
+        /* Set the flags */
+        if (user_requested)
+                flags = CON_IC_CONNECT_FLAG_NONE;
+        else
+                flags = CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED;
+
-        if (iap_id) {
-CON_IC_CONNECT_FLAG_NONE
+flags
-                        g_warning ("could not send connect_by_id dbus message");
-                        request_failed = TRUE;
-                }
-        } else {
-CON_IC_CONNECT_FLAG_NONE
+flags
-                        g_warning ("could not send connect dbus message");
-                        request_failed = TRUE;

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

@@ -51 +51 @@
-};
-
+typedef void (*TnyMaemoConicDeviceConnectCallback) (TnyMaemoConicDevice *self, const gchar* iap_id, gboolean canceled, GError *err, gpointer user_data);
+
+
-GType tny_maemo_conic_device_get_type (void);
-
-TnyDevice* tny_maemo_conic_device_new (void);
-
-
-
-
-
-
-
+
+
-gboolean tny_maemo_conic_device_disconnect (TnyMaemoConicDevice *self, const gchar* iap_id);
-const gchar* tny_maemo_conic_device_get_current_iap_id (TnyMaemoConicDevice *self);
@@ -70 +69 @@
-
-#endif
-

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

@@ -169 +169 @@
-
-static void 
-
+
+
+
-{
-        ConnectInfo *info = (ConnectInfo *) user_data;
@@ -210 +212 @@
-
-static void 
-
+
+
+
+
-{
-        ConnectInfo *info = g_slice_new0 (ConnectInfo);
@@ -241 +246 @@
- * @self: a #TnyDevice object
- * @iap_id: the id of the Internet Access Point (IAP), or NULL for 'any;
+ * @user_requested: whether or not the connection was automatically requested or by an user action
- * @callback: a #TnyMaemoConicDeviceConnectCallback
- * @user_data: user data for @callback
@@ -250 +256 @@
- **/
-void  
-
+
+
+
+
+
-{
-        dummy_con_ic_connection_connect_by_id_async (self, iap_id, callback, user_data);
@@ -674 +684 @@
-
-gboolean
-
+, gboolean user_requested
-{
-        return dummy_con_ic_connection_connect_by_id (self, iap_id);