Changeset 2045
- Timestamp:
- 05/24/07 16:42:39
- Files:
-
- trunk/ChangeLog (modified) (1 diff)
- trunk/libtinymail-maemo/tny-maemo-conic-device.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r2042 r2045 1 2007-05-24 Murray Cumming <murrayc@murrayc.com> 2 3 * libtinymail-maemo/tny-maemo-conic-device.c: 4 (tny_maemo_conic_device_get_iap): When running in scratchbox, 5 make sure that this returns an instance for a more complete fake 6 implementation. 7 1 8 2007-05-23 Murray Cumming <murrayc@murrayc.com> 2 9 trunk/libtinymail-maemo/tny-maemo-conic-device.c
r2012 r2045 268 268 tny_maemo_conic_device_get_iap (TnyMaemoConicDevice *self, const gchar *iap_id) 269 269 { 270 TnyMaemoConicDevicePriv *priv;271 272 270 g_return_val_if_fail (TNY_IS_MAEMO_CONIC_DEVICE(self), NULL); 273 271 g_return_val_if_fail (iap_id, NULL); 274 272 275 priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self); 273 #ifdef MAEMO_CONIC_DUMMY 274 /* Note that we have re-declared the private struct so that we 275 * can do this, which is very bad and fragile: */ 276 ConIcIap *iap = g_object_new (CON_IC_TYPE_IAP, NULL); 277 iap->id = g_strdup(iap_id); 278 iap->name = g_strdup_printf("%s name", iap->id); 279 return iap; 280 #else 281 TnyMaemoConicDevicePriv *priv = TNY_MAEMO_CONIC_DEVICE_GET_PRIVATE (self); 276 282 g_return_val_if_fail (priv->cnx, NULL); 277 283 … … 282 288 */ 283 289 return con_ic_connection_get_iap (priv->cnx, iap_id); 290 #endif 284 291 } 285 292 … … 324 331 ConIcIap *iap = g_object_new (CON_IC_TYPE_IAP, NULL); 325 332 iap->id = g_strdup_printf("debug id%d", i); 326 iap->name = g_strdup_printf(" debug name%d", i);333 iap->name = g_strdup_printf("%s name", iap->id); 327 334 328 335 result = g_slist_append (result, iap);
