aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--configure.in6
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-folder-tree-model.c10
-rw-r--r--po/ChangeLog5
-rw-r--r--po/POTFILES.in4
-rw-r--r--ui/ChangeLog5
-rw-r--r--ui/evolution-mail-global.xml4
8 files changed, 33 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b18cc8c39..1d97f908dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-15 Matthew Barnes <mbarnes@redhat.com>
+
+ * configure.in:
+ * plugins/mail-remote:
+ Just remove the mail-remote plugin altogether so we stop going
+ back and forth over whether the tranlatable files should be added
+ to POTFILES.in. We can always add it back once we get it working
+ again.
+
2007-12-13 Tobias Mueller <tobiasmue@svn.gnome.org>
** Fixes bug 474651
diff --git a/configure.in b/configure.in
index e304b0e579..b505ba39ec 100644
--- a/configure.in
+++ b/configure.in
@@ -1690,12 +1690,6 @@ plugins_standard_always="bbdb subject-thread save-calendar select-one-source cop
plugins_standard="$plugins_standard_always"
all_plugins_standard="$plugins_standard"
-# Disable the mail-remote plugin until it can be made to work or at least
-# compile again. If there is no movement on this before GNOME 2.24 ships
-# then it should be considered dead code and removed from source control.
-#
-# To reenable, add "mail-remote" to plugins_experimental_always.
-
plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting save-attachments external-editor"
plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS"
all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
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 <mbarnes@redhat.com>
+
+ * 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 <mcrha@redhat.com>
** 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);
}
diff --git a/po/ChangeLog b/po/ChangeLog
index e63dd22411..e19d6c6c2f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-15 Matthew Barnes <mbarnes@redhat.com>
+
+ * POTFILES.in:
+ Remove the mail-remote files for good this time.
+
2007-12-15 Seán de Búrca <sdeburca@svn.gnome.org>
* ga.po: Updated Irish translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3ad22ef5b6..91dd6a78f9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -520,7 +520,3 @@ widgets/table/e-tree-scrolled.c
widgets/table/e-tree-selection-model.c
widgets/table/e-tree.c
widgets/text/e-text.c
-plugins/mail-remote/client.c
-plugins/mail-remote/e-corba-utils.c
-plugins/mail-remote/evolution-mail-store.c
-plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 783cf1860f..ffd5e04441 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,6 +1,11 @@
2007-12-15 Matthew Barnes <mbarnes@redhat.com>
* evolution.xml:
+ Fix capitalization of "Download Messages..." (HIG 8.3.2).
+
+2007-12-15 Matthew Barnes <mbarnes@redhat.com>
+
+ * evolution.xml:
Fix capitalization of "Switcher Appearance" menu (HIG 8.3.2).
2007-12-09 Andre Klapper <a9016009@gmx.de>
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index edf15ec06d..a2c00fae50 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -41,7 +41,7 @@
<cmd name="ViewAfter" _label="_Vertical View"
type="radio" group="preview_display" _tip="Show message preview side-by-side with the message list"/>
- <cmd name="PrepareForOffline" _label="_Download messages for offline usage" _tip="Download messages of accounts/folders marked for offline"/>
+ <cmd name="PrepareForOffline" _label="_Download Messages for Offline Usage" _tip="Download messages of accounts/folders marked for offline"/>
</commands>
<keybindings>
@@ -53,7 +53,7 @@
<submenu name="File">
<placeholder name="EmptyTrashPlaceholder">
<menuitem name="EmptyTrash" verb="" _label="Empty _Trash"/>
- <menuitem name="PrepareForOffline" verb="" _label="_Download messages for offline usage"/>
+ <menuitem name="PrepareForOffline" verb="" _label="_Download Messages for Offline Usage"/>
</placeholder>
</submenu>