Changeset 1836
- Timestamp:
- 04/24/07 20:33:44
- Files:
-
- trunk/ChangeLog (modified) (1 diff)
- trunk/libtinymail-camel/tny-camel-folder.c (modified) (3 diffs)
- trunk/libtinymail/tny-folder-change.c (modified) (6 diffs)
- trunk/libtinymail/tny-folder-change.h (modified) (2 diffs)
- trunk/po/Makefile.in.in (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r1834 r1836 1 2007-04-23 Philip Van Hoof <pvanhoof@gnome.org> 2 3 * tny_folder_change_set_received_msg, 4 tny_folder_change_get_received_msg and 5 TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED added 6 7 * This was a major API change 8 1 9 2007-04-24 Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 2 10 trunk/libtinymail-camel/tny-camel-folder.c
r1827 r1836 1200 1200 { 1201 1201 GetMsgInfo *info = (GetMsgInfo *) thr_user_data; 1202 TnyFolderChange *change; 1203 1204 if (info->msg) 1205 { 1206 change = tny_folder_change_new (info->self); 1207 tny_folder_change_set_received_msg (change, info->msg); 1208 notify_folder_observers_about (info->self, change); 1209 g_object_unref (G_OBJECT (change)); 1210 1211 g_object_unref (G_OBJECT (info->msg)); 1212 } 1202 1213 1203 1214 /* thread reference */ 1204 1215 g_object_unref (G_OBJECT (info->self)); 1205 if (info->msg)1206 g_object_unref (G_OBJECT (info->msg));1207 1216 1208 1217 if (info->err) … … 1352 1361 TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 1353 1362 TnyMsg *retval = NULL; 1363 TnyFolderChange *change; 1354 1364 1355 1365 if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), err, … … 1375 1385 1376 1386 retval = tny_msg_receive_strategy_perform_get_msg (priv->receive_strat, self, header, err); 1387 1388 if (retval) 1389 { 1390 change = tny_folder_change_new (self); 1391 tny_folder_change_set_received_msg (change, retval); 1392 notify_folder_observers_about (self, change); 1393 g_object_unref (G_OBJECT (change)); 1394 } 1377 1395 1378 1396 g_static_rec_mutex_unlock (priv->folder_lock); trunk/libtinymail/tny-folder-change.c
r1728 r1836 37 37 gchar *oldname, *newname; 38 38 TnyFolderChangeChanged changed; 39 TnyMsg *msg; 39 40 }; 40 41 … … 42 43 (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_FOLDER_CHANGE, TnyFolderChangePriv)) 43 44 45 /** 46 * tny_folder_change_set_received_msg: 47 * @self: a #TnyFolderChange instance 48 * @msg: a #TnyMsg instance 49 * 50 * Set the message that got received 51 **/ 52 void 53 tny_folder_change_set_received_msg (TnyFolderChange *self, TnyMsg *msg) 54 { 55 TnyFolderChangePriv *priv = TNY_FOLDER_CHANGE_GET_PRIVATE (self); 56 57 g_mutex_lock (priv->lock); 58 if (priv->msg) 59 g_object_unref (priv->msg); 60 priv->msg = TNY_MSG (g_object_ref (msg)); 61 priv->changed |= TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED; 62 g_mutex_unlock (priv->lock); 63 } 64 65 /** 66 * tny_folder_change_get_received_msg: 67 * @self: a #TnyFolderChange instance 68 * 69 * Get the message that got received 70 * 71 * Return value: the message that got received 72 **/ 73 TnyMsg * 74 tny_folder_change_get_received_msg (TnyFolderChange *self) 75 { 76 TnyFolderChangePriv *priv = TNY_FOLDER_CHANGE_GET_PRIVATE (self); 77 TnyMsg *msg = NULL; 78 79 g_mutex_lock (priv->lock); 80 if (priv->msg) 81 msg = TNY_MSG (g_object_ref (priv->msg)); 82 g_mutex_unlock (priv->lock); 83 84 return msg; 85 } 44 86 45 87 /** … … 48 90 * 49 91 * Get an enum with all the changed things 92 * 93 * Return value: the changed-flags 50 94 **/ 51 95 TnyFolderChangeChanged … … 276 320 priv->added = NULL; 277 321 priv->removed = NULL; 278 322 if (priv->msg) 323 g_object_unref (priv->msg); 324 priv->msg = NULL; 279 325 g_mutex_unlock (priv->lock); 280 326 } … … 389 435 g_mutex_lock (priv->lock); 390 436 437 priv->msg = NULL; 391 438 priv->changed = 0; 392 439 priv->new_unread_count = 0; … … 418 465 priv->removed = NULL; 419 466 467 if (priv->msg) 468 g_object_unref (priv->msg); 420 469 if (priv->oldname) 421 470 g_free (priv->oldname); 422 471 if (priv->newname) 423 472 g_free (priv->newname); 424 425 473 if (priv->folder) 426 474 g_object_unref (G_OBJECT (priv->folder)); trunk/libtinymail/tny-folder-change.h
r1651 r1836 47 47 TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS = 1<<3, 48 48 TNY_FOLDER_CHANGE_CHANGED_REMOVED_HEADERS = 1<<4, 49 TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME = 1<<5 49 TNY_FOLDER_CHANGE_CHANGED_FOLDER_RENAME = 1<<5, 50 TNY_FOLDER_CHANGE_CHANGED_MSG_RECEIVED = 1<<6, 50 51 }; 51 52 … … 65 66 const gchar *tny_folder_change_get_rename (TnyFolderChange *self, const gchar **oldname); 66 67 void tny_folder_change_set_rename (TnyFolderChange *self, const gchar *newname); 68 void tny_folder_change_set_received_msg (TnyFolderChange *self, TnyMsg *msg); 69 TnyMsg *tny_folder_change_get_received_msg (TnyFolderChange *self); 67 70 void tny_folder_change_set_new_all_count (TnyFolderChange *self, guint new_all_count); 68 71 void tny_folder_change_set_new_unread_count (TnyFolderChange *self, guint new_unread_count); trunk/po/Makefile.in.in
r1821 r1836 26 26 prefix = @prefix@ 27 27 exec_prefix = @exec_prefix@ 28 datarootdir = @datarootdir@ 28 29 datadir = @datadir@ 29 30 libdir = @libdir@ … … 41 42 GMSGFMT = @GMSGFMT@ 42 43 MSGFMT = @MSGFMT@ 44 MSGFMT_OPTS = @MSGFMT_OPTS@ 43 45 XGETTEXT = @XGETTEXT@ 44 46 MSGMERGE = msgmerge … … 79 81 .po.gmo: 80 82 file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ 81 && rm -f $$file && $(GMSGFMT) -c-o $$file $<83 && rm -f $$file && $(GMSGFMT) $(MSGFMT_OPTS) -o $$file $< 82 84 83 85 .po.cat:
