From 62f68fae21f6c477bb2e497308da6b97d8ff235d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 16 Dec 2007 03:55:23 +0000 Subject: Just remove the mail-remote plugin altogether so we stop going back and 2007-12-15 Matthew Barnes * configure.in: * plugins/mail-remote: Just remove the mail-remote plugin altogether so we stop going back and forth over whether the translatable files should be added to POTFILES.in. We can always add it back once we get it working again. * po/POTFILES.in: Remove the mail-remote files for good this time. * mail/em-folder-tree-model.c (emft_model_unread_count_changed), (emfolder_tree_model_set_unread_count): Fix recently introduced compiler warnings. * plugins/mail-remote: Remove this plugin until it can be fixed. * ui/evolution.xml: Fix capitalization of "Download Messages..." (HIG 8.3.2). svn path=/trunk/; revision=34706 --- mail/ChangeLog | 6 ++++++ mail/em-folder-tree-model.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'mail') diff --git a/mail/ChangeLog b/mail/ChangeLog index 10a923c9e1..5228a70f7e 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2007-12-15 Matthew Barnes + + * em-folder-tree-model.c (emft_model_unread_count_changed), + (emfolder_tree_model_set_unread_count): + Fix recently introduced compiler warnings. + 2007-12-15 Milan Crha ** Part of fix for bug #492702 diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 69b9c55f3b..7f05c6ea21 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -256,7 +256,8 @@ emft_model_unread_count_changed (GtkTreeModel *model, GtkTreeIter *iter) GtkTreeIter parent_iter; GtkTreeIter child_iter = *iter; - g_signal_handler_block (model, emft_model_unread_count_changed); + g_signal_handlers_block_by_func ( + model, emft_model_unread_count_changed, NULL); /* Folders are displayed with a bold weight to indicate that they contain unread messages. We signal that parent rows @@ -271,7 +272,8 @@ emft_model_unread_count_changed (GtkTreeModel *model, GtkTreeIter *iter) child_iter = parent_iter; } - g_signal_handler_unblock (model, emft_model_unread_count_changed); + g_signal_handlers_unblock_by_func ( + model, emft_model_unread_count_changed, NULL); } static void @@ -1281,8 +1283,8 @@ em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *sto gtk_tree_store_set ((GtkTreeStore *) model, &iter, COL_UINT_UNREAD, unread, -1); - /* May be this is from where we should probagate unread count to parents etc. */ - emft_model_unread_count_changed (model, &iter); + /* May be this is from where we should propagate unread count to parents etc. */ + emft_model_unread_count_changed (GTK_TREE_MODEL (model), &iter); } -- cgit