Dummy device connecting incorrectly
- From: Sergio Villar Senin <svillar igalia com>
- To: tinymail-devel-list gnome org
- Subject: Dummy device connecting incorrectly
- Date: Wed, 28 Nov 2007 13:36:51 +0100
Hi,
this patch fixes an issue with the maemo dummy device (used in
scratchbox) that was incorrectly reporting a connection change after
starting the client application. The problem was that the device was not
checking the online status correctly.
Br
Index: tny-maemo-conic-dummy-device.c
===================================================================
--- tny-maemo-conic-dummy-device.c (revision 3017)
+++ tny-maemo-conic-dummy-device.c (working copy)
@@ -296,6 +296,7 @@
gchar *contents = NULL;
GError* error = NULL;
gboolean test = FALSE;
+ static gboolean first_time = TRUE;
self = TNY_MAEMO_CONIC_DEVICE (user_data);
@@ -333,16 +334,16 @@
if (strcmp (priv->iap, MAEMO_CONIC_DUMMY_IAP_ID_NONE) == 0) {
priv->is_online = FALSE;
- g_debug ("DEBUG: TnyMaemoConicDevice: %s:\n Dummy connection changed to no connection.\n", __FUNCTION__);
} else {
priv->is_online = TRUE;
- g_debug ("DEBUG: TnyMaemoConicDevice: %s:\n Dummy connection changed to '%s\n", __FUNCTION__, priv->iap);
}
-
- g_debug ("DEBUG1: %s: emitting is_online=%d\n", __FUNCTION__, priv->is_online);
- conic_emit_status (TNY_DEVICE (self), priv->is_online);
-
+ /* Do not need to emit it the first time because it's
+ called from the instance init */
+ if (!first_time)
+ conic_emit_status (TNY_DEVICE (self), priv->is_online);
+ else
+ first_time = FALSE;
}
g_free (contents);
@@ -538,11 +539,13 @@
priv->iap = NULL;
priv->is_online = dnsmasq_has_resolv ();
+ /* Check if we're online right now */
+ on_dummy_connection_check (self);
+
/* Allow debuggers to fake a connection change by setting an environment
* variable, which we check ever 1 second. This should match one of the
* fake iap IDs that we created in tny_maemo_conic_device_get_iap_list().*/
-
- priv->dummy_env_check_timeout =
+ priv->dummy_env_check_timeout =
g_timeout_add (1000, on_dummy_connection_check, self);
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]