aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRadek Doulik <rodo@ximian.com>2004-11-12 02:37:07 +0800
committerRadek Doulik <rodo@src.gnome.org>2004-11-12 02:37:07 +0800
commit83ef2d98db99efbdd5108606638ca4b29f97853b (patch)
tree70b5746b9423ba48c9df30b5fda0215f67250b16
parent38c307f2f8bafd0a17c68fcc83cacdcd82e7e9b0 (diff)
downloadgsoc2013-evolution-83ef2d98db99efbdd5108606638ca4b29f97853b.tar
gsoc2013-evolution-83ef2d98db99efbdd5108606638ca4b29f97853b.tar.gz
gsoc2013-evolution-83ef2d98db99efbdd5108606638ca4b29f97853b.tar.bz2
gsoc2013-evolution-83ef2d98db99efbdd5108606638ca4b29f97853b.tar.lz
gsoc2013-evolution-83ef2d98db99efbdd5108606638ca4b29f97853b.tar.xz
gsoc2013-evolution-83ef2d98db99efbdd5108606638ca4b29f97853b.tar.zst
gsoc2013-evolution-83ef2d98db99efbdd5108606638ca4b29f97853b.zip
l = g_list_next (l); in inner loop instead of g = g_list_next (l)..
2004-11-11 Radek Doulik <rodo@ximian.com> * em-format-hook.c (emfh_enable): l = g_list_next (l); in inner loop instead of g = g_list_next (l).. probably typo after c'n'p * em-format.c (em_format_class_remove_handler): in case the old handler doesn't exist, remove 'info' handler from type_handler table svn path=/trunk/; revision=27893
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/em-format-hook.c2
-rw-r--r--mail/em-format.c5
3 files changed, 14 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4b7e06cbf2..2061234d1a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,12 @@
+2004-11-11 Radek Doulik <rodo@ximian.com>
+
+ * em-format-hook.c (emfh_enable): l = g_list_next (l); in inner
+ loop instead of g = g_list_next (l).. probably typo after c'n'p
+
+ * em-format.c (em_format_class_remove_handler): in case the old
+ handler doesn't exist, remove 'info' handler from type_handler
+ table
+
2004-11-03 Not Zed <NotZed@Ximian.com>
* em-folder-view.c (emfv_popup): Fix the popup id.
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index d88323e348..9748dc8088 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -207,7 +207,7 @@ emfh_enable(EPluginHook *eph, int state)
struct _EMFormatHookGroup *group = g->data;
klass = g_hash_table_lookup(emfh_types, group->id);
- for (l=group->items;l;g=g_slist_next(l)) {
+ for (l=group->items;l;l=g_slist_next(l)) {
EMFormatHookItem *item = l->data;
if (state)
diff --git a/mail/em-format.c b/mail/em-format.c
index 73bba36e57..21b87d102c 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -239,7 +239,10 @@ em_format_class_remove_handler(EMFormatClass *emfc, EMFormatHandler *info)
current = g_hash_table_lookup(emfc->type_handlers, info->mime_type);
if (current == info) {
current = info->old;
- g_hash_table_insert(emfc->type_handlers, current->mime_type, current);
+ if (current)
+ g_hash_table_insert(emfc->type_handlers, current->mime_type, current);
+ else
+ g_hash_table_remove(emfc->type_handlers, info->mime_type);
} else {
while (current && current->old != info)
current = current->old;