diff options
| -rw-r--r-- | filter/ChangeLog | 4 | ||||
| -rw-r--r-- | filter/filter-folder.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/filter/ChangeLog b/filter/ChangeLog index 92825b84dd..51df7eb209 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,5 +1,9 @@ 2000-12-11 Jeffrey Stedfast <fejj@helixcode.com> + * filter-folder.c (button_clicked): Added a kludge, 'is_active' + which is a static variable that holds whether or not there is an + active shell folder dialog up or not. + * vfolder-editor.c (rule_delete): Autoselect the rule that ends up in the same position (or the one above it if the list is shorter than the position). diff --git a/filter/filter-folder.c b/filter/filter-folder.c index 1a29e31a5e..e00e61484e 100644 --- a/filter/filter-folder.c +++ b/filter/filter-folder.c @@ -204,8 +204,14 @@ button_clicked (GtkButton *button, FilterFolder *ff) #ifdef SHELL const char *allowed_types[] = { "mail", NULL }; char *def, *physical_uri, *evolution_uri; + static gboolean is_active = FALSE; gchar *s; + if (is_active) + return; + + is_active = TRUE; + def = ff->uri ? ff->uri : ""; evolution_shell_client_user_select_folder (global_shell_client, @@ -227,6 +233,8 @@ button_clicked (GtkButton *button, FilterFolder *ff) g_free (physical_uri); } g_free (evolution_uri); + + is_active = FALSE; #else GnomeDialog *gd; GtkEntry *entry; |