diff options
| -rw-r--r-- | mail/ChangeLog | 5 | ||||
| -rw-r--r-- | mail/folder-browser-ui.c | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index d293cc9351..2d3f4c52f8 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2003-04-29 Jeremy Katz <katzj@redhat.com> + + * folder-browser-ui.c (fbui_sensitise_item): Don't just blindly + cast an int to gpointer, use the proper glib magic instead. + 2003-04-29 Jeffrey Stedfast <fejj@ximian.com> * importers/netscape-importer.c diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c index 2dbf4df3cf..18aecd234f 100644 --- a/mail/folder-browser-ui.c +++ b/mail/folder-browser-ui.c @@ -663,13 +663,15 @@ void fbui_sensitise_item (FolderBrowser *fb, const char *item, int state) { char *name, *key; + gpointer val_ptr; int val; /* If this whole caching idea doesn't work, remove it here */ if (fb->sensitise_state == NULL) fb->sensitise_state = g_hash_table_new (g_str_hash, g_str_equal); - if (g_hash_table_lookup_extended (fb->sensitise_state, item, (void **)&key, (void **)&val)) { + if (g_hash_table_lookup_extended (fb->sensitise_state, item, (void **)&key, &val_ptr)) { + val = GPOINTER_TO_INT(val_ptr); if (val == state) return; } @@ -678,7 +680,7 @@ fbui_sensitise_item (FolderBrowser *fb, const char *item, int state) name = g_alloca (strlen (item) + strlen ("/commands/") + 1); sprintf (name, "/commands/%s", item); bonobo_ui_component_set_prop (fb->uicomp, name, "sensitive", state ? "1" : "0", NULL); - g_hash_table_insert (fb->sensitise_state, (char *) item, (gpointer) state); + g_hash_table_insert (fb->sensitise_state, (char *) item, GINT_TO_POINTER(state)); } } |